Merge pull request #72 from jamf/version-2.3

updates for version 2.3

Author: c7bercat

aftermath/Aftermath.swift

@@ -15,13 +15,20 @@ class Aftermath {
     static func shell(_ command: String) -> String {
         let task = Process()
         let pipe = Pipe()
-        
+
         task.standardOutput = pipe
         task.standardError = pipe
         task.arguments = ["-c", command]
         task.launchPath = "/bin/bash"
         task.launch()
-        
+
+        let timerSource = DispatchSource.makeTimerSource()
+        timerSource.setEventHandler {
+            task.terminate()
+        }
+        timerSource.schedule(wallDeadline: .now() + 30)
+        timerSource.resume()
+
         let data = pipe.fileHandleForReading.readDataToEndOfFile()
         let output = String(data: data, encoding: .utf8)!
 

aftermath/Command.swift

@@ -28,7 +28,7 @@ class Command {
     static var collectDirs: [String] = []
     static var unifiedLogsFile: String? = nil
     static var esLogs: [String] = ["create", "exec", "mmap"]
-    static let version: String = "2.2.2"
+    static let version: String = "2.3.0"
     static var disableFeatures: [String:Bool] = ["all": false, "browsers": false, "browser-killswitch": false, "databases": false, "filesystem": false, "proc-info": false, "slack": false, "ul": false]
 
     static func main() {

endpointSecurity/ESLogs.swift

@@ -21,12 +21,13 @@ class ESLogs: ESModule {
     func logESEvents(events: String) {
         var output = ""
         DispatchQueue.global(qos: .userInitiated).async { [weak self] in
-            let command = "eslogger \(events) > \(self!.outputFile.relativePath)"
+
+            let command = "eslogger \(events) > \(self?.outputFile.relativePath)"
             output = Aftermath.shell("\(command)")
 
             return
         }
-        
+
         self.addTextToFile(atUrl: self.outputFile, text: output)
     }