Browse Source

Add docker timeout to artifact configuration

tags/v1.4.0
dump_stack() 7 months ago
parent
commit
2f5f1db0db
Signed by: Mikhail Klementev <blame@dumpstack.io> GPG Key ID: BE44DA8C062D87DC
4 changed files with 19 additions and 0 deletions
  1. 7
    0
      CHANGELOG.md
  2. 4
    0
      config/config.go
  3. 4
    0
      debug.go
  4. 4
    0
      pew.go

+ 7
- 0
CHANGELOG.md View File

@@ -4,6 +4,13 @@

[Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

### Added

- Parameter `--docker-timeout` may also be set in the artifact
configuration file.

## [1.3.0] 2020-05-30

### Added

+ 4
- 0
config/config.go View File

@@ -115,6 +115,10 @@ type Artifact struct {
Timeout Duration
}

Docker struct {
Timeout Duration
}

Mitigations struct {
DisableSmep bool
DisableSmap bool

+ 4
- 0
debug.go View File

@@ -113,6 +113,10 @@ func debugHandler(kcfg config.KernelConfig, workPath, kernRegex, gdb string,
q.Memory = ka.Qemu.Memory
}

if ka.Docker.Timeout.Duration != 0 {
dockerTimeout = ka.Docker.Timeout.Duration
}

q.SetKASLR(false) // set KASLR to false by default because of gdb
q.SetSMEP(!ka.Mitigations.DisableSmep)
q.SetSMAP(!ka.Mitigations.DisableSmap)

+ 4
- 0
pew.go View File

@@ -325,6 +325,10 @@ func whatever(swg *sizedwaitgroup.SizedWaitGroup, ka config.Artifact,
q.Memory = ka.Qemu.Memory
}

if ka.Docker.Timeout.Duration != 0 {
dockerTimeout = ka.Docker.Timeout.Duration
}

q.SetKASLR(!ka.Mitigations.DisableKaslr)
q.SetSMEP(!ka.Mitigations.DisableSmep)
q.SetSMAP(!ka.Mitigations.DisableSmap)

Loading…
Cancel
Save