@simplewebauthn/server 7.3.1 → 7.4.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/dist/authentication/verifyAuthenticationResponse.d.ts +4 -0
- package/dist/authentication/verifyAuthenticationResponse.js +3 -1
- package/dist/authentication/verifyAuthenticationResponse.js.map +1 -1
- package/dist/helpers/matchExpectedRPID.d.ts +5 -2
- package/dist/helpers/matchExpectedRPID.js +7 -3
- package/dist/helpers/matchExpectedRPID.js.map +1 -1
- package/dist/registration/verifyRegistrationResponse.d.ts +5 -0
- package/dist/registration/verifyRegistrationResponse.js +4 -1
- package/dist/registration/verifyRegistrationResponse.js.map +1 -1
- package/package.json +4 -4
|
@@ -46,6 +46,8 @@ export declare function verifyAuthenticationResponse(options: VerifyAuthenticati
|
|
|
46
46
|
* @param authenticationInfo.credentialBackedUp Whether or not the multi-device credential has been
|
|
47
47
|
* backed up. Always `false` for single-device credentials. **Should be kept in a DB for later
|
|
48
48
|
* reference!**
|
|
49
|
+
* @param authenticationInfo.origin The origin of the website that the authentication occurred on
|
|
50
|
+
* @param authenticationInfo.rpID The RP ID that the authentication occurred on
|
|
49
51
|
* @param authenticationInfo?.authenticatorExtensionResults The authenticator extensions returned
|
|
50
52
|
* by the browser
|
|
51
53
|
*/
|
|
@@ -57,6 +59,8 @@ export type VerifiedAuthenticationResponse = {
|
|
|
57
59
|
userVerified: boolean;
|
|
58
60
|
credentialDeviceType: CredentialDeviceType;
|
|
59
61
|
credentialBackedUp: boolean;
|
|
62
|
+
origin: string;
|
|
63
|
+
rpID: string;
|
|
60
64
|
authenticatorExtensionResults?: AuthenticationExtensionsAuthenticatorOutputs;
|
|
61
65
|
};
|
|
62
66
|
};
|
|
@@ -103,7 +103,7 @@ async function verifyAuthenticationResponse(options) {
|
|
|
103
103
|
else {
|
|
104
104
|
expectedRPIDs = expectedRPID;
|
|
105
105
|
}
|
|
106
|
-
await (0, matchExpectedRPID_1.matchExpectedRPID)(rpIdHash, expectedRPIDs);
|
|
106
|
+
const matchedRPID = await (0, matchExpectedRPID_1.matchExpectedRPID)(rpIdHash, expectedRPIDs);
|
|
107
107
|
if (advancedFIDOConfig !== undefined) {
|
|
108
108
|
const { userVerification: fidoUserVerification } = advancedFIDOConfig;
|
|
109
109
|
/**
|
|
@@ -156,6 +156,8 @@ async function verifyAuthenticationResponse(options) {
|
|
|
156
156
|
credentialDeviceType,
|
|
157
157
|
credentialBackedUp,
|
|
158
158
|
authenticatorExtensionResults: extensionsData,
|
|
159
|
+
origin: clientDataJSON.origin,
|
|
160
|
+
rpID: matchedRPID,
|
|
159
161
|
},
|
|
160
162
|
};
|
|
161
163
|
return toReturn;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyAuthenticationResponse.js","sourceRoot":"","sources":["../../src/authentication/verifyAuthenticationResponse.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"verifyAuthenticationResponse.js","sourceRoot":"","sources":["../../src/authentication/verifyAuthenticationResponse.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Go through each expected RP ID and try to find one that matches.
|
|
2
|
+
* Go through each expected RP ID and try to find one that matches. Returns the unhashed RP ID
|
|
3
|
+
* that matched the hash in the response.
|
|
4
|
+
*
|
|
5
|
+
* Raises an `UnexpectedRPIDHash` error if no match is found
|
|
3
6
|
*/
|
|
4
|
-
export declare function matchExpectedRPID(rpIDHash: Uint8Array, expectedRPIDs: string[]): Promise<
|
|
7
|
+
export declare function matchExpectedRPID(rpIDHash: Uint8Array, expectedRPIDs: string[]): Promise<string>;
|
|
@@ -4,15 +4,18 @@ exports.matchExpectedRPID = void 0;
|
|
|
4
4
|
const toHash_1 = require("./toHash");
|
|
5
5
|
const iso_1 = require("./iso");
|
|
6
6
|
/**
|
|
7
|
-
* Go through each expected RP ID and try to find one that matches.
|
|
7
|
+
* Go through each expected RP ID and try to find one that matches. Returns the unhashed RP ID
|
|
8
|
+
* that matched the hash in the response.
|
|
9
|
+
*
|
|
10
|
+
* Raises an `UnexpectedRPIDHash` error if no match is found
|
|
8
11
|
*/
|
|
9
12
|
async function matchExpectedRPID(rpIDHash, expectedRPIDs) {
|
|
10
13
|
try {
|
|
11
|
-
await Promise.any(expectedRPIDs.map(expected => {
|
|
14
|
+
const matchedRPID = await Promise.any(expectedRPIDs.map(expected => {
|
|
12
15
|
return new Promise((resolve, reject) => {
|
|
13
16
|
(0, toHash_1.toHash)(iso_1.isoUint8Array.fromASCIIString(expected)).then(expectedRPIDHash => {
|
|
14
17
|
if (iso_1.isoUint8Array.areEqual(rpIDHash, expectedRPIDHash)) {
|
|
15
|
-
resolve(
|
|
18
|
+
resolve(expected);
|
|
16
19
|
}
|
|
17
20
|
else {
|
|
18
21
|
reject();
|
|
@@ -20,6 +23,7 @@ async function matchExpectedRPID(rpIDHash, expectedRPIDs) {
|
|
|
20
23
|
});
|
|
21
24
|
});
|
|
22
25
|
}));
|
|
26
|
+
return matchedRPID;
|
|
23
27
|
}
|
|
24
28
|
catch (err) {
|
|
25
29
|
const _err = err;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matchExpectedRPID.js","sourceRoot":"","sources":["../../src/helpers/matchExpectedRPID.ts"],"names":[],"mappings":";;;AAAA,qCAAkC;AAClC,+BAAsC;AAEtC
|
|
1
|
+
{"version":3,"file":"matchExpectedRPID.js","sourceRoot":"","sources":["../../src/helpers/matchExpectedRPID.ts"],"names":[],"mappings":";;;AAAA,qCAAkC;AAClC,+BAAsC;AAEtC;;;;;GAKG;AACI,KAAK,UAAU,iBAAiB,CACrC,QAAoB,EACpB,aAAuB;IAEvB,IAAI;QACF,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CACnC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YAC3B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,IAAA,eAAM,EAAC,mBAAa,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;oBACtE,IAAI,mBAAa,CAAC,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAAE;wBACtD,OAAO,CAAC,QAAQ,CAAC,CAAC;qBACnB;yBAAM;wBACL,MAAM,EAAE,CAAC;qBACV;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CACH,CAAC;QAEF,OAAO,WAAW,CAAC;KACpB;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,GAAG,GAAY,CAAC;QAE1B,mCAAmC;QACnC,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB,EAAE;YAClC,MAAM,IAAI,kBAAkB,EAAE,CAAC;SAChC;QAED,+BAA+B;QAC/B,MAAM,GAAG,CAAC;KACX;AACH,CAAC;AA/BD,8CA+BC;AAED,MAAM,kBAAmB,SAAQ,KAAK;IACpC;QACE,MAAM,OAAO,GAAG,uBAAuB,CAAC;QACxC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;IACnC,CAAC;CACF"}
|
|
@@ -45,6 +45,9 @@ export declare function verifyRegistrationResponse(options: VerifyRegistrationRe
|
|
|
45
45
|
* @param registrationInfo.credentialBackedUp Whether or not the multi-device credential has been
|
|
46
46
|
* backed up. Always `false` for single-device credentials. **Should be kept in a DB for later
|
|
47
47
|
* reference!**
|
|
48
|
+
* @param registrationInfo.origin The origin of the website that the registration occurred on
|
|
49
|
+
* @param registrationInfo?.rpID The RP ID that the registration occurred on, if one or more were
|
|
50
|
+
* specified in the registration options
|
|
48
51
|
* @param registrationInfo?.authenticatorExtensionResults The authenticator extensions returned
|
|
49
52
|
* by the browser
|
|
50
53
|
*/
|
|
@@ -61,6 +64,8 @@ export type VerifiedRegistrationResponse = {
|
|
|
61
64
|
userVerified: boolean;
|
|
62
65
|
credentialDeviceType: CredentialDeviceType;
|
|
63
66
|
credentialBackedUp: boolean;
|
|
67
|
+
origin: string;
|
|
68
|
+
rpID?: string;
|
|
64
69
|
authenticatorExtensionResults?: AuthenticationExtensionsAuthenticatorOutputs;
|
|
65
70
|
};
|
|
66
71
|
};
|
|
@@ -91,6 +91,7 @@ async function verifyRegistrationResponse(options) {
|
|
|
91
91
|
const parsedAuthData = (0, parseAuthenticatorData_1.parseAuthenticatorData)(authData);
|
|
92
92
|
const { aaguid, rpIdHash, flags, credentialID, counter, credentialPublicKey, extensionsData } = parsedAuthData;
|
|
93
93
|
// Make sure the response's RP ID is ours
|
|
94
|
+
let matchedRPID;
|
|
94
95
|
if (expectedRPID) {
|
|
95
96
|
let expectedRPIDs = [];
|
|
96
97
|
if (typeof expectedRPID === 'string') {
|
|
@@ -99,7 +100,7 @@ async function verifyRegistrationResponse(options) {
|
|
|
99
100
|
else {
|
|
100
101
|
expectedRPIDs = expectedRPID;
|
|
101
102
|
}
|
|
102
|
-
await (0, matchExpectedRPID_1.matchExpectedRPID)(rpIdHash, expectedRPIDs);
|
|
103
|
+
matchedRPID = await (0, matchExpectedRPID_1.matchExpectedRPID)(rpIdHash, expectedRPIDs);
|
|
103
104
|
}
|
|
104
105
|
// Make sure someone was physically present
|
|
105
106
|
if (!flags.up) {
|
|
@@ -189,6 +190,8 @@ async function verifyRegistrationResponse(options) {
|
|
|
189
190
|
userVerified: flags.uv,
|
|
190
191
|
credentialDeviceType,
|
|
191
192
|
credentialBackedUp,
|
|
193
|
+
origin: clientDataJSON.origin,
|
|
194
|
+
rpID: matchedRPID,
|
|
192
195
|
authenticatorExtensionResults: extensionsData,
|
|
193
196
|
};
|
|
194
197
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyRegistrationResponse.js","sourceRoot":"","sources":["../../src/registration/verifyRegistrationResponse.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"verifyRegistrationResponse.js","sourceRoot":"","sources":["../../src/registration/verifyRegistrationResponse.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@simplewebauthn/server",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.4.0",
|
|
4
4
|
"description": "SimpleWebAuthn for Servers",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -54,13 +54,13 @@
|
|
|
54
54
|
"@peculiar/asn1-rsa": "^2.3.4",
|
|
55
55
|
"@peculiar/asn1-schema": "^2.3.3",
|
|
56
56
|
"@peculiar/asn1-x509": "^2.3.4",
|
|
57
|
-
"@simplewebauthn/iso-webcrypto": "^7.
|
|
58
|
-
"@simplewebauthn/typescript-types": "
|
|
57
|
+
"@simplewebauthn/iso-webcrypto": "^7.4.0",
|
|
58
|
+
"@simplewebauthn/typescript-types": "^7.4.0",
|
|
59
59
|
"@types/debug": "^4.1.7",
|
|
60
60
|
"@types/node": "^18.11.9",
|
|
61
61
|
"cbor-x": "^1.4.1",
|
|
62
62
|
"cross-fetch": "^3.1.5",
|
|
63
63
|
"debug": "^4.3.2"
|
|
64
64
|
},
|
|
65
|
-
"gitHead": "
|
|
65
|
+
"gitHead": "f21955a5947f575858db0cd9ee728abc6b5f4310"
|
|
66
66
|
}
|