1
0
Fork 0

Add docker timeout to artifact configuration

master
dump_stack() 2 years ago
parent 551ec7f7ef
commit 2f5f1db0db
Signed by: dump_stack
GPG Key ID: BE44DA8C062D87DC
  1. 7
      CHANGELOG.md
  2. 4
      config/config.go
  3. 4
      debug.go
  4. 4
      pew.go

@ -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

@ -115,6 +115,10 @@ type Artifact struct {
Timeout Duration
}
Docker struct {
Timeout Duration
}
Mitigations struct {
DisableSmep bool
DisableSmap bool

@ -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)

@ -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