ox 0.12.4 → 0.13.1
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/CHANGELOG.md +21 -0
- package/_cjs/core/P256.js +1 -1
- package/_cjs/core/P256.js.map +1 -1
- package/_cjs/core/WebAuthnP256.js +15 -256
- package/_cjs/core/WebAuthnP256.js.map +1 -1
- package/_cjs/core/WebCryptoP256.js +3 -1
- package/_cjs/core/WebCryptoP256.js.map +1 -1
- package/_cjs/core/internal/webauthn.js +5 -13
- package/_cjs/core/internal/webauthn.js.map +1 -1
- package/_cjs/index.docs.js +1 -0
- package/_cjs/index.docs.js.map +1 -1
- package/_cjs/tempo/KeyAuthorization.js +18 -3
- package/_cjs/tempo/KeyAuthorization.js.map +1 -1
- package/_cjs/tempo/SignatureEnvelope.js +26 -0
- package/_cjs/tempo/SignatureEnvelope.js.map +1 -1
- package/_cjs/tempo/TxEnvelopeTempo.js +5 -10
- package/_cjs/tempo/TxEnvelopeTempo.js.map +1 -1
- package/_cjs/version.js +1 -1
- package/_cjs/webauthn/Authentication.js +246 -0
- package/_cjs/webauthn/Authentication.js.map +1 -0
- package/_cjs/webauthn/Authenticator.js +55 -0
- package/_cjs/webauthn/Authenticator.js.map +1 -0
- package/_cjs/webauthn/Credential.js +53 -0
- package/_cjs/webauthn/Credential.js.map +1 -0
- package/_cjs/webauthn/Registration.js +349 -0
- package/_cjs/webauthn/Registration.js.map +1 -0
- package/_cjs/webauthn/Types.js +3 -0
- package/_cjs/webauthn/Types.js.map +1 -0
- package/_cjs/webauthn/index.js +9 -0
- package/_cjs/webauthn/index.js.map +1 -0
- package/_cjs/webauthn/internal/utils.js +53 -0
- package/_cjs/webauthn/internal/utils.js.map +1 -0
- package/_esm/core/P256.js +1 -1
- package/_esm/core/P256.js.map +1 -1
- package/_esm/core/WebAuthnP256.js +13 -261
- package/_esm/core/WebAuthnP256.js.map +1 -1
- package/_esm/core/WebCryptoP256.js +4 -1
- package/_esm/core/WebCryptoP256.js.map +1 -1
- package/_esm/core/internal/webauthn.js +5 -13
- package/_esm/core/internal/webauthn.js.map +1 -1
- package/_esm/erc8021/index.js +2 -2
- package/_esm/index.docs.js +1 -0
- package/_esm/index.docs.js.map +1 -1
- package/_esm/tempo/KeyAuthorization.js +66 -3
- package/_esm/tempo/KeyAuthorization.js.map +1 -1
- package/_esm/tempo/SignatureEnvelope.js +74 -0
- package/_esm/tempo/SignatureEnvelope.js.map +1 -1
- package/_esm/tempo/TransactionReceipt.js +1 -1
- package/_esm/tempo/TransactionRequest.js +1 -1
- package/_esm/tempo/TxEnvelopeTempo.js +5 -10
- package/_esm/tempo/TxEnvelopeTempo.js.map +1 -1
- package/_esm/version.js +1 -1
- package/_esm/webauthn/Authentication.js +453 -0
- package/_esm/webauthn/Authentication.js.map +1 -0
- package/_esm/webauthn/Authenticator.js +176 -0
- package/_esm/webauthn/Authenticator.js.map +1 -0
- package/_esm/webauthn/Credential.js +95 -0
- package/_esm/webauthn/Credential.js.map +1 -0
- package/_esm/webauthn/Registration.js +512 -0
- package/_esm/webauthn/Registration.js.map +1 -0
- package/_esm/webauthn/Types.js +2 -0
- package/_esm/webauthn/Types.js.map +1 -0
- package/_esm/webauthn/index.js +31 -0
- package/_esm/webauthn/index.js.map +1 -0
- package/_esm/webauthn/internal/utils.js +52 -0
- package/_esm/webauthn/internal/utils.js.map +1 -0
- package/_types/core/WebAuthnP256.d.ts +33 -208
- package/_types/core/WebAuthnP256.d.ts.map +1 -1
- package/_types/core/WebCryptoP256.d.ts +2 -0
- package/_types/core/WebCryptoP256.d.ts.map +1 -1
- package/_types/core/internal/webauthn.d.ts +2 -110
- package/_types/core/internal/webauthn.d.ts.map +1 -1
- package/_types/erc8021/index.d.ts +2 -2
- package/_types/index.docs.d.ts +1 -0
- package/_types/index.docs.d.ts.map +1 -1
- package/_types/tempo/KeyAuthorization.d.ts +57 -0
- package/_types/tempo/KeyAuthorization.d.ts.map +1 -1
- package/_types/tempo/SignatureEnvelope.d.ts +75 -0
- package/_types/tempo/SignatureEnvelope.d.ts.map +1 -1
- package/_types/tempo/Transaction.d.ts +2 -2
- package/_types/tempo/TransactionReceipt.d.ts +2 -2
- package/_types/tempo/TransactionRequest.d.ts +2 -2
- package/_types/tempo/TxEnvelopeTempo.d.ts.map +1 -1
- package/_types/version.d.ts +1 -1
- package/_types/webauthn/Authentication.d.ts +324 -0
- package/_types/webauthn/Authentication.d.ts.map +1 -0
- package/_types/webauthn/Authenticator.d.ts +182 -0
- package/_types/webauthn/Authenticator.d.ts.map +1 -0
- package/_types/webauthn/Credential.d.ts +77 -0
- package/_types/webauthn/Credential.d.ts.map +1 -0
- package/_types/webauthn/Registration.d.ts +308 -0
- package/_types/webauthn/Registration.d.ts.map +1 -0
- package/_types/webauthn/Types.d.ts +106 -0
- package/_types/webauthn/Types.d.ts.map +1 -0
- package/_types/webauthn/index.d.ts +33 -0
- package/_types/webauthn/index.d.ts.map +1 -0
- package/_types/webauthn/internal/utils.d.ts +17 -0
- package/_types/webauthn/internal/utils.d.ts.map +1 -0
- package/core/P256.ts +1 -1
- package/core/WebAuthnP256.ts +37 -582
- package/core/WebCryptoP256.ts +6 -1
- package/core/internal/webauthn.ts +6 -165
- package/erc8021/index.ts +2 -2
- package/index.docs.ts +1 -0
- package/package.json +31 -1
- package/tempo/KeyAuthorization.test.ts +139 -0
- package/tempo/KeyAuthorization.ts +82 -3
- package/tempo/SignatureEnvelope.test.ts +147 -0
- package/tempo/SignatureEnvelope.ts +113 -0
- package/tempo/Transaction.ts +2 -2
- package/tempo/TransactionReceipt.ts +2 -2
- package/tempo/TransactionRequest.ts +2 -2
- package/tempo/TxEnvelopeTempo.ts +5 -12
- package/tempo/e2e.test.ts +265 -0
- package/version.ts +1 -1
- package/webauthn/Authentication/package.json +6 -0
- package/webauthn/Authentication.ts +673 -0
- package/webauthn/Authenticator/package.json +6 -0
- package/webauthn/Authenticator.ts +259 -0
- package/webauthn/Credential/package.json +6 -0
- package/webauthn/Credential.ts +146 -0
- package/webauthn/Registration/package.json +6 -0
- package/webauthn/Registration.ts +805 -0
- package/webauthn/Types/package.json +6 -0
- package/webauthn/Types.ts +158 -0
- package/webauthn/index.ts +38 -0
- package/webauthn/internal/utils.ts +63 -0
- package/webauthn/package.json +6 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,26 @@
|
|
|
1
1
|
# ox
|
|
2
2
|
|
|
3
|
+
## 0.13.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`50c4d08`](https://github.com/wevm/ox/commit/50c4d08556e3c049979b24200efcb5534c156411) Thanks [@jxom](https://github.com/jxom)! - `ox/tempo`: Added `KeyAuthorization.serialize` and `KeyAuthorization.deserialize` for RLP encoding/decoding key authorizations.
|
|
8
|
+
|
|
9
|
+
`ox/tempo`: Fixed `KeyAuthorization.toTuple` to always include expiry in the tuple when limits are present, preventing malformed RLP encoding.
|
|
10
|
+
|
|
11
|
+
- [`50c4d08`](https://github.com/wevm/ox/commit/50c4d08556e3c049979b24200efcb5534c156411) Thanks [@jxom](https://github.com/jxom)! - `ox/tempo`: Added `SignatureEnvelope.extractAddress` and `SignatureEnvelope.extractPublicKey` to extract signer address/public key from a signature envelope. Handles all signature types: secp256k1 (via ecrecover), p256/webAuthn (from embedded public key), and keychain (from inner signature or root `userAddress`).
|
|
12
|
+
|
|
13
|
+
## 0.13.0
|
|
14
|
+
|
|
15
|
+
### Minor Changes
|
|
16
|
+
|
|
17
|
+
- [`c8c6229`](https://github.com/wevm/ox/commit/c8c62297ac43161095482176e1846ce61bb62eb5) Thanks [@jxom](https://github.com/jxom)! - Overhauled WebAuthn support with a dedicated `ox/webauthn` entrypoint for server-side registration & authentication ceremonies, credential management, and authenticator data parsing.
|
|
18
|
+
|
|
19
|
+
- `Registration` – Full registration ceremony: `create`, `getOptions`, `verify`, with `serializeOptions`/`deserializeOptions` for server↔client transport
|
|
20
|
+
- `Authentication` – Full authentication ceremony: `sign`, `getOptions`, `verify`, with `serializeOptions`/`deserializeOptions` for server↔client transport
|
|
21
|
+
- `Credential` – `serialize`/`deserialize` for persisting and transporting WebAuthn credentials as JSON
|
|
22
|
+
- `Authenticator` – Low-level utilities for constructing/parsing authenticator data, attestation objects, and client data JSON
|
|
23
|
+
|
|
3
24
|
## 0.12.4
|
|
4
25
|
|
|
5
26
|
### Patch Changes
|
package/_cjs/core/P256.js
CHANGED
|
@@ -74,6 +74,6 @@ function sign(options) {
|
|
|
74
74
|
}
|
|
75
75
|
function verify(options) {
|
|
76
76
|
const { hash, payload, publicKey, signature } = options;
|
|
77
|
-
return p256_1.secp256r1.verify(signature, payload instanceof Uint8Array ? payload : Bytes.fromHex(payload), PublicKey.toHex(publicKey).substring(2), ...(hash ?
|
|
77
|
+
return p256_1.secp256r1.verify(signature, payload instanceof Uint8Array ? payload : Bytes.fromHex(payload), PublicKey.toHex(publicKey).substring(2), { lowS: true, ...(hash ? { prehash: true } : {}) });
|
|
78
78
|
}
|
|
79
79
|
//# sourceMappingURL=P256.js.map
|
package/_cjs/core/P256.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"P256.js","sourceRoot":"","sources":["../../core/P256.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"P256.js","sourceRoot":"","sources":["../../core/P256.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,267 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getSignPayload = exports.getCredentialRequestOptions = exports.getCredentialCreationOptions = exports.getAttestationObject = exports.getClientDataJSON = exports.getAuthenticatorData = exports.createChallenge = void 0;
|
|
4
4
|
exports.createCredential = createCredential;
|
|
5
|
-
exports.getAuthenticatorData = getAuthenticatorData;
|
|
6
|
-
exports.getClientDataJSON = getClientDataJSON;
|
|
7
|
-
exports.getAttestationObject = getAttestationObject;
|
|
8
|
-
exports.getCredentialCreationOptions = getCredentialCreationOptions;
|
|
9
|
-
exports.getCredentialRequestOptions = getCredentialRequestOptions;
|
|
10
|
-
exports.getSignPayload = getSignPayload;
|
|
11
5
|
exports.sign = sign;
|
|
12
6
|
exports.verify = verify;
|
|
13
|
-
const
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
const Errors = require("./Errors.js");
|
|
18
|
-
const Hash = require("./Hash.js");
|
|
19
|
-
const Hex = require("./Hex.js");
|
|
20
|
-
const internal = require("./internal/webauthn.js");
|
|
21
|
-
const P256 = require("./P256.js");
|
|
22
|
-
exports.createChallenge = Uint8Array.from([
|
|
23
|
-
105, 171, 180, 181, 160, 222, 75, 198, 42, 42, 32, 31, 141, 37, 186, 233,
|
|
24
|
-
]);
|
|
7
|
+
const Authentication = require("../webauthn/Authentication.js");
|
|
8
|
+
const Authenticator = require("../webauthn/Authenticator.js");
|
|
9
|
+
const Registration = require("../webauthn/Registration.js");
|
|
10
|
+
exports.createChallenge = Registration.createChallenge;
|
|
25
11
|
async function createCredential(options) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
return {
|
|
35
|
-
id: credential.id,
|
|
36
|
-
publicKey,
|
|
37
|
-
raw: credential,
|
|
38
|
-
};
|
|
39
|
-
}
|
|
40
|
-
catch (error) {
|
|
41
|
-
throw new CredentialCreationFailedError({
|
|
42
|
-
cause: error,
|
|
43
|
-
});
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
function getAuthenticatorData(options = {}) {
|
|
47
|
-
const { credential, flag = 5, rpId = window.location.hostname, signCount = 0, } = options;
|
|
48
|
-
const rpIdHash = Hash.sha256(Hex.fromString(rpId));
|
|
49
|
-
const flag_bytes = Hex.fromNumber(flag, { size: 1 });
|
|
50
|
-
const signCount_bytes = Hex.fromNumber(signCount, { size: 4 });
|
|
51
|
-
const base = Hex.concat(rpIdHash, flag_bytes, signCount_bytes);
|
|
52
|
-
if (!credential)
|
|
53
|
-
return base;
|
|
54
|
-
const aaguid = Hex.fromBytes(new Uint8Array(16));
|
|
55
|
-
const credentialId = Hex.fromBytes(credential.id);
|
|
56
|
-
const credIdLen = Hex.fromNumber(credential.id.length, { size: 2 });
|
|
57
|
-
const coseKey = CoseKey.fromPublicKey(credential.publicKey);
|
|
58
|
-
return Hex.concat(base, aaguid, credIdLen, credentialId, coseKey);
|
|
59
|
-
}
|
|
60
|
-
function getClientDataJSON(options) {
|
|
61
|
-
const { challenge, crossOrigin = false, extraClientData, origin = window.location.origin, type = 'webauthn.get', } = options;
|
|
62
|
-
return JSON.stringify({
|
|
63
|
-
type,
|
|
64
|
-
challenge: Base64.fromHex(challenge, { url: true, pad: false }),
|
|
65
|
-
origin,
|
|
66
|
-
crossOrigin,
|
|
67
|
-
...extraClientData,
|
|
68
|
-
});
|
|
69
|
-
}
|
|
70
|
-
function getAttestationObject(options) {
|
|
71
|
-
const { attStmt = {}, authData, fmt = 'none' } = options;
|
|
72
|
-
return Cbor.encode({
|
|
73
|
-
fmt,
|
|
74
|
-
attStmt,
|
|
75
|
-
authData: Hex.toBytes(authData),
|
|
76
|
-
});
|
|
77
|
-
}
|
|
78
|
-
function getCredentialCreationOptions(options) {
|
|
79
|
-
const { attestation = 'none', authenticatorSelection = {
|
|
80
|
-
residentKey: 'preferred',
|
|
81
|
-
requireResidentKey: false,
|
|
82
|
-
userVerification: 'required',
|
|
83
|
-
}, challenge = exports.createChallenge, excludeCredentialIds, extensions, name: name_, rp = {
|
|
84
|
-
id: window.location.hostname,
|
|
85
|
-
name: window.document.title,
|
|
86
|
-
}, user, } = options;
|
|
87
|
-
const name = (user?.name ?? name_);
|
|
88
|
-
return {
|
|
89
|
-
publicKey: {
|
|
90
|
-
attestation,
|
|
91
|
-
authenticatorSelection,
|
|
92
|
-
challenge: typeof challenge === 'string' ? Bytes.fromHex(challenge) : challenge,
|
|
93
|
-
...(excludeCredentialIds
|
|
94
|
-
? {
|
|
95
|
-
excludeCredentials: excludeCredentialIds?.map((id) => ({
|
|
96
|
-
id: Base64.toBytes(id),
|
|
97
|
-
type: 'public-key',
|
|
98
|
-
})),
|
|
99
|
-
}
|
|
100
|
-
: {}),
|
|
101
|
-
pubKeyCredParams: [
|
|
102
|
-
{
|
|
103
|
-
type: 'public-key',
|
|
104
|
-
alg: -7,
|
|
105
|
-
},
|
|
106
|
-
],
|
|
107
|
-
...(extensions && { extensions }),
|
|
108
|
-
rp,
|
|
109
|
-
user: {
|
|
110
|
-
id: user?.id ?? Hash.keccak256(Bytes.fromString(name), { as: 'Bytes' }),
|
|
111
|
-
name,
|
|
112
|
-
displayName: user?.displayName ?? name,
|
|
113
|
-
},
|
|
114
|
-
},
|
|
115
|
-
};
|
|
116
|
-
}
|
|
117
|
-
function getCredentialRequestOptions(options) {
|
|
118
|
-
const { credentialId, challenge, extensions, rpId = window.location.hostname, userVerification = 'required', } = options;
|
|
119
|
-
return {
|
|
120
|
-
publicKey: {
|
|
121
|
-
...(credentialId
|
|
122
|
-
? {
|
|
123
|
-
allowCredentials: Array.isArray(credentialId)
|
|
124
|
-
? credentialId.map((id) => ({
|
|
125
|
-
id: Base64.toBytes(id),
|
|
126
|
-
type: 'public-key',
|
|
127
|
-
}))
|
|
128
|
-
: [
|
|
129
|
-
{
|
|
130
|
-
id: Base64.toBytes(credentialId),
|
|
131
|
-
type: 'public-key',
|
|
132
|
-
},
|
|
133
|
-
],
|
|
134
|
-
}
|
|
135
|
-
: {}),
|
|
136
|
-
challenge: Bytes.fromHex(challenge),
|
|
137
|
-
...(extensions && { extensions }),
|
|
138
|
-
rpId,
|
|
139
|
-
userVerification,
|
|
140
|
-
},
|
|
141
|
-
};
|
|
142
|
-
}
|
|
143
|
-
function getSignPayload(options) {
|
|
144
|
-
const { challenge, crossOrigin, extraClientData, flag, origin, rpId, signCount, userVerification = 'required', } = options;
|
|
145
|
-
const authenticatorData = getAuthenticatorData({
|
|
146
|
-
flag,
|
|
147
|
-
rpId,
|
|
148
|
-
signCount,
|
|
149
|
-
});
|
|
150
|
-
const clientDataJSON = getClientDataJSON({
|
|
151
|
-
challenge,
|
|
152
|
-
crossOrigin,
|
|
153
|
-
extraClientData,
|
|
154
|
-
origin,
|
|
155
|
-
});
|
|
156
|
-
const clientDataJSONHash = Hash.sha256(Hex.fromString(clientDataJSON));
|
|
157
|
-
const challengeIndex = clientDataJSON.indexOf('"challenge"');
|
|
158
|
-
const typeIndex = clientDataJSON.indexOf('"type"');
|
|
159
|
-
const metadata = {
|
|
160
|
-
authenticatorData,
|
|
161
|
-
clientDataJSON,
|
|
162
|
-
challengeIndex,
|
|
163
|
-
typeIndex,
|
|
164
|
-
userVerificationRequired: userVerification === 'required',
|
|
165
|
-
};
|
|
166
|
-
const payload = Hex.concat(authenticatorData, clientDataJSONHash);
|
|
167
|
-
return { metadata, payload };
|
|
168
|
-
}
|
|
12
|
+
return Registration.create(options);
|
|
13
|
+
}
|
|
14
|
+
exports.getAuthenticatorData = Authenticator.getAuthenticatorData;
|
|
15
|
+
exports.getClientDataJSON = Authenticator.getClientDataJSON;
|
|
16
|
+
exports.getAttestationObject = Authenticator.getAttestationObject;
|
|
17
|
+
exports.getCredentialCreationOptions = Registration.getOptions;
|
|
18
|
+
exports.getCredentialRequestOptions = Authentication.getOptions;
|
|
19
|
+
exports.getSignPayload = Authentication.getSignPayload;
|
|
169
20
|
async function sign(options) {
|
|
170
|
-
|
|
171
|
-
const requestOptions = getCredentialRequestOptions(rest);
|
|
172
|
-
try {
|
|
173
|
-
const credential = (await getFn(requestOptions));
|
|
174
|
-
if (!credential)
|
|
175
|
-
throw new CredentialRequestFailedError();
|
|
176
|
-
const response = credential.response;
|
|
177
|
-
const clientDataJSON = String.fromCharCode(...new Uint8Array(response.clientDataJSON));
|
|
178
|
-
const challengeIndex = clientDataJSON.indexOf('"challenge"');
|
|
179
|
-
const typeIndex = clientDataJSON.indexOf('"type"');
|
|
180
|
-
const signature = internal.parseAsn1Signature(new Uint8Array(response.signature));
|
|
181
|
-
return {
|
|
182
|
-
metadata: {
|
|
183
|
-
authenticatorData: Hex.fromBytes(new Uint8Array(response.authenticatorData)),
|
|
184
|
-
clientDataJSON,
|
|
185
|
-
challengeIndex,
|
|
186
|
-
typeIndex,
|
|
187
|
-
userVerificationRequired: requestOptions.publicKey.userVerification === 'required',
|
|
188
|
-
},
|
|
189
|
-
signature,
|
|
190
|
-
raw: credential,
|
|
191
|
-
};
|
|
192
|
-
}
|
|
193
|
-
catch (error) {
|
|
194
|
-
throw new CredentialRequestFailedError({
|
|
195
|
-
cause: error,
|
|
196
|
-
});
|
|
197
|
-
}
|
|
21
|
+
return Authentication.sign(options);
|
|
198
22
|
}
|
|
199
23
|
function verify(options) {
|
|
200
|
-
|
|
201
|
-
const { authenticatorData, challengeIndex, clientDataJSON, typeIndex, userVerificationRequired, } = metadata;
|
|
202
|
-
const authenticatorDataBytes = Bytes.fromHex(authenticatorData);
|
|
203
|
-
if (authenticatorDataBytes.length < 37)
|
|
204
|
-
return false;
|
|
205
|
-
const flag = authenticatorDataBytes[32];
|
|
206
|
-
if ((flag & 0x01) !== 0x01)
|
|
207
|
-
return false;
|
|
208
|
-
if (userVerificationRequired && (flag & 0x04) !== 0x04)
|
|
209
|
-
return false;
|
|
210
|
-
if ((flag & 0x08) !== 0x08 && (flag & 0x10) === 0x10)
|
|
211
|
-
return false;
|
|
212
|
-
if (typeIndex !== undefined) {
|
|
213
|
-
const type = '"type":"webauthn.get"';
|
|
214
|
-
if (type !==
|
|
215
|
-
clientDataJSON.slice(Number(typeIndex), Number(typeIndex) + type.length))
|
|
216
|
-
return false;
|
|
217
|
-
}
|
|
218
|
-
const challengeMatch = challengeIndex !== undefined
|
|
219
|
-
? clientDataJSON
|
|
220
|
-
.slice(Number(challengeIndex))
|
|
221
|
-
.match(/^"challenge":"(.*?)"/)
|
|
222
|
-
: clientDataJSON.match(/"challenge":"(.*?)"/);
|
|
223
|
-
if (!challengeMatch)
|
|
224
|
-
return false;
|
|
225
|
-
const [_, challenge_extracted] = challengeMatch;
|
|
226
|
-
if (Hex.fromBytes(Base64.toBytes(challenge_extracted)) !== challenge)
|
|
227
|
-
return false;
|
|
228
|
-
const clientDataJSONHash = Hash.sha256(Bytes.fromString(clientDataJSON), {
|
|
229
|
-
as: 'Bytes',
|
|
230
|
-
});
|
|
231
|
-
const payload = Bytes.concat(authenticatorDataBytes, clientDataJSONHash);
|
|
232
|
-
return P256.verify({
|
|
233
|
-
hash,
|
|
234
|
-
payload,
|
|
235
|
-
publicKey,
|
|
236
|
-
signature,
|
|
237
|
-
});
|
|
238
|
-
}
|
|
239
|
-
class CredentialCreationFailedError extends Errors.BaseError {
|
|
240
|
-
constructor({ cause } = {}) {
|
|
241
|
-
super('Failed to create credential.', {
|
|
242
|
-
cause,
|
|
243
|
-
});
|
|
244
|
-
Object.defineProperty(this, "name", {
|
|
245
|
-
enumerable: true,
|
|
246
|
-
configurable: true,
|
|
247
|
-
writable: true,
|
|
248
|
-
value: 'WebAuthnP256.CredentialCreationFailedError'
|
|
249
|
-
});
|
|
250
|
-
}
|
|
251
|
-
}
|
|
252
|
-
exports.CredentialCreationFailedError = CredentialCreationFailedError;
|
|
253
|
-
class CredentialRequestFailedError extends Errors.BaseError {
|
|
254
|
-
constructor({ cause } = {}) {
|
|
255
|
-
super('Failed to request credential.', {
|
|
256
|
-
cause,
|
|
257
|
-
});
|
|
258
|
-
Object.defineProperty(this, "name", {
|
|
259
|
-
enumerable: true,
|
|
260
|
-
configurable: true,
|
|
261
|
-
writable: true,
|
|
262
|
-
value: 'WebAuthnP256.CredentialRequestFailedError'
|
|
263
|
-
});
|
|
264
|
-
}
|
|
24
|
+
return Authentication.verify(options);
|
|
265
25
|
}
|
|
266
|
-
exports.CredentialRequestFailedError = CredentialRequestFailedError;
|
|
267
26
|
//# sourceMappingURL=WebAuthnP256.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebAuthnP256.js","sourceRoot":"","sources":["../../core/WebAuthnP256.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"WebAuthnP256.js","sourceRoot":"","sources":["../../core/WebAuthnP256.ts"],"names":[],"mappings":";;;AAoCA,4CAIC;AA2QD,oBAEC;AAsCD,wBAEC;AA7VD,gEAA+D;AAC/D,8DAA6D;AAE7D,4DAA2D;AAQ9C,QAAA,eAAe,GAAG,YAAY,CAAC,eAAe,CAAA;AAyBpD,KAAK,UAAU,gBAAgB,CACpC,OAAiC;IAEjC,OAAO,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;AACrC,CAAC;AAsDY,QAAA,oBAAoB,GAAG,aAAa,CAAC,oBAAoB,CAAA;AAmCzD,QAAA,iBAAiB,GAAG,aAAa,CAAC,iBAAiB,CAAA;AAqCnD,QAAA,oBAAoB,GAAG,aAAa,CAAC,oBAAoB,CAAA;AAwBzD,QAAA,4BAA4B,GAAG,YAAY,CAAC,UAAU,CAAA;AAyBtD,QAAA,2BAA2B,GAAG,cAAc,CAAC,UAAU,CAAA;AAkDvD,QAAA,cAAc,GAAG,cAAc,CAAC,cAAc,CAAA;AA0CpD,KAAK,UAAU,IAAI,CAAC,OAAqB;IAC9C,OAAO,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AACrC,CAAC;AAsCD,SAAgB,MAAM,CAAC,OAAuB;IAC5C,OAAO,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;AACvC,CAAC"}
|
|
@@ -64,7 +64,9 @@ async function sign(options) {
|
|
|
64
64
|
return { r, s };
|
|
65
65
|
}
|
|
66
66
|
async function verify(options) {
|
|
67
|
-
const { payload, signature } = options;
|
|
67
|
+
const { lowS = true, payload, signature } = options;
|
|
68
|
+
if (lowS && signature.s > p256_1.p256.CURVE.n / 2n)
|
|
69
|
+
return false;
|
|
68
70
|
const publicKey = await globalThis.crypto.subtle.importKey('raw', PublicKey.toBytes(options.publicKey), { name: 'ECDSA', namedCurve: 'P-256' }, true, ['verify']);
|
|
69
71
|
return await globalThis.crypto.subtle.verify({
|
|
70
72
|
name: 'ECDSA',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebCryptoP256.js","sourceRoot":"","sources":["../../core/WebCryptoP256.ts"],"names":[],"mappings":";;AAiCA,sCAqBC;AAwCD,8CAqBC;AAmCD,0CA+BC;AAmDD,oBAiBC;AAmCD,
|
|
1
|
+
{"version":3,"file":"WebCryptoP256.js","sourceRoot":"","sources":["../../core/WebCryptoP256.ts"],"names":[],"mappings":";;AAiCA,sCAqBC;AAwCD,8CAqBC;AAmCD,0CA+BC;AAmDD,oBAiBC;AAmCD,wBAuBC;AAnTD,6CAAyC;AACzC,oCAAmC;AAEnC,gCAA+B;AAE/B,4CAA2C;AA4BpC,KAAK,UAAU,aAAa,CACjC,UAAiC,EAAE;IAEnC,MAAM,EAAE,WAAW,GAAG,KAAK,EAAE,GAAG,OAAO,CAAA;IACvC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CACxD;QACE,IAAI,EAAE,OAAO;QACb,UAAU,EAAE,OAAO;KACpB,EACD,WAAW,EACX,CAAC,MAAM,EAAE,QAAQ,CAAC,CACnB,CAAA;IACD,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAC5D,KAAK,EACL,OAAO,CAAC,SAAS,CAClB,CAAA;IACD,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,aAAa,CAAC,CAAC,CAAA;IAC/D,OAAO;QACL,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,SAAS;KACV,CAAA;AACH,CAAC;AAwCM,KAAK,UAAU,iBAAiB,CACrC,UAAqC,EAAE;IAEvC,MAAM,EAAE,WAAW,GAAG,KAAK,EAAE,GAAG,OAAO,CAAA;IACvC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CACxD;QACE,IAAI,EAAE,MAAM;QACZ,UAAU,EAAE,OAAO;KACpB,EACD,WAAW,EACX,CAAC,WAAW,EAAE,YAAY,CAAC,CAC5B,CAAA;IACD,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAC5D,KAAK,EACL,OAAO,CAAC,SAAS,CAClB,CAAA;IACD,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,aAAa,CAAC,CAAC,CAAA;IAC/D,OAAO;QACL,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,SAAS;KACV,CAAA;AACH,CAAC;AAmCM,KAAK,UAAU,eAAe,CACnC,OAAoC;IAEpC,MAAM,EAAE,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;IAErD,IAAI,UAAU,CAAC,SAAS,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CACb,+FAA+F,CAChG,CAAA;IACH,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAC9D,KAAK,EACL,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,EAC5B,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,EACrC,KAAK,EACL,EAAE,CACH,CAAA;IAED,MAAM,kBAAkB,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAClE;QACE,IAAI,EAAE,MAAM;QACZ,MAAM,EAAE,eAAe;KACxB,EACD,UAAU,EACV,GAAG,CACJ,CAAA;IAED,MAAM,YAAY,GAAG,IAAI,UAAU,CAAC,kBAAkB,CAAC,CAAA;IACvD,IAAI,EAAE,KAAK,KAAK;QAAE,OAAO,GAAG,CAAC,SAAS,CAAC,YAAY,CAAU,CAAA;IAC7D,OAAO,YAAqB,CAAA;AAC9B,CAAC;AAmDM,KAAK,UAAU,IAAI,CACxB,OAAqB;IAErB,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAA;IACvC,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CACnD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,SAAS;KAChB,EACD,UAAU,EACV,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CACpB,CAAA;IACD,MAAM,eAAe,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,UAAU,CAAC,SAAS,CAAC,CAAC,CAAA;IAClE,MAAM,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;IAC7D,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;IAC5D,IAAI,CAAC,GAAG,WAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE;QAAE,CAAC,GAAG,WAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAA;IAC/C,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAA;AACjB,CAAC;AAmCM,KAAK,UAAU,MAAM,CAAC,OAAuB;IAClD,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;IAGnD,IAAI,IAAI,IAAI,SAAS,CAAC,CAAC,GAAG,WAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE;QAAE,OAAO,KAAK,CAAA;IAEzD,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CACxD,KAAK,EACL,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EACpC,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,EACtC,IAAI,EACJ,CAAC,QAAQ,CAAC,CACX,CAAA;IAED,OAAO,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAC1C;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,SAAS;KAChB,EACD,SAAS,EACT,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAC1E,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CACpB,CAAA;AACH,CAAC"}
|
|
@@ -3,25 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.parseAsn1Signature = parseAsn1Signature;
|
|
4
4
|
exports.parseCredentialPublicKey = parseCredentialPublicKey;
|
|
5
5
|
const p256_1 = require("@noble/curves/p256");
|
|
6
|
-
const
|
|
6
|
+
const Registration = require("../../webauthn/Registration.js");
|
|
7
7
|
const PublicKey = require("../PublicKey.js");
|
|
8
|
-
const WebAuthnP256_js_1 = require("../WebAuthnP256.js");
|
|
9
8
|
function parseAsn1Signature(bytes) {
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
const s_start = bytes[r_end + 2] === 0 ? r_end + 3 : r_end + 2;
|
|
13
|
-
const r = BigInt(Hex.fromBytes(bytes.slice(r_start, r_end)));
|
|
14
|
-
const s = BigInt(Hex.fromBytes(bytes.slice(s_start)));
|
|
15
|
-
return {
|
|
16
|
-
r,
|
|
17
|
-
s: s > p256_1.p256.CURVE.n / 2n ? p256_1.p256.CURVE.n - s : s,
|
|
18
|
-
};
|
|
9
|
+
const sig = p256_1.p256.Signature.fromDER(bytes).normalizeS();
|
|
10
|
+
return { r: sig.r, s: sig.s };
|
|
19
11
|
}
|
|
20
12
|
async function parseCredentialPublicKey(response) {
|
|
21
13
|
try {
|
|
22
14
|
const publicKeyBuffer = response.getPublicKey();
|
|
23
15
|
if (!publicKeyBuffer)
|
|
24
|
-
throw new
|
|
16
|
+
throw new Registration.CreateFailedError();
|
|
25
17
|
const publicKeyBytes = new Uint8Array(publicKeyBuffer);
|
|
26
18
|
const cryptoKey = await crypto.subtle.importKey('spki', new Uint8Array(publicKeyBytes), {
|
|
27
19
|
name: 'ECDSA',
|
|
@@ -42,7 +34,7 @@ async function parseCredentialPublicKey(response) {
|
|
|
42
34
|
for (let i = 0; i < data.length - coordinate.length; i++)
|
|
43
35
|
if (coordinate.every((byte, j) => data[i + j] === byte))
|
|
44
36
|
return i + coordinate.length;
|
|
45
|
-
throw new
|
|
37
|
+
throw new Registration.CreateFailedError();
|
|
46
38
|
};
|
|
47
39
|
const xStart = findStart(0x21);
|
|
48
40
|
const yStart = findStart(0x22);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webauthn.js","sourceRoot":"","sources":["../../../core/internal/webauthn.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"webauthn.js","sourceRoot":"","sources":["../../../core/internal/webauthn.ts"],"names":[],"mappings":";;AAUA,gDAGC;AAQD,4DAsDC;AA3ED,6CAAyC;AACzC,+DAA8D;AAE9D,6CAA4C;AAO5C,SAAgB,kBAAkB,CAAC,KAAiB;IAClD,MAAM,GAAG,GAAG,WAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,CAAA;IACtD,OAAO,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAA;AAC/B,CAAC;AAQM,KAAK,UAAU,wBAAwB,CAC5C,QAA0C;IAE1C,IAAI,CAAC;QACH,MAAM,eAAe,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAA;QAC/C,IAAI,CAAC,eAAe;YAAE,MAAM,IAAI,YAAY,CAAC,iBAAiB,EAAE,CAAA;QAGhE,MAAM,cAAc,GAAG,IAAI,UAAU,CAAC,eAAe,CAAC,CAAA;QACtD,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAC7C,MAAM,EACN,IAAI,UAAU,CAAC,cAAc,CAAC,EAC9B;YACE,IAAI,EAAE,OAAO;YACb,UAAU,EAAE,OAAO;YACnB,IAAI,EAAE,SAAS;SAChB,EACD,IAAI,EACJ,CAAC,QAAQ,CAAC,CACX,CAAA;QACD,MAAM,SAAS,GAAG,IAAI,UAAU,CAC9B,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,CAChD,CAAA;QACD,OAAO,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAClC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAIf,IAAK,KAAe,CAAC,OAAO,KAAK,oCAAoC;YACnE,MAAM,KAAK,CAAA;QAEb,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAA;QACvD,MAAM,gBAAgB,GAAG,IAAI,CAAA;QAC7B,MAAM,UAAU,GAAG,IAAI,CAAA;QAEvB,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,EAAE;YAChC,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAA;YACtE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE;gBACtD,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC;oBACrD,OAAO,CAAC,GAAG,UAAU,CAAC,MAAM,CAAA;YAChC,MAAM,IAAI,YAAY,CAAC,iBAAiB,EAAE,CAAA;QAC5C,CAAC,CAAA;QAED,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;QAC9B,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;QAE9B,OAAO,SAAS,CAAC,IAAI,CACnB,IAAI,UAAU,CAAC;YACb,IAAI;YACJ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAAC;YAChD,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAAC;SACjD,CAAC,CACH,CAAA;IACH,CAAC;AACH,CAAC"}
|
package/_cjs/index.docs.js
CHANGED
|
@@ -7,5 +7,6 @@ tslib_1.__exportStar(require("./erc6492/index.js"), exports);
|
|
|
7
7
|
tslib_1.__exportStar(require("./erc7821/index.js"), exports);
|
|
8
8
|
tslib_1.__exportStar(require("./erc8010/index.js"), exports);
|
|
9
9
|
tslib_1.__exportStar(require("./erc8021/index.js"), exports);
|
|
10
|
+
tslib_1.__exportStar(require("./webauthn/index.js"), exports);
|
|
10
11
|
tslib_1.__exportStar(require("./tempo/index.js"), exports);
|
|
11
12
|
//# sourceMappingURL=index.docs.js.map
|
package/_cjs/index.docs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.docs.js","sourceRoot":"","sources":["../index.docs.ts"],"names":[],"mappings":";;;AAGA,qDAA0B;AAC1B,6DAAkC;AAClC,6DAAkC;AAClC,6DAAkC;AAClC,6DAAkC;AAClC,6DAAkC;AAClC,2DAAgC"}
|
|
1
|
+
{"version":3,"file":"index.docs.js","sourceRoot":"","sources":["../index.docs.ts"],"names":[],"mappings":";;;AAGA,qDAA0B;AAC1B,6DAAkC;AAClC,6DAAkC;AAClC,6DAAkC;AAClC,6DAAkC;AAClC,6DAAkC;AAClC,8DAAmC;AACnC,2DAAgC"}
|
|
@@ -4,7 +4,9 @@ exports.from = from;
|
|
|
4
4
|
exports.fromRpc = fromRpc;
|
|
5
5
|
exports.fromTuple = fromTuple;
|
|
6
6
|
exports.getSignPayload = getSignPayload;
|
|
7
|
+
exports.deserialize = deserialize;
|
|
7
8
|
exports.hash = hash;
|
|
9
|
+
exports.serialize = serialize;
|
|
8
10
|
exports.toRpc = toRpc;
|
|
9
11
|
exports.toTuple = toTuple;
|
|
10
12
|
const Hash = require("../core/Hash.js");
|
|
@@ -74,11 +76,19 @@ function fromTuple(tuple) {
|
|
|
74
76
|
function getSignPayload(authorization) {
|
|
75
77
|
return hash(authorization);
|
|
76
78
|
}
|
|
79
|
+
function deserialize(serialized) {
|
|
80
|
+
const tuple = Rlp.toHex(serialized);
|
|
81
|
+
return fromTuple(tuple);
|
|
82
|
+
}
|
|
77
83
|
function hash(authorization) {
|
|
78
84
|
const [authorizationTuple] = toTuple(authorization);
|
|
79
85
|
const serialized = Rlp.fromHex(authorizationTuple);
|
|
80
86
|
return Hash.keccak256(serialized);
|
|
81
87
|
}
|
|
88
|
+
function serialize(authorization) {
|
|
89
|
+
const tuple = toTuple(authorization);
|
|
90
|
+
return Rlp.fromHex(tuple);
|
|
91
|
+
}
|
|
82
92
|
function toRpc(authorization) {
|
|
83
93
|
const { address, chainId = 0n, expiry, limits, type, signature, } = authorization;
|
|
84
94
|
return {
|
|
@@ -110,13 +120,18 @@ function toTuple(authorization) {
|
|
|
110
120
|
throw new Error(`Invalid key type: ${authorization.type}`);
|
|
111
121
|
}
|
|
112
122
|
})();
|
|
123
|
+
const limitsValue = limits?.map((limit) => [
|
|
124
|
+
limit.token,
|
|
125
|
+
bigintToHex(limit.limit),
|
|
126
|
+
]);
|
|
113
127
|
const authorizationTuple = [
|
|
114
128
|
bigintToHex(chainId),
|
|
115
129
|
type,
|
|
116
130
|
address,
|
|
117
|
-
typeof expiry === 'number'
|
|
118
|
-
|
|
119
|
-
undefined,
|
|
131
|
+
typeof expiry === 'number' || limitsValue
|
|
132
|
+
? numberToHex(expiry ?? 0)
|
|
133
|
+
: undefined,
|
|
134
|
+
limitsValue,
|
|
120
135
|
].filter(Boolean);
|
|
121
136
|
return [authorizationTuple, ...(signature ? [signature] : [])];
|
|
122
137
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KeyAuthorization.js","sourceRoot":"","sources":["../../tempo/KeyAuthorization.ts"],"names":[],"mappings":";;AAsPA,oBAeC;AAqDD,0BAcC;AA6CD,8BAoCC;AA2CD,wCAEC;
|
|
1
|
+
{"version":3,"file":"KeyAuthorization.js","sourceRoot":"","sources":["../../tempo/KeyAuthorization.ts"],"names":[],"mappings":";;AAsPA,oBAeC;AAqDD,0BAcC;AA6CD,8BAoCC;AA2CD,wCAEC;AA+BD,kCAGC;AAiCD,oBAIC;AAmCD,8BAGC;AAuCD,sBAqBC;AAoCD,0BAkCC;AAnrBD,wCAAuC;AACvC,sCAAqC;AAErC,sCAAqC;AACrC,4DAA2D;AAgP3D,SAAgB,IAAI,CAIlB,aAA+C,EAC/C,UAAmC,EAAE;IAErC,IAAI,OAAO,aAAa,CAAC,MAAM,KAAK,QAAQ;QAC1C,OAAO,OAAO,CAAC,aAAoB,CAAU,CAAA;IAC/C,IAAI,OAAO,CAAC,SAAS;QACnB,OAAO;YACL,GAAG,aAAa;YAChB,SAAS,EAAE,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;SAC5C,CAAA;IACZ,OAAO,aAAsB,CAAA;AAC/B,CAAC;AAqDD,SAAgB,OAAO,CAAC,aAAkB;IACxC,MAAM,EAAE,OAAO,GAAG,KAAK,EAAE,KAAK,EAAE,MAAM,GAAG,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAA;IAC7E,MAAM,SAAS,GAAG,iBAAiB,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;IACpE,OAAO;QACL,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC;QACtD,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;QACtB,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC9B,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;SAC3B,CAAC,CAAC;QACH,SAAS;QACT,IAAI,EAAE,OAAO;KACd,CAAA;AACH,CAAC;AA6CD,SAAgB,SAAS,CACvB,KAAY;IAEZ,MAAM,CAAC,aAAa,EAAE,mBAAmB,CAAC,GAAG,KAAK,CAAA;IAClD,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,aAAa,CAAA;IACnE,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE;QACpB,QAAQ,WAAW,EAAE,CAAC;YACpB,KAAK,IAAI,CAAC;YACV,KAAK,MAAM;gBACT,OAAO,WAAW,CAAA;YACpB,KAAK,MAAM;gBACT,OAAO,MAAM,CAAA;YACf,KAAK,MAAM;gBACT,OAAO,UAAU,CAAA;YACnB;gBACE,MAAM,IAAI,KAAK,CAAC,qBAAqB,WAAW,EAAE,CAAC,CAAA;QACvD,CAAC;IACH,CAAC,CAAC,EAAE,CAAA;IACJ,MAAM,IAAI,GAAqB;QAC7B,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;QACvE,IAAI,EAAE,OAAO;QACb,GAAG,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,GAAG,CAAC,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,GAAG,CAAC,OAAO,MAAM,KAAK,WAAW;YAC/B,CAAC,CAAC;gBACE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;oBACtC,KAAK;oBACL,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC;iBAC1B,CAAC,CAAC;aACJ;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAA;IACD,IAAI,mBAAmB;QACrB,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAA;IACrE,OAAO,IAAI,CAAC,IAAI,CAAU,CAAA;AAC5B,CAAC;AA2CD,SAAgB,cAAc,CAAC,aAA+B;IAC5D,OAAO,IAAI,CAAC,aAAa,CAAC,CAAA;AAC5B,CAAC;AA+BD,SAAgB,WAAW,CAAC,UAAmB;IAC7C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAqB,CAAA;IACvD,OAAO,SAAS,CAAC,KAAK,CAAC,CAAA;AACzB,CAAC;AAiCD,SAAgB,IAAI,CAAC,aAA+B;IAClD,MAAM,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;IACnD,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAA;IAClD,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;AACnC,CAAC;AAmCD,SAAgB,SAAS,CAAC,aAA+B;IACvD,MAAM,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;IACpC,OAAO,GAAG,CAAC,OAAO,CAAC,KAAY,CAAC,CAAA;AAClC,CAAC;AAuCD,SAAgB,KAAK,CAAC,aAAqB;IACzC,MAAM,EACJ,OAAO,EACP,OAAO,GAAG,EAAE,EACZ,MAAM,EACN,MAAM,EACN,IAAI,EACJ,SAAS,GACV,GAAG,aAAa,CAAA;IAEjB,OAAO;QACL,OAAO,EAAE,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC;QACxD,MAAM,EAAE,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI;QAClE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;YACzC,KAAK;YACL,KAAK,EAAE,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC;SAC7B,CAAC,CAAC;QACH,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,iBAAiB,CAAC,KAAK,CAAC,SAAS,CAAC;QAC7C,OAAO,EAAE,IAAI;KACd,CAAA;AACH,CAAC;AAoCD,SAAgB,OAAO,CACrB,aAA4B;IAE5B,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAA;IAC/D,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS;QACvC,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC;QACtD,CAAC,CAAC,SAAS,CAAA;IACb,MAAM,IAAI,GAAG,CAAC,GAAG,EAAE;QACjB,QAAQ,aAAa,CAAC,IAAI,EAAE,CAAC;YAC3B,KAAK,WAAW;gBACd,OAAO,IAAI,CAAA;YACb,KAAK,MAAM;gBACT,OAAO,MAAM,CAAA;YACf,KAAK,UAAU;gBACb,OAAO,MAAM,CAAA;YACf;gBACE,MAAM,IAAI,KAAK,CAAC,qBAAqB,aAAa,CAAC,IAAI,EAAE,CAAC,CAAA;QAC9D,CAAC;IACH,CAAC,CAAC,EAAE,CAAA;IACJ,MAAM,WAAW,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QACzC,KAAK,CAAC,KAAK;QACX,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC;KACzB,CAAC,CAAA;IACF,MAAM,kBAAkB,GAAG;QACzB,WAAW,CAAC,OAAO,CAAC;QACpB,IAAI;QACJ,OAAO;QAEP,OAAO,MAAM,KAAK,QAAQ,IAAI,WAAW;YACvC,CAAC,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,CAAC;YAC1B,CAAC,CAAC,SAAS;QACb,WAAW;KACZ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACjB,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAU,CAAA;AACzE,CAAC;AASD,SAAS,WAAW,CAAC,KAAa;IAChC,OAAO,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;AACpD,CAAC;AAED,SAAS,WAAW,CAAC,KAAa;IAChC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;AACnD,CAAC;AAED,SAAS,WAAW,CAAC,GAAY;IAC/B,OAAO,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;AACxC,CAAC;AAED,SAAS,WAAW,CAAC,GAAY;IAC/B,OAAO,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;AAC7C,CAAC"}
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.VerificationError = exports.InvalidSerializedError = exports.MissingPropertiesError = exports.CoercionError = exports.types = exports.magicBytes = void 0;
|
|
4
4
|
exports.assert = assert;
|
|
5
|
+
exports.extractAddress = extractAddress;
|
|
6
|
+
exports.extractPublicKey = extractPublicKey;
|
|
5
7
|
exports.deserialize = deserialize;
|
|
6
8
|
exports.from = from;
|
|
7
9
|
exports.fromRpc = fromRpc;
|
|
@@ -84,6 +86,30 @@ function assert(envelope) {
|
|
|
84
86
|
return;
|
|
85
87
|
}
|
|
86
88
|
}
|
|
89
|
+
function extractAddress(options) {
|
|
90
|
+
const { signature, root } = options;
|
|
91
|
+
if (signature.type === 'keychain') {
|
|
92
|
+
if (root)
|
|
93
|
+
return signature.userAddress;
|
|
94
|
+
return extractAddress({ ...options, signature: signature.inner });
|
|
95
|
+
}
|
|
96
|
+
return Address.fromPublicKey(extractPublicKey(options));
|
|
97
|
+
}
|
|
98
|
+
function extractPublicKey(options) {
|
|
99
|
+
const { payload, signature } = options;
|
|
100
|
+
switch (signature.type) {
|
|
101
|
+
case 'secp256k1':
|
|
102
|
+
return ox_Secp256k1.recoverPublicKey({
|
|
103
|
+
payload,
|
|
104
|
+
signature: signature.signature,
|
|
105
|
+
});
|
|
106
|
+
case 'p256':
|
|
107
|
+
case 'webAuthn':
|
|
108
|
+
return signature.publicKey;
|
|
109
|
+
case 'keychain':
|
|
110
|
+
return extractPublicKey({ payload, signature: signature.inner });
|
|
111
|
+
}
|
|
112
|
+
}
|
|
87
113
|
function deserialize(value) {
|
|
88
114
|
const serialized = value.endsWith(exports.magicBytes.slice(2))
|
|
89
115
|
? Hex.slice(value, 0, -Hex.size(exports.magicBytes))
|