diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 106850b56..01d3ee81b 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -4439,7 +4439,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 80; + CURRENT_PROJECT_VERSION = 81; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = SUQ8J2PCT7; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -4453,7 +4453,7 @@ INFOPLIST_FILE = SignalShareExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 1.2.3; + MARKETING_VERSION = 1.2.4; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.share-extension"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -4501,7 +4501,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 80; + CURRENT_PROJECT_VERSION = 81; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = SUQ8J2PCT7; ENABLE_NS_ASSERTIONS = NO; @@ -4520,7 +4520,7 @@ INFOPLIST_FILE = SignalShareExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 1.2.3; + MARKETING_VERSION = 1.2.4; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.share-extension"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -4555,7 +4555,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 80; + CURRENT_PROJECT_VERSION = 81; DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = SUQ8J2PCT7; @@ -4574,7 +4574,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 1.2.3; + MARKETING_VERSION = 1.2.4; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.utilities"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; @@ -4625,7 +4625,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 80; + CURRENT_PROJECT_VERSION = 81; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = SUQ8J2PCT7; @@ -4649,7 +4649,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 1.2.3; + MARKETING_VERSION = 1.2.4; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.utilities"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; @@ -4687,7 +4687,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 80; + CURRENT_PROJECT_VERSION = 81; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = SUQ8J2PCT7; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -4699,7 +4699,7 @@ INFOPLIST_FILE = LokiPushNotificationService/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 1.2.3; + MARKETING_VERSION = 1.2.4; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.push-notification-service"; @@ -4750,7 +4750,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 80; + CURRENT_PROJECT_VERSION = 81; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = SUQ8J2PCT7; ENABLE_NS_ASSERTIONS = NO; @@ -4767,7 +4767,7 @@ INFOPLIST_FILE = LokiPushNotificationService/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 1.2.3; + MARKETING_VERSION = 1.2.4; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.push-notification-service"; @@ -4951,7 +4951,7 @@ CODE_SIGN_ENTITLEMENTS = Signal/Signal.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 80; + CURRENT_PROJECT_VERSION = 81; DEVELOPMENT_TEAM = SUQ8J2PCT7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -4986,7 +4986,7 @@ "$(SRCROOT)", ); LLVM_LTO = NO; - MARKETING_VERSION = 1.2.3; + MARKETING_VERSION = 1.2.4; OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger"; @@ -5019,7 +5019,7 @@ CODE_SIGN_ENTITLEMENTS = Signal/Signal.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 80; + CURRENT_PROJECT_VERSION = 81; DEVELOPMENT_TEAM = SUQ8J2PCT7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -5054,7 +5054,7 @@ "$(SRCROOT)", ); LLVM_LTO = NO; - MARKETING_VERSION = 1.2.3; + MARKETING_VERSION = 1.2.4; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger"; PRODUCT_NAME = Session; diff --git a/Signal/src/Loki/View Controllers/JoinPublicChatVC.swift b/Signal/src/Loki/View Controllers/JoinPublicChatVC.swift index 601b6c06a..a07594184 100644 --- a/Signal/src/Loki/View Controllers/JoinPublicChatVC.swift +++ b/Signal/src/Loki/View Controllers/JoinPublicChatVC.swift @@ -137,6 +137,11 @@ final class JoinPublicChatVC : BaseVC, UIPageViewControllerDataSource, UIPageVie let displayName = OWSProfileManager.shared().profileNameForRecipient(withID: userHexEncodedPublicKey) let profilePictureURL = OWSProfileManager.shared().profilePictureURL() let profileKey = OWSProfileManager.shared().localProfileKey().keyData + // TODO: Profile picture & profile key + OWSPrimaryStorage.shared().dbReadWriteConnection.readWrite { transaction in + transaction.removeObject(forKey: "\(urlAsString).\(channelID)", inCollection: LokiPublicChatAPI.lastMessageServerIDCollection) + transaction.removeObject(forKey: "\(urlAsString).\(channelID)", inCollection: LokiPublicChatAPI.lastDeletionServerIDCollection) + } LokiPublicChatManager.shared.addChat(server: urlAsString, channel: channelID) .done(on: .main) { [weak self] _ in let _ = LokiPublicChatAPI.getMessages(for: channelID, on: urlAsString) @@ -147,9 +152,15 @@ final class JoinPublicChatVC : BaseVC, UIPageViewControllerDataSource, UIPageVie let _ = syncManager.syncAllOpenGroups() self?.presentingViewController!.dismiss(animated: true, completion: nil) } - .catch(on: .main) { [weak self] _ in + .catch(on: .main) { [weak self] error in + var title = NSLocalizedString("Couldn't Join", comment: "") + var message = "" + if case LokiHTTPClient.HTTPError.networkError(let statusCode, _, _) = error, (statusCode == 401 || statusCode == 403) { + title = NSLocalizedString("Unauthorized", comment: "") + message = NSLocalizedString("Please ask the open group operator to add you to the group.", comment: "") + } self?.isJoining = false - self?.showError(title: NSLocalizedString("Couldn't Join", comment: "")) + self?.showError(title: title, message: message) } } diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 73db04a82..6d6a05675 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -2840,3 +2840,5 @@ "You" = "You"; "Destination" = "Destination"; "Learn More" = "Learn More"; +"Please ask the open group operator to add you to the group." = "Please ask the open group operator to add you to the group."; +"Unauthorized" = "Unauthorized"; diff --git a/SignalServiceKit/src/Loki/API/LokiAPI+SwarmAPI.swift b/SignalServiceKit/src/Loki/API/LokiAPI+SwarmAPI.swift index b66516844..4cf2d374d 100644 --- a/SignalServiceKit/src/Loki/API/LokiAPI+SwarmAPI.swift +++ b/SignalServiceKit/src/Loki/API/LokiAPI+SwarmAPI.swift @@ -132,42 +132,6 @@ public extension LokiAPI { } } - internal static func getFileServerProxy() -> Promise { - let (promise, seal) = Promise.pending() - func getVersion(for snode: LokiAPITarget) -> Promise { - if let version = snodeVersion[snode] { - return Promise { $0.fulfill(version) } - } else { - let url = URL(string: "\(snode.address):\(snode.port)/get_stats/v1")! - let request = TSRequest(url: url) - return TSNetworkManager.shared().perform(request, withCompletionQueue: DispatchQueue.global()).map(on: DispatchQueue.global()) { intermediate in - let rawResponse = intermediate.responseObject - guard let json = rawResponse as? JSON, let version = json["version"] as? String else { throw LokiAPIError.missingSnodeVersion } - snodeVersion[snode] = version - return version - } - } - } - getRandomSnode().then(on: DispatchQueue.global()) { snode -> Promise in - return getVersion(for: snode).then(on: DispatchQueue.global()) { version -> Promise in - if version >= "2.0.2" { - print("[Loki] Using file server proxy with version number \(version).") - return Promise { $0.fulfill(snode) } - } else { - print("[Loki] Rejecting file server proxy with version number \(version).") - return getFileServerProxy() - } - }.recover(on: DispatchQueue.global()) { _ in - return getFileServerProxy() - } - }.done(on: DispatchQueue.global()) { snode in - seal.fulfill(snode) - }.catch(on: DispatchQueue.global()) { error in - seal.reject(error) - } - return promise - } - // MARK: Public API @objc public static func clearSnodePool() { snodePool.removeAll() diff --git a/SignalServiceKit/src/Loki/API/LokiDotNetAPI.swift b/SignalServiceKit/src/Loki/API/LokiDotNetAPI.swift index 46b72c26b..08071be7f 100644 --- a/SignalServiceKit/src/Loki/API/LokiDotNetAPI.swift +++ b/SignalServiceKit/src/Loki/API/LokiDotNetAPI.swift @@ -53,6 +53,15 @@ public class LokiDotNetAPI : NSObject { transaction.setObject(newValue, forKey: server, inCollection: authTokenCollection) } + public static func clearAuthToken(for server: String) { + // Dispatch async on the main queue to avoid nested write transactions + DispatchQueue.main.async { + storage.dbReadWriteConnection.readWrite { transaction in + transaction.removeObject(forKey: server, inCollection: authTokenCollection) + } + } + } + // MARK: Lifecycle override private init() { } @@ -198,3 +207,17 @@ public class LokiDotNetAPI : NSObject { } } } + +// MARK: Error Handling +internal extension Promise { + + internal func handlingInvalidAuthTokenIfNeeded(for server: String) -> Promise { + return recover(on: DispatchQueue.global()) { error -> Promise in + if let error = error as? NetworkManagerError, (error.statusCode == 401 || error.statusCode == 403) { + print("[Loki] Group chat auth token for: \(server) expired; dropping it.") + LokiDotNetAPI.clearAuthToken(for: server) + } + throw error + } + } +} diff --git a/SignalServiceKit/src/Loki/API/LokiFileServerAPI.swift b/SignalServiceKit/src/Loki/API/LokiFileServerAPI.swift index 926d2799d..f50b18dfc 100644 --- a/SignalServiceKit/src/Loki/API/LokiFileServerAPI.swift +++ b/SignalServiceKit/src/Loki/API/LokiFileServerAPI.swift @@ -92,7 +92,7 @@ public final class LokiFileServerAPI : LokiDotNetAPI { */ return deviceLinks } - } + }.handlingInvalidAuthTokenIfNeeded(for: server) } public static func setDeviceLinks(_ deviceLinks: Set) -> Promise { @@ -108,7 +108,7 @@ public final class LokiFileServerAPI : LokiDotNetAPI { request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ] return attempt(maxRetryCount: 8, recoveringOn: LokiAPI.workQueue) { LokiFileServerProxy(for: server).perform(request).map { _ in } - }.recover { error in + }.handlingInvalidAuthTokenIfNeeded(for: server).recover { error in print("Couldn't update device links due to error: \(error).") throw error } diff --git a/SignalServiceKit/src/Loki/API/LokiFileServerProxy.swift b/SignalServiceKit/src/Loki/API/LokiFileServerProxy.swift index 9588ecabf..f276d7af3 100644 --- a/SignalServiceKit/src/Loki/API/LokiFileServerProxy.swift +++ b/SignalServiceKit/src/Loki/API/LokiFileServerProxy.swift @@ -49,7 +49,7 @@ internal class LokiFileServerProxy : LokiHTTPClient { DispatchQueue.global(qos: .userInitiated).async { let uncheckedSymmetricKey = try? Curve25519.generateSharedSecret(fromPublicKey: LokiFileServerProxy.fileServerPublicKey, privateKey: keyPair.privateKey) guard let symmetricKey = uncheckedSymmetricKey else { return seal.reject(Error.symmetricKeyGenerationFailed) } - LokiAPI.getFileServerProxy().then(on: DispatchQueue.global()) { proxy -> Promise in + LokiAPI.getRandomSnode().then(on: DispatchQueue.global()) { proxy -> Promise in let url = "\(proxy.address):\(proxy.port)/file_proxy" guard let urlAsString = request.url?.absoluteString, let serverURLEndIndex = urlAsString.range(of: server)?.upperBound, serverURLEndIndex < urlAsString.endIndex else { throw Error.endpointParsingFailed } diff --git a/SignalServiceKit/src/Loki/API/LokiHTTPClient.swift b/SignalServiceKit/src/Loki/API/LokiHTTPClient.swift index caf5bbcc1..f42a247e9 100644 --- a/SignalServiceKit/src/Loki/API/LokiHTTPClient.swift +++ b/SignalServiceKit/src/Loki/API/LokiHTTPClient.swift @@ -1,7 +1,7 @@ import PromiseKit /// Base class for `LokiSnodeProxy` and `LokiFileServerProxy`. -internal class LokiHTTPClient { +public class LokiHTTPClient { internal lazy var httpSession: AFHTTPSessionManager = { let result = AFHTTPSessionManager(sessionConfiguration: .ephemeral) @@ -34,9 +34,9 @@ internal class LokiHTTPClient { // MARK: - HTTP Error -internal extension LokiHTTPClient { +public extension LokiHTTPClient { - internal enum HTTPError : LocalizedError { + public enum HTTPError : LocalizedError { case networkError(code: Int, response: Any?, underlyingError: Error?) internal static func from(error: Error) -> LokiHTTPClient.HTTPError? { diff --git a/SignalServiceKit/src/Loki/API/Open Groups/LokiPublicChatAPI.swift b/SignalServiceKit/src/Loki/API/Open Groups/LokiPublicChatAPI.swift index d503f0159..ac6ae4847 100644 --- a/SignalServiceKit/src/Loki/API/Open Groups/LokiPublicChatAPI.swift +++ b/SignalServiceKit/src/Loki/API/Open Groups/LokiPublicChatAPI.swift @@ -25,6 +25,7 @@ public final class LokiPublicChatAPI : LokiDotNetAPI { // MARK: Database override internal class var authTokenCollection: String { "LokiGroupChatAuthTokenCollection" } + @objc public static let lastMessageServerIDCollection = "LokiGroupChatLastMessageServerIDCollection" @objc public static let lastDeletionServerIDCollection = "LokiGroupChatLastDeletionServerIDCollection" @@ -73,7 +74,7 @@ public final class LokiPublicChatAPI : LokiDotNetAPI { removeLastDeletionServerID(for: channel, on: server) } - // MARK: Public API + // MARK: Receiving @objc(getMessagesForGroup:onServer:) public static func objc_getMessages(for group: UInt64, on server: String) -> AnyPromise { return AnyPromise.from(getMessages(for: group, on: server)) @@ -86,80 +87,84 @@ public final class LokiPublicChatAPI : LokiDotNetAPI { } else { queryParameters += "&count=\(fallbackBatchCount)&include_deleted=0" } - let url = URL(string: "\(server)/channels/\(channel)/messages?\(queryParameters)")! - let request = TSRequest(url: url) - return LokiFileServerProxy(for: server).perform(request).map(on: DispatchQueue.global()) { rawResponse in - 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 LokiDotNetAPIError.parsingFailed - } - return rawMessages.flatMap { message in - let isDeleted = (message["is_deleted"] as? Int == 1) - guard !isDeleted else { return nil } - guard let annotations = message["annotations"] as? [JSON], let annotation = annotations.first(where: { $0["type"] as? String == publicChatMessageType }), let value = annotation["value"] as? JSON, - let serverID = message["id"] as? UInt64, let hexEncodedSignatureData = value["sig"] as? String, let signatureVersion = value["sigver"] as? UInt64, - let body = message["text"] as? String, let user = message["user"] as? JSON, let hexEncodedPublicKey = user["username"] as? String, - let timestamp = value["timestamp"] as? UInt64 else { - print("[Loki] Couldn't parse message for public chat channel with ID: \(channel) on server: \(server) from: \(message).") - return nil - } - var profilePicture: LokiPublicChatMessage.ProfilePicture? = nil - let displayName = user["name"] as? String ?? NSLocalizedString("Anonymous", comment: "") - if let userAnnotations = user["annotations"] as? [JSON], let profilePictureAnnotation = userAnnotations.first(where: { $0["type"] as? String == profilePictureType }), - let profilePictureValue = profilePictureAnnotation["value"] as? JSON, let profileKeyString = profilePictureValue["profileKey"] as? String, let profileKey = Data(base64Encoded: profileKeyString), let url = profilePictureValue["url"] as? String { - profilePicture = LokiPublicChatMessage.ProfilePicture(profileKey: profileKey, url: url) - } - let lastMessageServerID = getLastMessageServerID(for: channel, on: server) - if serverID > (lastMessageServerID ?? 0) { setLastMessageServerID(for: channel, on: server, to: serverID) } - let quote: LokiPublicChatMessage.Quote? - if let quoteAsJSON = value["quote"] as? JSON, let quotedMessageTimestamp = quoteAsJSON["id"] as? UInt64, let quoteeHexEncodedPublicKey = quoteAsJSON["author"] as? String, - let quotedMessageBody = quoteAsJSON["text"] as? String { - let quotedMessageServerID = message["reply_to"] as? UInt64 - quote = LokiPublicChatMessage.Quote(quotedMessageTimestamp: quotedMessageTimestamp, quoteeHexEncodedPublicKey: quoteeHexEncodedPublicKey, quotedMessageBody: quotedMessageBody, - quotedMessageServerID: quotedMessageServerID) - } else { - quote = nil + return getAuthToken(for: server).then { 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()) { rawResponse in + 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 LokiDotNetAPIError.parsingFailed } - let signature = LokiPublicChatMessage.Signature(data: Data(hex: hexEncodedSignatureData), version: signatureVersion) - let attachmentsAsJSON = annotations.filter { $0["type"] as? String == attachmentType } - let attachments: [LokiPublicChatMessage.Attachment] = attachmentsAsJSON.compactMap { attachmentAsJSON in - guard let value = attachmentAsJSON["value"] as? JSON, let kindAsString = value["lokiType"] as? String, let kind = LokiPublicChatMessage.Attachment.Kind(rawValue: kindAsString), - let serverID = value["id"] as? UInt64, let contentType = value["contentType"] as? String, let size = value["size"] as? UInt, let url = value["url"] as? String else { return nil } - let fileName = value["fileName"] as? String ?? UUID().description - let width = value["width"] as? UInt ?? 0 - let height = value["height"] as? UInt ?? 0 - let flags = (value["flags"] as? UInt) ?? 0 - let caption = value["caption"] as? String - let linkPreviewURL = value["linkPreviewUrl"] as? String - let linkPreviewTitle = value["linkPreviewTitle"] as? String - if kind == .linkPreview { - guard linkPreviewURL != nil && linkPreviewTitle != nil else { - print("[Loki] Ignoring public chat message with invalid link preview.") + return rawMessages.flatMap { message in + let isDeleted = (message["is_deleted"] as? Int == 1) + guard !isDeleted else { return nil } + guard let annotations = message["annotations"] as? [JSON], let annotation = annotations.first(where: { $0["type"] as? String == publicChatMessageType }), let value = annotation["value"] as? JSON, + let serverID = message["id"] as? UInt64, let hexEncodedSignatureData = value["sig"] as? String, let signatureVersion = value["sigver"] as? UInt64, + let body = message["text"] as? String, let user = message["user"] as? JSON, let hexEncodedPublicKey = user["username"] as? String, + let timestamp = value["timestamp"] as? UInt64 else { + print("[Loki] Couldn't parse message for public chat channel with ID: \(channel) on server: \(server) from: \(message).") return nil + } + var profilePicture: LokiPublicChatMessage.ProfilePicture? = nil + let displayName = user["name"] as? String ?? NSLocalizedString("Anonymous", comment: "") + if let userAnnotations = user["annotations"] as? [JSON], let profilePictureAnnotation = userAnnotations.first(where: { $0["type"] as? String == profilePictureType }), + let profilePictureValue = profilePictureAnnotation["value"] as? JSON, let profileKeyString = profilePictureValue["profileKey"] as? String, let profileKey = Data(base64Encoded: profileKeyString), let url = profilePictureValue["url"] as? String { + profilePicture = LokiPublicChatMessage.ProfilePicture(profileKey: profileKey, url: url) + } + let lastMessageServerID = getLastMessageServerID(for: channel, on: server) + if serverID > (lastMessageServerID ?? 0) { setLastMessageServerID(for: channel, on: server, to: serverID) } + let quote: LokiPublicChatMessage.Quote? + if let quoteAsJSON = value["quote"] as? JSON, let quotedMessageTimestamp = quoteAsJSON["id"] as? UInt64, let quoteeHexEncodedPublicKey = quoteAsJSON["author"] as? String, + let quotedMessageBody = quoteAsJSON["text"] as? String { + let quotedMessageServerID = message["reply_to"] as? UInt64 + quote = LokiPublicChatMessage.Quote(quotedMessageTimestamp: quotedMessageTimestamp, quoteeHexEncodedPublicKey: quoteeHexEncodedPublicKey, quotedMessageBody: quotedMessageBody, + quotedMessageServerID: quotedMessageServerID) + } else { + quote = nil + } + let signature = LokiPublicChatMessage.Signature(data: Data(hex: hexEncodedSignatureData), version: signatureVersion) + let attachmentsAsJSON = annotations.filter { $0["type"] as? String == attachmentType } + let attachments: [LokiPublicChatMessage.Attachment] = attachmentsAsJSON.compactMap { attachmentAsJSON in + guard let value = attachmentAsJSON["value"] as? JSON, let kindAsString = value["lokiType"] as? String, let kind = LokiPublicChatMessage.Attachment.Kind(rawValue: kindAsString), + let serverID = value["id"] as? UInt64, let contentType = value["contentType"] as? String, let size = value["size"] as? UInt, let url = value["url"] as? String else { return nil } + let fileName = value["fileName"] as? String ?? UUID().description + let width = value["width"] as? UInt ?? 0 + let height = value["height"] as? UInt ?? 0 + let flags = (value["flags"] as? UInt) ?? 0 + let caption = value["caption"] as? String + let linkPreviewURL = value["linkPreviewUrl"] as? String + let linkPreviewTitle = value["linkPreviewTitle"] as? String + if kind == .linkPreview { + guard linkPreviewURL != nil && linkPreviewTitle != nil else { + print("[Loki] Ignoring public chat message with invalid link preview.") + return nil + } } + return LokiPublicChatMessage.Attachment(kind: kind, server: server, serverID: serverID, contentType: contentType, size: size, fileName: fileName, flags: flags, + width: width, height: height, caption: caption, url: url, linkPreviewURL: linkPreviewURL, linkPreviewTitle: linkPreviewTitle) } - return LokiPublicChatMessage.Attachment(kind: kind, server: server, serverID: serverID, contentType: contentType, size: size, fileName: fileName, flags: flags, - width: width, height: height, caption: caption, url: url, linkPreviewURL: linkPreviewURL, linkPreviewTitle: linkPreviewTitle) - } - let result = LokiPublicChatMessage(serverID: serverID, hexEncodedPublicKey: hexEncodedPublicKey, displayName: displayName, profilePicture: profilePicture, - body: body, type: publicChatMessageType, timestamp: timestamp, quote: quote, attachments: attachments, signature: signature) - guard result.hasValidSignature() else { - print("[Loki] Ignoring public chat message with invalid signature.") - return nil - } - var existingMessageID: String? = nil - storage.dbReadConnection.read { transaction in - existingMessageID = storage.getIDForMessage(withServerID: UInt(result.serverID!), in: transaction) - } - guard existingMessageID == nil else { - print("[Loki] Ignoring duplicate public chat message.") - return nil - } - return result - }.sorted { $0.timestamp < $1.timestamp } - } + let result = LokiPublicChatMessage(serverID: serverID, hexEncodedPublicKey: hexEncodedPublicKey, displayName: displayName, profilePicture: profilePicture, + body: body, type: publicChatMessageType, timestamp: timestamp, quote: quote, attachments: attachments, signature: signature) + guard result.hasValidSignature() else { + print("[Loki] Ignoring public chat message with invalid signature.") + return nil + } + var existingMessageID: String? = nil + storage.dbReadConnection.read { transaction in + existingMessageID = storage.getIDForMessage(withServerID: UInt(result.serverID!), in: transaction) + } + guard existingMessageID == nil else { + print("[Loki] Ignoring duplicate public chat message.") + return nil + } + return result + }.sorted { $0.timestamp < $1.timestamp } + } + }.handlingInvalidAuthTokenIfNeeded(for: server) } + // MARK: Sending @objc(sendMessage:toGroup:onServer:) public static func objc_sendMessage(_ message: LokiPublicChatMessage, to group: UInt64, on server: String) -> AnyPromise { return AnyPromise.from(sendMessage(message, to: group, on: server)) @@ -190,13 +195,7 @@ public final class LokiPublicChatAPI : LokiDotNetAPI { 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) } - }.recover { error -> Promise in - if let error = error as? NetworkManagerError, error.statusCode == 401 { - print("[Loki] Group chat auth token for: \(server) expired; dropping it.") - storage.dbReadWriteConnection.removeObject(forKey: server, inCollection: authTokenCollection) - } - throw error - } + }.handlingInvalidAuthTokenIfNeeded(for: server) }.done { message in seal.fulfill(message) }.catch { error in @@ -205,7 +204,8 @@ public final class LokiPublicChatAPI : LokiDotNetAPI { } return promise } - + + // 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 @@ -214,23 +214,26 @@ public final class LokiPublicChatAPI : LokiDotNetAPI { } else { queryParameters = "count=\(fallbackBatchCount)" } - let url = URL(string: "\(server)/loki/v1/channel/\(channel)/deletes?\(queryParameters)")! - let request = TSRequest(url: url) - return LokiFileServerProxy(for: server).perform(request).map { rawResponse in - 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 LokiDotNetAPIError.parsingFailed - } - return deletions.flatMap { deletion in - guard let serverID = deletion["id"] as? UInt64, let messageServerID = deletion["message_id"] as? UInt64 else { - print("[Loki] Couldn't parse deleted message for public chat channel with ID: \(channel) on server: \(server) from: \(deletion).") - return nil + return getAuthToken(for: server).then { 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 { rawResponse in + 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 LokiDotNetAPIError.parsingFailed + } + return deletions.flatMap { deletion in + guard let serverID = deletion["id"] as? UInt64, let messageServerID = deletion["message_id"] as? UInt64 else { + print("[Loki] Couldn't parse deleted message for public chat channel with ID: \(channel) on server: \(server) from: \(deletion).") + return nil + } + let lastDeletionServerID = getLastDeletionServerID(for: channel, on: server) + if serverID > (lastDeletionServerID ?? 0) { setLastDeletionServerID(for: channel, on: server, to: serverID) } + return messageServerID } - let lastDeletionServerID = getLastDeletionServerID(for: channel, on: server) - if serverID > (lastDeletionServerID ?? 0) { setLastDeletionServerID(for: channel, on: server, to: serverID) } - return messageServerID } - } + }.handlingInvalidAuthTokenIfNeeded(for: server) } @objc(deleteMessageWithID:forGroup:onServer:isSentByUser:) @@ -239,65 +242,22 @@ public final class LokiPublicChatAPI : LokiDotNetAPI { } public static func deleteMessage(with messageID: UInt, for channel: UInt64, on server: String, isSentByUser: Bool) -> Promise { + let isModerationRequest = !isSentByUser + print("[Loki] Deleting message with ID: \(messageID) for public chat channel with ID: \(channel) on server: \(server) (isModerationRequest = \(isModerationRequest)).") + let urlAsString = isSentByUser ? "\(server)/channels/\(channel)/messages/\(messageID)" : "\(server)/loki/v1/moderation/message/\(messageID)" return attempt(maxRetryCount: maxRetryCount, recoveringOn: DispatchQueue.global()) { getAuthToken(for: server).then { token -> Promise in - let isModerationRequest = !isSentByUser - print("[Loki] Deleting message with ID: \(messageID) for public chat channel with ID: \(channel) on server: \(server) (isModerationRequest = \(isModerationRequest)).") - let urlAsString = isSentByUser ? "\(server)/channels/\(channel)/messages/\(messageID)" : "\(server)/loki/v1/moderation/message/\(messageID)" let url = URL(string: urlAsString)! let request = TSRequest(url: url, method: "DELETE", parameters: [:]) request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ] return LokiFileServerProxy(for: server).perform(request).done { result -> Void in print("[Loki] Deleted message with ID: \(messageID) on server: \(server).") } - } - } - } - - public static func getModerators(for channel: UInt64, on server: String) -> Promise> { - let url = URL(string: "\(server)/loki/v1/channel/\(channel)/get_moderators")! - let request = TSRequest(url: url) - return LokiFileServerProxy(for: server).perform(request).map { rawResponse in - 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 LokiDotNetAPIError.parsingFailed - } - let moderatorAsSet = Set(moderators); - if self.moderators.keys.contains(server) { - self.moderators[server]![channel] = moderatorAsSet - } else { - self.moderators[server] = [ channel : moderatorAsSet ] - } - return moderatorAsSet - } - } - - public static func join(_ channel: UInt64, on server: String) -> Promise { - return attempt(maxRetryCount: maxRetryCount, recoveringOn: DispatchQueue.global()) { - getAuthToken(for: server).then { token -> Promise in - 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)" ] - return LokiFileServerProxy(for: server).perform(request).done { result -> Void in - print("[Loki] Joined channel with ID: \(channel) on server: \(server).") - } - } - } - } - - public static func leave(_ channel: UInt64, on server: String) -> Promise { - return attempt(maxRetryCount: maxRetryCount, recoveringOn: DispatchQueue.global()) { - getAuthToken(for: server).then { token -> Promise in - 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)" ] - return LokiFileServerProxy(for: server).perform(request).done { result -> Void in - print("[Loki] Left channel with ID: \(channel) on server: \(server).") - } - } + }.handlingInvalidAuthTokenIfNeeded(for: server) } } - + + // MARK: Display Name & Profile Picture public static func getDisplayNames(for channel: UInt64, on server: String) -> Promise { let publicChatID = "\(server).\(channel)" guard let hexEncodedPublicKeys = displayNameUpdatees[publicChatID] else { return Promise.value(()) } @@ -322,12 +282,7 @@ public final class LokiPublicChatAPI : LokiDotNetAPI { } } } - } - } - - @objc(isUserModerator:forChannel:onServer:) - public static func isUserModerator(_ hexEncodedPublicString: String, for channel: UInt64, on server: String) -> Bool { - return moderators[server]?[channel]?.contains(hexEncodedPublicString) ?? false + }.handlingInvalidAuthTokenIfNeeded(for: server) } @objc(setDisplayName:on:) @@ -337,9 +292,9 @@ public final class LokiPublicChatAPI : LokiDotNetAPI { public static func setDisplayName(to newDisplayName: String?, on server: String) -> Promise { print("[Loki] Updating display name on server: \(server).") + let parameters: JSON = [ "name" : (newDisplayName ?? "") ] return attempt(maxRetryCount: maxRetryCount, recoveringOn: DispatchQueue.global()) { getAuthToken(for: server).then { token -> Promise in - let parameters: JSON = [ "name" : (newDisplayName ?? "") ] 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)" ] @@ -347,7 +302,7 @@ public final class LokiPublicChatAPI : LokiDotNetAPI { print("Couldn't update display name due to error: \(error).") throw error } - } + }.handlingInvalidAuthTokenIfNeeded(for: server) } } @@ -358,13 +313,13 @@ public final class LokiPublicChatAPI : LokiDotNetAPI { public static func setProfilePictureURL(to url: String?, using profileKey: Data, on server: String) -> Promise { print("[Loki] Updating profile picture on server: \(server).") + var annotation: JSON = [ "type" : profilePictureType ] + if let url = url { + annotation["value"] = [ "profileKey" : profileKey.base64EncodedString(), "url" : url ] + } + let parameters: JSON = [ "annotations" : [ annotation ] ] return attempt(maxRetryCount: maxRetryCount, recoveringOn: DispatchQueue.global()) { getAuthToken(for: server).then { token -> Promise in - var annotation: JSON = [ "type" : profilePictureType ] - if let url = url { - annotation["value"] = [ "profileKey" : profileKey.base64EncodedString(), "url" : url ] - } - let parameters: JSON = [ "annotations" : [ annotation ] ] 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)" ] @@ -372,37 +327,47 @@ public final class LokiPublicChatAPI : LokiDotNetAPI { print("[Loki] Couldn't update profile picture due to error: \(error).") throw error } - } + }.handlingInvalidAuthTokenIfNeeded(for: server) } } - + + // MARK: Joining & Leaving @objc(getInfoForChannelWithID:onServer:) public static func objc_getInfo(for channel: UInt64, on server: String) -> AnyPromise { return AnyPromise.from(getInfo(for: channel, on: server)) } public static func getInfo(for channel: UInt64, on server: String) -> Promise { - let url = URL(string: "\(server)/channels/\(channel)?include_annotations=1")! - let request = TSRequest(url: url) - return LokiFileServerProxy(for: server).perform(request).map { rawResponse in - guard let json = rawResponse as? JSON, - let data = json["data"] as? JSON, - let annotations = data["annotations"] as? [JSON], - let annotation = annotations.first, - let info = annotation["value"] as? JSON, - let displayName = info["name"] as? String, - let profilePictureURL = info["avatar"] as? String, - let countInfo = data["counts"] as? JSON, - let memberCount = countInfo["subscribers"] as? Int else { - print("[Loki] Couldn't parse info for public chat channel with ID: \(channel) on server: \(server) from: \(rawResponse).") - throw LokiDotNetAPIError.parsingFailed - } - let publicChatInfo = LokiPublicChatInfo(displayName: displayName, profilePictureURL: profilePictureURL, memberCount: memberCount) - updateOpenGroupProfileIfNeeded(for: channel, on: server, with: publicChatInfo) - return publicChatInfo + return attempt(maxRetryCount: maxRetryCount, recoveringOn: DispatchQueue.global()) { + getAuthToken(for: server).then { token -> Promise 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 { rawResponse in + guard let json = rawResponse as? JSON, + let data = json["data"] as? JSON, + let annotations = data["annotations"] as? [JSON], + let annotation = annotations.first, + let info = annotation["value"] as? JSON, + let displayName = info["name"] as? String, + let profilePictureURL = info["avatar"] as? String, + let countInfo = data["counts"] as? JSON, + let memberCount = countInfo["subscribers"] as? Int else { + print("[Loki] Couldn't parse info for public chat channel with ID: \(channel) on server: \(server) from: \(rawResponse).") + throw LokiDotNetAPIError.parsingFailed + } + let storage = OWSPrimaryStorage.shared() + storage.dbReadWriteConnection.readWrite { transaction in + storage.setUserCount(memberCount, forPublicChatWithID: "\(server).\(channel)", in: transaction) + } + let publicChatInfo = LokiPublicChatInfo(displayName: displayName, profilePictureURL: profilePictureURL, memberCount: memberCount) + updateOpenGroupProfileIfNeeded(for: channel, on: server, with: publicChatInfo) + return publicChatInfo + } + }.handlingInvalidAuthTokenIfNeeded(for: server) } } - + static func updateOpenGroupProfileIfNeeded(for channel: UInt64, on server: String, with info: LokiPublicChatInfo) { let storage = OWSPrimaryStorage.shared() let publicChatID = "\(server).\(channel)" @@ -451,6 +416,33 @@ public final class LokiPublicChatAPI : LokiDotNetAPI { } } + public static func join(_ channel: UInt64, on server: String) -> Promise { + return attempt(maxRetryCount: maxRetryCount, recoveringOn: DispatchQueue.global()) { + getAuthToken(for: server).then { token -> Promise in + 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)" ] + return LokiFileServerProxy(for: server).perform(request).done { result -> Void in + print("[Loki] Joined channel with ID: \(channel) on server: \(server).") + } + }.handlingInvalidAuthTokenIfNeeded(for: server) + } + } + + public static func leave(_ channel: UInt64, on server: String) -> Promise { + return attempt(maxRetryCount: maxRetryCount, recoveringOn: DispatchQueue.global()) { + getAuthToken(for: server).then { token -> Promise in + 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)" ] + return LokiFileServerProxy(for: server).perform(request).done { result -> Void in + print("[Loki] Left channel with ID: \(channel) on server: \(server).") + } + }.handlingInvalidAuthTokenIfNeeded(for: server) + } + } + + // MARK: Reporting @objc(reportMessageWithID:inChannel:onServer:) public static func objc_reportMessageWithID(_ messageID: UInt64, in channel: UInt64, on server: String) -> AnyPromise { return AnyPromise.from(reportMessageWithID(messageID, in: channel, on: server)) @@ -459,6 +451,34 @@ public final class LokiPublicChatAPI : LokiDotNetAPI { public static func reportMessageWithID(_ messageID: UInt64, in channel: UInt64, on server: String) -> Promise { 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 return LokiFileServerProxy(for: server).perform(request).map { _ in } } + + // MARK: Moderators + public static func getModerators(for channel: UInt64, on server: String) -> Promise> { + return getAuthToken(for: server).then { token -> Promise> 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 { rawResponse in + 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 LokiDotNetAPIError.parsingFailed + } + let moderatorsAsSet = Set(moderators); + if self.moderators.keys.contains(server) { + self.moderators[server]![channel] = moderatorsAsSet + } else { + self.moderators[server] = [ channel : moderatorsAsSet ] + } + return moderatorsAsSet + } + }.handlingInvalidAuthTokenIfNeeded(for: server) + } + + @objc(isUserModerator:forChannel:onServer:) + public static func isUserModerator(_ hexEncodedPublicString: String, for channel: UInt64, on server: String) -> Bool { + return moderators[server]?[channel]?.contains(hexEncodedPublicString) ?? false + } }