Add docker timeout to artifact configuration
This commit is contained in:
		@@ -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
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								debug.go
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								debug.go
									
									
									
									
									
								
							@@ -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
									
								
								pew.go
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								pew.go
									
									
									
									
									
								
							@@ -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)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user