Merge pull request #31 from jamf/v006_timestamps

fixed timestamps to conform to iso format
jamf · Sep 21, 2022 · e794091 · e794091
2 parents c1eb9a8 + 1505b8c
commit e794091
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/aftermath/Aftermath.swift b/aftermath/Aftermath.swift
@@ -50,7 +50,7 @@ class Aftermath {
 
         let dateFormatter = DateFormatter()
         dateFormatter.locale = Locale(identifier: "en_US")
-        dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
+        dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
         dateFormatter.timeZone = TimeZone(secondsFromGMT: 0)
 
         let dateString = dateFormatter.string(from: date as Date)
@@ -66,15 +66,15 @@ class Aftermath {
         dateFormatter.timeZone = TimeZone(secondsFromGMT: 0)
 
         if let date = dateFormatter.date(from: timeStamp) {
-            dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
+            dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
             let dateString = dateFormatter.string(from: date as Date)
             return dateString
         }
 
         dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
 
         if let date = dateFormatter.date(from: timeStamp) {
-            dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
+            dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
             let dateString = dateFormatter.string(from: date as Date)
             return dateString
         } else {

diff --git a/analysis/LogParser.swift b/analysis/LogParser.swift
@@ -48,7 +48,7 @@ class LogParser: AftermathModule {
                 sanatizeInfo(&info)
 
                 guard let dateZone = dateFormatter.date(from: unformattedDate) else { continue }
-                dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
+                dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
                 let formattedDate = dateFormatter.string(from: dateZone)
                 let text = "\(formattedDate), INSTALL, \(info)"
                 self.addTextToFile(atUrl: logsFile, text: text)
@@ -100,7 +100,7 @@ class LogParser: AftermathModule {
                 let unformattedTimestamp = "\(month) \(date) \(currentYear!) \(time)"
 
                 guard let formatted = dateFormatter.date(from: unformattedTimestamp) else { continue } //Ex: 2022-08-26 00:01:40 UTC
-                dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
+                dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
                 let dateString = dateFormatter.string(from: formatted)
 
                 let text = "\(dateString), SYSLOG, \(info)"
@@ -141,7 +141,7 @@ class LogParser: AftermathModule {
                 sanatizeInfo(&info)
 
                 guard let dateZome = dateFormatter.date(from: unformattedDate) else { continue }
-                dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
+                dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
                 let formattedDate = dateFormatter.string(from: dateZome)
                 let text = "\(formattedDate), XPROTECT_REMEDIATOR, \(info)"
                 self.addTextToFile(atUrl: logsFile, text: text)

diff --git a/analysis/ProcessParser.swift b/analysis/ProcessParser.swift
@@ -45,7 +45,7 @@ class ProcessParser: AftermathModule {
                 sanatizeInfo(&info)
 
                 guard let dateZone = dateFormatter.date(from: unformattedDate) else { continue }
-                dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
+                dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
                 let formattedDate = dateFormatter.string(from: dateZone)
                 let text = "\(formattedDate), PROCESS, \(info)"
                 self.addTextToFile(atUrl: self.storylineFile, text: text)

diff --git a/filesystem/browsers/Safari.swift b/filesystem/browsers/Safari.swift
@@ -95,7 +95,7 @@ class Safari: BrowserModule {
                                 let dateTimestamp = value as! Date
                                 let dateFormatter = DateFormatter()
                                 dateFormatter.locale = Locale(identifier: "en_US")
-                                dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
+                                dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
                                 dateFormatter.timeZone = TimeZone(secondsFromGMT: 0)
 
                                 let dateString = dateFormatter.string(from: dateTimestamp as Date)