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

Fix path traversal in load_page (#1257)

Browse Source
This commit is contained in:
Hunter Stanton
2025-08-13 11:36:04 -07:00
committed by Greg Neagle
parent 2f4c1c3c39
commit b04d50271e
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift
View File

@@ -922,12 +922,28 @@ class MainWindowController: NSWindowController {
func load_page(_ url_fragment: String) {
// Tells the WebView to load the appropriate page
msc_debug_log("load_page request for \(url_fragment)")
let baseURL = URL(fileURLWithPath: htmlDir).standardizedFileURL
let requestURL = baseURL.appendingPathComponent(url_fragment).standardizedFileURL
let baseComponents = baseURL.pathComponents
let requestComponents = requestURL.pathComponents
guard requestComponents.starts(with: baseComponents) else {
msc_debug_log("Attempt to access file outside htmlDir: \(url_fragment)")
let errorURL = baseURL.appendingPathComponent("error.html")
webView.load(URLRequest(url: errorURL))
return
}
let request = URLRequest(
url: requestURL,
cachePolicy: .reloadIgnoringLocalCacheData,
timeoutInterval: 10.0
)
let html_file = NSString.path(withComponents: [htmlDir, url_fragment])
let request = URLRequest(url: URL(fileURLWithPath: html_file),
cachePolicy: .reloadIgnoringLocalCacheData,
timeoutInterval: TimeInterval(10.0))
webView.load(request)
if url_fragment == "updates.html" {
if !_update_in_progress && NSApp.isActive {
// clear all earlier update notifications