@@ -11,14 +11,23 @@ import JustLog
1111
1212@UIApplicationMain
1313class AppDelegate : UIResponder , UIApplicationDelegate {
14-
14+
1515 var window : UIWindow ?
1616 private var sessionID = UUID ( ) . uuidString
17-
17+
1818 func application( _ application: UIApplication , didFinishLaunchingWithOptions launchOptions: [ UIApplication . LaunchOptionsKey : Any ] ? ) -> Bool {
1919 setupLogger ( )
2020 return true
2121 }
22+
23+ struct RegexListReponse : Codable {
24+ var pattern : String
25+ var minimumLogLevel : String
26+ }
27+
28+ struct ExceptionListResponse : Codable {
29+ var value : String
30+ }
2231
2332 func applicationDidEnterBackground( _ application: UIApplication ) {
2433 forceSendLogs ( application)
@@ -28,9 +37,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
2837 forceSendLogs ( application)
2938 }
3039
31- func redactValues( message: String , loggerExeptionList: [ String ] , matches: [ NSTextCheckingResult ] ) -> String {
40+ func redactValues( message: String , loggerExeptionList: [ ExceptionListResponse ] , matches: [ NSTextCheckingResult ] ) -> String {
3241
33- var redactedLogMessage = logMessagePlaceholder
42+ var redactedLogMessage = message
3443
3544 for match in matches. reversed ( ) {
3645 let key = match. range ( at: 1 )
@@ -39,14 +48,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
3948 let keyRange = Range ( key, in: redactedLogMessage) !
4049 let valueRange = Range ( value, in: redactedLogMessage) !
4150
42- for listedException in loggerExeptionList {
43- if listedException != redactedLogMessage [ valueRange] {
44- redactedLogMessage. replaceSubrange ( keyRange, with: " **** " )
45- redactedLogMessage. replaceSubrange ( valueRange, with: " **** " )
51+ for exception in loggerExeptionList {
52+ if exception. value == redactedLogMessage [ valueRange] {
53+ return redactedLogMessage
4654 }
4755 }
56+
57+ var redactedKey = redactedLogMessage [ keyRange]
58+ let redactedKeyStartIndex = redactedKey. index ( redactedKey. startIndex, offsetBy: 1 )
59+ let redactedKeyEndIndex = redactedKey. index ( redactedKey. endIndex, offsetBy: - 1 )
60+
61+ redactedKey. replaceSubrange ( redactedKeyStartIndex..< redactedKeyEndIndex, with: " *** " )
62+
63+ var redactedValue = redactedLogMessage [ valueRange]
64+ let valueReplacementStartIndex = redactedValue. startIndex
65+ let valueReplacementEndIndex = redactedValue. endIndex
66+
67+ redactedValue. replaceSubrange ( valueReplacementStartIndex..< valueReplacementEndIndex, with: " ***** " )
68+
69+ redactedLogMessage. replaceSubrange ( valueRange, with: redactedValue)
70+ redactedLogMessage. replaceSubrange ( keyRange, with: redactedKey)
71+
4872 return redactedLogMessage
4973 }
74+ return redactedLogMessage
5075 }
5176
5277 private func forceSendLogs( _ application: UIApplication ) {
@@ -63,12 +88,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
6388 identifier = UIBackgroundTaskIdentifier . invalid
6489 }
6590 }
66-
67- var regexRules = [ [ #"(name) = \\*"(.*?[^\\]+)"# , " function() " , " minimumLevel " ] ]
6891
6992 private func setupLogger( ) {
70-
7193 let logger = Logger . shared
94+ let decoder = JSONDecoder ( )
7295
7396 // custom keys
7497 logger. logTypeKey = " logtype "
@@ -84,27 +107,34 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
84107 logger. logstashPort = 5052
85108 logger. logstashTimeout = 5
86109 logger. logLogstashSocketActivity = true
87-
88- logger. sanitizer = { message, type, regexRules, loggerExeptionList in
89110
111+
112+ let regexRuleList = " [{ \" pattern \" : \" (name) = \\ \\ \\ \\ * \\ \" (.*?[^ \\ \\ \\ \\ ]+) \" , \" minimumLogLevel \" : \" warning \" }, { \" pattern \" : \" (token) = \\ \\ \\ \\ * \\ \" (.*?[^ \\ \\ \\ \\ ]+) \" , \" minimumLogLevel \" : \" warning \" }] " . data ( using: . utf8)
113+ let sanitizationExeceptionList = " [{ \" value \" : \" Dan Jones \" }, { \" value \" : \" Jack Jones \" }] " . data ( using: . utf8)
114+
115+ logger. sanitizer = { message, type in
90116 var sanitizedMessage = message
91117
92- for pattern in regexPattern {
93- if let regex = try ? NSRegularExpression ( pattern: pattern , options: NSRegularExpression . Options. caseInsensitive) {
94-
95- let range = NSRange ( message. startIndex..< message. endIndex, in: message)
96- let matches = regex. matches ( in: message, options: [ ] , range: range)
97-
98- sanitizedMessage = self . redactValues ( message: message, loggerExeptionList: [ " " ] , matches: matches)
99- }
100- }
118+ guard let ruleList = try ? . decode ( [ RegexListReponse ] . self, from: regexRuleList!) else { return " sanitizedMessage " }
119+ guard let exceptionList = try ? . decode ( [ ExceptionListResponse ] . self, from: sanitizationExeceptionList!) else { return " sanitizedMessage " }
101120
121+ for value in ruleList {
122+ if ( value. minimumLogLevel >= type. rawValue) {
123+ if let regex = try ? NSRegularExpression ( pattern: value. pattern , options: NSRegularExpression . Options. caseInsensitive) {
124+
125+ let range = NSRange ( sanitizedMessage. startIndex..< sanitizedMessage. endIndex, in: sanitizedMessage)
126+ let matches = regex. matches ( in: sanitizedMessage, options: [ ] , range: range)
127+
128+ sanitizedMessage = self . redactValues ( message: sanitizedMessage, loggerExeptionList: exceptionList, matches: matches)
129+ }
130+ }
131+ }
102132 return sanitizedMessage
103133 }
104134
105135 // logz.io support
106136 //logger.logzioToken = <logzioToken>
107-
137+
108138 // untrusted (self-signed) logstash server support
109139 //logger.allowUntrustedServer = <Bool>
110140
@@ -114,5 +144,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
114144 " session " : sessionID]
115145 logger. setup ( )
116146 }
117-
147+
148+
118149}
0 commit comments