@quickpipeaiab/tokens 0.5.0 → 0.6.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/README.md +7 -2
- package/dist/endpoint.d.ts +10 -0
- package/dist/endpoint.d.ts.map +1 -0
- package/dist/endpoint.js +25 -0
- package/dist/endpoint.js.map +1 -0
- package/dist/exchange.d.ts +5 -1
- package/dist/exchange.d.ts.map +1 -1
- package/dist/exchange.js +24 -8
- package/dist/exchange.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/live.d.ts +1 -0
- package/dist/live.d.ts.map +1 -1
- package/dist/live.js +8 -2
- package/dist/live.js.map +1 -1
- package/dist/source.d.ts +2 -0
- package/dist/source.d.ts.map +1 -1
- package/dist/source.js +6 -2
- package/dist/source.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -122,7 +122,7 @@ const bound = await exchange.userCall({ subjectToken, workspace, audience: billi
|
|
|
122
122
|
await fetch(url, { headers: { authorization: `Bearer ${bound.value}` } });
|
|
123
123
|
```
|
|
124
124
|
|
|
125
|
-
`userCall` signs a client assertion with the key, and gives the machine token of `actor` as the actor token. It gives the token and its expiry. It fails with an `ExchangeFailure`. Its `error` is the refusal of RFC 8693 (`invalid_request`, `invalid_grant`, `unauthorized_client` or `invalid_target`), or `unavailable` when `auth` does not answer or gives no token. The caller keeps the token in a cache until its expiry.
|
|
125
|
+
`userCall` signs a client assertion with the key, and gives the machine token of `actor` as the actor token. It gives the token and its expiry. It fails with an `ExchangeFailure`. Its `error` is the refusal of RFC 8693 (`invalid_request`, `invalid_grant`, `unauthorized_client` or `invalid_target`), or `unavailable` when `auth` does not answer or gives no token. Its `detail` tells the status of the answer (`status 502`), the network cause (`network ECONNRESET`, `timeout`) or `no token in the answer`, and `reason` joins the two for a log line. The caller keeps the token in a cache until its expiry.
|
|
126
126
|
|
|
127
127
|
## Exchange a user id for an action of a Kai flow
|
|
128
128
|
|
|
@@ -205,4 +205,9 @@ It keeps the answer for 10 seconds in a map of 1000 entries at most. The key is
|
|
|
205
205
|
|
|
206
206
|
`project` is the id of the project `quickpipe`. It must not be empty: `liveCheck` throws when it is empty, so the service fails at start. Its roles claim is the source of the access-roles, in the same form as `verify` reads it. The machine key of the service needs the project role `introspect`, as `auth` record 0015 tells. `issuer` must use `https`, as for `source`.
|
|
207
207
|
|
|
208
|
-
A staff token has no workspace claim.
|
|
208
|
+
A staff token has no workspace claim, as `auth` record 0015 item 4 tells. For a staff call, give the id of the organization `quickpipe` as `workspace` and set `staff: true`. `auth` grants the staff access-roles of a staff user in that organization.
|
|
209
|
+
|
|
210
|
+
| Caller | Workspace claim of the answer |
|
|
211
|
+
|--------|-------------------------------|
|
|
212
|
+
| `staff: true` | No claim, or the id of the organization `quickpipe` that the caller names |
|
|
213
|
+
| Other (user, machine) | The workspace of the caller. No claim is `bad-answer`. |
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export interface Endpoint {
|
|
2
|
+
url: string;
|
|
3
|
+
}
|
|
4
|
+
export interface Target {
|
|
5
|
+
url: string;
|
|
6
|
+
headers: Record<string, string>;
|
|
7
|
+
}
|
|
8
|
+
export declare function checkEndpoint(endpoint: Endpoint | undefined): void;
|
|
9
|
+
export declare function targetOf(issuer: string, endpoint: Endpoint | undefined): Target;
|
|
10
|
+
//# sourceMappingURL=endpoint.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"endpoint.d.ts","sourceRoot":"","sources":["../src/endpoint.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,QAAQ;IACvB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,MAAM;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAMD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS,GAAG,IAAI,CAGlE;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,SAAS,GAAG,MAAM,CAW/E"}
|
package/dist/endpoint.js
ADDED
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { trimmed } from './assertion.js';
|
|
2
|
+
const TOKEN_PATH = '/oauth/v2/token';
|
|
3
|
+
function hostOf(issuer) {
|
|
4
|
+
return new URL(issuer).host;
|
|
5
|
+
}
|
|
6
|
+
export function checkEndpoint(endpoint) {
|
|
7
|
+
if (endpoint === undefined)
|
|
8
|
+
return;
|
|
9
|
+
if (!URL.canParse(endpoint.url))
|
|
10
|
+
throw new Error('The endpoint must be a URL');
|
|
11
|
+
}
|
|
12
|
+
export function targetOf(issuer, endpoint) {
|
|
13
|
+
if (endpoint === undefined)
|
|
14
|
+
return { url: `${trimmed(issuer)}${TOKEN_PATH}`, headers: {} };
|
|
15
|
+
const host = hostOf(issuer);
|
|
16
|
+
return {
|
|
17
|
+
url: `${trimmed(endpoint.url)}${TOKEN_PATH}`,
|
|
18
|
+
headers: {
|
|
19
|
+
'x-zitadel-instance-host': host,
|
|
20
|
+
'x-zitadel-public-host': host,
|
|
21
|
+
'x-forwarded-proto': 'https',
|
|
22
|
+
},
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=endpoint.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"endpoint.js","sourceRoot":"","sources":["../src/endpoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,MAAM,UAAU,GAAG,iBAAiB,CAAC;AAarC,SAAS,MAAM,CAAC,MAAc;IAC5B,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,QAA8B;IAC1D,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO;IACnC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;AACjF,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,MAAc,EAAE,QAA8B;IACrE,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,UAAU,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IAC3F,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5B,OAAO;QACL,GAAG,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,UAAU,EAAE;QAC5C,OAAO,EAAE;YACP,yBAAyB,EAAE,IAAI;YAC/B,uBAAuB,EAAE,IAAI;YAC7B,mBAAmB,EAAE,OAAO;SAC7B;KACF,CAAC;AACJ,CAAC"}
|
package/dist/exchange.d.ts
CHANGED
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
import type { ClientKey } from './key.js';
|
|
2
|
+
import { type Endpoint } from './endpoint.js';
|
|
2
3
|
import type { Source } from './source.js';
|
|
3
4
|
export declare const EXCHANGE_ERRORS: readonly ["invalid_request", "invalid_grant", "unauthorized_client", "invalid_target"];
|
|
4
5
|
export type ExchangeError = (typeof EXCHANGE_ERRORS)[number] | 'unavailable';
|
|
5
6
|
export declare class ExchangeFailure extends Error {
|
|
6
7
|
readonly error: ExchangeError;
|
|
7
|
-
|
|
8
|
+
readonly detail?: string | undefined;
|
|
9
|
+
constructor(error: ExchangeError, detail?: string | undefined);
|
|
10
|
+
get reason(): string;
|
|
8
11
|
}
|
|
9
12
|
export interface ExchangeOptions {
|
|
10
13
|
key: ClientKey;
|
|
11
14
|
issuer: string;
|
|
15
|
+
endpoint?: Endpoint;
|
|
12
16
|
actor: Source;
|
|
13
17
|
fetch?: typeof fetch;
|
|
14
18
|
now?: () => number;
|
package/dist/exchange.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exchange.d.ts","sourceRoot":"","sources":["../src/exchange.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAkB1C,eAAO,MAAM,eAAe,wFAKlB,CAAC;AAEX,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC;AAE7E,qBAAa,eAAgB,SAAQ,KAAK;
|
|
1
|
+
{"version":3,"file":"exchange.d.ts","sourceRoot":"","sources":["../src/exchange.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAA2B,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAkB1C,eAAO,MAAM,eAAe,wFAKlB,CAAC;AAEX,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC;AAE7E,qBAAa,eAAgB,SAAQ,KAAK;IAEtC,QAAQ,CAAC,KAAK,EAAE,aAAa;IAC7B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM;gBADf,KAAK,EAAE,aAAa,EACpB,MAAM,CAAC,EAAE,MAAM,YAAA;IAK1B,IAAI,MAAM,IAAI,MAAM,CAEnB;CACF;AAED,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,SAAS,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,GAAI,SAAQ,QAAQ;IACnC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,YAAa,SAAQ,GAAG;IACvC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,IAAI;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAID,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAID,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;CAC9C;AAED,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,qBAAqB;IACpC,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;CACtD;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;CACtC;AAED,MAAM,WAAW,sBAAsB;IACrC,aAAa,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;CACxD;AA6FD,wBAAgB,SAAS,CAAC,OAAO,EAAE,eAAe,GAAG,SAAS,CAE7D;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,eAAe,GAAG,YAAY,CAEnE;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,eAAe,GAAG,qBAAqB,CAErF;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,aAAa,CAErE;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,eAAe,GAAG,sBAAsB,CAEvF"}
|
package/dist/exchange.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { assertion
|
|
1
|
+
import { assertion } from './assertion.js';
|
|
2
|
+
import { checkEndpoint, targetOf } from './endpoint.js';
|
|
2
3
|
import { checkSecure } from './url.js';
|
|
3
4
|
const GRANT = 'urn:ietf:params:oauth:grant-type:token-exchange';
|
|
4
5
|
const ACCESS_TOKEN = 'urn:ietf:params:oauth:token-type:access_token';
|
|
@@ -22,9 +23,14 @@ export const EXCHANGE_ERRORS = [
|
|
|
22
23
|
];
|
|
23
24
|
export class ExchangeFailure extends Error {
|
|
24
25
|
error;
|
|
25
|
-
|
|
26
|
-
|
|
26
|
+
detail;
|
|
27
|
+
constructor(error, detail) {
|
|
28
|
+
super(`The token exchange failed: ${detail === undefined ? error : `${error} (${detail})`}`);
|
|
27
29
|
this.error = error;
|
|
30
|
+
this.detail = detail;
|
|
31
|
+
}
|
|
32
|
+
get reason() {
|
|
33
|
+
return this.detail === undefined ? this.error : `${this.error} (${this.detail})`;
|
|
28
34
|
}
|
|
29
35
|
}
|
|
30
36
|
function isGrant(value) {
|
|
@@ -73,28 +79,38 @@ async function bodyOf(options, call, now) {
|
|
|
73
79
|
client_assertion: await assertion(options.key, options.issuer, now),
|
|
74
80
|
});
|
|
75
81
|
}
|
|
82
|
+
function networkDetailOf(error) {
|
|
83
|
+
if (error instanceof Error && error.name === 'TimeoutError')
|
|
84
|
+
return 'timeout';
|
|
85
|
+
const cause = error?.cause;
|
|
86
|
+
const code = typeof cause?.code === 'string' ? cause.code : undefined;
|
|
87
|
+
return code === undefined ? 'network error' : `network ${code}`;
|
|
88
|
+
}
|
|
76
89
|
async function send(options, body) {
|
|
77
|
-
const
|
|
90
|
+
const target = targetOf(options.issuer, options.endpoint);
|
|
91
|
+
const response = await (options.fetch ?? fetch)(target.url, {
|
|
78
92
|
method: 'POST',
|
|
79
93
|
body,
|
|
94
|
+
headers: target.headers,
|
|
80
95
|
redirect: 'error',
|
|
81
96
|
signal: AbortSignal.timeout(FETCH_TIMEOUT_MILLISECONDS),
|
|
82
|
-
}).catch(() => {
|
|
83
|
-
throw new ExchangeFailure('unavailable');
|
|
97
|
+
}).catch((error) => {
|
|
98
|
+
throw new ExchangeFailure('unavailable', networkDetailOf(error));
|
|
84
99
|
});
|
|
85
100
|
const parsed = await response.json().catch(() => undefined);
|
|
86
101
|
if (!response.ok)
|
|
87
|
-
throw new ExchangeFailure(errorOf(parsed));
|
|
102
|
+
throw new ExchangeFailure(errorOf(parsed), `status ${response.status}`);
|
|
88
103
|
return parsed;
|
|
89
104
|
}
|
|
90
105
|
function exchangeWith(options) {
|
|
91
106
|
checkSecure(options.issuer, 'The issuer');
|
|
107
|
+
checkEndpoint(options.endpoint);
|
|
92
108
|
const now = options.now ?? Date.now;
|
|
93
109
|
return async (call) => {
|
|
94
110
|
const startedAt = now();
|
|
95
111
|
const grant = await send(options, await bodyOf(options, call, startedAt));
|
|
96
112
|
if (!isGrant(grant))
|
|
97
|
-
throw new ExchangeFailure('unavailable');
|
|
113
|
+
throw new ExchangeFailure('unavailable', 'no token in the answer');
|
|
98
114
|
return {
|
|
99
115
|
value: grant.access_token,
|
|
100
116
|
expiresAt: new Date(startedAt + grant.expires_in * 1000),
|
package/dist/exchange.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exchange.js","sourceRoot":"","sources":["../src/exchange.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"exchange.js","sourceRoot":"","sources":["../src/exchange.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ export { KEY_SOURCE_FAILURE, Refusal, refusalKindOf } from './refusal.js';
|
|
|
5
5
|
export type { Reason, RefusalKind } from './refusal.js';
|
|
6
6
|
export { source } from './source.js';
|
|
7
7
|
export type { Options as SourceOptions, Source } from './source.js';
|
|
8
|
+
export type { Endpoint } from './endpoint.js';
|
|
8
9
|
export type { Actor, Client, Exchange, ExchangeKind, Kind, Token } from './token.js';
|
|
9
10
|
export { verifier } from './verifier.js';
|
|
10
11
|
export type { Options as VerifierOptions, Route, Verifier } from './verifier.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,YAAY,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC1E,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,YAAY,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACpE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,YAAY,EAAE,OAAO,IAAI,eAAe,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACjF,OAAO,EACL,eAAe,EACf,eAAe,EACf,SAAS,EACT,aAAa,EACb,sBAAsB,EACtB,YAAY,EACZ,qBAAqB,GACtB,MAAM,eAAe,CAAC;AACvB,YAAY,EACV,aAAa,EACb,eAAe,EACf,SAAS,EACT,SAAS,EACT,IAAI,EACJ,aAAa,EACb,aAAa,EACb,sBAAsB,EACtB,GAAG,EACH,YAAY,EACZ,YAAY,EACZ,qBAAqB,EACrB,QAAQ,GACT,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,YAAY,EACV,MAAM,IAAI,UAAU,EACpB,KAAK,IAAI,SAAS,EAClB,SAAS,EACT,MAAM,IAAI,UAAU,EACpB,OAAO,IAAI,WAAW,EACtB,MAAM,IAAI,UAAU,GACrB,MAAM,WAAW,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,YAAY,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC1E,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,YAAY,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACpE,YAAY,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,YAAY,EAAE,OAAO,IAAI,eAAe,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACjF,OAAO,EACL,eAAe,EACf,eAAe,EACf,SAAS,EACT,aAAa,EACb,sBAAsB,EACtB,YAAY,EACZ,qBAAqB,GACtB,MAAM,eAAe,CAAC;AACvB,YAAY,EACV,aAAa,EACb,eAAe,EACf,SAAS,EACT,SAAS,EACT,IAAI,EACJ,aAAa,EACb,aAAa,EACb,sBAAsB,EACtB,GAAG,EACH,YAAY,EACZ,YAAY,EACZ,qBAAqB,EACrB,QAAQ,GACT,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,YAAY,EACV,MAAM,IAAI,UAAU,EACpB,KAAK,IAAI,SAAS,EAClB,SAAS,EACT,MAAM,IAAI,UAAU,EACpB,OAAO,IAAI,WAAW,EACtB,MAAM,IAAI,UAAU,GACrB,MAAM,WAAW,CAAC"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE1E,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE1E,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIrC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EACL,eAAe,EACf,eAAe,EACf,SAAS,EACT,aAAa,EACb,sBAAsB,EACtB,YAAY,EACZ,qBAAqB,GACtB,MAAM,eAAe,CAAC;AAgBvB,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC"}
|
package/dist/live.d.ts
CHANGED
package/dist/live.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAY1C,MAAM,MAAM,KAAK,GAAG,SAAS,GAAG,cAAc,GAAG,UAAU,GAAG,kBAAkB,GAAG,YAAY,CAAC;AAEhG,MAAM,WAAW,MAAM;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACjC;AAED,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7C;AAED,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,SAAS,CAAC;IACf,SAAS,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC;IAC/D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,MAAM;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAY1C,MAAM,MAAM,KAAK,GAAG,SAAS,GAAG,cAAc,GAAG,UAAU,GAAG,kBAAkB,GAAG,YAAY,CAAC;AAEhG,MAAM,WAAW,MAAM;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACjC;AAED,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7C;AAED,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,SAAS,CAAC;IACf,SAAS,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC;IAC/D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,MAAM;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC7D;AAuFD,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,CAwDrD"}
|
package/dist/live.js
CHANGED
|
@@ -9,7 +9,13 @@ const WORKSPACE = 'urn:zitadel:iam:org:id';
|
|
|
9
9
|
const FETCH_TIMEOUT_MILLISECONDS = 5 * 1000;
|
|
10
10
|
const KEEP_MILLISECONDS = 10 * 1000;
|
|
11
11
|
const MAX_ANSWERS = 1000;
|
|
12
|
-
const keyOf = (caller, permission) => JSON.stringify([caller.subject, caller.workspace, permission]);
|
|
12
|
+
const keyOf = (caller, permission) => JSON.stringify([caller.subject, caller.workspace, caller.staff === true, permission]);
|
|
13
|
+
function workspaceMatches(answer, caller) {
|
|
14
|
+
const claim = answer[WORKSPACE];
|
|
15
|
+
if (caller.staff === true)
|
|
16
|
+
return claim === undefined || claim === caller.workspace;
|
|
17
|
+
return claim === caller.workspace;
|
|
18
|
+
}
|
|
13
19
|
function checkProject(project) {
|
|
14
20
|
if (project.trim() === '')
|
|
15
21
|
throw new Error('The project is not set');
|
|
@@ -44,7 +50,7 @@ function judge(answer, options, caller, permission) {
|
|
|
44
50
|
return refused('bad-answer');
|
|
45
51
|
if (answer.sub !== caller.subject)
|
|
46
52
|
return refused('bad-answer');
|
|
47
|
-
if (answer
|
|
53
|
+
if (!workspaceMatches(answer, caller))
|
|
48
54
|
return refused('bad-answer');
|
|
49
55
|
const accessRoles = parseAccessRoles(answer, options.project, caller.workspace);
|
|
50
56
|
if (accessRoles === undefined)
|
package/dist/live.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"live.js","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,eAAe,GAAG,sBAAsB,CAAC;AAC/C,MAAM,gBAAgB,GAAG,wDAAwD,CAAC;AAClF,MAAM,YAAY,GAAG,+CAA+C,CAAC;AACrE,MAAM,SAAS,GAAG,wBAAwB,CAAC;AAC3C,MAAM,0BAA0B,GAAG,CAAC,GAAG,IAAI,CAAC;AAC5C,MAAM,iBAAiB,GAAG,EAAE,GAAG,IAAI,CAAC;AACpC,MAAM,WAAW,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"live.js","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"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"}
|
package/dist/source.d.ts
CHANGED
package/dist/source.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source.d.ts","sourceRoot":"","sources":["../src/source.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"source.d.ts","sourceRoot":"","sources":["../src/source.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAA2B,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAQvE,MAAM,WAAW,OAAO;IACtB,GAAG,EAAE,SAAS,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,MAAM;IACrB,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CACxB;AA2DD,wBAAgB,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CA6C/C"}
|
package/dist/source.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { assertion
|
|
1
|
+
import { assertion } from './assertion.js';
|
|
2
|
+
import { checkEndpoint, targetOf } from './endpoint.js';
|
|
2
3
|
import { checkSecure } from './url.js';
|
|
3
4
|
const GRANT = 'urn:ietf:params:oauth:grant-type:jwt-bearer';
|
|
4
5
|
const RENEW_MARGIN_MILLISECONDS = 60 * 1000;
|
|
@@ -21,9 +22,11 @@ async function request(options, now) {
|
|
|
21
22
|
assertion: await assertion(options.key, options.issuer, now),
|
|
22
23
|
scope: scopeOf(options.audience),
|
|
23
24
|
});
|
|
24
|
-
const
|
|
25
|
+
const target = targetOf(options.issuer, options.endpoint);
|
|
26
|
+
const response = await (options.fetch ?? fetch)(target.url, {
|
|
25
27
|
method: 'POST',
|
|
26
28
|
body,
|
|
29
|
+
headers: target.headers,
|
|
27
30
|
redirect: 'error',
|
|
28
31
|
signal: AbortSignal.timeout(FETCH_TIMEOUT_MILLISECONDS),
|
|
29
32
|
});
|
|
@@ -41,6 +44,7 @@ function hold(grant, now) {
|
|
|
41
44
|
}
|
|
42
45
|
export function source(options) {
|
|
43
46
|
checkSecure(options.issuer, 'The issuer');
|
|
47
|
+
checkEndpoint(options.endpoint);
|
|
44
48
|
const now = options.now ?? Date.now;
|
|
45
49
|
let held;
|
|
46
50
|
let failure;
|
package/dist/source.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source.js","sourceRoot":"","sources":["../src/source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"source.js","sourceRoot":"","sources":["../src/source.ts"],"names":[],"mappings":"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"}
|