oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

enable onion routing for open groups

This commit is contained in:
Ryan ZHAO 2020-07-22 17:10:53 +10:00
parent e2219f986c
commit 89a56ba9bc
4 changed files with 335 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
SignalServiceKit/src/Loki/API/FileServerAPI.swift
View File

@ -200,4 +200,23 @@ public final class FileServerAPI : DotNetAPI {
return downloadURL
}
}
// MARK: Open Group Server Public Key
public static func getOpenGroupKey(for openGroupServer: String) -> Promise<String> {
let serverURL = URL(string: openGroupServer)!
let url = URL(string: "\(server)/loki/v1/getOpenGroupKey/\(serverURL.host!)")!
let request = TSRequest(url: url)
let token = "loki" // tokenless request, using a dummy token
request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]
return OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: fileServerPublicKey).map2 { rawResponse in
guard let bodyAsString = rawResponse["data"] as? String, let bodyAsData = bodyAsString.data(using: .utf8), let body = try JSONSerialization.jsonObject(with: bodyAsData, options: [ .fragmentsAllowed ]) as? JSON else { throw HTTP.Error.invalidJSON }
guard let base64EncodedPublicKey = body["data"] as? String else {
print("[Loki] Couldn't parse open group public key from: \(body).")
throw DotNetAPIError.parsingFailed
}
let publicKeyWithPrefix = Data(base64Encoded: base64EncodedPublicKey)!
let hexEncodedPublicKeyWithPrefix = publicKeyWithPrefix.toHexString()
return hexEncodedPublicKeyWithPrefix.removing05PrefixIfNeeded()
}
}
}

19
SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPI.swift
View File

