diff --git a/aftermath/Aftermath.swift b/aftermath/Aftermath.swift index 17d62d9..7d762f6 100644 --- 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,7 +66,7 @@ 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 } @@ -74,7 +74,7 @@ class Aftermath { 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 index 01a7748..54cfa6f 100644 --- 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 index 3880115..9404f10 100644 --- 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 index d149416..fdf7e10 100644 --- 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)