Merge pull request #468 from WalletConnect/develop

0.10.1

Sources/WalletConnectRelay/SocketConnectionHandler/AutomaticSocketConnectionHandler.swift

@@ -36,7 +36,6 @@ class AutomaticSocketConnectionHandler: SocketConnectionHandler {
         }
 
         appStateObserver.onWillEnterForeground = { [unowned self] in
-            backgroundTaskRegistrar.invalidate()
             socket.connect()
         }
     }

Sources/WalletConnectRelay/SocketConnectionHandler/BackgroundTaskRegistering.swift

@@ -5,7 +5,6 @@ import UIKit
 
 protocol BackgroundTaskRegistering {
     func register(name: String, completion: @escaping () -> Void)
-    func invalidate()
 }
 
 class BackgroundTaskRegistrar: BackgroundTaskRegistering {
@@ -15,7 +14,7 @@ class BackgroundTaskRegistrar: BackgroundTaskRegistering {
 
     func register(name: String, completion: @escaping () -> Void) {
 #if os(iOS)
-        backgroundTaskID = .invalid
+        invalidateIfNeeded()
         backgroundTaskID = UIApplication.shared.beginBackgroundTask(withName: name) { [unowned self] in
             UIApplication.shared.endBackgroundTask(backgroundTaskID)
             backgroundTaskID = .invalid
@@ -24,7 +23,7 @@ class BackgroundTaskRegistrar: BackgroundTaskRegistering {
 #endif
     }
 
-    func invalidate() {
+    private func invalidateIfNeeded() {
 #if os(iOS)
         if backgroundTaskID != .invalid {
             UIApplication.shared.endBackgroundTask(backgroundTaskID)

Tests/AuthTests/AppRespondSubscriberTests.swift

@@ -0,0 +1,67 @@
+import Foundation
+import XCTest
+@testable import Auth
+import WalletConnectUtils
+@testable import WalletConnectKMS
+@testable import TestingUtils
+import JSONRPC
+
+class AppRespondSubscriberTests: XCTestCase {
+    var networkingInteractor: NetworkingInteractorMock!
+    var sut: AppRespondSubscriber!
+    var messageFormatter: SIWEMessageFormatter!
+    var rpcHistory: RPCHistory!
+    let defaultTimeout: TimeInterval = 0.01
+    let walletAccount = Account(chainIdentifier: "eip155:1", address: "0x724d0D2DaD3fbB0C168f947B87Fa5DBe36F1A8bf")!
+    let prvKey = Data(hex: "462c1dad6832d7d96ccf87bd6a686a4110e114aaaebd5512e552c0e3a87b480f")
+    var messageSigner: MessageSigner!
+
+    override func setUp() {
+        networkingInteractor = NetworkingInteractorMock()
+        messageFormatter = SIWEMessageFormatter()
+        messageSigner = MessageSigner()
+        let historyStorage = CodableStore<RPCHistory.Record>(defaults: RuntimeKeyValueStorage(), identifier: StorageDomainIdentifiers.jsonRpcHistory.rawValue)
+        rpcHistory = RPCHistory(keyValueStore: historyStorage)
+        sut = AppRespondSubscriber(
+            networkingInteractor: networkingInteractor,
+            logger: ConsoleLoggerMock(),
+            rpcHistory: rpcHistory,
+            signatureVerifier: messageSigner,
+            messageFormatter: messageFormatter)
+    }
+
+    func testMessageCompromisedFailure() {
+        let messageExpectation = expectation(description: "receives response")
+
+        // set history record for a request
+        let topic = "topic"
+        let requestId: RPCID = RPCID(1234)
+        let request = RPCRequest(method: "wc_authRequest", params: AuthRequestParams.stub(), id: requestId.right!)
+        try! rpcHistory.set(request, forTopic: topic, emmitedBy: .local)
+
+        var messageId: RPCID!
+        var result: Result<Cacao, AuthError>!
+        sut.onResponse = { id, r in
+            messageId = id
+            result = r
+            messageExpectation.fulfill()
+        }
+
+        // subscribe on compromised cacao
+        let header = CacaoHeader(t: "eip4361")
+        let payload = CacaoPayload(params: AuthPayload.stub(nonce: "compromised nonce"), didpkh: DIDPKH(account: walletAccount))
+
+        let message = try! messageFormatter.formatMessage(from: payload)
+        let signature = try! messageSigner.sign(message: message, privateKey: prvKey)
+        let cacaoSignature = CacaoSignature(t: "eip191", s: signature)
+
+        let cacao = Cacao(header: header, payload: payload, signature: cacaoSignature)
+
+        let response = RPCResponse(id: requestId, result: cacao)
+        networkingInteractor.responsePublisherSubject.send(ResponseSubscriptionPayload(topic: topic, response: response))
+
+        wait(for: [messageExpectation], timeout: defaultTimeout)
+        XCTAssertEqual(result, .failure(AuthError.messageCompromised))
+        XCTAssertEqual(messageId, requestId)
+    }
+}

Tests/AuthTests/Mocks/AppMetadata.swift

@@ -0,0 +1,14 @@
+
+import Foundation
+import WalletConnectPairing
+
+public extension AppMetadata {
+    static func stub() -> AppMetadata {
+        AppMetadata(
+            name: "Wallet Connect",
+            description: "A protocol to connect blockchain wallets to dapps.",
+            url: "https://walletconnect.com/",
+            icons: []
+        )
+    }
+}

Tests/AuthTests/Mocks/NetworkingInteractorMock.swift

@@ -9,7 +9,7 @@ struct NetworkingInteractorMock: NetworkInteracting {
     var responsePublisher: AnyPublisher<ResponseSubscriptionPayload, Never> {
         responsePublisherSubject.eraseToAnyPublisher()
     }
-    private let responsePublisherSubject = PassthroughSubject<ResponseSubscriptionPayload, Never>()
+    let responsePublisherSubject = PassthroughSubject<ResponseSubscriptionPayload, Never>()
 
     let requestPublisherSubject = PassthroughSubject<RequestSubscriptionPayload, Never>()
     var requestPublisher: AnyPublisher<RequestSubscriptionPayload, Never> {

Tests/AuthTests/Stubs/AuthPayload.swift

@@ -6,3 +6,10 @@ extension AuthPayload {
         AuthPayload(requestParams: requestParams, iat: "2021-09-30T16:25:24Z")
     }
 }
+
+extension AuthPayload {
+    static func stub(nonce: String) -> AuthPayload {
+        let issueAt = ISO8601DateFormatter().string(from: Date())
+        return AuthPayload(requestParams: RequestParams.stub(nonce: nonce), iat: issueAt)
+    }
+}

Tests/AuthTests/Stubs/AuthRequestParams.swift

@@ -0,0 +1,16 @@
+@testable import Auth
+import Foundation
+import WalletConnectPairing
+
+extension AuthRequestParams {
+    static func stub(nonce: String = "32891756") -> AuthRequestParams {
+        let payload = AuthPayload.stub(nonce: nonce)
+        return AuthRequestParams(requester: Requester.stub(), payloadParams: payload)
+    }
+}
+
+extension AuthRequestParams.Requester {
+    static func stub() -> AuthRequestParams.Requester {
+        AuthRequestParams.Requester(publicKey: "", metadata: AppMetadata.stub())
+    }
+}

Tests/AuthTests/AuthRequstSubscriberTests.swift → Tests/AuthTests/WalletRequestSubscriberTests.swift

@@ -6,7 +6,7 @@ import WalletConnectUtils
 @testable import TestingUtils
 import JSONRPC
 
-class AuthRequstSubscriberTests: XCTestCase {
+class WalletRequestSubscriberTests: XCTestCase {
     var networkingInteractor: NetworkingInteractorMock!
     var sut: WalletRequestSubscriber!
     var messageFormatter: SIWEMessageFormatterMock!

Tests/WalletConnectSignTests/Mocks/AppMetadata.swift

@@ -0,0 +1,14 @@
+
+import Foundation
+import WalletConnectPairing
+
+public extension AppMetadata {
+    static func stub() -> AppMetadata {
+        AppMetadata(
+            name: "Wallet Connect",
+            description: "A protocol to connect blockchain wallets to dapps.",
+            url: "https://walletconnect.com/",
+            icons: []
+        )
+    }
+}

Tests/WalletConnectSignTests/Stub/Stubs.swift

@@ -5,16 +5,6 @@ import WalletConnectUtils
 import TestingUtils
 import WalletConnectPairing
 
-extension AppMetadata {
-    static func stub() -> AppMetadata {
-        AppMetadata(
-            name: "Wallet Connect",
-            description: "A protocol to connect blockchain wallets to dapps.",
-            url: "https://walletconnect.com/",
-            icons: []
-        )
-    }
-}
 
 extension Pairing {
     static func stub(expiryDate: Date = Date(timeIntervalSinceNow: 10000), topic: String = String.generateTopic()) -> Pairing {