Merge pull request #56 from spotify/20200210-redacting-non-word-paths

Redacting home directory fix

Author: ecamacho

Sources/XCLogParser/lexer/LexRedactor.swift

@@ -23,7 +23,7 @@ public class LexRedactor: LogRedactor {
     private static let redactedTemplate = "/Users/<redacted>/"
     private lazy var userDirRegex: NSRegularExpression? = {
         do {
-            return try NSRegularExpression(pattern: "\\/Users\\/(\\w*)\\/")
+            return try NSRegularExpression(pattern: "/Users/([^/]+)/?")
         } catch {
             return nil
         }

Tests/XCLogParserTests/LexRedactorTests.swift

@@ -25,14 +25,24 @@ class LexRedactorTests: XCTestCase {
     let redactor = LexRedactor()
 
     func testRedacting() {
-
         let redactedText = redactor.redactUserDir(string: "Some /Users/private/path")
 
         XCTAssertEqual(redactedText, "Some /Users/<redacted>/path")
     }
 
-    func testMultiplePathsRedacting() {
+    func testRedactingComplexUsername() {
+        let redactedText = redactor.redactUserDir(string: "Some /Users/private-user/path")
+
+        XCTAssertEqual(redactedText, "Some /Users/<redacted>/path")
+    }
 
+    func testRedactingHomePath() {
+        let redactedText = redactor.redactUserDir(string: "/Users/private-user")
+
+        XCTAssertEqual(redactedText, "/Users/<redacted>/")
+    }
+
+    func testMultiplePathsRedacting() {
         let redactedText = redactor.redactUserDir(string: "Some /Users/private/path and other /Users/private/path2")
 
         XCTAssertEqual(redactedText, "Some /Users/<redacted>/path and other /Users/<redacted>/path2")