From f2e56d1d654440581c3b9e7d17ffe057dbae4254 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Thu, 29 Oct 2020 15:56:59 +1100 Subject: [PATCH] Strip User-Agent header --- .../src/Loki/API/Onion Requests/OnionRequestAPI.swift | 3 ++- SignalServiceKit/src/Loki/API/Utilities/HTTP.swift | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPI.swift b/SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPI.swift index 9bef181e7..3d48ec977 100644 --- a/SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPI.swift +++ b/SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPI.swift @@ -281,7 +281,8 @@ public enum OnionRequestAPI { /// Sends an onion request to `server`. Builds new paths as needed. internal static func sendOnionRequest(_ request: NSURLRequest, to server: String, using x25519PublicKey: String, isJSONRequired: Bool = true) -> Promise { - let rawHeaders = request.allHTTPHeaderFields ?? [:] + var rawHeaders = request.allHTTPHeaderFields ?? [:] + rawHeaders.removeValue(forKey: "User-Agent") var headers: JSON = rawHeaders.mapValues { value in switch value.lowercased() { case "true": return true diff --git a/SignalServiceKit/src/Loki/API/Utilities/HTTP.swift b/SignalServiceKit/src/Loki/API/Utilities/HTTP.swift index e25d5b4bf..a6c908714 100644 --- a/SignalServiceKit/src/Loki/API/Utilities/HTTP.swift +++ b/SignalServiceKit/src/Loki/API/Utilities/HTTP.swift @@ -64,6 +64,7 @@ public enum HTTP { request.httpMethod = verb.rawValue request.httpBody = body request.timeoutInterval = timeout + request.allHTTPHeaderFields?.removeValue(forKey: "User-Agent") let (promise, seal) = Promise.pending() let urlSession = useSeedNodeURLSession ? seedNodeURLSession : defaultURLSession let task = urlSession.dataTask(with: request) { data, response, error in