diff --git a/code/cli/munki/shared/network/fetch.swift b/code/cli/munki/shared/network/fetch.swift index 4511f046..53d15dd1 100644 --- a/code/cli/munki/shared/network/fetch.swift +++ b/code/cli/munki/shared/network/fetch.swift @@ -184,13 +184,14 @@ func getURL( if pathExists(tempDownloadPath), !resume { try? FileManager.default.removeItem(atPath: tempDownloadPath) } - + let headers = headerDictFromList(customHeaders) - + // Run middleware var request = MunkiMiddlewareRequest( url: url, - headers: headers + headers: headers, + pkginfo: pkginfo ) request = runMiddleware(request) @@ -205,7 +206,7 @@ func getURL( let ignoreSystemProxy = pref("IgnoreSystemProxies") as? Bool ?? false - var options = GurlOptions( + let options = GurlOptions( url: request.url, destinationPath: tempDownloadPath, additionalHeaders: request.headers, diff --git a/code/cli/munki/shared/network/middleware/MiddlewareFactory.swift b/code/cli/munki/shared/network/middleware/MiddlewareFactory.swift index 3c7d3e69..841b0ca1 100644 --- a/code/cli/munki/shared/network/middleware/MiddlewareFactory.swift +++ b/code/cli/munki/shared/network/middleware/MiddlewareFactory.swift @@ -66,4 +66,3 @@ func loadMiddlewarePlugin() throws -> MunkiMiddleware? { } return nil } - diff --git a/code/cli/munki/shared/network/middleware/MiddlewareProtocol.swift b/code/cli/munki/shared/network/middleware/MiddlewareProtocol.swift index 6e8b33a4..88ab9ab0 100644 --- a/code/cli/munki/shared/network/middleware/MiddlewareProtocol.swift +++ b/code/cli/munki/shared/network/middleware/MiddlewareProtocol.swift @@ -23,6 +23,7 @@ import Foundation public struct MunkiMiddlewareRequest { var url: String var headers: [String: String] + var pkginfo: PlistDict? } public protocol MunkiMiddleware {