From 58b3c6e1e14fa10533415ce3e2a3ed5b32a8a422 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Thu, 17 Sep 2020 16:15:53 +1000
Subject: [PATCH] Change SSL approach

---
 SignalServiceKit/src/Loki/API/SnodeAPI.swift       |  2 +-
 SignalServiceKit/src/Loki/API/Utilities/HTTP.swift | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/SignalServiceKit/src/Loki/API/SnodeAPI.swift b/SignalServiceKit/src/Loki/API/SnodeAPI.swift
index f7ed65bc4..a6e5598d5 100644
--- a/SignalServiceKit/src/Loki/API/SnodeAPI.swift
+++ b/SignalServiceKit/src/Loki/API/SnodeAPI.swift
@@ -78,7 +78,7 @@ public final class SnodeAPI : NSObject {
             print("[Loki] Populating snode pool using: \(target).")
             let (promise, seal) = Promise<Snode>.pending()
             attempt(maxRetryCount: 4, recoveringOn: SnodeAPI.workQueue) {
-                HTTP.execute(.post, url, parameters: parameters).map2 { json -> Snode in
+                HTTP.execute(.post, url, parameters: parameters, useSeedNodeURLSession: true).map2 { json -> Snode in
                     guard let intermediate = json["result"] as? JSON, let rawSnodes = intermediate["service_node_states"] as? [JSON] else { throw SnodeAPIError.randomSnodePoolUpdatingFailed }
                     snodePool = try Set(rawSnodes.flatMap { rawSnode in
                         guard let address = rawSnode["public_ip"] as? String, let port = rawSnode["storage_port"] as? Int,
diff --git a/SignalServiceKit/src/Loki/API/Utilities/HTTP.swift b/SignalServiceKit/src/Loki/API/Utilities/HTTP.swift
index 52f8a4516..ccc0744fc 100644
--- a/SignalServiceKit/src/Loki/API/Utilities/HTTP.swift
+++ b/SignalServiceKit/src/Loki/API/Utilities/HTTP.swift
@@ -1,14 +1,15 @@
 import PromiseKit
 
 public enum HTTP {
-    private static let urlSession = URLSession(configuration: .ephemeral, delegate: urlSessionDelegate, delegateQueue: nil)
-    private static let urlSessionDelegate = URLSessionDelegateImplementation()
+    private static let seedNodeURLSession = URLSession(configuration: .ephemeral)
+    private static let defaultURLSession = URLSession(configuration: .ephemeral, delegate: defaultURLSessionDelegate, delegateQueue: nil)
+    private static let defaultURLSessionDelegate = DefaultURLSessionDelegateImplementation()
 
     // MARK: Settings
     public static let timeout: TimeInterval = 20
 
     // MARK: URL Session Delegate Implementation
-    private final class URLSessionDelegateImplementation : NSObject, URLSessionDelegate {
+    private final class DefaultURLSessionDelegateImplementation : NSObject, URLSessionDelegate {
 
         func urlSession(_ session: URLSession, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
             // Snode to snode communication uses self-signed certificates but clients can safely ignore this
@@ -40,7 +41,7 @@ public enum HTTP {
     }
 
     // MARK: Main
-    public static func execute(_ verb: Verb, _ url: String, parameters: JSON? = nil, timeout: TimeInterval = HTTP.timeout) -> Promise<JSON> {
+    public static func execute(_ verb: Verb, _ url: String, parameters: JSON? = nil, timeout: TimeInterval = HTTP.timeout, useSeedNodeURLSession: Bool = false) -> Promise<JSON> {
         var request = URLRequest(url: URL(string: url)!)
         request.httpMethod = verb.rawValue
         if let parameters = parameters {
@@ -53,6 +54,7 @@ public enum HTTP {
         }
         request.timeoutInterval = timeout
         let (promise, seal) = Promise<JSON>.pending()
+        let urlSession = useSeedNodeURLSession ? seedNodeURLSession : defaultURLSession
         let task = urlSession.dataTask(with: request) { data, response, error in
             guard let data = data, let response = response as? HTTPURLResponse else {
                 if let error = error {