@c9up/warden 0.2.2 → 0.2.4
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 +5 -3
- package/dist/AttemptStore.d.ts +64 -0
- package/dist/AttemptStore.d.ts.map +1 -0
- package/dist/AttemptStore.js +117 -0
- package/dist/AttemptStore.js.map +1 -0
- package/dist/AuthManager.d.ts +5 -3
- package/dist/AuthManager.d.ts.map +1 -1
- package/dist/AuthManager.js +5 -4
- package/dist/AuthManager.js.map +1 -1
- package/dist/AuthRateLimiter.d.ts +44 -10
- package/dist/AuthRateLimiter.d.ts.map +1 -1
- package/dist/AuthRateLimiter.js +58 -73
- package/dist/AuthRateLimiter.js.map +1 -1
- package/dist/Authenticator.d.ts +8 -11
- package/dist/Authenticator.d.ts.map +1 -1
- package/dist/Authenticator.js +72 -9
- package/dist/Authenticator.js.map +1 -1
- package/dist/RememberMeToken.d.ts +15 -4
- package/dist/RememberMeToken.d.ts.map +1 -1
- package/dist/RememberMeToken.js +20 -7
- package/dist/RememberMeToken.js.map +1 -1
- package/dist/bouncer/evaluate.d.ts +0 -8
- package/dist/bouncer/evaluate.d.ts.map +1 -1
- package/dist/bouncer/evaluate.js +1 -1
- package/dist/bouncer/evaluate.js.map +1 -1
- package/dist/configure.d.ts +6 -0
- package/dist/configure.d.ts.map +1 -1
- package/dist/configure.js +2 -21
- package/dist/configure.js.map +1 -1
- package/dist/duration.d.ts.map +1 -1
- package/dist/duration.js +6 -0
- package/dist/duration.js.map +1 -1
- package/dist/errors.d.ts +6 -0
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +6 -0
- package/dist/errors.js.map +1 -1
- package/dist/index.d.ts +8 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/mfa/BackupCodesProvider.d.ts +8 -1
- package/dist/mfa/BackupCodesProvider.d.ts.map +1 -1
- package/dist/mfa/BackupCodesProvider.js +5 -7
- package/dist/mfa/BackupCodesProvider.js.map +1 -1
- package/dist/mfa/MfaManager.d.ts +18 -2
- package/dist/mfa/MfaManager.d.ts.map +1 -1
- package/dist/mfa/MfaManager.js +38 -35
- package/dist/mfa/MfaManager.js.map +1 -1
- package/dist/mfa/TotpProvider.d.ts +30 -6
- package/dist/mfa/TotpProvider.d.ts.map +1 -1
- package/dist/mfa/TotpProvider.js +48 -19
- package/dist/mfa/TotpProvider.js.map +1 -1
- package/dist/mfa/WebauthnProvider.d.ts.map +1 -1
- package/dist/mfa/WebauthnProvider.js +4 -1
- package/dist/mfa/WebauthnProvider.js.map +1 -1
- package/dist/middleware.d.ts +2 -0
- package/dist/middleware.d.ts.map +1 -1
- package/dist/middleware.js +3 -0
- package/dist/middleware.js.map +1 -1
- package/dist/native/generated.d.ts +0 -5
- package/dist/native/generated.d.ts.map +1 -1
- package/dist/native.d.ts +0 -2
- package/dist/native.d.ts.map +1 -1
- package/dist/native.js +0 -4
- package/dist/native.js.map +1 -1
- package/dist/strategies/JwtStrategy.d.ts +11 -1
- package/dist/strategies/JwtStrategy.d.ts.map +1 -1
- package/dist/strategies/JwtStrategy.js +9 -2
- package/dist/strategies/JwtStrategy.js.map +1 -1
- package/dist/strategies/SessionStrategy.d.ts +22 -0
- package/dist/strategies/SessionStrategy.d.ts.map +1 -1
- package/dist/strategies/SessionStrategy.js +31 -1
- package/dist/strategies/SessionStrategy.js.map +1 -1
- package/dist/stubs.d.ts +14 -0
- package/dist/stubs.d.ts.map +1 -0
- package/dist/stubs.js +15 -0
- package/dist/stubs.js.map +1 -0
- package/dist/vendor/nodeEnv.d.ts +5 -0
- package/dist/vendor/nodeEnv.d.ts.map +1 -0
- package/dist/vendor/nodeEnv.js +38 -0
- package/dist/vendor/nodeEnv.js.map +1 -0
- package/index.darwin-arm64.node +0 -0
- package/index.darwin-x64.node +0 -0
- package/index.linux-arm64-gnu.node +0 -0
- package/index.linux-x64-gnu.node +0 -0
- package/index.win32-x64-msvc.node +0 -0
- package/package.json +4 -3
- package/src/AttemptStore.ts +158 -0
- package/src/AuthManager.ts +9 -7
- package/src/AuthRateLimiter.ts +85 -80
- package/src/Authenticator.ts +92 -13
- package/src/RememberMeToken.ts +36 -8
- package/src/bouncer/evaluate.ts +1 -1
- package/src/configure.ts +8 -24
- package/src/duration.ts +8 -0
- package/src/errors.ts +11 -1
- package/src/index.ts +24 -3
- package/src/mfa/BackupCodesProvider.ts +13 -14
- package/src/mfa/MfaManager.ts +58 -43
- package/src/mfa/TotpProvider.ts +90 -22
- package/src/mfa/WebauthnProvider.ts +4 -1
- package/src/middleware.ts +9 -0
- package/src/native/generated.ts +0 -14
- package/src/native.ts +0 -5
- package/src/strategies/JwtStrategy.ts +20 -2
- package/src/strategies/SessionStrategy.ts +52 -1
- package/src/stubs.ts +16 -0
- package/src/vendor/nodeEnv.ts +37 -0
- package/stubs/config/auth.stub +23 -0
package/README.md
CHANGED
|
@@ -62,12 +62,14 @@ const recoveryCodes = await mfa.createBackupCodes(user.id) // show once
|
|
|
62
62
|
|
|
63
63
|
// At sign-in step-up: TOTP code OR a backup code (rate-limited)
|
|
64
64
|
if (await mfa.verify(user.id, submittedCode)) {
|
|
65
|
-
|
|
65
|
+
const token = auth.issueFor(user, 'jwt', { mfa: true }) // JWT: the token carries the step-up
|
|
66
|
+
// or, on a session guard: ctx.auth.use('web').markMfaVerified()
|
|
66
67
|
}
|
|
67
68
|
```
|
|
68
69
|
|
|
69
|
-
Gate sensitive routes — the middleware returns `403
|
|
70
|
-
|
|
70
|
+
Gate sensitive routes — the middleware returns `403 E_WARDEN_MFA_REQUIRED` unless
|
|
71
|
+
the request's credential completed the step-up (a JWT signed with `{ mfa: true }`,
|
|
72
|
+
or a session marked with `markMfaVerified()`):
|
|
71
73
|
|
|
72
74
|
```typescript
|
|
73
75
|
class TransferController {
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Where failed-attempt counters live — for the login throttle
|
|
3
|
+
* ({@link AuthRateLimiter}) and the MFA lockout (`MfaManager`).
|
|
4
|
+
*
|
|
5
|
+
* The count is taken BEFORE the credential is checked, by one atomic
|
|
6
|
+
* increment. Checking "is it locked?" first and recording the failure after
|
|
7
|
+
* let a burst of concurrent attempts all read "not locked" and all reach the
|
|
8
|
+
* verifier; an increment that returns the new count cannot be raced that way.
|
|
9
|
+
*
|
|
10
|
+
* The memory store is one process's; a cluster shares {@link RedisAttemptStore}
|
|
11
|
+
* so a lockout holds whichever instance the next attempt lands on.
|
|
12
|
+
*/
|
|
13
|
+
/** A window of attempts counted under one key. */
|
|
14
|
+
export interface AttemptCount {
|
|
15
|
+
/** Attempts in the current window, this one included. */
|
|
16
|
+
count: number;
|
|
17
|
+
/** Seconds until the window ends and the count starts over. */
|
|
18
|
+
resetSeconds: number;
|
|
19
|
+
}
|
|
20
|
+
export interface AttemptStore {
|
|
21
|
+
/**
|
|
22
|
+
* Count one attempt under `key`, atomically, and return the count so far.
|
|
23
|
+
* The window starts at the first attempt and lasts `windowSeconds`.
|
|
24
|
+
*/
|
|
25
|
+
increment(key: string, windowSeconds: number): Promise<AttemptCount>;
|
|
26
|
+
/** The attempts counted under `key` in its current window (0 if none). */
|
|
27
|
+
count(key: string): Promise<number>;
|
|
28
|
+
/** Forget `key`'s attempts — after a success. */
|
|
29
|
+
reset(key: string): Promise<void>;
|
|
30
|
+
}
|
|
31
|
+
/** In this process's memory, bounded. Not shared across instances. */
|
|
32
|
+
export declare class MemoryAttemptStore implements AttemptStore {
|
|
33
|
+
#private;
|
|
34
|
+
constructor(options?: {
|
|
35
|
+
maxKeys?: number;
|
|
36
|
+
});
|
|
37
|
+
increment(key: string, windowSeconds: number): Promise<AttemptCount>;
|
|
38
|
+
count(key: string): Promise<number>;
|
|
39
|
+
reset(key: string): Promise<void>;
|
|
40
|
+
}
|
|
41
|
+
/** What {@link RedisAttemptStore} needs of a Redis client (ioredis, node-redis). */
|
|
42
|
+
export interface AttemptRedisClient {
|
|
43
|
+
incr(key: string): Promise<number>;
|
|
44
|
+
expire(key: string, seconds: number): Promise<unknown>;
|
|
45
|
+
ttl(key: string): Promise<number>;
|
|
46
|
+
get(key: string): Promise<string | null>;
|
|
47
|
+
del(key: string): Promise<unknown>;
|
|
48
|
+
}
|
|
49
|
+
/** A client, or a resolver for one — resolved on the first attempt. */
|
|
50
|
+
export type AttemptRedisSource = AttemptRedisClient | (() => Promise<AttemptRedisClient>);
|
|
51
|
+
/**
|
|
52
|
+
* Shared across instances through Redis: `INCR`, then `EXPIRE` on the first
|
|
53
|
+
* hit of a window.
|
|
54
|
+
*/
|
|
55
|
+
export declare class RedisAttemptStore implements AttemptStore {
|
|
56
|
+
#private;
|
|
57
|
+
constructor(source: AttemptRedisSource, options?: {
|
|
58
|
+
prefix?: string;
|
|
59
|
+
});
|
|
60
|
+
increment(key: string, windowSeconds: number): Promise<AttemptCount>;
|
|
61
|
+
count(key: string): Promise<number>;
|
|
62
|
+
reset(key: string): Promise<void>;
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=AttemptStore.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AttemptStore.d.ts","sourceRoot":"","sources":["../src/AttemptStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,kDAAkD;AAClD,MAAM,WAAW,YAAY;IAC5B,yDAAyD;IACzD,KAAK,EAAE,MAAM,CAAC;IACd,+DAA+D;IAC/D,YAAY,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC5B;;;OAGG;IACH,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IACrE,0EAA0E;IAC1E,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACpC,iDAAiD;IACjD,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClC;AAKD,sEAAsE;AACtE,qBAAa,kBAAmB,YAAW,YAAY;;gBAI1C,OAAO,GAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAO;IAIxC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAgBpE,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUnC,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAoBvC;AAED,oFAAoF;AACpF,MAAM,WAAW,kBAAkB;IAClC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACvD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAClC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACzC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACnC;AAED,uEAAuE;AACvE,MAAM,MAAM,kBAAkB,GAC3B,kBAAkB,GAClB,CAAC,MAAM,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC;AAEvC;;;GAGG;AACH,qBAAa,iBAAkB,YAAW,YAAY;;gBAKzC,MAAM,EAAE,kBAAkB,EAAE,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAO;IAYnE,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAkBpE,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAOnC,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAIvC"}
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Where failed-attempt counters live — for the login throttle
|
|
3
|
+
* ({@link AuthRateLimiter}) and the MFA lockout (`MfaManager`).
|
|
4
|
+
*
|
|
5
|
+
* The count is taken BEFORE the credential is checked, by one atomic
|
|
6
|
+
* increment. Checking "is it locked?" first and recording the failure after
|
|
7
|
+
* let a burst of concurrent attempts all read "not locked" and all reach the
|
|
8
|
+
* verifier; an increment that returns the new count cannot be raced that way.
|
|
9
|
+
*
|
|
10
|
+
* The memory store is one process's; a cluster shares {@link RedisAttemptStore}
|
|
11
|
+
* so a lockout holds whichever instance the next attempt lands on.
|
|
12
|
+
*/
|
|
13
|
+
/** Most keys the memory store holds before it makes room. */
|
|
14
|
+
const DEFAULT_MAX_KEYS = 100_000;
|
|
15
|
+
/** In this process's memory, bounded. Not shared across instances. */
|
|
16
|
+
export class MemoryAttemptStore {
|
|
17
|
+
#entries = new Map();
|
|
18
|
+
#maxKeys;
|
|
19
|
+
constructor(options = {}) {
|
|
20
|
+
this.#maxKeys = options.maxKeys ?? DEFAULT_MAX_KEYS;
|
|
21
|
+
}
|
|
22
|
+
async increment(key, windowSeconds) {
|
|
23
|
+
const now = Date.now();
|
|
24
|
+
let entry = this.#entries.get(key);
|
|
25
|
+
if (entry === undefined || entry.resetAt <= now) {
|
|
26
|
+
this.#entries.delete(key);
|
|
27
|
+
this.#makeRoom(now);
|
|
28
|
+
entry = { count: 0, resetAt: now + windowSeconds * 1000 };
|
|
29
|
+
this.#entries.set(key, entry);
|
|
30
|
+
}
|
|
31
|
+
entry.count++;
|
|
32
|
+
return {
|
|
33
|
+
count: entry.count,
|
|
34
|
+
resetSeconds: Math.ceil((entry.resetAt - now) / 1000),
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
async count(key) {
|
|
38
|
+
const entry = this.#entries.get(key);
|
|
39
|
+
if (entry === undefined)
|
|
40
|
+
return 0;
|
|
41
|
+
if (entry.resetAt <= Date.now()) {
|
|
42
|
+
this.#entries.delete(key);
|
|
43
|
+
return 0;
|
|
44
|
+
}
|
|
45
|
+
return entry.count;
|
|
46
|
+
}
|
|
47
|
+
async reset(key) {
|
|
48
|
+
this.#entries.delete(key);
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* Keep the map under its bound: drop the expired windows, and if every
|
|
52
|
+
* window is still live, the oldest ones — a Map iterates in insertion
|
|
53
|
+
* order. Evicting a live window forgives its attempts; growing without
|
|
54
|
+
* bound would take the process down instead.
|
|
55
|
+
*/
|
|
56
|
+
#makeRoom(now) {
|
|
57
|
+
if (this.#entries.size < this.#maxKeys)
|
|
58
|
+
return;
|
|
59
|
+
for (const [key, entry] of this.#entries) {
|
|
60
|
+
if (entry.resetAt <= now)
|
|
61
|
+
this.#entries.delete(key);
|
|
62
|
+
}
|
|
63
|
+
for (const key of this.#entries.keys()) {
|
|
64
|
+
if (this.#entries.size < this.#maxKeys)
|
|
65
|
+
break;
|
|
66
|
+
this.#entries.delete(key);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* Shared across instances through Redis: `INCR`, then `EXPIRE` on the first
|
|
72
|
+
* hit of a window.
|
|
73
|
+
*/
|
|
74
|
+
export class RedisAttemptStore {
|
|
75
|
+
#source;
|
|
76
|
+
#resolved;
|
|
77
|
+
#prefix;
|
|
78
|
+
constructor(source, options = {}) {
|
|
79
|
+
this.#source = source;
|
|
80
|
+
this.#prefix = options.prefix ?? "warden:attempts";
|
|
81
|
+
}
|
|
82
|
+
async #client() {
|
|
83
|
+
if (this.#resolved)
|
|
84
|
+
return this.#resolved;
|
|
85
|
+
this.#resolved =
|
|
86
|
+
typeof this.#source === "function" ? await this.#source() : this.#source;
|
|
87
|
+
return this.#resolved;
|
|
88
|
+
}
|
|
89
|
+
async increment(key, windowSeconds) {
|
|
90
|
+
const client = await this.#client();
|
|
91
|
+
const namespaced = `${this.#prefix}:${key}`;
|
|
92
|
+
const count = await client.incr(namespaced);
|
|
93
|
+
if (count === 1) {
|
|
94
|
+
await client.expire(namespaced, windowSeconds);
|
|
95
|
+
return { count, resetSeconds: windowSeconds };
|
|
96
|
+
}
|
|
97
|
+
const ttl = await client.ttl(namespaced);
|
|
98
|
+
// A key with no expiry — the process died between its INCR and its
|
|
99
|
+
// EXPIRE — would count forever: give it the window it should have had.
|
|
100
|
+
if (ttl < 0) {
|
|
101
|
+
await client.expire(namespaced, windowSeconds);
|
|
102
|
+
return { count, resetSeconds: windowSeconds };
|
|
103
|
+
}
|
|
104
|
+
return { count, resetSeconds: ttl };
|
|
105
|
+
}
|
|
106
|
+
async count(key) {
|
|
107
|
+
const client = await this.#client();
|
|
108
|
+
const value = await client.get(`${this.#prefix}:${key}`);
|
|
109
|
+
const count = Number(value ?? 0);
|
|
110
|
+
return Number.isSafeInteger(count) ? count : 0;
|
|
111
|
+
}
|
|
112
|
+
async reset(key) {
|
|
113
|
+
const client = await this.#client();
|
|
114
|
+
await client.del(`${this.#prefix}:${key}`);
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
//# sourceMappingURL=AttemptStore.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AttemptStore.js","sourceRoot":"","sources":["../src/AttemptStore.ts"],"names":[],"mappings":"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"}
|
package/dist/AuthManager.d.ts
CHANGED
|
@@ -5,8 +5,6 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { Authenticator } from "./Authenticator.js";
|
|
7
7
|
import type { WardenContext } from "./middleware.js";
|
|
8
|
-
import { sanitizePayload } from "./sanitize.js";
|
|
9
|
-
export { sanitizePayload };
|
|
10
8
|
import { RightsResolver } from "./rights/RightsResolver.js";
|
|
11
9
|
import type { EffectivePermissions, Scope } from "./rights/types.js";
|
|
12
10
|
import type { SessionGuardState, SessionStore } from "./strategies/SessionStrategy.js";
|
|
@@ -139,7 +137,11 @@ export declare class AuthManager {
|
|
|
139
137
|
* / permissions / iat / exp / jti — are identical. Throws if the resolved
|
|
140
138
|
* strategy can't issue tokens (e.g. session / API-key strategies).
|
|
141
139
|
*/
|
|
142
|
-
issueFor(user: UserPayload, strategyName?: string
|
|
140
|
+
issueFor(user: UserPayload, strategyName?: string,
|
|
141
|
+
/** `{ mfa: true }` once the user completed an MFA step-up. */
|
|
142
|
+
options?: {
|
|
143
|
+
mfa?: boolean;
|
|
144
|
+
}): string;
|
|
143
145
|
/**
|
|
144
146
|
* Resolve a user's effective permissions for a scope (Epic 56). The single
|
|
145
147
|
* resolution entry the coarse helpers wrap — `hasRole`/`hasPermission`/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthManager.d.ts","sourceRoot":"","sources":["../src/AuthManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"AuthManager.d.ts","sourceRoot":"","sources":["../src/AuthManager.ts"],"names":[],"mappings":"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"}
|
package/dist/AuthManager.js
CHANGED
|
@@ -5,10 +5,9 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { Authenticator } from "./Authenticator.js";
|
|
7
7
|
import { WardenError } from "./errors.js";
|
|
8
|
-
import { sanitizePayload } from "./sanitize.js";
|
|
9
|
-
export { sanitizePayload };
|
|
10
8
|
import { MemoryRightsStore } from "./rights/MemoryRightsStore.js";
|
|
11
9
|
import { RightsResolver } from "./rights/RightsResolver.js";
|
|
10
|
+
import { sanitizePayload } from "./sanitize.js";
|
|
12
11
|
/**
|
|
13
12
|
* The event namespace for a guard, taken from its DRIVER.
|
|
14
13
|
*
|
|
@@ -158,14 +157,16 @@ export class AuthManager {
|
|
|
158
157
|
* / permissions / iat / exp / jti — are identical. Throws if the resolved
|
|
159
158
|
* strategy can't issue tokens (e.g. session / API-key strategies).
|
|
160
159
|
*/
|
|
161
|
-
issueFor(user, strategyName
|
|
160
|
+
issueFor(user, strategyName,
|
|
161
|
+
/** `{ mfa: true }` once the user completed an MFA step-up. */
|
|
162
|
+
options) {
|
|
162
163
|
const strategy = this.getStrategy(strategyName);
|
|
163
164
|
if (!isTokenIssuer(strategy)) {
|
|
164
165
|
throw new WardenError("STRATEGY_CANNOT_ISSUE", `Auth strategy '${strategyName ?? this.#default}' cannot issue tokens.`, {
|
|
165
166
|
hint: "issueFor() needs a token-minting strategy (e.g. JwtStrategy with signToken). Session / API-key strategies don't mint tokens.",
|
|
166
167
|
});
|
|
167
168
|
}
|
|
168
|
-
return strategy.signToken(user);
|
|
169
|
+
return strategy.signToken(user, options);
|
|
169
170
|
}
|
|
170
171
|
/**
|
|
171
172
|
* Resolve a user's effective permissions for a scope (Epic 56). The single
|
package/dist/AuthManager.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthManager.js","sourceRoot":"","sources":["../src/AuthManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"AuthManager.js","sourceRoot":"","sources":["../src/AuthManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,24 +1,58 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* AuthRateLimiter — brute force protection for login endpoints
|
|
2
|
+
* AuthRateLimiter — brute force protection for login endpoints, and the
|
|
3
|
+
* lockout behind `MfaManager.verify()`.
|
|
3
4
|
*
|
|
4
|
-
*
|
|
5
|
+
* An attempt is counted BEFORE the credential is checked, by one atomic
|
|
6
|
+
* increment per key ({@link AttemptStore}): checking first and recording the
|
|
7
|
+
* failure afterwards let a burst of concurrent attempts all pass the check.
|
|
8
|
+
* A success clears the keys.
|
|
9
|
+
*
|
|
10
|
+
* A login is counted under two keys, its IP and its identifier
|
|
11
|
+
* ({@link AuthRateLimiter.loginKeys}), so neither spraying one password across
|
|
12
|
+
* accounts from one address nor one account from many addresses gets through.
|
|
13
|
+
*
|
|
14
|
+
* const keys = AuthRateLimiter.loginKeys(ctx.request.ip(), email)
|
|
15
|
+
* if (!(await limiter.attempt(...keys)).allowed) return tooManyAttempts()
|
|
16
|
+
* const user = await verify(email, password)
|
|
17
|
+
* if (user) await limiter.clear(...keys)
|
|
5
18
|
*
|
|
6
19
|
* @implements MISS-26
|
|
7
20
|
*/
|
|
21
|
+
import { type AttemptStore } from "./AttemptStore.js";
|
|
8
22
|
export interface AuthRateLimiterConfig {
|
|
23
|
+
/** Attempts allowed per window, per key. Default 5. */
|
|
9
24
|
maxAttempts?: number;
|
|
25
|
+
/** How long a window lasts, in seconds. Default 900 (15 min). */
|
|
10
26
|
windowSeconds?: number;
|
|
27
|
+
/**
|
|
28
|
+
* Where the counts live. Default: this process's memory. A cluster passes a
|
|
29
|
+
* shared one ({@link RedisAttemptStore}), or a lockout holds only on the
|
|
30
|
+
* instance that counted it.
|
|
31
|
+
*/
|
|
32
|
+
store?: AttemptStore;
|
|
33
|
+
}
|
|
34
|
+
/** What {@link AuthRateLimiter.attempt} decided. */
|
|
35
|
+
export interface AttemptDecision {
|
|
36
|
+
/** Whether this attempt may go on to the credential check. */
|
|
37
|
+
allowed: boolean;
|
|
38
|
+
/** Attempts left on the most-used key. */
|
|
39
|
+
remaining: number;
|
|
40
|
+
/** Seconds until the most-used key's window ends. */
|
|
41
|
+
retryAfterSeconds: number;
|
|
11
42
|
}
|
|
12
43
|
export declare class AuthRateLimiter {
|
|
13
44
|
#private;
|
|
14
45
|
constructor(config?: AuthRateLimiterConfig);
|
|
15
|
-
/**
|
|
16
|
-
|
|
17
|
-
/**
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
46
|
+
/** The keys a login attempt is counted under: its IP and its identifier. */
|
|
47
|
+
static loginKeys(ip: string, identifier: string): string[];
|
|
48
|
+
/**
|
|
49
|
+
* Count an attempt under every key, and say whether it may go on. Call it
|
|
50
|
+
* BEFORE checking the credential; a refused attempt must not reach it.
|
|
51
|
+
*/
|
|
52
|
+
attempt(...keys: string[]): Promise<AttemptDecision>;
|
|
53
|
+
/** Whether any key has used up its attempts, without counting one. */
|
|
54
|
+
isBlocked(...keys: string[]): Promise<boolean>;
|
|
55
|
+
/** Forget the keys' attempts — after a success. */
|
|
56
|
+
clear(...keys: string[]): Promise<void>;
|
|
23
57
|
}
|
|
24
58
|
//# sourceMappingURL=AuthRateLimiter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthRateLimiter.d.ts","sourceRoot":"","sources":["../src/AuthRateLimiter.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"AuthRateLimiter.d.ts","sourceRoot":"","sources":["../src/AuthRateLimiter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,KAAK,YAAY,EAAsB,MAAM,mBAAmB,CAAC;AAG1E,MAAM,WAAW,qBAAqB;IACrC,uDAAuD;IACvD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iEAAiE;IACjE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,KAAK,CAAC,EAAE,YAAY,CAAC;CACrB;AAED,oDAAoD;AACpD,MAAM,WAAW,eAAe;IAC/B,8DAA8D;IAC9D,OAAO,EAAE,OAAO,CAAC;IACjB,0CAA0C;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,qDAAqD;IACrD,iBAAiB,EAAE,MAAM,CAAC;CAC1B;AAED,qBAAa,eAAe;;gBAKf,MAAM,GAAE,qBAA0B;IAS9C,4EAA4E;IAC5E,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE;IAI1D;;;OAGG;IACG,OAAO,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAe1D,sEAAsE;IAChE,SAAS,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAKpD,mDAAmD;IAC7C,KAAK,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAG7C"}
|
package/dist/AuthRateLimiter.js
CHANGED
|
@@ -1,88 +1,73 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* AuthRateLimiter — brute force protection for login endpoints
|
|
2
|
+
* AuthRateLimiter — brute force protection for login endpoints, and the
|
|
3
|
+
* lockout behind `MfaManager.verify()`.
|
|
3
4
|
*
|
|
4
|
-
*
|
|
5
|
+
* An attempt is counted BEFORE the credential is checked, by one atomic
|
|
6
|
+
* increment per key ({@link AttemptStore}): checking first and recording the
|
|
7
|
+
* failure afterwards let a burst of concurrent attempts all pass the check.
|
|
8
|
+
* A success clears the keys.
|
|
9
|
+
*
|
|
10
|
+
* A login is counted under two keys, its IP and its identifier
|
|
11
|
+
* ({@link AuthRateLimiter.loginKeys}), so neither spraying one password across
|
|
12
|
+
* accounts from one address nor one account from many addresses gets through.
|
|
13
|
+
*
|
|
14
|
+
* const keys = AuthRateLimiter.loginKeys(ctx.request.ip(), email)
|
|
15
|
+
* if (!(await limiter.attempt(...keys)).allowed) return tooManyAttempts()
|
|
16
|
+
* const user = await verify(email, password)
|
|
17
|
+
* if (user) await limiter.clear(...keys)
|
|
5
18
|
*
|
|
6
19
|
* @implements MISS-26
|
|
7
20
|
*/
|
|
21
|
+
import { MemoryAttemptStore } from "./AttemptStore.js";
|
|
22
|
+
import { WardenError } from "./errors.js";
|
|
8
23
|
export class AuthRateLimiter {
|
|
9
24
|
#maxAttempts;
|
|
10
|
-
#
|
|
11
|
-
#store
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
this.#
|
|
15
|
-
|
|
16
|
-
this.#maxAttempts = 1;
|
|
17
|
-
this.#window = (config?.windowSeconds ?? 900) * 1000;
|
|
18
|
-
if (this.#window <= 0)
|
|
19
|
-
this.#window = 900_000; // prevent bypass via 0/negative
|
|
20
|
-
}
|
|
21
|
-
/** Check if an attempt is allowed. Returns false if rate limited. */
|
|
22
|
-
check(ip, identifier) {
|
|
23
|
-
const now = Date.now();
|
|
24
|
-
const ipNorm = normalizeIp(ip);
|
|
25
|
-
const identifierNorm = normalizeIdentifier(identifier);
|
|
26
|
-
// Dual key: limit both by IP and by identifier (email)
|
|
27
|
-
const ipKey = `ip:${ipNorm}`;
|
|
28
|
-
const idKey = `id:${identifierNorm}`;
|
|
29
|
-
return this.#checkKey(ipKey, now) && this.#checkKey(idKey, now);
|
|
25
|
+
#windowSeconds;
|
|
26
|
+
#store;
|
|
27
|
+
constructor(config = {}) {
|
|
28
|
+
this.#maxAttempts = positiveInteger("maxAttempts", config.maxAttempts ?? 5);
|
|
29
|
+
this.#windowSeconds = positiveInteger("windowSeconds", config.windowSeconds ?? 900);
|
|
30
|
+
this.#store = config.store ?? new MemoryAttemptStore();
|
|
30
31
|
}
|
|
31
|
-
/**
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
const ipNorm = normalizeIp(ip);
|
|
35
|
-
const identifierNorm = normalizeIdentifier(identifier);
|
|
36
|
-
this.#increment(`ip:${ipNorm}`, now);
|
|
37
|
-
this.#increment(`id:${identifierNorm}`, now);
|
|
32
|
+
/** The keys a login attempt is counted under: its IP and its identifier. */
|
|
33
|
+
static loginKeys(ip, identifier) {
|
|
34
|
+
return [`ip:${ip.trim()}`, `id:${identifier.trim().toLowerCase()}`];
|
|
38
35
|
}
|
|
39
|
-
/**
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
this.#store.
|
|
36
|
+
/**
|
|
37
|
+
* Count an attempt under every key, and say whether it may go on. Call it
|
|
38
|
+
* BEFORE checking the credential; a refused attempt must not reach it.
|
|
39
|
+
*/
|
|
40
|
+
async attempt(...keys) {
|
|
41
|
+
const counts = await Promise.all(keys.map((key) => this.#store.increment(key, this.#windowSeconds)));
|
|
42
|
+
let highest = { count: 0, resetSeconds: 0 };
|
|
43
|
+
for (const counted of counts) {
|
|
44
|
+
if (counted.count > highest.count)
|
|
45
|
+
highest = counted;
|
|
46
|
+
}
|
|
47
|
+
return {
|
|
48
|
+
allowed: highest.count <= this.#maxAttempts,
|
|
49
|
+
remaining: Math.max(0, this.#maxAttempts - highest.count),
|
|
50
|
+
retryAfterSeconds: highest.resetSeconds,
|
|
51
|
+
};
|
|
45
52
|
}
|
|
46
|
-
/**
|
|
47
|
-
|
|
48
|
-
const
|
|
49
|
-
|
|
50
|
-
const ipEntry = this.#store.get(`ip:${ipNorm}`);
|
|
51
|
-
const idEntry = this.#store.get(`id:${identifierNorm}`);
|
|
52
|
-
const ipRemaining = ipEntry
|
|
53
|
-
? Math.max(0, this.#maxAttempts - ipEntry.count)
|
|
54
|
-
: this.#maxAttempts;
|
|
55
|
-
const idRemaining = idEntry
|
|
56
|
-
? Math.max(0, this.#maxAttempts - idEntry.count)
|
|
57
|
-
: this.#maxAttempts;
|
|
58
|
-
return Math.min(ipRemaining, idRemaining);
|
|
53
|
+
/** Whether any key has used up its attempts, without counting one. */
|
|
54
|
+
async isBlocked(...keys) {
|
|
55
|
+
const counts = await Promise.all(keys.map((key) => this.#store.count(key)));
|
|
56
|
+
return counts.some((count) => count >= this.#maxAttempts);
|
|
59
57
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
return true;
|
|
64
|
-
return entry.count < this.#maxAttempts;
|
|
58
|
+
/** Forget the keys' attempts — after a success. */
|
|
59
|
+
async clear(...keys) {
|
|
60
|
+
await Promise.all(keys.map((key) => this.#store.reset(key)));
|
|
65
61
|
}
|
|
66
|
-
#increment(key, now) {
|
|
67
|
-
// Evict expired entries when store grows too large (prevent OOM)
|
|
68
|
-
if (this.#store.size > this.#maxStoreSize) {
|
|
69
|
-
for (const [k, v] of this.#store) {
|
|
70
|
-
if (v.resetAt < now)
|
|
71
|
-
this.#store.delete(k);
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
let entry = this.#store.get(key);
|
|
75
|
-
if (!entry || entry.resetAt < now) {
|
|
76
|
-
entry = { count: 0, resetAt: now + this.#window };
|
|
77
|
-
this.#store.set(key, entry);
|
|
78
|
-
}
|
|
79
|
-
entry.count++;
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
|
-
function normalizeIdentifier(identifier) {
|
|
83
|
-
return identifier.trim().toLowerCase();
|
|
84
62
|
}
|
|
85
|
-
|
|
86
|
-
|
|
63
|
+
/**
|
|
64
|
+
* A limit that would not limit is refused: `Infinity` attempts or a window of
|
|
65
|
+
* 0 turned the protection off, silently.
|
|
66
|
+
*/
|
|
67
|
+
function positiveInteger(field, value) {
|
|
68
|
+
if (!Number.isSafeInteger(value) || value <= 0) {
|
|
69
|
+
throw new WardenError("INVALID_CONFIG", `AuthRateLimiter ${field} must be a positive whole number, got ${String(value)}`);
|
|
70
|
+
}
|
|
71
|
+
return value;
|
|
87
72
|
}
|
|
88
73
|
//# sourceMappingURL=AuthRateLimiter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthRateLimiter.js","sourceRoot":"","sources":["../src/AuthRateLimiter.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"AuthRateLimiter.js","sourceRoot":"","sources":["../src/AuthRateLimiter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAqB,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAyB1C,MAAM,OAAO,eAAe;IAClB,YAAY,CAAS;IACrB,cAAc,CAAS;IACvB,MAAM,CAAe;IAE9B,YAAY,SAAgC,EAAE;QAC7C,IAAI,CAAC,YAAY,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC;QAC5E,IAAI,CAAC,cAAc,GAAG,eAAe,CACpC,eAAe,EACf,MAAM,CAAC,aAAa,IAAI,GAAG,CAC3B,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,IAAI,IAAI,kBAAkB,EAAE,CAAC;IACxD,CAAC;IAED,4EAA4E;IAC5E,MAAM,CAAC,SAAS,CAAC,EAAU,EAAE,UAAkB;QAC9C,OAAO,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACrE,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,OAAO,CAAC,GAAG,IAAc;QAC9B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC,CAClE,CAAC;QACF,IAAI,OAAO,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;QAC5C,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE,CAAC;YAC9B,IAAI,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK;gBAAE,OAAO,GAAG,OAAO,CAAC;QACtD,CAAC;QACD,OAAO;YACN,OAAO,EAAE,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,YAAY;YAC3C,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC;YACzD,iBAAiB,EAAE,OAAO,CAAC,YAAY;SACvC,CAAC;IACH,CAAC;IAED,sEAAsE;IACtE,KAAK,CAAC,SAAS,CAAC,GAAG,IAAc;QAChC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC5E,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,IAAI,CAAC,YAAY,CAAC,CAAC;IAC3D,CAAC;IAED,mDAAmD;IACnD,KAAK,CAAC,KAAK,CAAC,GAAG,IAAc;QAC5B,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC;CACD;AAED;;;GAGG;AACH,SAAS,eAAe,CAAC,KAAa,EAAE,KAAa;IACpD,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,WAAW,CACpB,gBAAgB,EAChB,mBAAmB,KAAK,yCAAyC,MAAM,CAAC,KAAK,CAAC,EAAE,CAChF,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC"}
|
package/dist/Authenticator.d.ts
CHANGED
|
@@ -26,6 +26,8 @@ export declare const API_KEY_GUARD_NAMES: readonly string[];
|
|
|
26
26
|
export interface ExtractedCredentials {
|
|
27
27
|
bearerToken: string;
|
|
28
28
|
apiKey: string;
|
|
29
|
+
/** The whole `Authorization` header when its scheme is Basic, else `""`. */
|
|
30
|
+
basicAuth: string;
|
|
29
31
|
session: SessionStore | undefined;
|
|
30
32
|
}
|
|
31
33
|
/**
|
|
@@ -43,17 +45,6 @@ export interface AuthAttempt {
|
|
|
43
45
|
attemptCount: number;
|
|
44
46
|
crashCount: number;
|
|
45
47
|
}
|
|
46
|
-
/**
|
|
47
|
-
* Try each declared guard in order — session guards via `verifyWithContext()`,
|
|
48
|
-
* others via `verify(token)` with native-first credential fallback.
|
|
49
|
-
* Distinguishes crashes (strategy threw / `strategyCrash`) from credential
|
|
50
|
-
* rejections so the caller can return 500 vs 401.
|
|
51
|
-
*/
|
|
52
|
-
export declare function tryAuthenticate(auth: AuthManager, strategies: string[], creds: {
|
|
53
|
-
bearerToken: string;
|
|
54
|
-
apiKey: string;
|
|
55
|
-
session: SessionStore | undefined;
|
|
56
|
-
}): Promise<AuthAttempt>;
|
|
57
48
|
/**
|
|
58
49
|
* A named-guard accessor (AdonisJS `auth.use('web')`). Exposes the stateful
|
|
59
50
|
* `login()`/`logout()` for session guards plus per-guard `authenticate()`.
|
|
@@ -113,6 +104,12 @@ export declare class GuardAccessor {
|
|
|
113
104
|
* permission, not leave it in place.
|
|
114
105
|
*/
|
|
115
106
|
login(user: UserPayload, remember?: boolean): Promise<void>;
|
|
107
|
+
/**
|
|
108
|
+
* Record that this session completed an MFA step-up, once
|
|
109
|
+
* `MfaManager.verify()` succeeded — what `@RequireMfa()` requires (session
|
|
110
|
+
* guards; a JWT carries it as `issueFor(user, guard, { mfa: true })`).
|
|
111
|
+
*/
|
|
112
|
+
markMfaVerified(): void;
|
|
116
113
|
/** Log the current user out of this guard (session guards). */
|
|
117
114
|
logout(): Promise<void>;
|
|
118
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Authenticator.d.ts","sourceRoot":"","sources":["../src/Authenticator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACX,WAAW,EACX,UAAU,EAEV,WAAW,EACX,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,
|
|
1
|
+
{"version":3,"file":"Authenticator.d.ts","sourceRoot":"","sources":["../src/Authenticator.ts"],"names":[],"mappings":"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"}
|