Skip to content

Commit 5ca983d

Browse files
committed
fixed timestamps to conform to iso format
1 parent 6fde0a7 commit 5ca983d

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

aftermath/Aftermath.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class Aftermath {
5050

5151
let dateFormatter = DateFormatter()
5252
dateFormatter.locale = Locale(identifier: "en_US")
53-
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
53+
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
5454
dateFormatter.timeZone = TimeZone(secondsFromGMT: 0)
5555

5656
let dateString = dateFormatter.string(from: date as Date)
@@ -74,7 +74,7 @@ class Aftermath {
7474
dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
7575

7676
if let date = dateFormatter.date(from: timeStamp) {
77-
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
77+
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
7878
let dateString = dateFormatter.string(from: date as Date)
7979
return dateString
8080
} else {

analysis/LogParser.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class LogParser: AftermathModule {
4848
sanatizeInfo(&info)
4949

5050
guard let dateZone = dateFormatter.date(from: unformattedDate) else { continue }
51-
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
51+
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
5252
let formattedDate = dateFormatter.string(from: dateZone)
5353
let text = "\(formattedDate), INSTALL, \(info)"
5454
self.addTextToFile(atUrl: logsFile, text: text)
@@ -100,7 +100,7 @@ class LogParser: AftermathModule {
100100
let unformattedTimestamp = "\(month) \(date) \(currentYear!) \(time)"
101101

102102
guard let formatted = dateFormatter.date(from: unformattedTimestamp) else { continue } //Ex: 2022-08-26 00:01:40 UTC
103-
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
103+
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
104104
let dateString = dateFormatter.string(from: formatted)
105105

106106
let text = "\(dateString), SYSLOG, \(info)"
@@ -141,7 +141,7 @@ class LogParser: AftermathModule {
141141
sanatizeInfo(&info)
142142

143143
guard let dateZome = dateFormatter.date(from: unformattedDate) else { continue }
144-
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
144+
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
145145
let formattedDate = dateFormatter.string(from: dateZome)
146146
let text = "\(formattedDate), XPROTECT_REMEDIATOR, \(info)"
147147
self.addTextToFile(atUrl: logsFile, text: text)

analysis/ProcessParser.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class ProcessParser: AftermathModule {
4545
sanatizeInfo(&info)
4646

4747
guard let dateZone = dateFormatter.date(from: unformattedDate) else { continue }
48-
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
48+
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
4949
let formattedDate = dateFormatter.string(from: dateZone)
5050
let text = "\(formattedDate), PROCESS, \(info)"
5151
self.addTextToFile(atUrl: self.storylineFile, text: text)

filesystem/browsers/Safari.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class Safari: BrowserModule {
9595
let dateTimestamp = value as! Date
9696
let dateFormatter = DateFormatter()
9797
dateFormatter.locale = Locale(identifier: "en_US")
98-
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
98+
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
9999
dateFormatter.timeZone = TimeZone(secondsFromGMT: 0)
100100

101101
let dateString = dateFormatter.string(from: dateTimestamp as Date)

0 commit comments

Comments
 (0)