@idp.global/sdk 19.5.0 → 19.6.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/changelog.md +34 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts_relyingparty/classes.idpoidcprovider.d.ts +69 -11
- package/dist_ts_relyingparty/classes.idpoidcprovider.js +127 -17
- package/dist_ts_relyingparty/classes.relyingpartysessions.d.ts +67 -12
- package/dist_ts_relyingparty/classes.relyingpartysessions.js +179 -41
- package/dist_ts_relyingparty/classes.rpmodels.d.ts +21 -4
- package/dist_ts_relyingparty/classes.rpmodels.js +35 -8
- package/dist_ts_relyingparty/helpers.cookies.d.ts +6 -0
- package/dist_ts_relyingparty/helpers.cookies.js +8 -1
- package/dist_ts_relyingparty/interfaces.d.ts +31 -0
- package/dist_ts_relyingparty/testing.js +8 -4
- package/package.json +3 -3
- package/readme.md +132 -32
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts_relyingparty/classes.idpoidcprovider.ts +183 -17
- package/ts_relyingparty/classes.relyingpartysessions.ts +225 -44
- package/ts_relyingparty/classes.rpmodels.ts +27 -4
- package/ts_relyingparty/helpers.cookies.ts +13 -0
- package/ts_relyingparty/interfaces.ts +32 -0
- package/ts_relyingparty/testing.ts +7 -3
package/changelog.md
CHANGED
|
@@ -1,5 +1,39 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-11-11 - 19.6.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- a lost refresh answer no longer signs the person out: `bearer.refreshReuseGraceSeconds` (relyingparty)
|
|
8
|
+
- A spent bearer refresh token that comes back within the window of its rotation (60 seconds by default, 0 turns it off, at most 300; the constructor refuses anything else), while its successor was never presented, revokes that successor and answers a new pair; the `bearer_refresh_reissued` event reports it. Presented means the successor's access token authenticated a request or its refresh token was sent to `bearer/refresh`; the first presentation is recorded on the token generation (`firstUsedAt`), and a rotation names its successor (`successorId`). Only hashes are stored, so the lost pair is replaced, never repeated.
|
|
9
|
+
- Once the successor was presented, after the window (counted from the rotation, however often the retry's answer is lost too), and for the second of two retries at once, the spent token is reuse and ends the session as before (`refresh_token_reused`). Generations stored before this release carry neither field and are handled as before.
|
|
10
|
+
- `bearer/logout` (`endBearerSession`) judges a spent refresh token as the refresh does: one that would be a lost answer there ends the session as a `logout`, so signing out after a lost refresh answer reports no `bearer_credential_reused` and no `refresh_token_reused`.
|
|
11
|
+
- The browser client needs no change: after a lost refresh its next refresh with the stored pair recovers within the window. A relying party that wants the strict rotation of 19.5.0 sets `refreshReuseGraceSeconds: 0`.
|
|
12
|
+
- `TRelyingPartyEventName` gains `bearer_refresh_reissued`; a consumer that switches over it exhaustively adds the case.
|
|
13
|
+
- The first request with each new access token now writes once to record its presentation.
|
|
14
|
+
- a cookie policy for framed applications: `cookiePolicy: { sameSite, partitioned }` (relyingparty)
|
|
15
|
+
- `sameSite` is `'Lax'` (the default, unchanged) or `'None'`; `partitioned: true` adds the CHIPS `Partitioned` attribute and is valid only with `'None'`. One policy goes on the session and the intent cookie, on every `Set-Cookie` that sets or clears them: the login start, the opened session, `openSession`, `clearSessionCookie` and `clearIntentCookie`.
|
|
16
|
+
- The constructor refuses `partitioned` without `sameSite: 'None'`, `sameSite: 'None'` on an http `publicOrigin` (a `SameSite=None` cookie must be `Secure`), any other value, and `cookiePolicy` in bearer-only mode. `sessions.cookiePolicy` answers the resolved policy.
|
|
17
|
+
- `serializeCookie` takes `partitioned` and throws when it is given without `secure`.
|
|
18
|
+
- typed provider errors: `OidcProviderError` with `code` and `oauthError` (relyingparty)
|
|
19
|
+
- An application classifies a failure of the provider half without importing openid-client. `code` (`TOidcProviderErrorCode`, listed in `OIDC_PROVIDER_ERROR_CODES`) is `token_exchange_refused`, `login_mismatch`, `invalid_response`, `provider_unreachable` or `refresh_refused`; `oauthError` is the provider's own OAuth error code when it sent one, such as `invalid_grant`, kept only when it is a short token and never with its description.
|
|
20
|
+
- `OidcCompletionError`, `OidcRefreshRefusedError` and `OidcAuthorityUnavailableError` now extend `OidcProviderError`; their names, `stage`, `reason` and constructors stay, and `OidcCompletionError` takes the code as an optional third argument (without it, the code is read from the cause). `IdpOidcProvider` maps openid-client's failures to the codes, and the provider double of `/relyingparty/testing` answers with the codes idp.global's would.
|
|
21
|
+
- `IdpOidcProvider.completeAuthorization` refuses a callback whose one `state` is not the login's (`login_mismatch`) before it asks the provider. A refresh whose answer fails openid-client's checks is now `OidcAuthorityUnavailableError` with the reason `invalid_response` instead of `unavailable`; both fail closed as before.
|
|
22
|
+
|
|
23
|
+
### Fixes
|
|
24
|
+
|
|
25
|
+
- a swept session takes its bearer rows with it, and `endSessionsOfPrincipal` leaves expired sessions alone (relyingparty)
|
|
26
|
+
- The session sweep now deletes a session's bearer hand-offs and token generations by `sessionId` before the session row. Before, a session revoked early was swept an hour after its revocation while its generations stayed until an hour after its original expiry, with no row left that named the principal, so `eraseSessionsOfPrincipal` could not reach them. A sweep that fails between the two leaves the session row, and the next sweep finishes it.
|
|
27
|
+
- The bearer hand-off and bearer token models declare a `sessionId` index, which the sweep and `eraseSessionsOfPrincipal` read; it is built on first use like the `expiresAt` index. On the test suite's engine a token write cost 3.68 instead of 3.22 ms in memory and 9.38 instead of 9.23 ms on file storage, and a delete by session took 5 instead of 54 ms (4,000 rows, memory) and 16 instead of 88 ms (600 rows, file).
|
|
28
|
+
- `endSessionsOfPrincipal` reads only sessions that have not expired: an expired one is over already and is no longer revoked, handed back to the provider or counted. `eraseSessionsOfPrincipal` still ends it.
|
|
29
|
+
- ID tokens are verified against idp.global's signing keys (relyingparty)
|
|
30
|
+
- Before, `IdpOidcProvider` accepted the ID token of a code exchange or a refresh on the trust of the TLS connection to the token endpoint alone and never checked its signature. Discovery now turns on openid-client's `enableNonRepudiationChecks`, so every ID token of both grants is checked against the issuer's `jwks_uri` (RS256), fetched through the provider's own transport (`trustedCaPem` or `fetch` included) and cached by openid-client.
|
|
31
|
+
- A code exchange whose ID token is signed by a key outside the JWKS fails as `OidcCompletionError` at the `token_exchange` stage, and a refresh as `OidcAuthorityUnavailableError`, which ends nothing and fails closed. The first login after a start fetches the JWKS once more.
|
|
32
|
+
|
|
33
|
+
### Maintenance
|
|
34
|
+
|
|
35
|
+
- release tooling: `@git.zone/tsrepo` ^1.1.1 → ^2.1.0 (2.0.0 makes `@push.rocks/smartmongo` an optional peer of its tapbundle; the sdk's tests do not call `createSmartmongo()`), `@types/node` 26.6.5 → 26.6.6 and pnpm 12.14.0 → 12.17.0; the re-resolved tooling (`@push.rocks/smartfile` 13.2.4 with `@push.rocks/smartcrypto` 3.1.0) no longer installs `node-forge`; `brace-expansion` 2.1.2 → 2.1.7 (through `minimatch` 9.0.9 in the production closure) clears its high advisories.
|
|
36
|
+
|
|
3
37
|
## 2026-10-26 - 19.5.0
|
|
4
38
|
|
|
5
39
|
### Features
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@idp.global/sdk',
|
|
6
|
-
version: '19.
|
|
6
|
+
version: '19.6.0',
|
|
7
7
|
description: 'Reusable browser and server SDK for idp.global authentication.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxpQkFBaUI7SUFDdkIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLGdFQUFnRTtDQUM5RSxDQUFBIn0=
|
|
@@ -56,22 +56,80 @@ export interface IOidcRefreshedTokens {
|
|
|
56
56
|
/** epoch milliseconds; `0` when the token response named no lifetime */
|
|
57
57
|
accessTokenExpiresAt: number;
|
|
58
58
|
}
|
|
59
|
+
/**
|
|
60
|
+
* What failed when the provider was asked, as an application tells the cases
|
|
61
|
+
* apart; never why access was refused, which only an authority answer says.
|
|
62
|
+
*/
|
|
63
|
+
export type TOidcProviderErrorCode =
|
|
64
|
+
/**
|
|
65
|
+
* The provider refused the login: an OAuth error in the callback, for the
|
|
66
|
+
* code at the token endpoint, or for its token at UserInfo. `oauthError`
|
|
67
|
+
* names it, such as `invalid_grant` for a code that was used or expired.
|
|
68
|
+
*/
|
|
69
|
+
'token_exchange_refused'
|
|
70
|
+
/**
|
|
71
|
+
* The callback or its ID token is not this login's: a `state` that is not
|
|
72
|
+
* the login's, or an ID token claim that does not match it (the nonce, and
|
|
73
|
+
* likewise the issuer, the audience or the authorized party).
|
|
74
|
+
*/
|
|
75
|
+
| 'login_mismatch'
|
|
76
|
+
/**
|
|
77
|
+
* The provider answered outside its contract: an ID token whose signature
|
|
78
|
+
* does not verify against the JWKS or that has expired, no subject, another
|
|
79
|
+
* subject at UserInfo, or a body that is no OAuth answer.
|
|
80
|
+
*/
|
|
81
|
+
| 'invalid_response'
|
|
82
|
+
/** The provider could not be asked: no answer in time, a transport failure, a 5xx, or no discovery yet. */
|
|
83
|
+
| 'provider_unreachable'
|
|
84
|
+
/** The refresh grant answered `invalid_grant`: the refresh family is revoked, expired or was reused. */
|
|
85
|
+
| 'refresh_refused';
|
|
86
|
+
export declare const OIDC_PROVIDER_ERROR_CODES: readonly TOidcProviderErrorCode[];
|
|
87
|
+
/**
|
|
88
|
+
* Every failure of the provider this module throws: its `code` says which
|
|
89
|
+
* case it is, `oauthError` the provider's own OAuth error code where it sent
|
|
90
|
+
* one (a short token, never its description). An application classifies a
|
|
91
|
+
* failure by these and never by openid-client's classes; `cause` keeps the
|
|
92
|
+
* original for a debugger, not for a log line.
|
|
93
|
+
*/
|
|
94
|
+
export declare class OidcProviderError extends Error {
|
|
95
|
+
readonly code: TOidcProviderErrorCode;
|
|
96
|
+
readonly oauthError?: string;
|
|
97
|
+
constructor(messageArg: string, detailArg: {
|
|
98
|
+
code: TOidcProviderErrorCode;
|
|
99
|
+
oauthError?: string;
|
|
100
|
+
}, causeArg?: unknown);
|
|
101
|
+
}
|
|
59
102
|
/** Why an observation or a refresh could not be made; never why access was refused. */
|
|
60
103
|
export type TOidcAuthorityFailure = 'unavailable' | 'invalid_response';
|
|
61
|
-
/**
|
|
62
|
-
|
|
104
|
+
/**
|
|
105
|
+
* The provider could not be asked, or did not answer in its own contract. The
|
|
106
|
+
* caller fails closed on it. `code` is `provider_unreachable` or
|
|
107
|
+
* `invalid_response`, after `reason`.
|
|
108
|
+
*/
|
|
109
|
+
export declare class OidcAuthorityUnavailableError extends OidcProviderError {
|
|
63
110
|
readonly reason: TOidcAuthorityFailure;
|
|
64
111
|
constructor(reason: TOidcAuthorityFailure, causeArg?: unknown);
|
|
65
112
|
}
|
|
66
|
-
/**
|
|
67
|
-
|
|
113
|
+
/**
|
|
114
|
+
* The provider refused the refresh with `invalid_grant`: the refresh family is
|
|
115
|
+
* revoked, expired or was reused. `code` is `refresh_refused`.
|
|
116
|
+
*/
|
|
117
|
+
export declare class OidcRefreshRefusedError extends OidcProviderError {
|
|
68
118
|
constructor(causeArg?: unknown);
|
|
69
119
|
}
|
|
70
120
|
export type TOidcTokenHint = 'access_token' | 'refresh_token';
|
|
71
121
|
export type TOidcCompletionFailureStage = 'token_exchange' | 'token_validation' | 'userinfo';
|
|
72
|
-
|
|
122
|
+
/**
|
|
123
|
+
* A login the provider half could not complete. `stage` says where it
|
|
124
|
+
* stopped, `code` what it was; without a `detailArg` the code is read from
|
|
125
|
+
* the cause, an openid-client failure.
|
|
126
|
+
*/
|
|
127
|
+
export declare class OidcCompletionError extends OidcProviderError {
|
|
73
128
|
readonly stage: TOidcCompletionFailureStage;
|
|
74
|
-
constructor(stage: TOidcCompletionFailureStage, causeArg: unknown
|
|
129
|
+
constructor(stage: TOidcCompletionFailureStage, causeArg: unknown, detailArg?: {
|
|
130
|
+
code: TOidcProviderErrorCode;
|
|
131
|
+
oauthError?: string;
|
|
132
|
+
});
|
|
75
133
|
}
|
|
76
134
|
/**
|
|
77
135
|
* What the session layer needs from the provider. `IdpOidcProvider` is the
|
|
@@ -115,7 +173,7 @@ export interface IIdpOidcProviderOptions {
|
|
|
115
173
|
/** the registered callback, on the application's public origin */
|
|
116
174
|
redirectUri: URL;
|
|
117
175
|
scopes?: string;
|
|
118
|
-
/** deadline of discovery, token, UserInfo, refresh and revocation requests */
|
|
176
|
+
/** deadline of discovery, token, JWKS, UserInfo, refresh and revocation requests */
|
|
119
177
|
requestTimeoutSeconds?: number;
|
|
120
178
|
/** deadline of one introspection; the introspection client's default applies when absent */
|
|
121
179
|
introspectionTimeoutMs?: number;
|
|
@@ -129,7 +187,7 @@ export interface IIdpOidcProviderOptions {
|
|
|
129
187
|
trustedCaPem?: string | readonly string[];
|
|
130
188
|
/**
|
|
131
189
|
* Advanced: the fetch that carries every request of this provider —
|
|
132
|
-
* discovery, token, UserInfo, refresh, revocation and introspection.
|
|
190
|
+
* discovery, token, JWKS, UserInfo, refresh, revocation and introspection.
|
|
133
191
|
* It owns the transport's trust decisions; https-only still holds. Not
|
|
134
192
|
* combined with `trustedCaPem`.
|
|
135
193
|
*/
|
|
@@ -144,9 +202,9 @@ export declare const readOrganizationClaims: (valueArg: unknown) => IOidcOrganiz
|
|
|
144
202
|
/**
|
|
145
203
|
* The relying-party side of the authorization code flow with S256 PKCE on
|
|
146
204
|
* `openid-client`, in the profile idp.global supports: code responses, S256
|
|
147
|
-
* challenges, RS256 ID tokens
|
|
148
|
-
*
|
|
149
|
-
* `OidcIntrospectionClient`.
|
|
205
|
+
* challenges, RS256 ID tokens whose signature is verified against the
|
|
206
|
+
* issuer's JWKS, and `client_secret_basic` for a confidential client. Live
|
|
207
|
+
* organization authority is observed with the sdk's `OidcIntrospectionClient`.
|
|
150
208
|
*/
|
|
151
209
|
export declare class IdpOidcProvider implements IOidcProvider {
|
|
152
210
|
#private;
|
|
@@ -2,26 +2,123 @@ import * as plugins from './plugins.js';
|
|
|
2
2
|
import { OidcIntrospectionClient, OidcIntrospectionError, } from '../dist_ts_server/classes.oidc-introspection-client.js';
|
|
3
3
|
import { createTrustedCaFetch } from '../dist_ts_server/helpers.trusted-ca-fetch.js';
|
|
4
4
|
export const OIDC_PROMPTS = ['none', 'login', 'consent'];
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
export const OIDC_PROVIDER_ERROR_CODES = [
|
|
6
|
+
'token_exchange_refused',
|
|
7
|
+
'login_mismatch',
|
|
8
|
+
'invalid_response',
|
|
9
|
+
'provider_unreachable',
|
|
10
|
+
'refresh_refused',
|
|
11
|
+
];
|
|
12
|
+
/** An OAuth error code is a short token; anything else a provider sends there is dropped, never kept. */
|
|
13
|
+
const OAUTH_ERROR_PATTERN = /^[A-Za-z0-9_.-]{1,64}$/;
|
|
14
|
+
const oauthErrorOf = (valueArg) => typeof valueArg === 'string' && OAUTH_ERROR_PATTERN.test(valueArg) ? valueArg : undefined;
|
|
15
|
+
/** The OAuth error and HTTP status of an openid-client failure that is the provider's own answer; `null` for any other failure. */
|
|
16
|
+
const providerAnswerOf = (errorArg) => {
|
|
17
|
+
const openidClient = plugins.openidClient;
|
|
18
|
+
if (errorArg instanceof openidClient.ResponseBodyError) {
|
|
19
|
+
return { oauthError: oauthErrorOf(errorArg.error), status: errorArg.status };
|
|
20
|
+
}
|
|
21
|
+
if (errorArg instanceof openidClient.AuthorizationResponseError) {
|
|
22
|
+
return { oauthError: oauthErrorOf(errorArg.error) };
|
|
23
|
+
}
|
|
24
|
+
if (errorArg instanceof openidClient.WWWAuthenticateChallengeError) {
|
|
25
|
+
return { oauthError: oauthErrorOf(errorArg.cause[0]?.parameters.error), status: errorArg.status };
|
|
26
|
+
}
|
|
27
|
+
return null;
|
|
28
|
+
};
|
|
29
|
+
/** openid-client's codes (`ClientError.code`) for a provider that did not answer in time or within HTTP's own contract. */
|
|
30
|
+
const UNREACHABLE_CLIENT_ERROR_CODES = ['OAUTH_TIMEOUT', 'OAUTH_ABORT', 'OAUTH_RESPONSE_IS_NOT_CONFORM'];
|
|
31
|
+
/** openid-client's code for a JWT claim that is not the expected one: the nonce, the issuer, the audience or the authorized party. */
|
|
32
|
+
const JWT_CLAIM_COMPARISON_CODE = 'OAUTH_JWT_CLAIM_COMPARISON_FAILED';
|
|
33
|
+
/**
|
|
34
|
+
* The class of an openid-client failure of the code exchange or of UserInfo.
|
|
35
|
+
* The provider's own OAuth error answer is a refusal, or unreachable on a 5xx;
|
|
36
|
+
* a claim that does not match is not this login's; every other failure of
|
|
37
|
+
* openid-client's checks is an invalid response; and anything else (a
|
|
38
|
+
* transport failure is fetch's `TypeError`) is an unreachable provider.
|
|
39
|
+
*/
|
|
40
|
+
const classifyCompletionFailure = (errorArg) => {
|
|
41
|
+
if (errorArg instanceof OidcProviderError) {
|
|
42
|
+
return { code: errorArg.code, oauthError: errorArg.oauthError };
|
|
43
|
+
}
|
|
44
|
+
const answer = providerAnswerOf(errorArg);
|
|
45
|
+
if (answer) {
|
|
46
|
+
const code = answer.status !== undefined && answer.status >= 500
|
|
47
|
+
? 'provider_unreachable'
|
|
48
|
+
: 'token_exchange_refused';
|
|
49
|
+
return { code, oauthError: answer.oauthError };
|
|
50
|
+
}
|
|
51
|
+
if (errorArg instanceof plugins.openidClient.ClientError) {
|
|
52
|
+
if (errorArg.code === JWT_CLAIM_COMPARISON_CODE) {
|
|
53
|
+
return { code: 'login_mismatch' };
|
|
54
|
+
}
|
|
55
|
+
return { code: errorArg.code !== undefined && UNREACHABLE_CLIENT_ERROR_CODES.includes(errorArg.code) ? 'provider_unreachable' : 'invalid_response' };
|
|
56
|
+
}
|
|
57
|
+
return { code: 'provider_unreachable' };
|
|
58
|
+
};
|
|
59
|
+
/** Why a refresh could not be made: openid-client's checks failed on the answer, or the provider could not be asked. */
|
|
60
|
+
const refreshFailureReasonOf = (errorArg) => errorArg instanceof plugins.openidClient.ClientError
|
|
61
|
+
&& !(errorArg.code !== undefined && UNREACHABLE_CLIENT_ERROR_CODES.includes(errorArg.code))
|
|
62
|
+
? 'invalid_response'
|
|
63
|
+
: 'unavailable';
|
|
64
|
+
/**
|
|
65
|
+
* Every failure of the provider this module throws: its `code` says which
|
|
66
|
+
* case it is, `oauthError` the provider's own OAuth error code where it sent
|
|
67
|
+
* one (a short token, never its description). An application classifies a
|
|
68
|
+
* failure by these and never by openid-client's classes; `cause` keeps the
|
|
69
|
+
* original for a debugger, not for a log line.
|
|
70
|
+
*/
|
|
71
|
+
export class OidcProviderError extends Error {
|
|
72
|
+
code;
|
|
73
|
+
oauthError;
|
|
74
|
+
constructor(messageArg, detailArg, causeArg) {
|
|
75
|
+
super(messageArg, { cause: causeArg });
|
|
76
|
+
this.name = 'OidcProviderError';
|
|
77
|
+
if (!OIDC_PROVIDER_ERROR_CODES.includes(detailArg?.code)) {
|
|
78
|
+
throw new TypeError('OidcProviderError needs one of OIDC_PROVIDER_ERROR_CODES');
|
|
79
|
+
}
|
|
80
|
+
this.code = detailArg.code;
|
|
81
|
+
const oauthError = oauthErrorOf(detailArg.oauthError);
|
|
82
|
+
if (oauthError !== undefined) {
|
|
83
|
+
this.oauthError = oauthError;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* The provider could not be asked, or did not answer in its own contract. The
|
|
89
|
+
* caller fails closed on it. `code` is `provider_unreachable` or
|
|
90
|
+
* `invalid_response`, after `reason`.
|
|
91
|
+
*/
|
|
92
|
+
export class OidcAuthorityUnavailableError extends OidcProviderError {
|
|
7
93
|
reason;
|
|
8
94
|
constructor(reason, causeArg) {
|
|
9
|
-
super('The identity provider could not be observed', {
|
|
95
|
+
super('The identity provider could not be observed', {
|
|
96
|
+
code: reason === 'invalid_response' ? 'invalid_response' : 'provider_unreachable',
|
|
97
|
+
oauthError: providerAnswerOf(causeArg)?.oauthError,
|
|
98
|
+
}, causeArg);
|
|
10
99
|
this.reason = reason;
|
|
11
100
|
this.name = 'OidcAuthorityUnavailableError';
|
|
12
101
|
}
|
|
13
102
|
}
|
|
14
|
-
/**
|
|
15
|
-
|
|
103
|
+
/**
|
|
104
|
+
* The provider refused the refresh with `invalid_grant`: the refresh family is
|
|
105
|
+
* revoked, expired or was reused. `code` is `refresh_refused`.
|
|
106
|
+
*/
|
|
107
|
+
export class OidcRefreshRefusedError extends OidcProviderError {
|
|
16
108
|
constructor(causeArg) {
|
|
17
|
-
super('The identity provider refused the refresh', {
|
|
109
|
+
super('The identity provider refused the refresh', { code: 'refresh_refused', oauthError: 'invalid_grant' }, causeArg);
|
|
18
110
|
this.name = 'OidcRefreshRefusedError';
|
|
19
111
|
}
|
|
20
112
|
}
|
|
21
|
-
|
|
113
|
+
/**
|
|
114
|
+
* A login the provider half could not complete. `stage` says where it
|
|
115
|
+
* stopped, `code` what it was; without a `detailArg` the code is read from
|
|
116
|
+
* the cause, an openid-client failure.
|
|
117
|
+
*/
|
|
118
|
+
export class OidcCompletionError extends OidcProviderError {
|
|
22
119
|
stage;
|
|
23
|
-
constructor(stage, causeArg) {
|
|
24
|
-
super('OIDC completion failed',
|
|
120
|
+
constructor(stage, causeArg, detailArg) {
|
|
121
|
+
super('OIDC completion failed', detailArg ?? classifyCompletionFailure(causeArg), causeArg);
|
|
25
122
|
this.stage = stage;
|
|
26
123
|
this.name = 'OidcCompletionError';
|
|
27
124
|
}
|
|
@@ -68,9 +165,9 @@ export const readOrganizationClaims = (valueArg) => {
|
|
|
68
165
|
/**
|
|
69
166
|
* The relying-party side of the authorization code flow with S256 PKCE on
|
|
70
167
|
* `openid-client`, in the profile idp.global supports: code responses, S256
|
|
71
|
-
* challenges, RS256 ID tokens
|
|
72
|
-
*
|
|
73
|
-
* `OidcIntrospectionClient`.
|
|
168
|
+
* challenges, RS256 ID tokens whose signature is verified against the
|
|
169
|
+
* issuer's JWKS, and `client_secret_basic` for a confidential client. Live
|
|
170
|
+
* organization authority is observed with the sdk's `OidcIntrospectionClient`.
|
|
74
171
|
*/
|
|
75
172
|
export class IdpOidcProvider {
|
|
76
173
|
requestTimeoutSeconds;
|
|
@@ -114,13 +211,18 @@ export class IdpOidcProvider {
|
|
|
114
211
|
}
|
|
115
212
|
const options = this.#options;
|
|
116
213
|
// the timeout and the fetch given to discovery apply to discovery itself
|
|
117
|
-
// and stay on the resolved configuration for every later request
|
|
214
|
+
// and stay on the resolved configuration for every later request.
|
|
215
|
+
// `enableNonRepudiationChecks` verifies the signature of every ID token the
|
|
216
|
+
// code grant and the refresh grant answer against the issuer's JWKS
|
|
217
|
+
// (`jwks_uri`, fetched through the same fetch), so an ID token is never
|
|
218
|
+
// accepted on the trust of the TLS connection alone
|
|
118
219
|
const configuration = await plugins.openidClient.discovery(options.issuer, options.clientId, {
|
|
119
220
|
client_secret: options.clientSecret,
|
|
120
221
|
token_endpoint_auth_method: 'client_secret_basic',
|
|
121
222
|
id_token_signed_response_alg: 'RS256',
|
|
122
223
|
}, plugins.openidClient.ClientSecretBasic(options.clientSecret), {
|
|
123
224
|
timeout: this.requestTimeoutSeconds,
|
|
225
|
+
execute: [plugins.openidClient.enableNonRepudiationChecks],
|
|
124
226
|
...(this.#fetch ? { [plugins.openidClient.customFetch]: this.#fetch } : {}),
|
|
125
227
|
});
|
|
126
228
|
const metadata = configuration.serverMetadata();
|
|
@@ -164,6 +266,11 @@ export class IdpOidcProvider {
|
|
|
164
266
|
});
|
|
165
267
|
}
|
|
166
268
|
async completeAuthorization(optionsArg) {
|
|
269
|
+
// the one state of the callback is the login's, or nothing is exchanged
|
|
270
|
+
const states = optionsArg.callbackUrl.searchParams.getAll('state');
|
|
271
|
+
if (states.length !== 1 || states[0] !== optionsArg.state) {
|
|
272
|
+
throw new OidcCompletionError('token_exchange', new Error('The callback state is not the state of this login'), { code: 'login_mismatch' });
|
|
273
|
+
}
|
|
167
274
|
let tokens;
|
|
168
275
|
try {
|
|
169
276
|
tokens = await plugins.openidClient.authorizationCodeGrant(this.configuration, optionsArg.callbackUrl, {
|
|
@@ -185,7 +292,7 @@ export class IdpOidcProvider {
|
|
|
185
292
|
subject = claims.sub;
|
|
186
293
|
}
|
|
187
294
|
catch (error) {
|
|
188
|
-
throw new OidcCompletionError('token_validation', error);
|
|
295
|
+
throw new OidcCompletionError('token_validation', error, { code: 'invalid_response' });
|
|
189
296
|
}
|
|
190
297
|
// UserInfo is the current view of profile and organization claims; the ID
|
|
191
298
|
// token proves the login. Both are read, and the subjects must agree.
|
|
@@ -197,7 +304,7 @@ export class IdpOidcProvider {
|
|
|
197
304
|
throw new OidcCompletionError('userinfo', error);
|
|
198
305
|
}
|
|
199
306
|
if (userInfo.sub !== subject) {
|
|
200
|
-
throw new OidcCompletionError('token_validation', new Error('The UserInfo subject does not match the ID token'));
|
|
307
|
+
throw new OidcCompletionError('token_validation', new Error('The UserInfo subject does not match the ID token'), { code: 'invalid_response' });
|
|
201
308
|
}
|
|
202
309
|
return {
|
|
203
310
|
subject,
|
|
@@ -263,7 +370,10 @@ export class IdpOidcProvider {
|
|
|
263
370
|
if (error instanceof plugins.openidClient.ResponseBodyError && error.error === 'invalid_grant') {
|
|
264
371
|
throw new OidcRefreshRefusedError(error);
|
|
265
372
|
}
|
|
266
|
-
|
|
373
|
+
// everything else fails closed: another OAuth error (`invalid_client` for a
|
|
374
|
+
// deactivated app) or a transport failure is unreachable, an answer that
|
|
375
|
+
// fails openid-client's checks (an ID token that does not verify) is invalid
|
|
376
|
+
throw new OidcAuthorityUnavailableError(refreshFailureReasonOf(error), error);
|
|
267
377
|
}
|
|
268
378
|
return {
|
|
269
379
|
accessToken: tokens.access_token,
|
|
@@ -272,4 +382,4 @@ export class IdpOidcProvider {
|
|
|
272
382
|
};
|
|
273
383
|
}
|
|
274
384
|
}
|
|
275
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.idpoidcprovider.js","sourceRoot":"","sources":["../../ts_relyingparty/classes.idpoidcprovider.ts"],"names":[],"mappings":"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"}
|
|
385
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.idpoidcprovider.js","sourceRoot":"","sources":["../../ts_relyingparty/classes.idpoidcprovider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type IOidcProvider } from './classes.idpoidcprovider.js';
|
|
2
2
|
import type { IRelyingPartyModels } from './classes.rpmodels.js';
|
|
3
|
-
import type { IAuthorityTokenSource, IProviderToken, IRelyingPartyBearerDelivery, IRelyingPartyBearerHandoff, IRelyingPartyBearerHandoffOpening, IRelyingPartyBearerLoginRequest, IRelyingPartyBearerLoginStart, IRelyingPartyBearerOptions, IRelyingPartyBearerReturnTargets, IRelyingPartyBearerTokens, IRelyingPartyHooks, IRelyingPartyLiveSession, IRelyingPartyLoginOptions, IRelyingPartyLoginStart, IRelyingPartySession, IRelyingPartySessionOpening, IRelyingPartySessionsErasure, IRelyingPartySessionsPage, IRelyingPartySessionsPageOptions, IResolvedRelyingPartySession, TRelyingPartyPrincipals, TRelyingPartySessionEndReason } from './interfaces.js';
|
|
3
|
+
import type { IAuthorityTokenSource, IProviderToken, IRelyingPartyBearerDelivery, IRelyingPartyBearerHandoff, IRelyingPartyBearerHandoffOpening, IRelyingPartyBearerLoginRequest, IRelyingPartyBearerLoginStart, IRelyingPartyBearerOptions, IRelyingPartyBearerReturnTargets, IRelyingPartyBearerTokens, IRelyingPartyCookiePolicy, IRelyingPartyHooks, IRelyingPartyLiveSession, IRelyingPartyLoginOptions, IRelyingPartyLoginStart, IRelyingPartySession, IRelyingPartySessionOpening, IRelyingPartySessionsErasure, IRelyingPartySessionsPage, IRelyingPartySessionsPageOptions, IResolvedRelyingPartySession, TRelyingPartyPrincipals, TRelyingPartySessionEndReason } from './interfaces.js';
|
|
4
4
|
export declare const RELYING_PARTY_DEFAULT_SESSION_MAX_AGE_SECONDS: number;
|
|
5
5
|
export declare const RELYING_PARTY_DEFAULT_LOGIN_PATH_PREFIX = "/auth/";
|
|
6
6
|
/** The label the CSRF HMAC starts with unless the application names its own. */
|
|
@@ -17,6 +17,10 @@ export declare const RELYING_PARTY_MAX_SESSIONS_PAGE_LIMIT = 1000;
|
|
|
17
17
|
export declare const BEARER_HANDOFF_MAX_AGE_SECONDS = 60;
|
|
18
18
|
/** How long a bearer access token lives unless `bearer.accessTokenMaxAgeSeconds` says otherwise. */
|
|
19
19
|
export declare const RELYING_PARTY_DEFAULT_BEARER_ACCESS_TOKEN_MAX_AGE_SECONDS: number;
|
|
20
|
+
/** How long a spent refresh token may come back as a lost answer unless `bearer.refreshReuseGraceSeconds` says otherwise. */
|
|
21
|
+
export declare const RELYING_PARTY_DEFAULT_REFRESH_REUSE_GRACE_SECONDS = 60;
|
|
22
|
+
/** The longest `bearer.refreshReuseGraceSeconds`: a spent token that comes back later is always reuse. */
|
|
23
|
+
export declare const RELYING_PARTY_MAX_REFRESH_REUSE_GRACE_SECONDS = 300;
|
|
20
24
|
/**
|
|
21
25
|
* How long ending a session waits for the provider to take its tokens back.
|
|
22
26
|
* The local session is already revoked when that call runs.
|
|
@@ -62,6 +66,14 @@ export interface IRelyingPartySessionsOptions<TPrincipal extends object | undefi
|
|
|
62
66
|
session?: string;
|
|
63
67
|
intent?: string;
|
|
64
68
|
};
|
|
69
|
+
/**
|
|
70
|
+
* How the session and intent cookies go across sites: `{ sameSite: 'Lax' }`
|
|
71
|
+
* by default. A page framed on another site needs `sameSite: 'None'` (an
|
|
72
|
+
* https `publicOrigin` only), with `partitioned: true` where the browser
|
|
73
|
+
* keeps third-party cookies per top-level site. The constructor refuses
|
|
74
|
+
* every other combination.
|
|
75
|
+
*/
|
|
76
|
+
cookiePolicy?: IRelyingPartyCookiePolicy;
|
|
65
77
|
/** the prefix of the login routes; a login never returns into it */
|
|
66
78
|
loginPathPrefix?: string;
|
|
67
79
|
/**
|
|
@@ -78,13 +90,14 @@ export interface IRelyingPartySessionsOptions<TPrincipal extends object | undefi
|
|
|
78
90
|
* sign in through bearer hand-off and nothing else. The relying party never
|
|
79
91
|
* reads or sets a cookie — not even the clearing intent cookie of a callback
|
|
80
92
|
* that is no bearer login — so it has no CSRF token and takes no CSRF key:
|
|
81
|
-
* `csrfKey`, `csrfLabel` and `
|
|
93
|
+
* `csrfKey`, `csrfLabel`, `cookieNames` and `cookiePolicy` are refused, not
|
|
94
|
+
* ignored. The
|
|
82
95
|
* cookie steps (`openSession`, `startLogin`, `completeLogin`, `abandonLogin`,
|
|
83
96
|
* `finalizeLogin`, `clearSessionCookie`, `clearIntentCookie`) throw
|
|
84
97
|
* `RelyingPartyError('login_method_unavailable')` and `resolveCookieSession`
|
|
85
98
|
* answers `null`.
|
|
86
99
|
*/
|
|
87
|
-
export interface IRelyingPartyBearerOnlySessionsOptions<TPrincipal extends object | undefined = undefined> extends Omit<IRelyingPartySessionsOptions<TPrincipal>, 'provider' | 'csrfKey' | 'csrfLabel' | 'cookieNames' | 'cookieSessions' | 'bearer'> {
|
|
100
|
+
export interface IRelyingPartyBearerOnlySessionsOptions<TPrincipal extends object | undefined = undefined> extends Omit<IRelyingPartySessionsOptions<TPrincipal>, 'provider' | 'csrfKey' | 'csrfLabel' | 'cookieNames' | 'cookiePolicy' | 'cookieSessions' | 'bearer'> {
|
|
88
101
|
cookieSessions: false;
|
|
89
102
|
/** every bearer session comes from a live provider login, directly or through a hand-off opened from one */
|
|
90
103
|
provider: IOidcProvider;
|
|
@@ -92,6 +105,7 @@ export interface IRelyingPartyBearerOnlySessionsOptions<TPrincipal extends objec
|
|
|
92
105
|
csrfKey?: never;
|
|
93
106
|
csrfLabel?: never;
|
|
94
107
|
cookieNames?: never;
|
|
108
|
+
cookiePolicy?: never;
|
|
95
109
|
}
|
|
96
110
|
/**
|
|
97
111
|
* The relying-party session layer: provider logins through the authorization
|
|
@@ -120,6 +134,8 @@ export declare class RelyingPartySessions<TPrincipal extends object | undefined
|
|
|
120
134
|
readonly secureCookies: boolean;
|
|
121
135
|
readonly sessionCookieName: string;
|
|
122
136
|
readonly intentCookieName: string;
|
|
137
|
+
/** how the session and intent cookies go across sites, as the constructor resolved `cookiePolicy` */
|
|
138
|
+
readonly cookiePolicy: Readonly<Required<IRelyingPartyCookiePolicy>>;
|
|
123
139
|
readonly loginPathPrefix: string;
|
|
124
140
|
readonly sessionMaxAgeSeconds: number;
|
|
125
141
|
constructor(optionsArg: IRelyingPartySessionsOptions<TPrincipal> | IRelyingPartyBearerOnlySessionsOptions<TPrincipal>);
|
|
@@ -181,6 +197,7 @@ export declare class RelyingPartySessions<TPrincipal extends object | undefined
|
|
|
181
197
|
/**
|
|
182
198
|
* Ends every live session of a principal but `keepSessionId` (a password
|
|
183
199
|
* change keeps the session that asked for it) and answers how many ended.
|
|
200
|
+
* A session that expired is over already and is neither ended nor counted.
|
|
184
201
|
*/
|
|
185
202
|
endSessionsOfPrincipal(principalIdArg: string, optionsArg?: {
|
|
186
203
|
keepSessionId?: string;
|
|
@@ -308,15 +325,45 @@ export declare class RelyingPartySessions<TPrincipal extends object | undefined
|
|
|
308
325
|
/**
|
|
309
326
|
* Rotates a bearer session's tokens: the refresh token is spent, a new
|
|
310
327
|
* access and refresh token answer, and the old access token stops working.
|
|
311
|
-
*
|
|
312
|
-
*
|
|
313
|
-
*
|
|
314
|
-
*
|
|
328
|
+
* A client serializes its refreshes, because a refresh token that comes
|
|
329
|
+
* back after it was spent ends the whole session, with one exception for
|
|
330
|
+
* an answer that never reached the client: within
|
|
331
|
+
* `bearer.refreshReuseGraceSeconds` of its rotation (60 by default), a
|
|
332
|
+
* spent refresh token whose successor was never presented — neither its
|
|
333
|
+
* access token nor its refresh token — revokes that successor and answers a
|
|
334
|
+
* new pair (`bearer_refresh_reissued`). Only hashes are stored, so the lost
|
|
335
|
+
* pair is replaced, never repeated. Once the successor was presented, after
|
|
336
|
+
* the window, or for a second retry that loses the race to the first, it is
|
|
337
|
+
* reuse. The provider login of a bearer login is checked on the way: a
|
|
338
|
+
* login idp.global ended ends the session here (`invalid_bearer_grant`), an
|
|
315
339
|
* unreachable provider fails with `AuthorityTokenError('authority_unavailable')`
|
|
316
340
|
* and spends nothing. A session `openBearerHandoff` opened has no provider
|
|
317
341
|
* login (no `idpSubject` is stored) and rotates without the provider.
|
|
318
342
|
*/
|
|
319
343
|
refreshBearerTokens(refreshTokenArg: unknown): Promise<IRelyingPartyBearerTokens>;
|
|
344
|
+
/**
|
|
345
|
+
* The successor of a spent generation when its answer may have been lost:
|
|
346
|
+
* the rotation is at most `refreshReuseGraceMs` old, and the successor is
|
|
347
|
+
* still current and was never presented. `null` otherwise, which is reuse.
|
|
348
|
+
*/
|
|
349
|
+
private lostSuccessorOf;
|
|
350
|
+
/**
|
|
351
|
+
* Issues a pair again for a spent generation whose answer was lost. The
|
|
352
|
+
* successor that answer carried is revoked first, by one conditional write
|
|
353
|
+
* that needs it current and unpresented: of two retries at once exactly one
|
|
354
|
+
* takes it, and the other is reuse, as is a successor presented in the
|
|
355
|
+
* meantime. Then the new generation is stored and the spent one names it,
|
|
356
|
+
* so a retry after this answer is lost too finds it within the same window
|
|
357
|
+
* (counted from the original rotation). A failure after the revocation
|
|
358
|
+
* leaves the session without a current generation; its retry is reuse.
|
|
359
|
+
*/
|
|
360
|
+
private reissueLostRotation;
|
|
361
|
+
/**
|
|
362
|
+
* Records the first presentation of a current generation's access or refresh
|
|
363
|
+
* token, once. Answers whether the generation is still current: `false`
|
|
364
|
+
* when a lost answer of its predecessor revoked it just now.
|
|
365
|
+
*/
|
|
366
|
+
private markBearerGenerationPresented;
|
|
320
367
|
/**
|
|
321
368
|
* The live session behind a bearer access token, or `null`: the token of the
|
|
322
369
|
* session's current generation, not expired, its session live and its
|
|
@@ -328,7 +375,9 @@ export declare class RelyingPartySessions<TPrincipal extends object | undefined
|
|
|
328
375
|
/**
|
|
329
376
|
* Ends the session of a bearer token — a live access token or the current
|
|
330
377
|
* refresh token — like `endSession`. A refresh token that was already spent
|
|
331
|
-
* is reuse and ends the session as such
|
|
378
|
+
* is reuse and ends the session as such, unless `refreshBearerTokens` would
|
|
379
|
+
* take it as a lost answer (`lostSuccessorOf`): then it is a logout like the
|
|
380
|
+
* current one. Answers whether this call ended it.
|
|
332
381
|
*/
|
|
333
382
|
endBearerSession(tokenArg: unknown): Promise<boolean>;
|
|
334
383
|
/**
|
|
@@ -377,6 +426,8 @@ export declare class RelyingPartySessions<TPrincipal extends object | undefined
|
|
|
377
426
|
*/
|
|
378
427
|
private openProviderLogin;
|
|
379
428
|
private newSessionDoc;
|
|
429
|
+
/** The attributes every session and intent cookie is set and cleared with: one policy for all of them. */
|
|
430
|
+
private cookieAttributes;
|
|
380
431
|
private csrfTokenOf;
|
|
381
432
|
private opening;
|
|
382
433
|
private snapshot;
|
|
@@ -396,7 +447,7 @@ export declare class RelyingPartySessions<TPrincipal extends object | undefined
|
|
|
396
447
|
* `BEARER_HANDOFF_MAX_AGE_SECONDS` at most and never past the session.
|
|
397
448
|
*/
|
|
398
449
|
private storeBearerHandoff;
|
|
399
|
-
/** Stores the next token generation of a live session and answers its tokens;
|
|
450
|
+
/** Stores the next token generation of a live session and answers its tokens and its id; no token is stored in the clear. */
|
|
400
451
|
private issueBearerTokens;
|
|
401
452
|
/** A spent hand-off code or refresh token came back: whoever holds it, the session ends. */
|
|
402
453
|
private bearerCredentialReused;
|
|
@@ -470,9 +521,13 @@ export declare class RelyingPartySessions<TPrincipal extends object | undefined
|
|
|
470
521
|
* page per login start and per session the application opens. An ended
|
|
471
522
|
* session's expiry is its revocation at the latest, so the expiry index
|
|
472
523
|
* finds expired and revoked sessions alike. Each of them ended already: the
|
|
473
|
-
* row goes without an end, a hook or a provider call.
|
|
474
|
-
*
|
|
475
|
-
*
|
|
524
|
+
* row goes without an end, a hook or a provider call. Its children go
|
|
525
|
+
* first: in bearer mode its hand-offs and token generations, by their
|
|
526
|
+
* `sessionId` index, and only then the session row, which is the only link
|
|
527
|
+
* from a principal to them; a sweep that fails half way leaves the session
|
|
528
|
+
* row, and the next sweep finds it and deletes the rest. Expiry never moves
|
|
529
|
+
* later, so a session past the cutoff stays past it, and its row is deleted
|
|
530
|
+
* only while that still holds. A sweep that cannot run never blocks a
|
|
476
531
|
* sign-in.
|
|
477
532
|
*/
|
|
478
533
|
private sweepEndedSessions;
|