GitHub/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-06-06 20:08:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

When constructing a URL for a Munki resource, percent-encode any + characters in the path.

Browse Source
This commit is contained in:
Greg Neagle
2026-04-23 13:17:26 -07:00
parent 6eda31b97f
commit 427a9268ff
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/cli/munki/munkiCLItesting/urlsTests.swift
+7 -1
View File
@@ -53,9 +53,15 @@ struct munkiRepoURLTests {
#expect(munkiRepoURL("manifests", resource: "site_default", munkiRepoURL: munkiBaseURL) == "https://munki.example.com/cgi?manifests/site_default")
}
/// Tests building URLs to Munki repo resources when base URL iwhen resource name contains a special character
/// Tests building URLs to Munki repo resources when resource name contains a special character
@Test func urlWithResourceWithSpecialCharacterContructsExpected() async throws {
let munkiBaseURL = "https://munki.example.com/repo"
#expect(munkiRepoURL("manifests", resource: "site default", munkiRepoURL: munkiBaseURL) == "https://munki.example.com/repo/manifests/site%20default")
}
/// Tests building URLs to Munki repo resources when resource name contains a +
@Test func urlWithResourceWithPlusCharacterContructsExpected() async throws {
let munkiBaseURL = "https://munki.example.com/repo"
#expect(munkiRepoURL("manifests", resource: "site+default", munkiRepoURL: munkiBaseURL) == "https://munki.example.com/repo/manifests/site%2Bdefault")
}
}
code/cli/munki/shared/network/urls.swift
+6 -2
View File
@@ -58,7 +58,11 @@ func munkiRepoURL(_ type: String = "", resource: String = "", munkiRepoURL: Stri
"manifests": "ManifestURL",
"pkgs": "PackageURL",
]
guard let encodedType = (type as NSString).addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) else {
// we're going to remove '+' from the set of characters allowed in the urlPath
// this forces '+' to be precent encoded, which makes some web servers happier
let allowedCharacters = CharacterSet.urlPathAllowed.subtracting(CharacterSet(charactersIn: "+"))
guard let encodedType = (type as NSString).addingPercentEncoding(withAllowedCharacters: allowedCharacters) else {
// encoding failed
return nil
}
@@ -84,7 +88,7 @@ func munkiRepoURL(_ type: String = "", resource: String = "", munkiRepoURL: Stri
if resource.isEmpty {
return typeURL
}
if let encodedResource = (resource as NSString).addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) {
if let encodedResource = (resource as NSString).addingPercentEncoding(withAllowedCharacters: allowedCharacters) {
return typeURL + encodedResource
}
// encoding failed