@canton-network/wallet-gateway-remote 1.12.0 → 1.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +107 -31
- package/dist/auth/jwt-auth-service.d.ts.map +1 -1
- package/dist/auth/jwt-auth-service.js +164 -77
- package/dist/config/Config.d.ts +407 -24
- package/dist/config/Config.d.ts.map +1 -1
- package/dist/config/Config.js +146 -11
- package/dist/config/ConfigUtils.d.ts +16 -1
- package/dist/config/ConfigUtils.d.ts.map +1 -1
- package/dist/config/ConfigUtils.js +150 -60
- package/dist/dapp-api/controller.d.ts +13 -1
- package/dist/dapp-api/controller.d.ts.map +1 -1
- package/dist/dapp-api/controller.js +16 -20
- package/dist/dapp-api/rpc-gen/index.d.ts.map +1 -1
- package/dist/dapp-api/rpc-gen/typings.d.ts +33 -3
- package/dist/dapp-api/rpc-gen/typings.d.ts.map +1 -1
- package/dist/dapp-api/server.d.ts +10 -5
- package/dist/dapp-api/server.d.ts.map +1 -1
- package/dist/dapp-api/server.js +10 -3
- package/dist/dapp-api/sse-sink.d.ts.map +1 -1
- package/dist/env.d.ts +1 -24
- package/dist/env.d.ts.map +1 -1
- package/dist/env.js +0 -23
- package/dist/example-config.d.ts +94 -62
- package/dist/example-config.d.ts.map +1 -1
- package/dist/example-config.js +95 -61
- package/dist/index.d.ts +3 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +82 -32
- package/dist/init.d.ts.map +1 -1
- package/dist/init.js +86 -127
- package/dist/ledger/party-allocation-service.d.ts +1 -4
- package/dist/ledger/party-allocation-service.d.ts.map +1 -1
- package/dist/ledger/party-allocation-service.js +1 -3
- package/dist/ledger/wallet-allocation/signing-providers/bitgo-wallet-allocator.d.ts.map +1 -1
- package/dist/ledger/wallet-allocation/signing-providers/bitgo-wallet-allocator.js +1 -1
- package/dist/ledger/wallet-allocation/signing-providers/blockdaemon-wallet-allocator.d.ts.map +1 -1
- package/dist/ledger/wallet-allocation/signing-providers/dfns-wallet-allocator.d.ts.map +1 -1
- package/dist/ledger/wallet-allocation/signing-providers/fireblocks-wallet-allocator.d.ts.map +1 -1
- package/dist/ledger/wallet-allocation/signing-providers/kernel-wallet-allocator.d.ts.map +1 -1
- package/dist/ledger/wallet-allocation/signing-providers/participant-wallet-allocator.d.ts.map +1 -1
- package/dist/ledger/wallet-allocation/signing-providers/securosys-wallet-allocator.d.ts.map +1 -1
- package/dist/ledger/wallet-allocation/wallet-allocation-service.d.ts +2 -2
- package/dist/ledger/wallet-allocation/wallet-allocation-service.d.ts.map +1 -1
- package/dist/ledger/wallet-allocation/wallet-allocation-service.js +2 -2
- package/dist/ledger/wallet-sync-service.d.ts +14 -1
- package/dist/ledger/wallet-sync-service.d.ts.map +1 -1
- package/dist/ledger/wallet-sync-service.js +240 -72
- package/dist/middleware/apiKeyAuth.d.ts.map +1 -1
- package/dist/middleware/apiKeyAuth.js +4 -8
- package/dist/middleware/errorHandler.d.ts +1 -1
- package/dist/middleware/errorHandler.d.ts.map +1 -1
- package/dist/middleware/jsonRpcHandler.d.ts.map +1 -1
- package/dist/middleware/jsonRpcHandler.js +3 -3
- package/dist/middleware/jwtAuth.d.ts +1 -1
- package/dist/middleware/jwtAuth.d.ts.map +1 -1
- package/dist/middleware/jwtAuth.js +17 -2
- package/dist/middleware/rateLimit.d.ts.map +1 -1
- package/dist/middleware/rateLimit.js +3 -9
- package/dist/middleware/securityHeaders.d.ts.map +1 -1
- package/dist/middleware/sessionHandler.d.ts +3 -3
- package/dist/middleware/sessionHandler.d.ts.map +1 -1
- package/dist/middleware/sessionHandler.js +8 -8
- package/dist/notices/server-notices.d.ts +24 -0
- package/dist/notices/server-notices.d.ts.map +1 -0
- package/dist/notices/server-notices.js +40 -0
- package/dist/notices/server-status-service.d.ts +11 -0
- package/dist/notices/server-status-service.d.ts.map +1 -0
- package/dist/notices/server-status-service.js +17 -0
- package/dist/signing/service-account-session.d.ts +16 -2
- package/dist/signing/service-account-session.d.ts.map +1 -1
- package/dist/signing/service-account-session.js +32 -1
- package/dist/signing-providers-registration.d.ts +7 -0
- package/dist/signing-providers-registration.d.ts.map +1 -0
- package/dist/signing-providers-registration.js +276 -0
- package/dist/user-api/controller.d.ts +25 -4
- package/dist/user-api/controller.d.ts.map +1 -1
- package/dist/user-api/controller.js +218 -235
- package/dist/user-api/rpc-gen/index.d.ts +27 -9
- package/dist/user-api/rpc-gen/index.d.ts.map +1 -1
- package/dist/user-api/rpc-gen/index.js +9 -3
- package/dist/user-api/rpc-gen/schemas.d.ts.map +1 -1
- package/dist/user-api/rpc-gen/schemas.js +86 -11
- package/dist/user-api/rpc-gen/typings.d.ts +158 -58
- package/dist/user-api/rpc-gen/typings.d.ts.map +1 -1
- package/dist/user-api/server.d.ts +7 -5
- package/dist/user-api/server.d.ts.map +1 -1
- package/dist/user-api/server.js +7 -2
- package/dist/web/frontend/404/index.html +3 -2
- package/dist/web/frontend/activities/index.html +4 -3
- package/dist/web/frontend/admin/index.html +16 -0
- package/dist/web/frontend/api-keys/add/index.html +3 -2
- package/dist/web/frontend/api-keys/index.html +3 -2
- package/dist/web/frontend/approve/index.html +4 -3
- package/dist/web/frontend/assets/404-N2p-H94F.js +5 -0
- package/dist/web/frontend/assets/activities-CIyMcvMq.js +71 -0
- package/dist/web/frontend/assets/addApiKey-DD_HxolC.js +92 -0
- package/dist/web/frontend/assets/addIdentityProvider-DNaST3bz.js +28 -0
- package/dist/web/frontend/assets/addNetwork-BwV-qK9L.js +38 -0
- package/dist/web/frontend/assets/addParty-DtBW1rpV.js +14 -0
- package/dist/web/frontend/assets/admin-CKAkdJym.js +53 -0
- package/dist/web/frontend/assets/apiKeys-CcnbBkNH.js +68 -0
- package/dist/web/frontend/assets/approve-33mo5eC8.js +27 -0
- package/dist/web/frontend/assets/callback-lKGXXz-1.js +7 -0
- package/dist/web/frontend/assets/common-DaUa4tUM.js +15 -0
- package/dist/web/frontend/assets/dist-BW5ACUmw.js +2 -0
- package/dist/web/frontend/assets/dist-CVv1nHd6.js +1 -0
- package/dist/web/frontend/assets/editParty-ZifjLzYx.js +15 -0
- package/dist/web/frontend/assets/frontend-Bs6UVmG1.js +4968 -0
- package/dist/web/frontend/assets/identityProviders-D5s7N-Ec.js +76 -0
- package/dist/web/frontend/assets/login-BAJsIB9G.js +11 -0
- package/dist/web/frontend/assets/networks-Do-zoG5E.js +78 -0
- package/dist/web/frontend/assets/parties-DFcN190b.js +51 -0
- package/dist/web/frontend/assets/reviewIdentityProvider-C2tsrpKc.js +43 -0
- package/dist/web/frontend/assets/reviewNetwork-BEGzls61.js +43 -0
- package/dist/web/frontend/assets/rolldown-runtime-pP25SEvz.js +1 -0
- package/dist/web/frontend/assets/selfIssuedLogin-a2KenO2P.js +112 -0
- package/dist/web/frontend/assets/signMessage-CQF0sCMe.js +23 -0
- package/dist/web/frontend/callback/index.html +3 -2
- package/dist/web/frontend/identity-providers/add/index.html +3 -2
- package/dist/web/frontend/identity-providers/index.html +3 -2
- package/dist/web/frontend/identity-providers/review/index.html +3 -2
- package/dist/web/frontend/index.html +2 -1
- package/dist/web/frontend/login/index.html +4 -11
- package/dist/web/frontend/networks/add/index.html +3 -2
- package/dist/web/frontend/networks/index.html +3 -2
- package/dist/web/frontend/networks/review/index.html +3 -2
- package/dist/web/frontend/parties/add/index.html +5 -5
- package/dist/web/frontend/parties/edit/index.html +5 -5
- package/dist/web/frontend/parties/index.html +4 -3
- package/dist/web/frontend/self-issued-login/index.html +16 -0
- package/dist/web/frontend/sign-message/index.html +3 -2
- package/dist/web/route-inputs.d.ts.map +1 -1
- package/dist/web/route-inputs.js +2 -1
- package/dist/web/server.d.ts.map +1 -1
- package/dist/web/server.js +1 -1
- package/package.json +53 -51
- package/dist/auth/jwt-auth-service.test.d.ts +0 -2
- package/dist/auth/jwt-auth-service.test.d.ts.map +0 -1
- package/dist/auth/jwt-auth-service.test.js +0 -659
- package/dist/config/Config.test.d.ts +0 -2
- package/dist/config/Config.test.d.ts.map +0 -1
- package/dist/config/Config.test.js +0 -26
- package/dist/dapp-api/controller.test.d.ts +0 -2
- package/dist/dapp-api/controller.test.d.ts.map +0 -1
- package/dist/dapp-api/controller.test.js +0 -531
- package/dist/dapp-api/server.test.d.ts +0 -2
- package/dist/dapp-api/server.test.d.ts.map +0 -1
- package/dist/dapp-api/server.test.js +0 -79
- package/dist/dapp-api/sse-sink.test.d.ts +0 -2
- package/dist/dapp-api/sse-sink.test.d.ts.map +0 -1
- package/dist/dapp-api/sse-sink.test.js +0 -30
- package/dist/ledger/party-allocation-service.test.d.ts +0 -2
- package/dist/ledger/party-allocation-service.test.d.ts.map +0 -1
- package/dist/ledger/party-allocation-service.test.js +0 -105
- package/dist/ledger/self-issued-auth-service.d.ts +0 -50
- package/dist/ledger/self-issued-auth-service.d.ts.map +0 -1
- package/dist/ledger/self-issued-auth-service.js +0 -263
- package/dist/ledger/self-issued-auth-service.test.d.ts +0 -2
- package/dist/ledger/self-issued-auth-service.test.d.ts.map +0 -1
- package/dist/ledger/self-issued-auth-service.test.js +0 -454
- package/dist/ledger/wallet-allocation/wallet-allocation-service.test.d.ts +0 -2
- package/dist/ledger/wallet-allocation/wallet-allocation-service.test.d.ts.map +0 -1
- package/dist/ledger/wallet-allocation/wallet-allocation-service.test.js +0 -1005
- package/dist/ledger/wallet-sync-service.test.d.ts +0 -2
- package/dist/ledger/wallet-sync-service.test.d.ts.map +0 -1
- package/dist/ledger/wallet-sync-service.test.js +0 -1017
- package/dist/middleware/apiKeyAuth.test.d.ts +0 -2
- package/dist/middleware/apiKeyAuth.test.d.ts.map +0 -1
- package/dist/middleware/apiKeyAuth.test.js +0 -126
- package/dist/middleware/errorHandler.test.d.ts +0 -2
- package/dist/middleware/errorHandler.test.d.ts.map +0 -1
- package/dist/middleware/errorHandler.test.js +0 -138
- package/dist/middleware/jsonRpcHandler.test.d.ts +0 -2
- package/dist/middleware/jsonRpcHandler.test.d.ts.map +0 -1
- package/dist/middleware/jsonRpcHandler.test.js +0 -377
- package/dist/middleware/jwtAuth.test.d.ts +0 -2
- package/dist/middleware/jwtAuth.test.d.ts.map +0 -1
- package/dist/middleware/jwtAuth.test.js +0 -100
- package/dist/middleware/rateLimit.test.d.ts +0 -2
- package/dist/middleware/rateLimit.test.d.ts.map +0 -1
- package/dist/middleware/rateLimit.test.js +0 -56
- package/dist/middleware/securityHeaders.test.d.ts +0 -2
- package/dist/middleware/securityHeaders.test.d.ts.map +0 -1
- package/dist/middleware/securityHeaders.test.js +0 -18
- package/dist/middleware/sessionHandler.test.d.ts +0 -2
- package/dist/middleware/sessionHandler.test.d.ts.map +0 -1
- package/dist/middleware/sessionHandler.test.js +0 -215
- package/dist/signing/service-account-session.test.d.ts +0 -2
- package/dist/signing/service-account-session.test.d.ts.map +0 -1
- package/dist/signing/service-account-session.test.js +0 -88
- package/dist/signing/signing-worker.d.ts +0 -86
- package/dist/signing/signing-worker.d.ts.map +0 -1
- package/dist/signing/signing-worker.js +0 -216
- package/dist/signing/signing-worker.test.d.ts +0 -2
- package/dist/signing/signing-worker.test.d.ts.map +0 -1
- package/dist/signing/signing-worker.test.js +0 -158
- package/dist/user-api/controller.test.d.ts +0 -2
- package/dist/user-api/controller.test.d.ts.map +0 -1
- package/dist/user-api/controller.test.js +0 -1228
- package/dist/user-api/server.test.d.ts +0 -2
- package/dist/user-api/server.test.d.ts.map +0 -1
- package/dist/user-api/server.test.js +0 -117
- package/dist/user-api/token-network-matching.test.d.ts +0 -2
- package/dist/user-api/token-network-matching.test.d.ts.map +0 -1
- package/dist/user-api/token-network-matching.test.js +0 -66
- package/dist/utils.test.d.ts +0 -2
- package/dist/utils.test.d.ts.map +0 -1
- package/dist/utils.test.js +0 -24
- package/dist/web/frontend/assets/404-B1XXXMXN.js +0 -5
- package/dist/web/frontend/assets/activities-HZnPjlMp.js +0 -61
- package/dist/web/frontend/assets/addApiKey-BvkCtUF3.js +0 -92
- package/dist/web/frontend/assets/addIdentityProvider-Dvjma837.js +0 -28
- package/dist/web/frontend/assets/addNetwork-Cahac0uo.js +0 -38
- package/dist/web/frontend/assets/addParty-Cdoed_Yx.js +0 -13
- package/dist/web/frontend/assets/apiKeys-BwV6ylWL.js +0 -68
- package/dist/web/frontend/assets/approve-B0nIfe2y.js +0 -26
- package/dist/web/frontend/assets/callback-BieW5Ux2.js +0 -7
- package/dist/web/frontend/assets/common-Bv9twGrA.js +0 -31
- package/dist/web/frontend/assets/editParty-OOjTHFay.js +0 -14
- package/dist/web/frontend/assets/identityProviders-BxJAq1Ne.js +0 -71
- package/dist/web/frontend/assets/index-Bo6MnlYI.js +0 -2
- package/dist/web/frontend/assets/index-CG_aFABR.js +0 -1
- package/dist/web/frontend/assets/index-D1Brmwbg.js +0 -93
- package/dist/web/frontend/assets/index-pMOoiNFq.js +0 -4887
- package/dist/web/frontend/assets/login-BHxgJEz_.js +0 -11
- package/dist/web/frontend/assets/networks-CBprjUF5.js +0 -73
- package/dist/web/frontend/assets/onboarding-ChmWs-TC.js +0 -84
- package/dist/web/frontend/assets/reviewIdentityProvider-CCmKgN8N.js +0 -43
- package/dist/web/frontend/assets/reviewNetwork-CX8Bmuf3.js +0 -43
- package/dist/web/frontend/assets/signMessage-BN_6S5FV.js +0 -79
- package/dist/web/frontend/onboarding/index.html +0 -23
- package/dist/web/route-inputs.test.d.ts +0 -2
- package/dist/web/route-inputs.test.d.ts.map +0 -1
- package/dist/web/route-inputs.test.js +0 -30
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
// Copyright (c) 2025-2026 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
|
-
import { defaultRetryableOptions, } from '@canton-network/core-ledger-client';
|
|
3
|
+
import { defaultRetryableOptions, isJsCantonError, } from '@canton-network/core-ledger-client';
|
|
4
4
|
import { PartyLevelRight, UserLevelRight, } from '@canton-network/core-wallet-store';
|
|
5
5
|
import { SigningProvider, } from '@canton-network/core-signing-lib';
|
|
6
|
+
import { canUserUseSelfIssuedAuth } from '@canton-network/core-wallet-services';
|
|
6
7
|
import { WALLET_DISABLED_REASON } from '@canton-network/core-types';
|
|
7
8
|
export class WalletSyncService {
|
|
8
9
|
constructor(store, ledgerClient, authContext, logger, signingDrivers = {}, partyAllocator) {
|
|
@@ -37,9 +38,43 @@ export class WalletSyncService {
|
|
|
37
38
|
throw new Error(`Invalid participantId format: expected "hint::namespace", got "${participantId}"`);
|
|
38
39
|
return extractedNamespace;
|
|
39
40
|
}
|
|
40
|
-
//
|
|
41
|
-
async
|
|
41
|
+
// Fetches a provider's keys and their fingerprints. Errors are logged and yield no keys.
|
|
42
|
+
async loadProviderKeys(providerId, driver) {
|
|
42
43
|
const partyAllocator = this.requirePartyAllocator();
|
|
44
|
+
try {
|
|
45
|
+
const result = await driver
|
|
46
|
+
.controller(this.authContext?.userId)
|
|
47
|
+
.getKeys();
|
|
48
|
+
// In case of error getKeys resolve Promise but with error object
|
|
49
|
+
if ('error' in result) {
|
|
50
|
+
this.logger.warn({
|
|
51
|
+
providerId,
|
|
52
|
+
error: result.error,
|
|
53
|
+
error_description: result.error_description,
|
|
54
|
+
}, 'Failed to get keys from signing provider');
|
|
55
|
+
return [];
|
|
56
|
+
}
|
|
57
|
+
return (result.keys ?? [])
|
|
58
|
+
.map((key) => {
|
|
59
|
+
const normalizedKey = partyAllocator.normalizePublicKeyToBase64(key.publicKey);
|
|
60
|
+
if (!normalizedKey)
|
|
61
|
+
return undefined;
|
|
62
|
+
return {
|
|
63
|
+
id: key.id,
|
|
64
|
+
publicKey: key.publicKey,
|
|
65
|
+
fingerprint: partyAllocator.createFingerprintFromKey(normalizedKey),
|
|
66
|
+
};
|
|
67
|
+
})
|
|
68
|
+
.filter((key) => key !== undefined);
|
|
69
|
+
}
|
|
70
|
+
catch (err) {
|
|
71
|
+
this.logger.error({ err, providerId }, 'Error getting keys from signing provider');
|
|
72
|
+
return [];
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
// Protected for tests
|
|
76
|
+
// Pass the same keyCache for every party in a sync, so each provider is asked for its keys once.
|
|
77
|
+
async resolveSigningProvider(partyNamespace, participantNamespace, keyCache = new Map()) {
|
|
43
78
|
try {
|
|
44
79
|
if (participantNamespace &&
|
|
45
80
|
partyNamespace === participantNamespace) {
|
|
@@ -49,7 +84,6 @@ export class WalletSyncService {
|
|
|
49
84
|
};
|
|
50
85
|
}
|
|
51
86
|
// Get keys from signing providers try to match
|
|
52
|
-
const userId = this.authContext?.userId;
|
|
53
87
|
for (const [providerId, driver] of Object.entries(this.signingDrivers)) {
|
|
54
88
|
if (!driver)
|
|
55
89
|
continue;
|
|
@@ -57,44 +91,23 @@ export class WalletSyncService {
|
|
|
57
91
|
if (providerId === SigningProvider.PARTICIPANT) {
|
|
58
92
|
continue;
|
|
59
93
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
continue;
|
|
78
|
-
const keyNamespace = partyAllocator.createFingerprintFromKey(normalizedKey);
|
|
79
|
-
if (keyNamespace === partyNamespace) {
|
|
80
|
-
this.logger.info({
|
|
81
|
-
namespace: partyNamespace,
|
|
82
|
-
providerId,
|
|
83
|
-
keyId: key.id,
|
|
84
|
-
publicKey: key.publicKey,
|
|
85
|
-
}, 'Matched namespace with signing provider');
|
|
86
|
-
return {
|
|
87
|
-
signingProviderId: providerId,
|
|
88
|
-
publicKey: key.publicKey,
|
|
89
|
-
matched: true,
|
|
90
|
-
};
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
catch (err) {
|
|
96
|
-
this.logger.error({ err, providerId }, 'Error getting keys from signing provider');
|
|
97
|
-
// Continue to next signing provider
|
|
94
|
+
const cachedKeys = keyCache.get(providerId) ??
|
|
95
|
+
this.loadProviderKeys(providerId, driver);
|
|
96
|
+
keyCache.set(providerId, cachedKeys);
|
|
97
|
+
const keys = await cachedKeys;
|
|
98
|
+
const key = keys.find((key) => key.fingerprint === partyNamespace);
|
|
99
|
+
if (key) {
|
|
100
|
+
this.logger.info({
|
|
101
|
+
namespace: partyNamespace,
|
|
102
|
+
providerId,
|
|
103
|
+
keyId: key.id,
|
|
104
|
+
publicKey: key.publicKey,
|
|
105
|
+
}, 'Matched namespace with signing provider');
|
|
106
|
+
return {
|
|
107
|
+
signingProviderId: providerId,
|
|
108
|
+
publicKey: key.publicKey,
|
|
109
|
+
matched: true,
|
|
110
|
+
};
|
|
98
111
|
}
|
|
99
112
|
}
|
|
100
113
|
// No match found - use participant as default provider
|
|
@@ -166,6 +179,25 @@ export class WalletSyncService {
|
|
|
166
179
|
rightsByUser,
|
|
167
180
|
};
|
|
168
181
|
}
|
|
182
|
+
async getUserAuthParty(network) {
|
|
183
|
+
if (network.auth.method !== 'self_issued')
|
|
184
|
+
return null;
|
|
185
|
+
try {
|
|
186
|
+
const response = await this.ledgerClient.getWithRetry('/v2/users/{user-id}', defaultRetryableOptions, {
|
|
187
|
+
path: { 'user-id': this.authContext.userId },
|
|
188
|
+
});
|
|
189
|
+
const user = response.user ?? null;
|
|
190
|
+
return canUserUseSelfIssuedAuth(user) ? user.primaryParty : null;
|
|
191
|
+
}
|
|
192
|
+
catch (error) {
|
|
193
|
+
if (isJsCantonError(error) && error.code === 'USER_NOT_FOUND') {
|
|
194
|
+
return null;
|
|
195
|
+
}
|
|
196
|
+
else {
|
|
197
|
+
throw error;
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
}
|
|
169
201
|
async isWalletSyncNeeded() {
|
|
170
202
|
try {
|
|
171
203
|
const network = await this.store.getCurrentNetwork();
|
|
@@ -199,9 +231,14 @@ export class WalletSyncService {
|
|
|
199
231
|
const hasChangedUserRights = new Set(currentUserRights).size !==
|
|
200
232
|
new Set(nextUserRights).size ||
|
|
201
233
|
currentUserRights.some((right) => !nextUserRights.includes(right));
|
|
234
|
+
const authParty = await this.getUserAuthParty(network);
|
|
235
|
+
const hasAuthPartyFlagMismatch = network.auth.method === 'self_issued' &&
|
|
236
|
+
existingWallets.some((wallet) => Boolean(wallet.isAuthParty) !==
|
|
237
|
+
(wallet.partyId === authParty));
|
|
202
238
|
return (hasWalletsWithoutParty ||
|
|
203
239
|
hasChangedRights ||
|
|
204
|
-
hasChangedUserRights
|
|
240
|
+
hasChangedUserRights ||
|
|
241
|
+
hasAuthPartyFlagMismatch);
|
|
205
242
|
}
|
|
206
243
|
catch (err) {
|
|
207
244
|
this.logger.error({ err }, 'Error checking if sync is needed');
|
|
@@ -267,12 +304,38 @@ export class WalletSyncService {
|
|
|
267
304
|
updatedToDisabled,
|
|
268
305
|
};
|
|
269
306
|
}
|
|
307
|
+
// Retries provider resolution for wallets disabled with NO_SIGNING_PROVIDER_MATCHED,
|
|
308
|
+
// enabling them in place once a signing provider has their key.
|
|
309
|
+
async handleUnmatchedWallets(unmatchedWallets, participantNamespace, keyCache) {
|
|
310
|
+
const reenabledWallets = [];
|
|
311
|
+
for (const wallet of unmatchedWallets) {
|
|
312
|
+
const resolved = await this.resolveSigningProvider(wallet.namespace, participantNamespace, keyCache);
|
|
313
|
+
if (!resolved.matched)
|
|
314
|
+
continue;
|
|
315
|
+
const update = {
|
|
316
|
+
signingProviderId: resolved.signingProviderId,
|
|
317
|
+
publicKey: 'publicKey' in resolved
|
|
318
|
+
? resolved.publicKey
|
|
319
|
+
: wallet.namespace,
|
|
320
|
+
disabled: false,
|
|
321
|
+
reason: '',
|
|
322
|
+
};
|
|
323
|
+
this.logger.info({ wallet: { ...wallet, ...update } }, 'Wallet sync result, enabling unmatched wallet');
|
|
324
|
+
await this.store.updateWallet({
|
|
325
|
+
partyId: wallet.partyId,
|
|
326
|
+
networkId: wallet.networkId,
|
|
327
|
+
...update,
|
|
328
|
+
});
|
|
329
|
+
reenabledWallets.push({ ...wallet, ...update });
|
|
330
|
+
}
|
|
331
|
+
return reenabledWallets;
|
|
332
|
+
}
|
|
270
333
|
// Creates wallets for parties user has rights to
|
|
271
|
-
async handlePartiesWithoutWallet(newParties, networkId, rightsByParty, participantNamespace) {
|
|
334
|
+
async handlePartiesWithoutWallet(newParties, networkId, rightsByParty, participantNamespace, keyCache) {
|
|
272
335
|
this.requirePartyAllocator();
|
|
273
336
|
return await Promise.all(newParties.map(async (partyId) => {
|
|
274
337
|
const [hint, namespace] = partyId.split('::');
|
|
275
|
-
const resolvedSigningProvider = await this.resolveSigningProvider(namespace, participantNamespace);
|
|
338
|
+
const resolvedSigningProvider = await this.resolveSigningProvider(namespace, participantNamespace, keyCache);
|
|
276
339
|
const isMatched = resolvedSigningProvider.matched;
|
|
277
340
|
const walletPublicKey = resolvedSigningProvider.signingProviderId ===
|
|
278
341
|
SigningProvider.PARTICIPANT
|
|
@@ -337,6 +400,59 @@ export class WalletSyncService {
|
|
|
337
400
|
const existingAllocatedWallets = (await this.store.getWallets()).filter((wallet) => wallet.status === 'allocated');
|
|
338
401
|
return this.handleRightsUpdates(existingAllocatedWallets, snapshot.rightsByParty);
|
|
339
402
|
}
|
|
403
|
+
// Discover only auth party by id for self-issued auth login.
|
|
404
|
+
// It's less network intensive than full wallet sync and doesn't allow altering existing wallets before user proves they can sign the self issued token.
|
|
405
|
+
async syncAuthParty(partyId) {
|
|
406
|
+
this.logger.info({ partyId }, 'Starting auth party sync...');
|
|
407
|
+
try {
|
|
408
|
+
this.requirePartyAllocator();
|
|
409
|
+
const network = await this.store.getCurrentNetwork();
|
|
410
|
+
if (network.auth.method !== 'self_issued') {
|
|
411
|
+
return undefined;
|
|
412
|
+
}
|
|
413
|
+
const existing = (await this.store.getWallets()).find((wallet) => wallet.partyId === partyId);
|
|
414
|
+
if (existing) {
|
|
415
|
+
await this.store.setAuthPartyWallet(partyId);
|
|
416
|
+
return (await this.store.getWallets()).find((wallet) => wallet.partyId === partyId);
|
|
417
|
+
}
|
|
418
|
+
const [hint, namespace] = partyId.split('::');
|
|
419
|
+
if (!hint || !namespace)
|
|
420
|
+
return undefined;
|
|
421
|
+
const participantNamespace = await this.getParticipantNamespace();
|
|
422
|
+
if (namespace === participantNamespace) {
|
|
423
|
+
this.logger.info({ partyId }, 'Auth party uses the participant namespace, skipping');
|
|
424
|
+
return undefined;
|
|
425
|
+
}
|
|
426
|
+
const resolved = await this.resolveSigningProvider(namespace, participantNamespace);
|
|
427
|
+
if (!resolved.matched ||
|
|
428
|
+
resolved.signingProviderId === SigningProvider.PARTICIPANT) {
|
|
429
|
+
this.logger.info({ partyId }, 'No signing provider matched auth party, skipping');
|
|
430
|
+
return undefined;
|
|
431
|
+
}
|
|
432
|
+
const { rightsByParty } = await this.getRightsSnapshot();
|
|
433
|
+
const wallet = {
|
|
434
|
+
primary: false,
|
|
435
|
+
status: 'allocated',
|
|
436
|
+
partyId,
|
|
437
|
+
hint,
|
|
438
|
+
publicKey: resolved.publicKey,
|
|
439
|
+
namespace,
|
|
440
|
+
networkId: network.id,
|
|
441
|
+
signingProviderId: resolved.signingProviderId,
|
|
442
|
+
userId: this.authContext.userId,
|
|
443
|
+
rights: rightsByParty.get(partyId) ??
|
|
444
|
+
WalletSyncService.EMPTY_RIGHTS,
|
|
445
|
+
isAuthParty: true,
|
|
446
|
+
};
|
|
447
|
+
await this.store.addWallet(wallet);
|
|
448
|
+
await this.store.setAuthPartyWallet(partyId);
|
|
449
|
+
return (await this.store.getWallets()).find((stored) => stored.partyId === partyId);
|
|
450
|
+
}
|
|
451
|
+
catch (err) {
|
|
452
|
+
this.logger.error({ err, partyId }, 'Auth party sync failed.');
|
|
453
|
+
throw err;
|
|
454
|
+
}
|
|
455
|
+
}
|
|
340
456
|
async syncRights() {
|
|
341
457
|
this.logger.info('Starting rights sync...');
|
|
342
458
|
try {
|
|
@@ -349,6 +465,57 @@ export class WalletSyncService {
|
|
|
349
465
|
throw err;
|
|
350
466
|
}
|
|
351
467
|
}
|
|
468
|
+
generateSyncReport({ newWallets, updatedToInitialized, updatedToDisabled, updatedToEnabled, rightsUpdatedWallets, existingWallets, walletsAfterAuthParty, }) {
|
|
469
|
+
const added = new Set();
|
|
470
|
+
const updated = new Set();
|
|
471
|
+
const disabled = new Set();
|
|
472
|
+
for (const wallet of newWallets) {
|
|
473
|
+
if (wallet.disabled)
|
|
474
|
+
disabled.add(wallet.partyId);
|
|
475
|
+
else
|
|
476
|
+
added.add(wallet.partyId);
|
|
477
|
+
}
|
|
478
|
+
for (const wallet of updatedToDisabled) {
|
|
479
|
+
disabled.add(wallet.partyId);
|
|
480
|
+
}
|
|
481
|
+
for (const wallet of updatedToInitialized) {
|
|
482
|
+
if (!disabled.has(wallet.partyId))
|
|
483
|
+
updated.add(wallet.partyId);
|
|
484
|
+
}
|
|
485
|
+
for (const wallet of updatedToEnabled) {
|
|
486
|
+
updated.add(wallet.partyId);
|
|
487
|
+
}
|
|
488
|
+
for (const wallet of rightsUpdatedWallets) {
|
|
489
|
+
if (added.has(wallet.partyId) ||
|
|
490
|
+
disabled.has(wallet.partyId) ||
|
|
491
|
+
updated.has(wallet.partyId)) {
|
|
492
|
+
continue;
|
|
493
|
+
}
|
|
494
|
+
if (wallet.disabled)
|
|
495
|
+
disabled.add(wallet.partyId);
|
|
496
|
+
else
|
|
497
|
+
updated.add(wallet.partyId);
|
|
498
|
+
}
|
|
499
|
+
const authPartyBefore = new Map(existingWallets.map((wallet) => [
|
|
500
|
+
wallet.partyId,
|
|
501
|
+
Boolean(wallet.isAuthParty),
|
|
502
|
+
]));
|
|
503
|
+
for (const wallet of walletsAfterAuthParty ?? []) {
|
|
504
|
+
if (Boolean(wallet.isAuthParty) ===
|
|
505
|
+
(authPartyBefore.get(wallet.partyId) ?? false)) {
|
|
506
|
+
continue;
|
|
507
|
+
}
|
|
508
|
+
if (added.has(wallet.partyId) || disabled.has(wallet.partyId)) {
|
|
509
|
+
continue;
|
|
510
|
+
}
|
|
511
|
+
updated.add(wallet.partyId);
|
|
512
|
+
}
|
|
513
|
+
return {
|
|
514
|
+
added: [...added],
|
|
515
|
+
updated: [...updated],
|
|
516
|
+
disabled: [...disabled],
|
|
517
|
+
};
|
|
518
|
+
}
|
|
352
519
|
async syncWallets() {
|
|
353
520
|
this.logger.info('Starting wallet sync...');
|
|
354
521
|
try {
|
|
@@ -374,7 +541,16 @@ export class WalletSyncService {
|
|
|
374
541
|
updatedToInitialized: updatedToInitialized.map((w) => w.partyId),
|
|
375
542
|
updatedToDisabled: updatedToDisabled.map((w) => w.partyId),
|
|
376
543
|
}, 'Wallets without parties');
|
|
377
|
-
|
|
544
|
+
// Shared across both resolution passes, so each provider is asked for its keys once per sync
|
|
545
|
+
const keyCache = new Map();
|
|
546
|
+
// Wallets no signing provider matched yet are retried every sync, so they
|
|
547
|
+
// are enabled once a provider (e.g. Blockdaemon) learns about their key
|
|
548
|
+
const unmatchedWallets = existingAllocatedWallets.filter((w) => w.disabled &&
|
|
549
|
+
w.reason ===
|
|
550
|
+
WALLET_DISABLED_REASON.NO_SIGNING_PROVIDER_MATCHED &&
|
|
551
|
+
rightsByParty.has(w.partyId));
|
|
552
|
+
const updatedToEnabled = await this.handleUnmatchedWallets(unmatchedWallets, participantNamespace, keyCache);
|
|
553
|
+
const newWallets = await this.handlePartiesWithoutWallet(newParties, network.id, rightsByParty, participantNamespace, keyCache);
|
|
378
554
|
// Set primary wallet if none exists, or if primary is on an initialized wallet
|
|
379
555
|
const networkWallets = await this.store.getWallets();
|
|
380
556
|
const primaryWallet = networkWallets.find((w) => w.primary);
|
|
@@ -385,32 +561,24 @@ export class WalletSyncService {
|
|
|
385
561
|
await this.store.setPrimaryWallet(allocatedWallets[0].partyId);
|
|
386
562
|
this.logger.info(`Set ${allocatedWallets[0].partyId} as primary wallet in network ${network.id}`);
|
|
387
563
|
}
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
const
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
this.logger.info(
|
|
405
|
-
|
|
406
|
-
updated,
|
|
407
|
-
disabled,
|
|
408
|
-
}, 'Wallet sync completed.');
|
|
409
|
-
return {
|
|
410
|
-
added,
|
|
411
|
-
updated,
|
|
412
|
-
disabled,
|
|
413
|
-
};
|
|
564
|
+
// On self-issued auth networks set wallet.isAuthParty to true for a party that is in user.primaryParty, if every other setting of user enables primary party authentication
|
|
565
|
+
let walletsAfterAuthParty;
|
|
566
|
+
if (network.auth.method === 'self_issued') {
|
|
567
|
+
const authParty = await this.getUserAuthParty(network);
|
|
568
|
+
await this.store.setAuthPartyWallet(authParty ?? null);
|
|
569
|
+
walletsAfterAuthParty = await this.store.getWallets();
|
|
570
|
+
}
|
|
571
|
+
const report = this.generateSyncReport({
|
|
572
|
+
newWallets,
|
|
573
|
+
updatedToInitialized,
|
|
574
|
+
updatedToDisabled,
|
|
575
|
+
updatedToEnabled,
|
|
576
|
+
rightsUpdatedWallets,
|
|
577
|
+
existingWallets,
|
|
578
|
+
walletsAfterAuthParty,
|
|
579
|
+
});
|
|
580
|
+
this.logger.info(report, 'Wallet sync completed.');
|
|
581
|
+
return report;
|
|
414
582
|
}
|
|
415
583
|
catch (err) {
|
|
416
584
|
this.logger.error({ err }, 'Wallet sync failed.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiKeyAuth.d.ts","sourceRoot":"","sources":["../../src/middleware/apiKeyAuth.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAC9D,OAAO,EACH,KAAK,SAAS,EAIjB,MAAM,kCAAkC,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAA;
|
|
1
|
+
{"version":3,"file":"apiKeyAuth.d.ts","sourceRoot":"","sources":["../../src/middleware/apiKeyAuth.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAC9D,OAAO,EACH,KAAK,SAAS,EAIjB,MAAM,kCAAkC,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAA;AAK9D,wBAAgB,UAAU,CACtB,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,EAC/B,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,SAEK,OAAO,OAAO,QAAQ,QAAQ,YAAY,wDA4IhE"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
// Copyright (c) 2025-2026 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
import { AuthTokenProvider, resolveAuthIdentityProviderId, } from '@canton-network/core-wallet-auth';
|
|
4
|
-
import crypto from 'crypto';
|
|
5
|
-
import { v4 } from 'uuid';
|
|
6
4
|
import { rpcErrors } from '@canton-network/core-rpc-errors';
|
|
7
5
|
import { jsonRpcResponse } from '@canton-network/core-rpc-transport';
|
|
6
|
+
import { createHash } from 'crypto';
|
|
8
7
|
export function apiKeyAuth(store, dappApiPath, logger) {
|
|
9
8
|
return async (req, res, next) => {
|
|
10
9
|
const authHeader = req.headers.authorization;
|
|
@@ -27,10 +26,7 @@ export function apiKeyAuth(store, dappApiPath, logger) {
|
|
|
27
26
|
}));
|
|
28
27
|
}
|
|
29
28
|
const apiKey = authHeader.slice('ApiKey'.length).trim();
|
|
30
|
-
const hashedApiKey =
|
|
31
|
-
.createHash('sha256')
|
|
32
|
-
.update(apiKey)
|
|
33
|
-
.digest('hex');
|
|
29
|
+
const hashedApiKey = createHash('sha256').update(apiKey).digest('hex');
|
|
34
30
|
const matchingKey = await store.getApiKey(hashedApiKey);
|
|
35
31
|
if (matchingKey) {
|
|
36
32
|
logger.debug({ apiKeyId: matchingKey.id, userId: matchingKey.userId }, 'API Key authentication successful');
|
|
@@ -40,7 +36,7 @@ export function apiKeyAuth(store, dappApiPath, logger) {
|
|
|
40
36
|
accessToken: hashedApiKey,
|
|
41
37
|
});
|
|
42
38
|
// automatically initiate a session for the API key user
|
|
43
|
-
const sessionId =
|
|
39
|
+
const sessionId = crypto.randomUUID();
|
|
44
40
|
await authStore.setSession({
|
|
45
41
|
id: sessionId,
|
|
46
42
|
origin: `apikey:${matchingKey.id}`,
|
|
@@ -67,7 +63,7 @@ export function apiKeyAuth(store, dappApiPath, logger) {
|
|
|
67
63
|
}));
|
|
68
64
|
}
|
|
69
65
|
const idp = await authStore.getIdp(resolveAuthIdentityProviderId(network.serviceAccountAuth, network.identityProviderId));
|
|
70
|
-
const accessTokenProvider = AuthTokenProvider.fromGatewayConfig(idp, network.serviceAccountAuth
|
|
66
|
+
const accessTokenProvider = AuthTokenProvider.fromGatewayConfig(idp, network.serviceAccountAuth);
|
|
71
67
|
const serviceAccountCtx = await accessTokenProvider.getAuthContext();
|
|
72
68
|
const context = {
|
|
73
69
|
isApiKey: true,
|
|
@@ -5,6 +5,6 @@ import type { Logger } from 'pino';
|
|
|
5
5
|
* at: `info` for an expected, client/business-caused rejection, `error` for
|
|
6
6
|
* an unexpected system fault (including anything we can't classify).
|
|
7
7
|
*/
|
|
8
|
-
export declare const errorLogLevel: (error: unknown) =>
|
|
8
|
+
export declare const errorLogLevel: (error: unknown) => 'info' | 'error';
|
|
9
9
|
export declare function errorHandler(logger: Logger, isApiPath: (path: string) => boolean): (err: unknown, req: Request, res: Response, next: NextFunction) => void;
|
|
10
10
|
//# sourceMappingURL=errorHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorHandler.d.ts","sourceRoot":"","sources":["../../src/middleware/errorHandler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAyDlC;;;;GAIG;AACH,eAAO,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"errorHandler.d.ts","sourceRoot":"","sources":["../../src/middleware/errorHandler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAyDlC;;;;GAIG;AACH,eAAO,MAAM,aAAa,UAAW,OAAO,KAAG,MAAM,GAAG,OAiCvD,CAAA;AAgBD,wBAAgB,YAAY,CACxB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,SAG3B,OAAO,OACP,OAAO,OACP,QAAQ,QACP,YAAY,KACnB,IAAI,CA0CV"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonRpcHandler.d.ts","sourceRoot":"","sources":["../../src/middleware/jsonRpcHandler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAMlC,OAAO,EAGH,KAAK,eAAe,EACvB,MAAM,4BAA4B,CAAA;AAInC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,UAAU,kBAAkB,CAAC,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,CAAC,CAAA;IACb,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAA;CAC1C;AAkCD;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"jsonRpcHandler.d.ts","sourceRoot":"","sources":["../../src/middleware/jsonRpcHandler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAMlC,OAAO,EAGH,KAAK,eAAe,EACvB,MAAM,4BAA4B,CAAA;AAInC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,UAAU,kBAAkB,CAAC,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,CAAC,CAAA;IACb,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAA;CAC1C;AAkCD;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,UAChB,OAAO,MACV,MAAM,GAAG,MAAM,GAAG,IAAI,WACjB,MAAM,KAChB,CAAC,MAAM,EAAE,eAAe,CAiD1B,CAAA;AAED,eAAO,MAAM,cAAc,GAEtB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,kDAI/C,kBAAkB,CAAC,CAAC,CAAC,WAMP,OAAO,OAAO,QAAQ,QAAQ,YAAY,8CAgG1D,CAAA"}
|
|
@@ -44,7 +44,7 @@ export const handleRpcError = (error, id, method) => {
|
|
|
44
44
|
: 'Something went wrong';
|
|
45
45
|
let response = {
|
|
46
46
|
error: {
|
|
47
|
-
|
|
47
|
+
code: rpcErrors.internal().code,
|
|
48
48
|
message: genericMessage,
|
|
49
49
|
},
|
|
50
50
|
};
|
|
@@ -86,7 +86,7 @@ export const handleRpcError = (error, id, method) => {
|
|
|
86
86
|
return [500, jsonResponse];
|
|
87
87
|
};
|
|
88
88
|
export const jsonRpcHandler =
|
|
89
|
-
//
|
|
89
|
+
// oxlint-disable-next-line typescript/no-explicit-any
|
|
90
90
|
({ controller, logger: _logger, paramSchemas, }) => {
|
|
91
91
|
const logger = _logger.child({ component: 'json-rpc-http' });
|
|
92
92
|
return (req, res, next) => {
|
|
@@ -135,7 +135,7 @@ export const jsonRpcHandler =
|
|
|
135
135
|
return res.status(status).json(response);
|
|
136
136
|
}
|
|
137
137
|
methodFn(validated.data)
|
|
138
|
-
//
|
|
138
|
+
// oxlint-disable-next-line typescript/no-explicit-any
|
|
139
139
|
.then((result) => {
|
|
140
140
|
const response = jsonRpcResponse(id, { result });
|
|
141
141
|
logger.trace({ response }, 'RPC response: success with response');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Request, Response, NextFunction } from 'express';
|
|
2
|
-
import type
|
|
2
|
+
import { type AuthService } from '@canton-network/core-wallet-auth';
|
|
3
3
|
import type { Logger } from 'pino';
|
|
4
4
|
export declare function jwtAuth(authService: AuthService, logger: Logger): (req: Request, res: Response, next: NextFunction) => Promise<void>;
|
|
5
5
|
//# sourceMappingURL=jwtAuth.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwtAuth.d.ts","sourceRoot":"","sources":["../../src/middleware/jwtAuth.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAC9D,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"jwtAuth.d.ts","sourceRoot":"","sources":["../../src/middleware/jwtAuth.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAC9D,OAAO,EAEH,KAAK,WAAW,EACnB,MAAM,kCAAkC,CAAA;AAOzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC,wBAAgB,OAAO,CAAC,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,SACzC,OAAO,OAAO,QAAQ,QAAQ,YAAY,mBA8ChE"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// Copyright (c) 2025-2026 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
|
-
import {
|
|
3
|
+
import { IdpUnavailableError, } from '@canton-network/core-wallet-auth';
|
|
4
|
+
import { providerErrors, rpcErrors, toHttpErrorCode, } from '@canton-network/core-rpc-errors';
|
|
4
5
|
import { jsonRpcResponse } from '@canton-network/core-rpc-transport';
|
|
5
6
|
export function jwtAuth(authService, logger) {
|
|
6
7
|
return async (req, res, next) => {
|
|
@@ -10,13 +11,27 @@ export function jwtAuth(authService, logger) {
|
|
|
10
11
|
}
|
|
11
12
|
// Support both Authorization header and token query parameter (for EventSource)
|
|
12
13
|
const authHeader = req.headers.authorization ||
|
|
13
|
-
(req.query.token
|
|
14
|
+
(typeof req.query.token === 'string' && req.query.token
|
|
15
|
+
? `Bearer ${req.query.token}`
|
|
16
|
+
: undefined);
|
|
14
17
|
try {
|
|
15
18
|
const context = await authService.verifyToken(authHeader);
|
|
16
19
|
req.authContext = context;
|
|
17
20
|
next();
|
|
18
21
|
}
|
|
19
22
|
catch (err) {
|
|
23
|
+
// The token couldn't be checked, keep client session intact
|
|
24
|
+
if (err instanceof IdpUnavailableError) {
|
|
25
|
+
logger.error({ err }, 'Identity provider unavailable');
|
|
26
|
+
const { code } = rpcErrors.resourceUnavailable();
|
|
27
|
+
res.status(toHttpErrorCode(code)).json(jsonRpcResponse(req.body?.id ?? null, {
|
|
28
|
+
error: {
|
|
29
|
+
code,
|
|
30
|
+
message: 'Unable to verify the token, identity provider unavailable',
|
|
31
|
+
},
|
|
32
|
+
}));
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
20
35
|
// Reason stays in the logs, the client sees the token was rejected.
|
|
21
36
|
logger.warn({ err }, 'JWT verification failed');
|
|
22
37
|
res.status(401).json(jsonRpcResponse(req.body?.id ?? null, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rateLimit.d.ts","sourceRoot":"","sources":["../../src/middleware/rateLimit.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"rateLimit.d.ts","sourceRoot":"","sources":["../../src/middleware/rateLimit.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEtC,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAE5D;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAO1D;AAED,wBAAgB,WAAW,CAAC,gBAAgB,EAAE,MAAM,wDAQnD;AAED,wBAAgB,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,wDAW5D;AAED,wBAAgB,wBAAwB,CAAC,gBAAgB,EAAE,MAAM,wDAUhE"}
|
|
@@ -1,13 +1,6 @@
|
|
|
1
1
|
// Copyright (c) 2025-2026 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
import rateLimit, { ipKeyGenerator } from 'express-rate-limit';
|
|
4
|
-
function hasBearerToken(req) {
|
|
5
|
-
const authHeader = req.headers.authorization;
|
|
6
|
-
if (typeof authHeader === 'string' && authHeader.startsWith('Bearer ')) {
|
|
7
|
-
return true;
|
|
8
|
-
}
|
|
9
|
-
return typeof req.query.token === 'string' && req.query.token.length > 0;
|
|
10
|
-
}
|
|
11
4
|
export function ipRateLimitKeyGenerator(req) {
|
|
12
5
|
return `ip:${ipKeyGenerator(req.ip || req.socket.remoteAddress || 'unknown')}`;
|
|
13
6
|
}
|
|
@@ -32,8 +25,9 @@ export function preAuthIpRateLimiter(requestRateLimit) {
|
|
|
32
25
|
windowMs: 1 * 60 * 1000,
|
|
33
26
|
max: requestRateLimit,
|
|
34
27
|
keyGenerator: ipRateLimitKeyGenerator,
|
|
35
|
-
//
|
|
36
|
-
|
|
28
|
+
// Apply only if JWT middleware has not attached an authenticated context at end of request.
|
|
29
|
+
skipSuccessfulRequests: true,
|
|
30
|
+
requestWasSuccessful: (req) => req.authContext?.userId !== undefined,
|
|
37
31
|
standardHeaders: true,
|
|
38
32
|
legacyHeaders: false,
|
|
39
33
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"securityHeaders.d.ts","sourceRoot":"","sources":["../../src/middleware/securityHeaders.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAE9D,wBAAgB,eAAe,
|
|
1
|
+
{"version":3,"file":"securityHeaders.d.ts","sourceRoot":"","sources":["../../src/middleware/securityHeaders.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAE9D,wBAAgB,eAAe,WACb,OAAO,OAAO,QAAQ,QAAQ,YAAY,UAM3D"}
|
|
@@ -7,9 +7,9 @@ import type { Store } from '@canton-network/core-wallet-store';
|
|
|
7
7
|
* @param store needs to be AuthAware
|
|
8
8
|
* @param allowedPaths a record of path -> list of methods which do not require authentication
|
|
9
9
|
* @param logger
|
|
10
|
-
* @param
|
|
11
|
-
*
|
|
10
|
+
* @param selfIssuedLoginPaths a record of path -> list of methods authenticated by a tokenless
|
|
11
|
+
* self-issued login session, passed as `params.sessionId`
|
|
12
12
|
* @returns
|
|
13
13
|
*/
|
|
14
|
-
export declare function sessionHandler(store: Store & AuthAware<Store>, allowedPaths: Record<string, string[]>, logger: Logger,
|
|
14
|
+
export declare function sessionHandler(store: Store & AuthAware<Store>, allowedPaths: Record<string, string[]>, logger: Logger, selfIssuedLoginPaths?: Record<string, string[]>): (req: Request, res: Response, next: NextFunction) => Promise<void | Response<any, Record<string, any>>>;
|
|
15
15
|
//# sourceMappingURL=sessionHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionHandler.d.ts","sourceRoot":"","sources":["../../src/middleware/sessionHandler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAGjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAA;AAE9D;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC1B,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,EAC/B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,
|
|
1
|
+
{"version":3,"file":"sessionHandler.d.ts","sourceRoot":"","sources":["../../src/middleware/sessionHandler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAGjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAA;AAE9D;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC1B,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,EAC/B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,oBAAoB,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAM,SAEhC,OAAO,OAAO,QAAQ,QAAQ,YAAY,wDAkFhE"}
|
|
@@ -7,15 +7,15 @@ import { jsonRpcResponse } from '@canton-network/core-rpc-transport';
|
|
|
7
7
|
* @param store needs to be AuthAware
|
|
8
8
|
* @param allowedPaths a record of path -> list of methods which do not require authentication
|
|
9
9
|
* @param logger
|
|
10
|
-
* @param
|
|
11
|
-
*
|
|
10
|
+
* @param selfIssuedLoginPaths a record of path -> list of methods authenticated by a tokenless
|
|
11
|
+
* self-issued login session, passed as `params.sessionId`
|
|
12
12
|
* @returns
|
|
13
13
|
*/
|
|
14
|
-
export function sessionHandler(store, allowedPaths, logger,
|
|
14
|
+
export function sessionHandler(store, allowedPaths, logger, selfIssuedLoginPaths = {}) {
|
|
15
15
|
return async (req, res, next) => {
|
|
16
16
|
const context = req.authContext;
|
|
17
17
|
const allowedMethods = allowedPaths[req.baseUrl];
|
|
18
|
-
const
|
|
18
|
+
const selfIssuedLoginMethods = selfIssuedLoginPaths[req.baseUrl];
|
|
19
19
|
if (req.method !== 'POST') {
|
|
20
20
|
logger.debug(`Skipping authentication for ${req.method} request to ${req.baseUrl}`);
|
|
21
21
|
return next();
|
|
@@ -27,17 +27,17 @@ export function sessionHandler(store, allowedPaths, logger, onboardingPaths = {}
|
|
|
27
27
|
return next();
|
|
28
28
|
}
|
|
29
29
|
const reqId = req.body?.id ?? null;
|
|
30
|
-
if (
|
|
30
|
+
if (selfIssuedLoginMethods?.includes(req.body.method)) {
|
|
31
31
|
const sessionId = req.body.params?.sessionId;
|
|
32
32
|
const session = typeof sessionId === 'string' && sessionId
|
|
33
|
-
? await store.
|
|
33
|
+
? await store.getSelfIssuedLoginSession(sessionId)
|
|
34
34
|
: undefined;
|
|
35
35
|
if (!session?.userId) {
|
|
36
|
-
logger.debug('No
|
|
36
|
+
logger.debug('No self-issued login session found');
|
|
37
37
|
return res.status(401).json(jsonRpcResponse(reqId, {
|
|
38
38
|
error: {
|
|
39
39
|
code: providerErrors.unauthorized().code,
|
|
40
|
-
message: 'No
|
|
40
|
+
message: 'No self-issued login session found',
|
|
41
41
|
},
|
|
42
42
|
}));
|
|
43
43
|
}
|