update verify context creation

WalletConnect · Jul 24, 2024 · 572591d · 572591d
1 parent 7d8c2f4
commit 572591d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/Sources/WalletConnectSign/Auth/Link/ApproveSessionAuthenticateUtil.swift b/Sources/WalletConnectSign/Auth/Link/ApproveSessionAuthenticateUtil.swift
@@ -14,6 +14,8 @@ class ApproveSessionAuthenticateUtil {
     private let logger: ConsoleLogging
     private let sessionStore: WCSessionStorage
     private let sessionNamespaceBuilder: SessionNamespaceBuilder
+    private let verifyContextStore: CodableStore<VerifyContext>
+    private let verifyClient: VerifyClientProtocol
 
     init(
         logger: ConsoleLogging,
@@ -23,7 +25,9 @@ class ApproveSessionAuthenticateUtil {
         messageFormatter: SIWEFromCacaoFormatting,
         sessionStore: WCSessionStorage,
         sessionNamespaceBuilder: SessionNamespaceBuilder,
-        networkingInteractor: NetworkInteracting
+        networkingInteractor: NetworkInteracting,
+        verifyContextStore: CodableStore<VerifyContext>,
+        verifyClient: VerifyClientProtocol
     ) {
         self.logger = logger
         self.kms = kms
@@ -33,6 +37,8 @@ class ApproveSessionAuthenticateUtil {
         self.signatureVerifier = signatureVerifier
         self.messageFormatter = messageFormatter
         self.networkingInteractor = networkingInteractor
+        self.verifyContextStore = verifyContextStore
+        self.verifyClient = verifyClient
     }
 
     func getsessionAuthenticateRequestParams(requestId: RPCID) throws -> (request: SessionAuthenticateRequestParams, topic: String) {
@@ -60,7 +66,6 @@ class ApproveSessionAuthenticateUtil {
         return (topic, keys)
     }
 
-
     func createSession(
         response: SessionAuthenticateResponseParams,
         pairingTopic: String,
@@ -116,6 +121,12 @@ class ApproveSessionAuthenticateUtil {
         return session.publicRepresentation()
     }
 
+
+    func getVerifyContext(requestId: RPCID, domain: String) -> VerifyContext {
+        (try? verifyContextStore.get(key: requestId.string)) ?? verifyClient.createVerifyContext(origin: nil, domain: domain, isScam: false)
+    }
+
+
     func recoverAndVerifySignature(cacaos: [Cacao]) async throws {
         try await cacaos.asyncForEach { [unowned self] cacao in
             guard

diff --git a/Sources/WalletConnectSign/Auth/Link/LinkSessionAuthenticateResponder.swift b/Sources/WalletConnectSign/Auth/Link/LinkSessionAuthenticateResponder.swift
@@ -60,15 +60,13 @@ actor LinkSessionAuthenticateResponder {
 
         let url = try await linkEnvelopesDispatcher.respond(topic: responseTopic, response: response, peerUniversalLink: peerUniversalLink, envelopeType: .type1(pubKey: responseKeys.publicKey.rawRepresentation))
 
-        let verifyContext = (try? verifyContextStore.get(key: requestId.string)) ?? VerifyContext(origin: nil, validation: .unknown)
-
         let session = try util.createSession(
             response: responseParams,
             pairingTopic: pairingTopic,
             request: sessionAuthenticateRequestParams,
             sessionTopic: sessionTopic,
             transportType: .linkMode,
-            verifyContext: verifyContext
+            verifyContext: util.getVerifyContext(requestId: requestId, domain: sessionAuthenticateRequestParams.requester.metadata.url)
         )
 
         verifyContextStore.delete(forKey: requestId.string)

diff --git a/Sources/WalletConnectSign/Auth/Services/Wallet/SessionAuthenticateResponder.swift b/Sources/WalletConnectSign/Auth/Services/Wallet/SessionAuthenticateResponder.swift
@@ -120,14 +120,13 @@ actor SessionAuthenticateResponder {
         }
 
         do {
-            let verifyContext = (try? verifyContextStore.get(key: requestId.string)) ?? VerifyContext(origin: nil, validation: .unknown)
             let session = try util.createSession(
                 response: responseParams,
                 pairingTopic: pairingTopic,
                 request: sessionAuthenticateRequestParams,
                 sessionTopic: sessionTopic,
                 transportType: .relay,
-                verifyContext: verifyContext
+                verifyContext: util.getVerifyContext(requestId: requestId, domain: sessionAuthenticateRequestParams.requester.metadata.url)
             )
             pairingRegisterer.activate(
                 pairingTopic: pairingTopic,

diff --git a/Sources/WalletConnectSign/Engine/Common/ApproveEngine.swift b/Sources/WalletConnectSign/Engine/Common/ApproveEngine.swift
@@ -226,7 +226,8 @@ final class ApproveEngine {
             expiry: Int64(expiry)
         )
 
-        let verifyContext = (try? verifyContextStore.get(key: proposal.proposer.publicKey)) ?? VerifyContext(origin: nil, validation: .unknown)
+        let verifyContext = (try? verifyContextStore.get(key: proposal.proposer.publicKey)) ?? verifyClient.createVerifyContext(origin: nil, domain: proposal.proposer.metadata.url, isScam: false)
+
 
         let session = WCSession(
             topic: topic,

diff --git a/Sources/WalletConnectSign/Sign/SignClientFactory.swift b/Sources/WalletConnectSign/Sign/SignClientFactory.swift
@@ -121,7 +121,7 @@ public struct SignClientFactory {
         let walletErrorResponder = WalletErrorResponder(networkingInteractor: networkingClient, logger: logger, kms: kms, rpcHistory: rpcHistory, linkEnvelopesDispatcher: linkEnvelopesDispatcher)
         let authRequestSubscriber = AuthRequestSubscriber(networkingInteractor: networkingClient, logger: logger, kms: kms, walletErrorResponder: walletErrorResponder, pairingRegisterer: pairingClient, verifyClient: verifyClient, verifyContextStore: verifyContextStore, pairingStore: pairingStore)
 
-        let approveSessionAuthenticateUtil = ApproveSessionAuthenticateUtil(logger: logger, kms: kms, rpcHistory: rpcHistory, signatureVerifier: signatureVerifier, messageFormatter: messageFormatter, sessionStore: sessionStore, sessionNamespaceBuilder: sessionNameSpaceBuilder, networkingInteractor: networkingClient)
+        let approveSessionAuthenticateUtil = ApproveSessionAuthenticateUtil(logger: logger, kms: kms, rpcHistory: rpcHistory, signatureVerifier: signatureVerifier, messageFormatter: messageFormatter, sessionStore: sessionStore, sessionNamespaceBuilder: sessionNameSpaceBuilder, networkingInteractor: networkingClient, verifyContextStore: verifyContextStore, verifyClient: verifyClient)
 
         let pendingRequestsProvider = PendingRequestsProvider(rpcHistory: rpcHistory, verifyContextStore: verifyContextStore)
         let authResponseTopicResubscriptionService = AuthResponseTopicResubscriptionService(networkingInteractor: networkingClient, logger: logger, authResponseTopicRecordsStore: authResponseTopicRecordsStore)