Skip to content

Redacting home directory fix #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ecamacho merged 3 commits into from
Feb 11, 2020
Merged

Redacting home directory fix #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac601a3
Fix redacting complex username
polac24 Feb 11, 2020
d693390
Redact plain home directory
polac24 Feb 11, 2020
e1e088f
Emply line removal
polac24 Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/XCLogParser/lexer/LexRedactor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
14 changes: 12 additions & 2 deletions Tests/XCLogParserTests/LexRedactorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down