Skip to content

fix: avoid path trailing slash stripped in older os versions #695

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
ACTCD merged 4 commits into from
Aug 26, 2024
Merged

fix: avoid path trailing slash stripped in older os versions #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb6393b
fix: avoid path trailing slash stripped in older os versions
ACTCD Aug 23, 2024
d216e3b
refactor: improve trailing slash detection
ACTCD Aug 23, 2024
a79549f
test: add some match test cases
ACTCD Aug 24, 2024
a27ae56
refactor: revert d216e3b and add a new test case
ACTCD Aug 24, 2024
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 xcode/Ext-Safari/Functions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1047,7 +1047,7 @@ func match(_ url: String, _ matchPattern: String) -> Bool {
let partsPatternReg = try! NSRegularExpression(pattern: partsPattern, options: .caseInsensitive)
let range = NSMakeRange(0, matchPattern.utf16.count)
guard let parts = partsPatternReg.firstMatch(in: matchPattern, options: [], range: range) else {
logger?.error("\(#function, privacy: .public) - malformed regex match pattern")
logger?.error("\(#function, privacy: .public) - malformed regex match pattern - \(matchPattern, privacy: .public)")
return false
}
// ensure url protocol matches pattern protocol
Expand Down
5 changes: 4 additions & 1 deletion xcode/Shared/UrlPolyfill.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,17 @@ func jsLikeURL(_ urlString: String, baseString: String? = nil) -> [String: Strin
let host = (port == "") ? hostname : "\(hostname):\(port)"
let query = url.query ?? ""
let fragment = url.fragment ?? ""
/// If the path has a trailing slash, it is stripped. https://developer.apple.com/documentation/foundation/nsurl/1408809-path
let strippedPath = url.path.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? url.path
let pathname = (strippedPath != "/" && url.hasDirectoryPath) ? "\(strippedPath)/" : strippedPath
return [
"hash": fragment == "" ? "" : "#\(fragment)",
"host": host,
"hostname": hostname,
// "href": url.absoluteString,
"origin": "\(scheme)://\(host)",
"password": url.password ?? "",
"pathname": url.path.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? url.path,
"pathname": pathname,
"port": port,
"protocol": "\(scheme):",
"search": query == "" ? "" : "?\(query)",
Expand Down
14 changes: 14 additions & 0 deletions xcode/Tests-Mac/UrlCodecTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,20 @@ final class UrlCodecTests: XCTestCase {
"search": "",
"username": ""
]))

XCTAssert(check("http://host.test/path//", [
"hash": "",
"host": "host.test",
"hostname": "host.test",
// "href": "http://host.test/path//",
"origin": "http://host.test",
"password": "",
"pathname": "/path//",
"port": "",
"protocol": "http:",
"search": "",
"username": ""
]))

XCTAssert(check("http://host.test/", [
"hash": "",
Expand Down
131 changes: 116 additions & 15 deletions xcode/Tests-Mac/UserscriptsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,59 +124,160 @@ class UserscriptsTests: XCTestCase {
}

func testMatching() throws {
/// https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Match_patterns#examples
let patternDict = [
"<all_urls>": [
"http://example.org/",
"https://a.org/some/path/"
],
"*://*/*": [
"https://www.bing.com/",
"https://example.org/foo/bar.html",
"http://example.org/",
"https://a.org/some/path/",
"https://☁️.com/"
"https://www.example.com/",
"https://example.org/foo/bar.html",
"https://☁️.com/",
"https://🙂.☁️/",
],
"*://*.mozilla.org/*": [
"http://mozilla.org/",
"https://mozilla.org/",
"https://b.mozilla.org/path/"
"http://a.mozilla.org/",
"http://a.b.mozilla.org/",
"https://b.mozilla.org/path/",
],
"*://mozilla.org/": [
"http://mozilla.org/",
"https://mozilla.org/",
],
"https://*/path": [
"https://mozilla.org/path",
"https://a.mozilla.org/path",
"https://something.com/path",
],
"https://*/path/": [
"https://mozilla.org/path/",
"https://a.mozilla.org/path/",
"https://something.com/path/",
],
"https://mozilla.org/*": [
"https://mozilla.org/",
"https://mozilla.org/path",
"https://mozilla.org/another",
"https://mozilla.org/path/to/doc",
"https://mozilla.org/path/to/doc?foo=1",
],
"https://mozilla.org/a/b/c/": [
"https://mozilla.org/a/b/c/",
"https://mozilla.org/a/b/c/#section1",
],
"https://mozilla.org/*/b/*/": [
"https://mozilla.org/a/b/c/",
"https://mozilla.org/d/b/f/",
"https://mozilla.org/a/b/c/d/",
"https://mozilla.org/a/b/c/d/#section1",
"https://mozilla.org/a/b/c/d/?foo=/",
"https://mozilla.org/a?foo=21314&bar=/b/&extra=c/",
],
"*://www.google.com/*": [
"https://www.google.com/://aa",
"https://www.google.com/preferences?prev=https://www.google.com/",
"https://www.google.com/preferences?prev=",
"https://www.google.com/"
"https://www.google.com/",
],
"*://localhost/*": [
"http://localhost:8000/",
"https://localhost:3000/foo.html"
"https://localhost:3000/foo.html",
],
"http://127.0.0.1/*": [
"http://127.0.0.1/",
"http://127.0.0.1/foo/bar.html"
"http://127.0.0.1/foo/bar.html",
"http://127.0.0.1/?bar=1",
"http://127.0.0.1/foo?bar=1",
],
"*://*.example.com/*?a=1*": [
"http://example.com/?a=1",
"https://www.example.com/index?a=1&b=2"
]
"https://www.example.com/index?a=1&b=2",
],
"*://*.example.com/path/": [
"http://example.com/path/",
"http://a.example.com/path/",
"https://example.com/path/",
"https://a.b.example.com/path/",
"https://☁️.example.com/path/",
],
"*://*.example.com/path/*": [
"https://example.com/path/",
"https://example.com/path/foo",
"https://example.com/path/foo?bar",
"https://example.com/path/?foo=bar",
"https://example.com/path/☁️?☁️=🙂",
],
]
let patternDictFails = [
"*://*/*": [
"ftp://ftp.example.org/", // unmatched scheme)
"file:///a/", // unmatched scheme
],
"*://*.mozilla.org/*": [
"ftp://mozilla.org/", // unmatched scheme
"http://mozilla.com/", // unmatched host
"http://firefox.org/", // unmatched host
],
"*://mozilla.org/": [
"ftp://mozilla.org/", // unmatched scheme
"http://a.mozilla.org/", // unmatched host
"http://mozilla.org/a", // unmatched path
],
"https://*/path": [
"http://mozilla.org/path", // unmatched scheme
"https://mozilla.org/path/", // unmatched path
"https://mozilla.org/a", // unmatched path
"https://mozilla.org/", // unmatched path
"https://mozilla.org/path?foo=1", // unmatched path due to URL query string
],
"https://*/path/": [
"http://mozilla.org/path/", // unmatched scheme
"https://mozilla.org/path", // unmatched path
"https://mozilla.org/a", // unmatched path
"https://mozilla.org/", // unmatched path
"https://mozilla.org/path/?foo=1", // unmatched path due to URL query string
],
"https://mozilla.org/*": [
"http://mozilla.org/path", // unmatched scheme
"https://mozilla.com/path", // unmatched host
],
"https://mozilla.org/*/b/*/": [
"https://mozilla.org/b/*/", // unmatched path
"https://mozilla.org/a/b/", // unmatched path
"https://mozilla.org/a/b/c/d/?foo=bar", // unmatched path due to URL query string
],
"https://www.example.com/*": [
"file://www.example.com/",
"ftp://www.example.com/",
"ws://www.example.com/",
"http://www.example.com/"
"http://www.example.com/",
],
"http://www.example.com/index.html": [
"http://www.example.com/",
"https://www.example.com/index.html"
"https://www.example.com/index.html",
],
"*://localhost/*": [
"https://localhost.com/",
"ftp://localhost:8080/"
"ftp://localhost:8080/",
],
"https://www.example*/*": [
"https://www.example.com/"
"https://www.example.com/",
],
"*://*.example.com/*?a=1*": [
"http://example.com/",
"https://www.example.com/?a=2"
]
"https://www.example.com/?a=2",
],
"*://*.example.com/foo/": [
"https://example.com/foo",
"https://example.com/foo?bar",
"https://example.com/foo/bar",
"https://example.com/foo/?bar",
],
]
for (pattern, urls) in patternDict {
for url in urls {
Expand Down