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

Merge branch 'Munki7dev' into custom-sidebar

Browse Source
This commit is contained in:
Greg Neagle
2025-08-13 13:36:10 -07:00
parent 774bdeccae b429567f5d
commit cebd2b236e
1 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1110,17 +1110,40 @@ 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)")
var request: URLRequest
let html_file = NSString.path(withComponents: [htmlDir, url_fragment])
var request = URLRequest(url: URL(fileURLWithPath: html_file),
cachePolicy: .reloadIgnoringLocalCacheData,
timeoutInterval: TimeInterval(10.0))
if url_fragment.starts(with: "http") {
request = URLRequest(url: URL(string: url_fragment)!,
cachePolicy: .reloadIgnoringLocalCacheData,
timeoutInterval: TimeInterval(10.0))
if let components = URLComponents(string: url_fragment),
["https", "http"].contains(components.scheme)
{
// url_fragment is http:// or https:// URL
request = URLRequest(
url: URL(string: url_fragment)!,
cachePolicy: .reloadIgnoringLocalCacheData,
timeoutInterval: TimeInterval(10.0)
)
} else {
// url_fragment is just a path (or filename)
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)")
// since error.html doesn't exist, this ends up triggering buildItemNotFoundPage()
let errorURL = baseURL.appendingPathComponent("error.html")
webView.load(URLRequest(url: errorURL))
return
}
request = URLRequest(
url: requestURL,
cachePolicy: .reloadIgnoringLocalCacheData,
timeoutInterval: 10.0
)
}
webView.load(request)
if url_fragment == "updates.html" {