From 97325840e97dfe4a9ec23d171e8248be753fb939 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Tue, 8 Dec 2020 10:33:53 +1100 Subject: [PATCH] Guard against invalid open group server URLs --- SessionMessagingKit/File Server/FileServerAPI.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SessionMessagingKit/File Server/FileServerAPI.swift b/SessionMessagingKit/File Server/FileServerAPI.swift index b0b8d2a0e..3852ffeaa 100644 --- a/SessionMessagingKit/File Server/FileServerAPI.swift +++ b/SessionMessagingKit/File Server/FileServerAPI.swift @@ -56,7 +56,8 @@ public final class FileServerAPI : DotNetAPI { // MARK: Open Group Server Public Key public static func getPublicKey(for openGroupServer: String) -> Promise { - let url = URL(string: "\(server)/loki/v1/getOpenGroupKey/\(URL(string: openGroupServer)!.host!)")! + guard let host = URL(string: openGroupServer)?.host, + let url = URL(string: "\(server)/loki/v1/getOpenGroupKey/\(host)") else { return Promise(error: DotNetAPI.Error.invalidURL) } let request = TSRequest(url: url) let token = "loki" // Tokenless request; use a dummy token request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]