@ -241,12 +241,15 @@ public enum OnionRequestAPI {
}
/// Sends an onion request to `file server`. Builds new paths as needed.
internal static func sendOnionRequestLsrpcDest(_ request: NSURLRequest, server: String, using x25519Key: String) -> Promise<JSON> {
internal static func sendOnionRequestLsrpcDest(_ request: NSURLRequest, server: String, using x25519Key: String, noJSON: Bool = false) -> Promise<JSON> {
var headers = getCanonicalHeaders(for: request)
let urlAsString = request.url!.absoluteString
let serverURLEndIndex = urlAsString.range(of: server)!.upperBound
var endpoint = ""
if server.count < urlAsString.count {
let endpointStartIndex = urlAsString.index(after: serverURLEndIndex)
let endpoint = String(urlAsString[endpointStartIndex..<urlAsString.endIndex])
endpoint = String(urlAsString[endpointStartIndex..<urlAsString.endIndex])
}
let parametersAsString: String
if let tsRequest = request as? TSRequest {
headers["Content-Type"] = "application/json"
@ -269,7 +272,7 @@ public enum OnionRequestAPI {
let destination: JSON = [ "host" : request.url?.host,
"target" : "/loki/v1/lsrpc",
"method" : "POST"]
let promise = sendOnionRequest(on: nil, with: payload, to: destination, using: x25519Key, associatedWith: getUserHexEncodedPublicKey())
let promise = sendOnionRequest(on: nil, with: payload, to: destination, using: x25519Key, associatedWith: getUserHexEncodedPublicKey(), noJSON: noJSON)
promise.recover2{ error -> Promise<JSON> in
// TODO: File Server API handle Error
throw error
@ -277,7 +280,7 @@ public enum OnionRequestAPI {
return promise
}
internal static func sendOnionRequest(on snode: Snode?, with payload: JSON, to destination: JSON, using x25519Key: String?, associatedWith publicKey: String) -> Promise<JSON> {
internal static func sendOnionRequest(on snode: Snode?, with payload: JSON, to destination: JSON, using x25519Key: String?, associatedWith publicKey: String, noJSON: Bool = false) -> Promise<JSON> {
let (promise, seal) = Promise<JSON>.pending()
var guardSnode: Snode!
DispatchQueue.global(qos: .userInitiated).async {
@ -305,12 +308,20 @@ public enum OnionRequestAPI {
if statusCode == 406 { // Clock out of sync
print("[Loki] The user's clock is out of sync with the service node network.")
seal.reject(SnodeAPI.SnodeAPIError.clockOutOfSync)
} else {
if noJSON {
let body = ["body": bodyAsString]
guard 200...299 ~= statusCode else { return seal.reject(Error.httpRequestFailedAtTargetSnode(statusCode: UInt(statusCode), json: body)) }
seal.fulfill(body)
} else {
guard let bodyAsData = bodyAsString.data(using: .utf8),
let body = try JSONSerialization.jsonObject(with: bodyAsData, options: [ .fragmentsAllowed ]) as? JSON else { return seal.reject(HTTP.Error.invalidJSON) }
guard 200...299 ~= statusCode else { return seal.reject(Error.httpRequestFailedAtTargetSnode(statusCode: UInt(statusCode), json: body)) }
seal.fulfill(body)
}
}
} catch (let error) {
seal.reject(error)
}

261
SignalServiceKit/src/Loki/API/Open Groups/LokiPublicChatAPI.swift
View File

@ -8,7 +8,7 @@ public final class LokiPublicChatAPI : DotNetAPI {
public static var displayNameUpdatees: [String:Set<String>] = [:]
internal static var useOnionRequests = true
public static var useOnionRequests = true
// MARK: Settings
private static let attachmentType = "net.app.core.oembed"
@ -31,6 +31,28 @@ public final class LokiPublicChatAPI : DotNetAPI {
@objc public static let lastMessageServerIDCollection = "LokiGroupChatLastMessageServerIDCollection"
@objc public static let lastDeletionServerIDCollection = "LokiGroupChatLastDeletionServerIDCollection"
@objc public static let openGroupPublicKeyCollection = "LokiGroupChatPublicKeyCollection"
private static func getOpenGroupPublicKey(on server: String) -> String? {
var result: String? = nil
storage.dbReadConnection.read { transaction in
result = transaction.object(forKey: "\(server)", inCollection: openGroupPublicKeyCollection) as! String?
}
return result
}
private static func setOpneGroupPublicKey(on server: String, value publicKey: String) {
try! Storage.writeSync { transaction in
transaction.setObject(publicKey, forKey: "\(server)", inCollection: openGroupPublicKeyCollection)
}
}
private static func removeOpenGroupPublicKey(on server: String) {
try! Storage.writeSync { transaction in
transaction.removeObject(forKey: "\(server)", inCollection: openGroupPublicKeyCollection)
}
}
private static func getLastMessageServerID(for group: UInt64, on server: String) -> UInt? {
var result: UInt? = nil
storage.dbReadConnection.read { transaction in
@ -74,6 +96,23 @@ public final class LokiPublicChatAPI : DotNetAPI {
public static func clearCaches(for channel: UInt64, on server: String) {
removeLastMessageServerID(for: channel, on: server)
removeLastDeletionServerID(for: channel, on: server)
removeOpenGroupPublicKey(on: server)
}
// MARK: Open Group Public Key Validation
public static func getOpenGroupServerPublicKey(on server: String) -> Promise<String> {
if let publicKey = getOpenGroupPublicKey(on: server) {
return Promise.value(publicKey)
} else {
return FileServerAPI.getOpenGroupKey(for: server).then2 { hexEncodedPublicKey -> Promise<String> in
let url = URL(string: server)!
let request = TSRequest(url: url)
return OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: hexEncodedPublicKey, noJSON: true).map2 { _ -> String in
setOpneGroupPublicKey(on: server, value: hexEncodedPublicKey)
return hexEncodedPublicKey
}
}
}
}
// MARK: Receiving
@ -83,17 +122,8 @@ public final class LokiPublicChatAPI : DotNetAPI {
}
public static func getMessages(for channel: UInt64, on server: String) -> Promise<[LokiPublicChatMessage]> {
var queryParameters = "include_annotations=1"
if let lastMessageServerID = getLastMessageServerID(for: channel, on: server) {
queryParameters += "&since_id=\(lastMessageServerID)"
} else {
queryParameters += "&count=\(fallbackBatchCount)&include_deleted=0"
}
return getAuthToken(for: server).then(on: DispatchQueue.global(qos: .default)) { token -> Promise<[LokiPublicChatMessage]> in
let url = URL(string: "\(server)/channels/\(channel)/messages?\(queryParameters)")!
let request = TSRequest(url: url)
request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]
return LokiFileServerProxy(for: server).perform(request).map(on: DispatchQueue.global(qos: .default)) { rawResponse in
func handleMessages(rawResponse: Any) throws -> [LokiPublicChatMessage] {
guard let json = rawResponse as? JSON, let rawMessages = json["data"] as? [JSON] else {
print("[Loki] Couldn't parse messages for public chat channel with ID: \(channel) on server: \(server) from: \(rawResponse).")
throw DotNetAPIError.parsingFailed
@ -163,6 +193,27 @@ public final class LokiPublicChatAPI : DotNetAPI {
return result
}.sorted { $0.timestamp < $1.timestamp }
}
var queryParameters = "include_annotations=1"
if let lastMessageServerID = getLastMessageServerID(for: channel, on: server) {
queryParameters += "&since_id=\(lastMessageServerID)"
} else {
queryParameters += "&count=\(fallbackBatchCount)&include_deleted=0"
}
return getAuthToken(for: server).then(on: DispatchQueue.global(qos: .default)) { token -> Promise<[LokiPublicChatMessage]> in
let url = URL(string: "\(server)/channels/\(channel)/messages?\(queryParameters)")!
let request = TSRequest(url: url)
request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]
if (useOnionRequests) {
return getOpenGroupServerPublicKey(on: server).then2 { hexEncodedPublickey in
OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: hexEncodedPublickey).map2 { rawResponse in
return try handleMessages(rawResponse: rawResponse)
}
}
}
return LokiFileServerProxy(for: server).perform(request).map(on: DispatchQueue.global(qos: .default)) { rawResponse in
return try handleMessages(rawResponse: rawResponse)
}
}.handlingInvalidAuthTokenIfNeeded(for: server)
}
@ -173,6 +224,20 @@ public final class LokiPublicChatAPI : DotNetAPI {
}
public static func sendMessage(_ message: LokiPublicChatMessage, to channel: UInt64, on server: String) -> Promise<LokiPublicChatMessage> {
func handleSendMessageResult(rawResponse: Any, with displayName: String, for signedMessage: LokiPublicChatMessage) throws -> LokiPublicChatMessage {
// ISO8601DateFormatter doesn't support milliseconds before iOS 11
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
guard let json = rawResponse as? JSON, let messageAsJSON = json["data"] as? JSON, let serverID = messageAsJSON["id"] as? UInt64, let body = messageAsJSON["text"] as? String,
let dateAsString = messageAsJSON["created_at"] as? String, let date = dateFormatter.date(from: dateAsString) else {
print("[Loki] Couldn't parse message for public chat channel with ID: \(channel) on server: \(server) from: \(rawResponse).")
throw DotNetAPIError.parsingFailed
}
let timestamp = UInt64(date.timeIntervalSince1970) * 1000
return LokiPublicChatMessage(serverID: serverID, hexEncodedPublicKey: getUserHexEncodedPublicKey(), displayName: displayName, profilePicture: signedMessage.profilePicture, body: body, type: publicChatMessageType, timestamp: timestamp, quote: signedMessage.quote, attachments: signedMessage.attachments, signature: signedMessage.signature)
}
print("[Loki] Sending message to public chat channel with ID: \(channel) on server: \(server).")
let (promise, seal) = Promise<LokiPublicChatMessage>.pending()
DispatchQueue.global(qos: .userInitiated).async { [privateKey = userKeyPair.privateKey] in
@ -184,17 +249,15 @@ public final class LokiPublicChatAPI : DotNetAPI {
let request = TSRequest(url: url, method: "POST", parameters: parameters)
request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]
let displayName = userDisplayName
return LokiFileServerProxy(for: server).perform(request).map(on: DispatchQueue.global(qos: .default)) { rawResponse in
// ISO8601DateFormatter doesn't support milliseconds before iOS 11
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
guard let json = rawResponse as? JSON, let messageAsJSON = json["data"] as? JSON, let serverID = messageAsJSON["id"] as? UInt64, let body = messageAsJSON["text"] as? String,
let dateAsString = messageAsJSON["created_at"] as? String, let date = dateFormatter.date(from: dateAsString) else {
print("[Loki] Couldn't parse message for public chat channel with ID: \(channel) on server: \(server) from: \(rawResponse).")
throw DotNetAPIError.parsingFailed
if (useOnionRequests) {
return getOpenGroupServerPublicKey(on: server).then2 { hexEncodedPublicKey in
OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: hexEncodedPublicKey).map2 { rawResponse in
return try handleSendMessageResult(rawResponse: rawResponse, with: displayName, for: signedMessage)
}
let timestamp = UInt64(date.timeIntervalSince1970) * 1000
return LokiPublicChatMessage(serverID: serverID, hexEncodedPublicKey: getUserHexEncodedPublicKey(), displayName: displayName, profilePicture: signedMessage.profilePicture, body: body, type: publicChatMessageType, timestamp: timestamp, quote: signedMessage.quote, attachments: signedMessage.attachments, signature: signedMessage.signature)
}
}
return LokiFileServerProxy(for: server).perform(request).map(on: DispatchQueue.global(qos: .default)) { rawResponse in
return try handleSendMessageResult(rawResponse: rawResponse, with: displayName, for: signedMessage)
}
}.handlingInvalidAuthTokenIfNeeded(for: server)
}.done(on: DispatchQueue.global(qos: .default)) { message in
@ -208,18 +271,8 @@ public final class LokiPublicChatAPI : DotNetAPI {
// MARK: Deletion
public static func getDeletedMessageServerIDs(for channel: UInt64, on server: String) -> Promise<[UInt64]> {
print("[Loki] Getting deleted messages for public chat channel with ID: \(channel) on server: \(server).")
let queryParameters: String
if let lastDeletionServerID = getLastDeletionServerID(for: channel, on: server) {
queryParameters = "since_id=\(lastDeletionServerID)"
} else {
queryParameters = "count=\(fallbackBatchCount)"
}
return getAuthToken(for: server).then(on: DispatchQueue.global(qos: .default)) { token -> Promise<[UInt64]> in
let url = URL(string: "\(server)/loki/v1/channel/\(channel)/deletes?\(queryParameters)")!
let request = TSRequest(url: url)
request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]
return LokiFileServerProxy(for: server).perform(request).map(on: DispatchQueue.global(qos: .default)) { rawResponse in
func handleDeletedMessageServerIDs(rawResponse: Any) throws -> [UInt64] {
guard let json = rawResponse as? JSON, let deletions = json["data"] as? [JSON] else {
print("[Loki] Couldn't parse deleted messages for public chat channel with ID: \(channel) on server: \(server) from: \(rawResponse).")
throw DotNetAPIError.parsingFailed
@ -234,6 +287,28 @@ public final class LokiPublicChatAPI : DotNetAPI {
return messageServerID
}
}
print("[Loki] Getting deleted messages for public chat channel with ID: \(channel) on server: \(server).")
let queryParameters: String
if let lastDeletionServerID = getLastDeletionServerID(for: channel, on: server) {
queryParameters = "since_id=\(lastDeletionServerID)"
} else {
queryParameters = "count=\(fallbackBatchCount)"
}
return getAuthToken(for: server).then(on: DispatchQueue.global(qos: .default)) { token -> Promise<[UInt64]> in
let url = URL(string: "\(server)/loki/v1/channel/\(channel)/deletes?\(queryParameters)")!
let request = TSRequest(url: url)
request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]
if (useOnionRequests) {
return getOpenGroupServerPublicKey(on: server).then2 { hexEncodedPublicKey in
OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: hexEncodedPublicKey).map2 { rawResponse in
return try handleDeletedMessageServerIDs(rawResponse: rawResponse)
}
}
}
return LokiFileServerProxy(for: server).perform(request).map(on: DispatchQueue.global(qos: .default)) { rawResponse in
return try handleDeletedMessageServerIDs(rawResponse: rawResponse)
}
}.handlingInvalidAuthTokenIfNeeded(for: server)
}
@ -251,6 +326,13 @@ public final class LokiPublicChatAPI : DotNetAPI {
let url = URL(string: urlAsString)!
let request = TSRequest(url: url, method: "DELETE", parameters: [:])
request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]
if (useOnionRequests) {
return getOpenGroupServerPublicKey(on: server).then2 { hexEncodedPublicKey in
OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: hexEncodedPublicKey).done2 { result -> Void in
print("[Loki] Deleted message with ID: \(messageID) on server: \(server).")
}
}
}
return LokiFileServerProxy(for: server).perform(request).done(on: DispatchQueue.global(qos: .default)) { result -> Void in
print("[Loki] Deleted message with ID: \(messageID) on server: \(server).")
}
@ -260,15 +342,8 @@ public final class LokiPublicChatAPI : DotNetAPI {
// MARK: Display Name & Profile Picture
public static func getDisplayNames(for channel: UInt64, on server: String) -> Promise<Void> {
let publicChatID = "\(server).\(channel)"
guard let hexEncodedPublicKeys = displayNameUpdatees[publicChatID] else { return Promise.value(()) }
displayNameUpdatees[publicChatID] = []
print("[Loki] Getting display names for: \(hexEncodedPublicKeys).")
return getAuthToken(for: server).then(on: DispatchQueue.global(qos: .default)) { token -> Promise<Void> in
let queryParameters = "ids=\(hexEncodedPublicKeys.map { "@\($0)" }.joined(separator: ","))&include_user_annotations=1"
let url = URL(string: "\(server)/users?\(queryParameters)")!
let request = TSRequest(url: url)
return LokiFileServerProxy(for: server).perform(request).map(on: DispatchQueue.global(qos: .default)) { rawResponse in
func handleDisplayNames(rawResponse: Any, for hexEncodedPublicKeys: Set<String>) throws {
guard let json = rawResponse as? JSON, let data = json["data"] as? [JSON] else {
print("[Loki] Couldn't parse display names for users: \(hexEncodedPublicKeys) from: \(rawResponse).")
throw DotNetAPIError.parsingFailed
@ -283,6 +358,25 @@ public final class LokiPublicChatAPI : DotNetAPI {
}
}
}
let publicChatID = "\(server).\(channel)"
guard let hexEncodedPublicKeys = displayNameUpdatees[publicChatID] else { return Promise.value(()) }
displayNameUpdatees[publicChatID] = []
print("[Loki] Getting display names for: \(hexEncodedPublicKeys).")
return getAuthToken(for: server).then(on: DispatchQueue.global(qos: .default)) { token -> Promise<Void> in
let queryParameters = "ids=\(hexEncodedPublicKeys.map { "@\($0)" }.joined(separator: ","))&include_user_annotations=1"
let url = URL(string: "\(server)/users?\(queryParameters)")!
let request = TSRequest(url: url)
if (useOnionRequests) {
return getOpenGroupServerPublicKey(on: server).then2 { hexEncodedPublicKey in
OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: hexEncodedPublicKey).map2 { rawResponse in
try handleDisplayNames(rawResponse: rawResponse, for: hexEncodedPublicKeys)
}
}
}
return LokiFileServerProxy(for: server).perform(request).map(on: DispatchQueue.global(qos: .default)) { rawResponse in
try handleDisplayNames(rawResponse: rawResponse, for: hexEncodedPublicKeys)
}
}.handlingInvalidAuthTokenIfNeeded(for: server)
}
@ -299,6 +393,14 @@ public final class LokiPublicChatAPI : DotNetAPI {
let url = URL(string: "\(server)/users/me")!
let request = TSRequest(url: url, method: "PATCH", parameters: parameters)
request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]
if (useOnionRequests) {
return getOpenGroupServerPublicKey(on: server).then2 { hexEncodedPublicKey in
OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: hexEncodedPublicKey).map2 { _ in }.recover(on: DispatchQueue.global(qos: .default)) { error in
print("Couldn't update display name due to error: \(error).")
throw error
}
}
}
return LokiFileServerProxy(for: server).perform(request).map(on: DispatchQueue.global(qos: .default)) { _ in }.recover(on: DispatchQueue.global(qos: .default)) { error in
print("Couldn't update display name due to error: \(error).")
throw error
@ -324,6 +426,14 @@ public final class LokiPublicChatAPI : DotNetAPI {
let url = URL(string: "\(server)/users/me")!
let request = TSRequest(url: url, method: "PATCH", parameters: parameters)
request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]
if (useOnionRequests) {
return getOpenGroupServerPublicKey(on: server).then2 { hexEncodedPublicKey in
OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: hexEncodedPublicKey).map2 { _ in }.recover(on: DispatchQueue.global(qos: .default)) { error in
print("[Loki] Couldn't update profile picture due to error: \(error).")
throw error
}
}
}
return LokiFileServerProxy(for: server).perform(request).map(on: DispatchQueue.global(qos: .default)) { _ in }.recover(on: DispatchQueue.global(qos: .default)) { error in
print("[Loki] Couldn't update profile picture due to error: \(error).")
throw error
@ -384,12 +494,8 @@ public final class LokiPublicChatAPI : DotNetAPI {
}
public static func getInfo(for channel: UInt64, on server: String) -> Promise<LokiPublicChatInfo> {
return attempt(maxRetryCount: maxRetryCount, recoveringOn: DispatchQueue.global(qos: .default)) {
getAuthToken(for: server).then(on: DispatchQueue.global(qos: .default)) { token -> Promise<LokiPublicChatInfo> in
let url = URL(string: "\(server)/channels/\(channel)?include_annotations=1")!
let request = TSRequest(url: url)
request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]
return LokiFileServerProxy(for: server).perform(request).map(on: DispatchQueue.global(qos: .default)) { rawResponse in
func handleInfo(rawResponse: Any) throws -> LokiPublicChatInfo {
guard let json = rawResponse as? JSON,
let data = json["data"] as? JSON,
let annotations = data["annotations"] as? [JSON],
@ -410,6 +516,22 @@ public final class LokiPublicChatAPI : DotNetAPI {
updateProfileIfNeeded(for: channel, on: server, from: publicChatInfo)
return publicChatInfo
}
return attempt(maxRetryCount: maxRetryCount, recoveringOn: DispatchQueue.global(qos: .default)) {
getAuthToken(for: server).then(on: DispatchQueue.global(qos: .default)) { token -> Promise<LokiPublicChatInfo> in
let url = URL(string: "\(server)/channels/\(channel)?include_annotations=1")!
let request = TSRequest(url: url)
request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]
if (useOnionRequests) {
return getOpenGroupServerPublicKey(on: server).then2 { hexEncodedPublicKey in
return OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: hexEncodedPublicKey).map2 { rawResponse in
return try handleInfo(rawResponse: rawResponse)
}
}
}
return LokiFileServerProxy(for: server).perform(request).map(on: DispatchQueue.global(qos: .default)) { rawResponse in
return try handleInfo(rawResponse: rawResponse)
}
}.handlingInvalidAuthTokenIfNeeded(for: server)
}
}
@ -420,6 +542,13 @@ public final class LokiPublicChatAPI : DotNetAPI {
let url = URL(string: "\(server)/channels/\(channel)/subscribe")!
let request = TSRequest(url: url, method: "POST", parameters: [:])
request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]
if (useOnionRequests) {
return getOpenGroupServerPublicKey(on: server).then2 { hexEncodedPublicKey in
OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: hexEncodedPublicKey).done2 { result -> Void in
print("[Loki] Joined channel with ID: \(channel) on server: \(server).")
}
}
}
return LokiFileServerProxy(for: server).perform(request).done(on: DispatchQueue.global(qos: .default)) { result -> Void in
print("[Loki] Joined channel with ID: \(channel) on server: \(server).")
}
@ -433,6 +562,13 @@ public final class LokiPublicChatAPI : DotNetAPI {
let url = URL(string: "\(server)/channels/\(channel)/subscribe")!
let request = TSRequest(url: url, method: "DELETE", parameters: [:])
request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]
if (useOnionRequests) {
return getOpenGroupServerPublicKey(on: server).then2 { hexEncodedPublicKey in
OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: hexEncodedPublicKey).done2 { result -> Void in
print("[Loki] Left channel with ID: \(channel) on server: \(server).")
}
}
}
return LokiFileServerProxy(for: server).perform(request).done(on: DispatchQueue.global(qos: .default)) { result -> Void in
print("[Loki] Left channel with ID: \(channel) on server: \(server).")
}
@ -450,16 +586,18 @@ public final class LokiPublicChatAPI : DotNetAPI {
let url = URL(string: "\(server)/loki/v1/channels/\(channel)/messages/\(messageID)/report")!
let request = TSRequest(url: url, method: "POST", parameters: [:])
// Only used for the Loki Public Chat which doesn't require authentication
if (useOnionRequests) {
return getOpenGroupServerPublicKey(on: server).then2 { hexEncodedPublicKey in
OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: hexEncodedPublicKey).map2 { _ in}
}
}
return LokiFileServerProxy(for: server).perform(request).map(on: DispatchQueue.global(qos: .default)) { _ in }
}
// MARK: Moderators
public static func getModerators(for channel: UInt64, on server: String) -> Promise<Set<String>> {
return getAuthToken(for: server).then(on: DispatchQueue.global(qos: .default)) { token -> Promise<Set<String>> in
let url = URL(string: "\(server)/loki/v1/channel/\(channel)/get_moderators")!
let request = TSRequest(url: url)
request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]
return LokiFileServerProxy(for: server).perform(request).map(on: DispatchQueue.global(qos: .default)) { rawResponse in
func handleModerators(rawResponse: Any) throws -> Set<String> {
guard let json = rawResponse as? JSON, let moderators = json["moderators"] as? [String] else {
print("[Loki] Couldn't parse moderators for public chat channel with ID: \(channel) on server: \(server) from: \(rawResponse).")
throw DotNetAPIError.parsingFailed
@ -472,6 +610,21 @@ public final class LokiPublicChatAPI : DotNetAPI {
}
return moderatorsAsSet
}
return getAuthToken(for: server).then(on: DispatchQueue.global(qos: .default)) { token -> Promise<Set<String>> in
let url = URL(string: "\(server)/loki/v1/channel/\(channel)/get_moderators")!
let request = TSRequest(url: url)
request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]
if (useOnionRequests) {
return getOpenGroupServerPublicKey(on: server).then2 { hexEncodedPublicKey in
OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: hexEncodedPublicKey).map2 { rawResponse in
return try handleModerators(rawResponse: rawResponse)
}
}
}
return LokiFileServerProxy(for: server).perform(request).map(on: DispatchQueue.global(qos: .default)) { rawResponse in
return try handleModerators(rawResponse: rawResponse)
}
}.handlingInvalidAuthTokenIfNeeded(for: server)
}

11
SignalServiceKit/src/Loki/API/Open Groups/LokiPublicChatManager.swift
View File

@ -56,6 +56,17 @@ public final class LokiPublicChatManager : NSObject {
return Promise(error: Error.chatCreationFailed)
}
}
if (LokiPublicChatAPI.useOnionRequests) {
return LokiPublicChatAPI.getOpenGroupServerPublicKey(on: server).then2 { publicKey in
return LokiPublicChatAPI.getAuthToken(for: server).then2 { token in
return LokiPublicChatAPI.getInfo(for: channel, on: server)
}.map2 { channelInfo -> LokiPublicChat in
guard let chat = self.addChat(server: server, channel: channel, name: channelInfo.displayName) else { throw Error.chatCreationFailed }
return chat
}
}
}
// TODO: Remove this when we use onion request totally
return LokiPublicChatAPI.getAuthToken(for: server).then2 { token in
return LokiPublicChatAPI.getInfo(for: channel, on: server)
}.map2 { channelInfo -> LokiPublicChat in