Feature/issue 278 verify signed messages

FlowCrypt.xcodeproj/project.pbxproj

@@ -74,6 +74,7 @@
 		51C0C1F2271987DB000C9738 /* Toast in Frameworks */ = {isa = PBXBuildFile; productRef = 51C0C1F1271987DB000C9738 /* Toast */; };
 		51DA5BD62721AB07001C4359 /* PubKeyState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51DA5BD52721AB07001C4359 /* PubKeyState.swift */; };
 		51DA5BDA2722C82E001C4359 /* RecipientTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51DA5BD92722C82E001C4359 /* RecipientTests.swift */; };
+		51DAD9BD273E7DD20076CBA7 /* BadgeNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51DAD9BC273E7DD20076CBA7 /* BadgeNode.swift */; };
 		51DE2FEE2714DA0400916222 /* ContactKeyCellNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51DE2FED2714DA0400916222 /* ContactKeyCellNode.swift */; };
 		51E13F12270F92BA00F287CA /* IDZSwiftCommonCrypto in Frameworks */ = {isa = PBXBuildFile; productRef = 51E13F11270F92BA00F287CA /* IDZSwiftCommonCrypto */; };
 		51E13F15270F92F200F287CA /* BigInt in Frameworks */ = {isa = PBXBuildFile; productRef = 51E13F14270F92F200F287CA /* BigInt */; };
@@ -493,6 +494,7 @@
 		51B4AE5227144E590001F33B /* PubKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PubKey.swift; sourceTree = "<group>"; };
 		51DA5BD52721AB07001C4359 /* PubKeyState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PubKeyState.swift; sourceTree = "<group>"; };
 		51DA5BD92722C82E001C4359 /* RecipientTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecipientTests.swift; sourceTree = "<group>"; };
+		51DAD9BC273E7DD20076CBA7 /* BadgeNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BadgeNode.swift; sourceTree = "<group>"; };
 		51DE2FED2714DA0400916222 /* ContactKeyCellNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactKeyCellNode.swift; sourceTree = "<group>"; };
 		51E1673C270DAFF900D27C52 /* Localizable.stringsdict */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; path = Localizable.stringsdict; sourceTree = "<group>"; };
 		51E4F0B427348E310017DABB /* Error+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Error+Extension.swift"; sourceTree = "<group>"; };
@@ -2009,6 +2011,7 @@
 				9F4453C1236B9273005D7D05 /* TextFieldNode.swift */,
 				D24FAFAA2520BFAE00BF46C5 /* CheckBoxNode.swift */,
 				50531BE32629B9A80039BAE9 /* AttachmentNode.swift */,
+				51DAD9BC273E7DD20076CBA7 /* BadgeNode.swift */,
 			);
 			path = Nodes;
 			sourceTree = "<group>";
@@ -2734,6 +2737,7 @@
 				5133B6742716E5EA00C95463 /* LabelCellNode.swift in Sources */,
 				D211CE7123FC35AC00D1CE38 /* TextFieldCellNode.swift in Sources */,
 				9FA19890253C841F008C9CF2 /* TableViewController.swift in Sources */,
+				51DAD9BD273E7DD20076CBA7 /* BadgeNode.swift in Sources */,
 				D2CCD1FA247C50DA00D21F9C /* UIColorExtension.swift in Sources */,
 				51DE2FEE2714DA0400916222 /* ContactKeyCellNode.swift in Sources */,
 				D2A9CA432426210200E1D898 /* SetupTitleNode.swift in Sources */,

FlowCrypt/Controllers/Threads/ThreadDetailsDecorator.swift

