From d3904589e3d48192114e89a61d7c83b5c6aa6879 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 28 Jan 2020 10:24:03 +1100 Subject: [PATCH] Clean --- SignalServiceKit/src/Loki/API/LokiSnodeProxy.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SignalServiceKit/src/Loki/API/LokiSnodeProxy.swift b/SignalServiceKit/src/Loki/API/LokiSnodeProxy.swift index 7839bf660..0298bfde3 100644 --- a/SignalServiceKit/src/Loki/API/LokiSnodeProxy.swift +++ b/SignalServiceKit/src/Loki/API/LokiSnodeProxy.swift @@ -43,12 +43,12 @@ internal class LokiSnodeProxy : LokiHTTPClient { guard let targetHexEncodedPublicKeySet = target.publicKeySet else { return Promise(error: Error.targetPublicKeySetMissing) } let uncheckedSymmetricKey = try? Curve25519.generateSharedSecret(fromPublicKey: Data(hex: targetHexEncodedPublicKeySet.encryptionKey), privateKey: keyPair.privateKey) guard let symmetricKey = uncheckedSymmetricKey else { return Promise(error: Error.symmetricKeyGenerationFailed) } - let headers = convertHeadersToProxyEndpointFormat(for: request) + let headers = getCanonicalHeaders(for: request) return LokiAPI.getRandomSnode().then { [target = self.target, keyPair = self.keyPair, httpSession = self.httpSession] proxy -> Promise in let url = "\(proxy.address):\(proxy.port)/proxy" print("[Loki] Proxying request to \(target) through \(proxy).") let parametersAsData = try JSONSerialization.data(withJSONObject: request.parameters, options: []) - let proxyRequestParameters: [String : Any] = [ + let proxyRequestParameters: [String:Any] = [ "method" : request.httpMethod, "body" : String(bytes: parametersAsData, encoding: .utf8), "headers" : headers @@ -103,7 +103,7 @@ internal class LokiSnodeProxy : LokiHTTPClient { } // MARK: Convenience - private func convertHeadersToProxyEndpointFormat(for request: TSRequest) -> [String: Any] { + private func getCanonicalHeaders(for request: TSRequest) -> [String: Any] { guard let headers = request.allHTTPHeaderFields else { return [:] } return headers.mapValues { value in switch value.lowercased() {