@@ -11,6 +11,12 @@ import UIKit
 
 extension ThreadMessageSenderCellNode.Input {
     init(threadMessage: ThreadDetailsViewController.Input) {
+        let signature: String
+        if let processedMessage = threadMessage.processedMessage, processedMessage.messageType == .encrypted {
+            signature = processedMessage.signature.message
+        } else {
+            signature = "message_not_signed".localized
+        }
         let sender = threadMessage.rawMessage.sender ?? "message_unknown_sender".localized
         let date = DateFormatter().formatDate(threadMessage.rawMessage.date)
         let isMessageRead = threadMessage.rawMessage.isMessageRead
@@ -28,9 +34,13 @@ extension ThreadMessageSenderCellNode.Input {
             : .mainTextUnreadColor
 
         self.init(
+            signature: NSAttributedString.text(from: signature, style: .regular(12), color: .white),
+            signatureColor: threadMessage.processedMessage?.signature.color,
+            signatureIcon: threadMessage.processedMessage?.signature.icon,
             sender: NSAttributedString.text(from: sender, style: style, color: textColor),
             date: NSAttributedString.text(from: date, style: style, color: dateColor),
             isExpanded: threadMessage.isExpanded,
+            isEncrypted: threadMessage.processedMessage?.messageType == .encrypted,
             buttonColor: .messageButtonColor
         )
     }

FlowCrypt/Controllers/Threads/ThreadDetailsViewController.swift

@@ -57,15 +57,15 @@ final class ThreadDetailsViewController: TableNodeViewController {
         filesManager: FilesManagerType = FilesManager(),
         completion: @escaping MessageActionCompletion
     ) {
-        self.threadOperationsProvider = threadOperationsProvider
         self.messageService = messageService
+        self.threadOperationsProvider = threadOperationsProvider
         self.messageOperationsProvider = messageOperationsProvider
         self.trashFolderProvider = trashFolderProvider
         self.thread = thread
         self.filesManager = filesManager
         self.onComplete = completion
         self.input = thread.messages
-            .sorted(by: { $0 > $1 })
+            .sorted(by: >)
             .map { Input(message: $0, isExpanded: false) }
 
         super.init(node: TableNode())
@@ -166,11 +166,18 @@ extension ThreadDetailsViewController {
 
         Task {
             do {
-                let processedMessage = try await messageService.getAndProcessMessage(
+                var processedMessage = try await messageService.getAndProcessMessage(
                     with: message,
                     folder: thread.path,
+                    onlyLocalKeys: true,
                     progressHandler: { [weak self] in self?.handleFetchProgress(state: $0) }
                 )
+                if case .missingPubkey = processedMessage.signature {
+                    processedMessage.signature = .pending
+                    retryVerifyingSignatureWithRemotelyFetchedKeys(message: message,
+                                                                   folder: thread.path,
+                                                                   indexPath: indexPath)
+                }
                 handleReceived(message: processedMessage, at: indexPath)
             } catch {
                 handleError(error, at: indexPath)
@@ -182,18 +189,26 @@ extension ThreadDetailsViewController {
         hideSpinner()
 
         let messageIndex = indexPath.section - 1
-        input[messageIndex].processedMessage = processedMessage
-        input[messageIndex].isExpanded = !input[messageIndex].isExpanded
-        markAsRead(at: messageIndex)
-
-        UIView.animate(
-            withDuration: 0.2,
-            animations: {
-                self.node.reloadSections(IndexSet(integer: indexPath.section), with: .fade)
-            },
-            completion: { _ in
-                self.node.scrollToRow(at: indexPath, at: .middle, animated: true)
-            })
+        let isAlreadyProcessed = input[messageIndex].processedMessage != nil
+
+        if !isAlreadyProcessed {
+            input[messageIndex].processedMessage = processedMessage
+            input[messageIndex].isExpanded = true
+
+            markAsRead(at: messageIndex)
+
+            UIView.animate(
+                withDuration: 0.2,
+                animations: {
+                    self.node.reloadSections(IndexSet(integer: indexPath.section), with: .fade)
+                },
+                completion: { [weak self] _ in
+                    self?.node.scrollToRow(at: indexPath, at: .middle, animated: true)
+                })
+        } else {
+            input[messageIndex].processedMessage?.signature = processedMessage.signature
+            node.reloadSections(IndexSet(integer: indexPath.section), with: .fade)
+        }
     }
 
     private func handleError(_ error: Error, at indexPath: IndexPath) {
@@ -249,7 +264,11 @@ extension ThreadDetailsViewController {
             do {
                 let matched = try await messageService.checkAndPotentiallySaveEnteredPassPhrase(passPhrase)
                 if matched {
-                    let processedMessage = try await messageService.decryptAndProcessMessage(mime: rawMimeData)
+                    let sender = input[indexPath.section-1].rawMessage.sender
+                    let processedMessage = try await messageService.decryptAndProcessMessage(
+                        mime: rawMimeData,
+                        sender: sender,
+                        onlyLocalKeys: false)
                     handleReceived(message: processedMessage, at: indexPath)
                 } else {
                     handleWrongPassPhrase(for: rawMimeData, with: passPhrase, at: indexPath)
@@ -260,6 +279,25 @@ extension ThreadDetailsViewController {
         }
     }
 
+    private func retryVerifyingSignatureWithRemotelyFetchedKeys(message: Message,
+                                                                folder: String,
+                                                                indexPath: IndexPath) {
+        Task {
+            do {
+                let processedMessage = try await messageService.getAndProcessMessage(
+                    with: message,
+                    folder: thread.path,
+                    onlyLocalKeys: false,
+                    progressHandler: { _ in }
+                )
+                handleReceived(message: processedMessage, at: indexPath)
+            } catch {
+                let message = "message_signature_fail_reason".localizeWithArguments(error.errorMessage)
+                input[indexPath.section-1].processedMessage?.signature = .error(message)
+            }
+        }
+    }
+
     private func handleFetchProgress(state: MessageFetchState) {
         switch state {
         case .fetch:
@@ -286,54 +324,44 @@ extension ThreadDetailsViewController: MessageActionsHandler {
 
     func permanentlyDelete() {
         logger.logInfo("permanently delete")
-        Task {
-            do {
-                showSpinner()
-                try await threadOperationsProvider.delete(thread: thread)
-                handleSuccessfulMessage(action: .permanentlyDelete)
-            } catch {
-                handleMessageAction(error: error)
-            }
-        }
+        handle(action: .permanentlyDelete)
     }
 
     func moveToTrash(with trashPath: String) {
         logger.logInfo("move to trash \(trashPath)")
-        Task {
-            do {
-                showSpinner()
-                try await threadOperationsProvider.moveThreadToTrash(thread: thread)
-                handleSuccessfulMessage(action: .moveToTrash)
-            } catch {
-                handleMessageAction(error: error)
-            }
-        }
+        handle(action: .moveToTrash)
     }
 
     func handleArchiveTap() {
-        Task {
-            do {
-                showSpinner()
-                try await threadOperationsProvider.archive(thread: thread, in: currentFolderPath)
-                handleSuccessfulMessage(action: .archive)
-            } catch {
-                handleMessageAction(error: error)
-            }
-        }
+        handle(action: .archive)
     }
 
     func handleMarkUnreadTap() {
         let messages = input.filter { $0.isExpanded }.map(\.rawMessage)
 
-        guard messages.isNotEmpty else {
-            return
-        }
+        guard messages.isNotEmpty else { return }
+
+        handle(action: .markAsRead(false))
+    }
 
+    func handle(action: MessageAction) {
         Task {
             do {
                 showSpinner()
-                try await threadOperationsProvider.mark(thread: thread, asRead: false, in: currentFolderPath)
-                handleSuccessfulMessage(action: .markAsRead(false))
+
+                switch action {
+                case .archive:
+                    try await threadOperationsProvider.archive(thread: thread, in: currentFolderPath)
+                case .markAsRead(let isRead):
+                    guard !isRead else { return }
+                    try await threadOperationsProvider.mark(thread: thread, asRead: false, in: currentFolderPath)
+                case .moveToTrash:
+                    try await threadOperationsProvider.moveThreadToTrash(thread: thread)
+                case .permanentlyDelete:
+                    try await threadOperationsProvider.delete(thread: thread)
+                }
+
+                handleSuccessfulMessage(action: action)
             } catch {
                 handleMessageAction(error: error)
             }

FlowCrypt/Core/Core.swift

@@ -127,11 +127,16 @@ actor Core: KeyDecrypter, KeyParser, CoreComposeMessageType {
         return CoreRes.EncryptFile(encryptedFile: encrypted.data)
     }
 
-    func parseDecryptMsg(encrypted: Data, keys: [PrvKeyInfo], msgPwd: String?, isEmail: Bool) async throws -> CoreRes.ParseDecryptMsg {
+    func parseDecryptMsg(encrypted: Data,
+                         keys: [PrvKeyInfo],
+                         msgPwd: String?,
+                         isEmail: Bool,
+                         verificationPubKeys: [String]) async throws -> CoreRes.ParseDecryptMsg {
         let json: [String : Any?]? = [
             "keys": try keys.map { try $0.toJsonEncodedDict() },
             "isEmail": isEmail,
-            "msgPwd": msgPwd
+            "msgPwd": msgPwd,
+            "verificationPubkeys": verificationPubKeys
         ]
         let parsed = try await call(
             "parseDecryptMsg",

FlowCrypt/Core/CoreTypes.swift

@@ -144,15 +144,15 @@ struct SendableMsg: Equatable {
 
 struct MsgBlock: Decodable {
     static func blockParseErr(with content: String) -> MsgBlock {
-        MsgBlock(type: .blockParseErr, content: content, decryptErr: nil, keyDetails: nil, attMeta: nil)
+        MsgBlock(type: .blockParseErr, content: content, decryptErr: nil, keyDetails: nil, attMeta: nil, verifyRes: nil)
     }
 
     let type: BlockType
     let content: String
     let decryptErr: DecryptErr? // always present in decryptErr BlockType
     let keyDetails: KeyDetails? // always present in publicKey BlockType
     let attMeta: AttMeta? // always present in plainAtt, encryptedAtt, decryptedAtt, encryptedAttLink
-    // let verifyRes: VerifyRes?,
+    let verifyRes: VerifyRes?
 
     // let signature: String? // possibly not neded in Swift
 
@@ -192,6 +192,14 @@ struct MsgBlock: Decodable {
         let length: Int
     }
 
+    struct VerifyRes: Decodable {
+        let match: Bool?
+        let signer: String?
+        let error: String?
+        let mixed: Bool?
+        let partial: Bool?
+    }
+
     enum BlockType: String, Decodable {
         case plainHtml // all content blocks, regardless if encrypted or not, formatted as a plainHtml (todo - rename this one day to formattedHtml)
         case publicKey

FlowCrypt/Extensions/UIColorExtension.swift

@@ -78,7 +78,7 @@ extension UIColor {
 }
 
 // Uncomment for FlowCryptUIApplication
-//extension UIColor {
+// extension UIColor {
 //    static var main: UIColor {
 //        .green
 //    }
@@ -110,4 +110,4 @@ extension UIColor {
 //    static var blueColor: UIColor {
 //        .blue
 //    }
-//}
+// }

FlowCrypt/Functionality/Mail Provider/Imap/Imap+session.swift

@@ -40,7 +40,7 @@ extension Imap {
         }
     }
 
-    func connectImap(session: IMAPSession) async throws -> Void {
+    func connectImap(session: IMAPSession) async throws {
         return try await withCheckedThrowingContinuation { continuation in
             MCOIMAPSession(session: session)
                 .log()

FlowCrypt/Functionality/Mail Provider/Message Gateway/GmailService+draft.swift

@@ -33,7 +33,7 @@ extension GmailService: DraftGateway {
     }
 
     func deleteDraft(with identifier: String) async {
-        await withCheckedContinuation{ (continuation: CheckedContinuation<Void, Never>) in
+        await withCheckedContinuation { (continuation: CheckedContinuation<Void, Never>) in
             let query = GTLRGmailQuery_UsersDraftsDelete.query(withUserId: .me, identifier: identifier)
             gmailService.executeQuery(query) { _, _, _ in
                 return continuation.resume()