@sebastienrousseau/crypto-server 0.0.34 → 0.0.36
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 +128 -73
- package/dist/@types/types.d.ts +1 -0
- package/dist/@types/types.d.ts.map +1 -1
- package/dist/config/auth-policy.d.ts +1 -0
- package/dist/config/auth-policy.d.ts.map +1 -1
- package/dist/config/auth-policy.js +10 -4
- package/dist/config/constants.d.ts +7 -2
- package/dist/config/constants.d.ts.map +1 -1
- package/dist/config/constants.js +15 -18
- package/dist/config/env.d.ts +9 -2
- package/dist/config/env.d.ts.map +1 -1
- package/dist/config/env.js +59 -36
- package/dist/config/settings.d.ts +3 -0
- package/dist/config/settings.d.ts.map +1 -0
- package/dist/config/settings.js +24 -0
- package/dist/enterprise/metering.d.ts +5 -5
- package/dist/enterprise/metering.d.ts.map +1 -1
- package/dist/enterprise/metering.js +36 -76
- package/dist/enterprise/types.d.ts +0 -11
- package/dist/enterprise/types.d.ts.map +1 -1
- package/dist/index.js +9 -35
- package/dist/lib/audit.d.ts +18 -0
- package/dist/lib/audit.d.ts.map +1 -0
- package/dist/lib/audit.js +57 -0
- package/dist/lib/auth.d.ts +4 -0
- package/dist/lib/auth.d.ts.map +1 -1
- package/dist/lib/auth.js +15 -1
- package/dist/lib/crypto-workers.d.ts +27 -0
- package/dist/lib/crypto-workers.d.ts.map +1 -0
- package/dist/lib/crypto-workers.js +46 -0
- package/dist/lib/http-metrics.d.ts +13 -0
- package/dist/lib/http-metrics.d.ts.map +1 -0
- package/dist/lib/http-metrics.js +45 -0
- package/dist/lib/key-store.d.ts +15 -1
- package/dist/lib/key-store.d.ts.map +1 -1
- package/dist/lib/key-store.js +128 -44
- package/dist/lib/kms-owners.d.ts +9 -0
- package/dist/lib/kms-owners.d.ts.map +1 -0
- package/dist/lib/kms-owners.js +80 -0
- package/dist/lib/kms-providers.d.ts +15 -0
- package/dist/lib/kms-providers.d.ts.map +1 -0
- package/dist/lib/kms-providers.js +99 -0
- package/dist/lib/lifecycle.d.ts +16 -0
- package/dist/lib/lifecycle.d.ts.map +1 -0
- package/dist/lib/lifecycle.js +50 -0
- package/dist/lib/logger.d.ts +5 -1
- package/dist/lib/logger.d.ts.map +1 -1
- package/dist/lib/logger.js +34 -15
- package/dist/lib/opaque-store.d.ts +13 -0
- package/dist/lib/opaque-store.d.ts.map +1 -1
- package/dist/lib/opaque-store.js +27 -2
- package/dist/lib/problem.d.ts +8 -0
- package/dist/lib/problem.d.ts.map +1 -1
- package/dist/lib/problem.js +25 -15
- package/dist/lib/readiness.d.ts +12 -0
- package/dist/lib/readiness.d.ts.map +1 -0
- package/dist/lib/readiness.js +17 -0
- package/dist/lib/telemetry.d.ts +1 -1
- package/dist/lib/telemetry.d.ts.map +1 -1
- package/dist/lib/telemetry.js +45 -73
- package/dist/routes/index.d.ts +3 -0
- package/dist/routes/index.d.ts.map +1 -1
- package/dist/routes/index.js +19 -12
- package/dist/routes/probes.d.ts.map +1 -1
- package/dist/routes/probes.js +4 -10
- package/dist/routes/v1/decrypt.d.ts.map +1 -1
- package/dist/routes/v1/decrypt.js +2 -1
- package/dist/routes/v1/encrypt.d.ts.map +1 -1
- package/dist/routes/v1/encrypt.js +2 -1
- package/dist/routes/v1/generate.d.ts.map +1 -1
- package/dist/routes/v1/generate.js +3 -2
- package/dist/routes/v1/index.js +2 -2
- package/dist/routes/v1/revoke.d.ts.map +1 -1
- package/dist/routes/v1/revoke.js +3 -2
- package/dist/routes/v1/verify.d.ts.map +1 -1
- package/dist/routes/v1/verify.js +27 -12
- package/dist/routes/v2/compliance.js +1 -1
- package/dist/routes/v2/hpke.d.ts.map +1 -1
- package/dist/routes/v2/hpke.js +8 -4
- package/dist/routes/v2/keys.d.ts.map +1 -1
- package/dist/routes/v2/keys.js +24 -2
- package/dist/routes/v2/kms.d.ts +8 -4
- package/dist/routes/v2/kms.d.ts.map +1 -1
- package/dist/routes/v2/kms.js +81 -82
- package/dist/routes/v2/opaque.d.ts.map +1 -1
- package/dist/routes/v2/opaque.js +26 -4
- package/dist/routes/v2/pq-hash-sign.d.ts.map +1 -1
- package/dist/routes/v2/pq-hash-sign.js +2 -4
- package/dist/routes/v2/pq-sign.d.ts.map +1 -1
- package/dist/routes/v2/pq-sign.js +2 -4
- package/dist/routes/v2/pq.d.ts.map +1 -1
- package/dist/routes/v2/pq.js +10 -9
- package/dist/server.d.ts +1 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +40 -15
- package/dist/utils/keys.d.ts +1 -0
- package/dist/utils/keys.d.ts.map +1 -1
- package/dist/utils/keys.js +9 -2
- package/dist/utils/route-helpers.d.ts.map +1 -1
- package/dist/utils/route-helpers.js +5 -10
- package/dist/utils/validation.d.ts.map +1 -1
- package/dist/utils/validation.js +16 -30
- package/package.json +6 -8
- package/dist/lib/kdf-runner.d.ts +0 -18
- package/dist/lib/kdf-runner.d.ts.map +0 -1
- package/dist/lib/kdf-runner.js +0 -27
package/dist/config/env.js
CHANGED
|
@@ -1,17 +1,32 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.ConfigError = void 0;
|
|
4
|
+
exports.docsEnabled = docsEnabled;
|
|
5
|
+
exports.v1Enabled = v1Enabled;
|
|
4
6
|
exports.loadConfig = loadConfig;
|
|
5
7
|
const auth_policy_1 = require("./auth-policy");
|
|
6
|
-
|
|
7
|
-
|
|
8
|
+
const constants_1 = require("./constants");
|
|
9
|
+
const settings_1 = require("./settings");
|
|
10
|
+
const kms_providers_1 = require("../lib/kms-providers");
|
|
11
|
+
const key_store_1 = require("../lib/key-store");
|
|
12
|
+
class ConfigError extends Error {
|
|
13
|
+
name = "ConfigError";
|
|
8
14
|
}
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
15
|
+
exports.ConfigError = ConfigError;
|
|
16
|
+
function docsEnabled(env = process.env) {
|
|
17
|
+
return (0, settings_1.flagSetting)(env, "DOCS_ENABLED", true);
|
|
18
|
+
}
|
|
19
|
+
function v1Enabled(env = process.env) {
|
|
20
|
+
return (0, settings_1.flagSetting)(env, "V1_ENABLED", true);
|
|
21
|
+
}
|
|
22
|
+
function attempt(errors, fallback, parse) {
|
|
23
|
+
try {
|
|
24
|
+
return parse();
|
|
25
|
+
}
|
|
26
|
+
catch (e) {
|
|
27
|
+
errors.push(e.message);
|
|
28
|
+
return fallback;
|
|
13
29
|
}
|
|
14
|
-
return port;
|
|
15
30
|
}
|
|
16
31
|
function parseCsvList(val) {
|
|
17
32
|
if (!val)
|
|
@@ -22,13 +37,8 @@ function parseCsvList(val) {
|
|
|
22
37
|
.filter((s) => s.length > 0);
|
|
23
38
|
return entries.length > 0 ? entries : false;
|
|
24
39
|
}
|
|
25
|
-
function
|
|
40
|
+
function enumErrors(protocol, nodeEnv, logLevel) {
|
|
26
41
|
const errors = [];
|
|
27
|
-
const host = optional("HOST", "localhost");
|
|
28
|
-
const portStr = optional("PORT", "3000");
|
|
29
|
-
const protocol = optional("PROTOCOL", "http");
|
|
30
|
-
const nodeEnv = optional("NODE_ENV", "development");
|
|
31
|
-
const logLevel = optional("LOG_LEVEL", "info");
|
|
32
42
|
if (!["http", "https"].includes(protocol)) {
|
|
33
43
|
errors.push(`PROTOCOL must be "http" or "https", got "${protocol}"`);
|
|
34
44
|
}
|
|
@@ -38,37 +48,50 @@ function loadConfig() {
|
|
|
38
48
|
if (!["error", "warn", "info", "debug"].includes(logLevel)) {
|
|
39
49
|
errors.push(`LOG_LEVEL must be one of error|warn|info|debug, got "${logLevel}"`);
|
|
40
50
|
}
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
errors
|
|
51
|
+
return errors;
|
|
52
|
+
}
|
|
53
|
+
function checkedSettings(env, errors) {
|
|
54
|
+
return {
|
|
55
|
+
port: attempt(errors, 3000, () => (0, settings_1.integerSetting)(env, "PORT", 3000, 0, 65535)),
|
|
56
|
+
shutdownTimeoutMs: attempt(errors, 30000, () => (0, settings_1.integerSetting)(env, "SHUTDOWN_TIMEOUT_MS", 30000, 1)),
|
|
57
|
+
rateLimitMax: attempt(errors, 0, () => (0, constants_1.resolveRateLimitMax)(env)),
|
|
58
|
+
docsEnabled: attempt(errors, true, () => docsEnabled(env)),
|
|
59
|
+
v1Enabled: attempt(errors, true, () => v1Enabled(env)),
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
function openSettings(env) {
|
|
63
|
+
return {
|
|
64
|
+
host: env["HOST"] ?? "localhost",
|
|
65
|
+
apiKey: env["CRYPTO_API_KEY"] || undefined,
|
|
66
|
+
corsOrigins: parseCsvList(env["CORS_ORIGIN"]),
|
|
67
|
+
trustProxy: parseCsvList(env["TRUSTED_PROXY_CIDRS"]),
|
|
68
|
+
keyDir: env["CRYPTO_KEY_DIR"] || undefined,
|
|
69
|
+
keyOutDir: env["CRYPTO_KEY_OUT_DIR"] || undefined,
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
function loadConfig(env = process.env) {
|
|
73
|
+
const protocol = (env["PROTOCOL"] ?? "http");
|
|
74
|
+
const nodeEnv = (env["NODE_ENV"] ?? "development");
|
|
75
|
+
const logLevel = (env["LOG_LEVEL"] ?? "info");
|
|
76
|
+
const errors = enumErrors(protocol, nodeEnv, logLevel);
|
|
77
|
+
for (const check of [auth_policy_1.authConfigError, kms_providers_1.kmsConfigError, key_store_1.keyStoreConfigError]) {
|
|
78
|
+
const error = check(env);
|
|
79
|
+
if (error)
|
|
80
|
+
errors.push(error);
|
|
50
81
|
}
|
|
82
|
+
const checked = checkedSettings(env, errors);
|
|
51
83
|
if (errors.length > 0) {
|
|
52
|
-
|
|
84
|
+
throw new ConfigError([
|
|
53
85
|
"Configuration validation failed:",
|
|
54
86
|
...errors.map((e) => ` - ${e}`),
|
|
55
|
-
].join("\n");
|
|
56
|
-
console.error(msg);
|
|
57
|
-
process.exit(1);
|
|
87
|
+
].join("\n"));
|
|
58
88
|
}
|
|
59
89
|
return Object.freeze({
|
|
60
|
-
|
|
61
|
-
port,
|
|
90
|
+
...openSettings(env),
|
|
62
91
|
protocol,
|
|
63
92
|
nodeEnv,
|
|
64
93
|
logLevel,
|
|
65
|
-
|
|
66
|
-
corsOrigins: parseCsvList(process.env["CORS_ORIGIN"]),
|
|
67
|
-
trustProxy: parseCsvList(process.env["TRUSTED_PROXY_CIDRS"]),
|
|
68
|
-
keyDir: process.env["CRYPTO_KEY_DIR"] || undefined,
|
|
69
|
-
keyOutDir: process.env["CRYPTO_KEY_OUT_DIR"] || undefined,
|
|
70
|
-
shutdownTimeoutMs: parseInt(optional("SHUTDOWN_TIMEOUT_MS", "30000"), 10),
|
|
94
|
+
...checked,
|
|
71
95
|
});
|
|
72
96
|
}
|
|
73
|
-
exports.config = loadConfig();
|
|
74
97
|
//# sourceMappingURL=env.js.map
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
export declare function integerSetting(env: NodeJS.ProcessEnv, name: string, fallback: number, min: number, max?: number): number;
|
|
2
|
+
export declare function flagSetting(env: NodeJS.ProcessEnv, name: string, fallback: boolean): boolean;
|
|
3
|
+
//# sourceMappingURL=settings.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/config/settings.ts"],"names":[],"mappings":"AAkBA,wBAAgB,cAAc,CAC5B,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,GAAG,GAAE,MAAgC,GACpC,MAAM,CAUR;AAQD,wBAAgB,WAAW,CACzB,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO,GAChB,OAAO,CAOT"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.integerSetting = integerSetting;
|
|
4
|
+
exports.flagSetting = flagSetting;
|
|
5
|
+
function integerSetting(env, name, fallback, min, max = Number.MAX_SAFE_INTEGER) {
|
|
6
|
+
const raw = env[name];
|
|
7
|
+
if (raw === undefined || raw === "")
|
|
8
|
+
return fallback;
|
|
9
|
+
const value = /^\d+$/.test(raw) ? Number(raw) : NaN;
|
|
10
|
+
if (!Number.isSafeInteger(value) || value < min || value > max) {
|
|
11
|
+
throw new Error(`${name} must be a whole number from ${min} to ${max}, got "${raw}"`);
|
|
12
|
+
}
|
|
13
|
+
return value;
|
|
14
|
+
}
|
|
15
|
+
function flagSetting(env, name, fallback) {
|
|
16
|
+
const raw = env[name];
|
|
17
|
+
if (raw === undefined || raw === "")
|
|
18
|
+
return fallback;
|
|
19
|
+
if (raw !== "0" && raw !== "1") {
|
|
20
|
+
throw new Error(`${name} must be "0" or "1", got "${raw}"`);
|
|
21
|
+
}
|
|
22
|
+
return raw === "1";
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=settings.js.map
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import type { FastifyInstance } from "fastify";
|
|
2
|
-
import type {
|
|
3
|
-
export declare const
|
|
2
|
+
import type { MeteringCheckResult } from "./types";
|
|
3
|
+
export declare const TENANT_REQUESTS_PER_MINUTE = 60;
|
|
4
4
|
export declare const DEFAULT_MAX_TENANTS = 10000;
|
|
5
5
|
export declare class MeteringEngine {
|
|
6
6
|
private readonly maxTenants;
|
|
7
|
+
private readonly requestsPerMinute;
|
|
7
8
|
private readonly tenants;
|
|
8
|
-
constructor(maxTenants?: number);
|
|
9
|
+
constructor(maxTenants?: number, requestsPerMinute?: number);
|
|
9
10
|
get size(): number;
|
|
10
|
-
resolveTier(claim?: unknown): LicenseTier;
|
|
11
11
|
private getUsage;
|
|
12
12
|
private evictIfFull;
|
|
13
13
|
private refillTokens;
|
|
14
|
-
checkRequest(tenantKey: string,
|
|
14
|
+
checkRequest(tenantKey: string, contentLength?: number, nowMs?: number): MeteringCheckResult;
|
|
15
15
|
reset(): void;
|
|
16
16
|
}
|
|
17
17
|
export declare const defaultMeteringEngine: MeteringEngine;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metering.d.ts","sourceRoot":"","sources":["../../src/enterprise/metering.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"metering.d.ts","sourceRoot":"","sources":["../../src/enterprise/metering.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAG7E,OAAO,KAAK,EAAE,mBAAmB,EAAe,MAAM,SAAS,CAAC;AAYhE,eAAO,MAAM,0BAA0B,KAAK,CAAC;AAG7C,eAAO,MAAM,mBAAmB,QAAS,CAAC;AA+B1C,qBAAa,cAAc;IAKvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IALpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkC;gBAIvC,UAAU,GAAE,MAA4B,EACxC,iBAAiB,GAAE,MAAmC;IAIzE,IAAW,IAAI,IAAI,MAAM,CAExB;IAGD,OAAO,CAAC,QAAQ;IAmBhB,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,YAAY;IAeb,YAAY,CACjB,SAAS,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,MAAM,EACtB,KAAK,GAAE,MAAmB,GACzB,mBAAmB;IAyBf,KAAK,IAAI,IAAI;CAGrB;AAGD,eAAO,MAAM,qBAAqB,gBAAuB,CAAC;AA0B1D,eAAO,MAAM,gBAAgB,GAC3B,KAAK,eAAe,EACpB,SAAQ,cAAqC,KAC5C,IA2BF,CAAC"}
|
|
@@ -1,48 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.registerMetering = exports.defaultMeteringEngine = exports.MeteringEngine = exports.DEFAULT_MAX_TENANTS = exports.
|
|
3
|
+
exports.registerMetering = exports.defaultMeteringEngine = exports.MeteringEngine = exports.DEFAULT_MAX_TENANTS = exports.TENANT_REQUESTS_PER_MINUTE = void 0;
|
|
4
4
|
const constants_1 = require("../config/constants");
|
|
5
5
|
const problem_1 = require("../lib/problem");
|
|
6
|
-
exports.
|
|
7
|
-
community: {
|
|
8
|
-
tier: "community",
|
|
9
|
-
maxRequestsPerMinute: 60,
|
|
10
|
-
maxBytesPerPayload: 1024 * 1024,
|
|
11
|
-
allowQuantumOperations: true,
|
|
12
|
-
allowComplianceAudit: true,
|
|
13
|
-
},
|
|
14
|
-
enterprise: {
|
|
15
|
-
tier: "enterprise",
|
|
16
|
-
maxRequestsPerMinute: 1000,
|
|
17
|
-
maxBytesPerPayload: 10 * 1024 * 1024,
|
|
18
|
-
allowQuantumOperations: true,
|
|
19
|
-
allowComplianceAudit: true,
|
|
20
|
-
},
|
|
21
|
-
sovereign: {
|
|
22
|
-
tier: "sovereign",
|
|
23
|
-
maxRequestsPerMinute: 10000,
|
|
24
|
-
maxBytesPerPayload: 50 * 1024 * 1024,
|
|
25
|
-
allowQuantumOperations: true,
|
|
26
|
-
allowComplianceAudit: true,
|
|
27
|
-
},
|
|
28
|
-
};
|
|
6
|
+
exports.TENANT_REQUESTS_PER_MINUTE = 60;
|
|
29
7
|
exports.DEFAULT_MAX_TENANTS = 10_000;
|
|
30
8
|
const ANONYMOUS_TENANT = "anonymous";
|
|
9
|
+
const remainingTokens = (usage) => Math.floor(Math.max(0, usage.tokens));
|
|
10
|
+
function secondsToReset(usage, nowMs) {
|
|
11
|
+
const msIntoWindow = (nowMs - usage.lastRefillMs) % 60000;
|
|
12
|
+
return Math.max(1, Math.ceil((60000 - msIntoWindow) / 1000));
|
|
13
|
+
}
|
|
14
|
+
function recordRequest(usage, contentLength) {
|
|
15
|
+
usage.tokens -= 1;
|
|
16
|
+
usage.totalRequests += 1;
|
|
17
|
+
if (contentLength !== undefined && contentLength > 0) {
|
|
18
|
+
usage.totalBytes += contentLength;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
31
21
|
class MeteringEngine {
|
|
32
22
|
maxTenants;
|
|
23
|
+
requestsPerMinute;
|
|
33
24
|
tenants = new Map();
|
|
34
|
-
constructor(maxTenants = exports.DEFAULT_MAX_TENANTS) {
|
|
25
|
+
constructor(maxTenants = exports.DEFAULT_MAX_TENANTS, requestsPerMinute = exports.TENANT_REQUESTS_PER_MINUTE) {
|
|
35
26
|
this.maxTenants = maxTenants;
|
|
27
|
+
this.requestsPerMinute = requestsPerMinute;
|
|
36
28
|
}
|
|
37
29
|
get size() {
|
|
38
30
|
return this.tenants.size;
|
|
39
31
|
}
|
|
40
|
-
|
|
41
|
-
return typeof claim === "string" && Object.hasOwn(exports.TIER_QUOTAS, claim)
|
|
42
|
-
? claim
|
|
43
|
-
: "community";
|
|
44
|
-
}
|
|
45
|
-
getUsage(tenantKey, tier, nowMs) {
|
|
32
|
+
getUsage(tenantKey, nowMs) {
|
|
46
33
|
let usage = this.tenants.get(tenantKey);
|
|
47
34
|
if (usage) {
|
|
48
35
|
this.tenants.delete(tenantKey);
|
|
@@ -50,11 +37,10 @@ class MeteringEngine {
|
|
|
50
37
|
else {
|
|
51
38
|
this.evictIfFull();
|
|
52
39
|
usage = {
|
|
53
|
-
tokens:
|
|
40
|
+
tokens: this.requestsPerMinute,
|
|
54
41
|
lastRefillMs: nowMs,
|
|
55
42
|
totalRequests: 0,
|
|
56
43
|
totalBytes: 0,
|
|
57
|
-
tier,
|
|
58
44
|
};
|
|
59
45
|
}
|
|
60
46
|
this.tenants.set(tenantKey, usage);
|
|
@@ -66,56 +52,34 @@ class MeteringEngine {
|
|
|
66
52
|
const oldest = this.tenants.keys().next().value;
|
|
67
53
|
this.tenants.delete(oldest);
|
|
68
54
|
}
|
|
69
|
-
refillTokens(usage,
|
|
55
|
+
refillTokens(usage, nowMs) {
|
|
70
56
|
const elapsedMs = nowMs - usage.lastRefillMs;
|
|
71
57
|
if (elapsedMs <= 0)
|
|
72
58
|
return;
|
|
73
|
-
const refillRatePerMs =
|
|
59
|
+
const refillRatePerMs = this.requestsPerMinute / 60000;
|
|
74
60
|
const tokensToAdd = elapsedMs * refillRatePerMs;
|
|
75
|
-
usage.tokens = Math.min(
|
|
61
|
+
usage.tokens = Math.min(this.requestsPerMinute, usage.tokens + tokensToAdd);
|
|
76
62
|
usage.lastRefillMs = nowMs;
|
|
77
63
|
}
|
|
78
|
-
checkRequest(tenantKey,
|
|
79
|
-
const
|
|
80
|
-
|
|
81
|
-
this.
|
|
82
|
-
if (contentLength !== undefined &&
|
|
83
|
-
contentLength > quota.maxBytesPerPayload) {
|
|
84
|
-
const resetSeconds = Math.ceil((60000 - ((nowMs - usage.lastRefillMs) % 60000)) / 1000);
|
|
85
|
-
return {
|
|
86
|
-
allowed: false,
|
|
87
|
-
limit: quota.maxRequestsPerMinute,
|
|
88
|
-
remaining: Math.floor(Math.max(0, usage.tokens)),
|
|
89
|
-
resetSeconds: Math.max(1, resetSeconds),
|
|
90
|
-
tier,
|
|
91
|
-
error: `Payload size (${contentLength} bytes) exceeds tier limit of ${quota.maxBytesPerPayload} bytes`,
|
|
92
|
-
statusCode: 413,
|
|
93
|
-
};
|
|
94
|
-
}
|
|
64
|
+
checkRequest(tenantKey, contentLength, nowMs = Date.now()) {
|
|
65
|
+
const usage = this.getUsage(tenantKey, nowMs);
|
|
66
|
+
this.refillTokens(usage, nowMs);
|
|
67
|
+
const limit = this.requestsPerMinute;
|
|
95
68
|
if (usage.tokens < 1) {
|
|
96
|
-
const resetSeconds = Math.ceil((60000 - ((nowMs - usage.lastRefillMs) % 60000)) / 1000);
|
|
97
69
|
return {
|
|
98
70
|
allowed: false,
|
|
99
|
-
limit
|
|
71
|
+
limit,
|
|
100
72
|
remaining: 0,
|
|
101
|
-
resetSeconds:
|
|
102
|
-
|
|
103
|
-
error: `Tenant rate limit exceeded for tier '${tier}'. Limit: ${quota.maxRequestsPerMinute} req/min.`,
|
|
104
|
-
statusCode: 429,
|
|
73
|
+
resetSeconds: secondsToReset(usage, nowMs),
|
|
74
|
+
error: `Tenant rate limit exceeded. Limit: ${limit} req/min.`,
|
|
105
75
|
};
|
|
106
76
|
}
|
|
107
|
-
usage
|
|
108
|
-
usage.totalRequests += 1;
|
|
109
|
-
if (contentLength !== undefined && contentLength > 0) {
|
|
110
|
-
usage.totalBytes += contentLength;
|
|
111
|
-
}
|
|
112
|
-
const resetSeconds = Math.ceil((60000 - ((nowMs - usage.lastRefillMs) % 60000)) / 1000);
|
|
77
|
+
recordRequest(usage, contentLength);
|
|
113
78
|
return {
|
|
114
79
|
allowed: true,
|
|
115
|
-
limit
|
|
116
|
-
remaining:
|
|
117
|
-
resetSeconds:
|
|
118
|
-
tier,
|
|
80
|
+
limit,
|
|
81
|
+
remaining: remainingTokens(usage),
|
|
82
|
+
resetSeconds: secondsToReset(usage, nowMs),
|
|
119
83
|
};
|
|
120
84
|
}
|
|
121
85
|
reset() {
|
|
@@ -136,17 +100,13 @@ const registerMetering = (app, engine = new MeteringEngine()) => {
|
|
|
136
100
|
if (isUnmeteredPath(request.url))
|
|
137
101
|
return;
|
|
138
102
|
const auth = request.auth;
|
|
139
|
-
const result = engine.checkRequest(auth?.sub ?? ANONYMOUS_TENANT
|
|
103
|
+
const result = engine.checkRequest(auth?.sub ?? `${ANONYMOUS_TENANT}:${request.ip}`, parseContentLength(request.headers["content-length"]));
|
|
140
104
|
reply.header("X-Tenant-RateLimit-Limit", result.limit);
|
|
141
105
|
reply.header("X-Tenant-RateLimit-Remaining", result.remaining);
|
|
142
106
|
reply.header("X-Tenant-RateLimit-Reset", result.resetSeconds);
|
|
143
|
-
reply.header("X-License-Tier", result.tier);
|
|
144
107
|
if (!result.allowed) {
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
reply.header("Retry-After", result.resetSeconds);
|
|
148
|
-
return (0, problem_1.sendProblem)(reply, code, code === 413 ? "payload-too-large" : "rate-limited", result.error, {
|
|
149
|
-
tier: result.tier,
|
|
108
|
+
reply.header("Retry-After", result.resetSeconds);
|
|
109
|
+
return (0, problem_1.sendProblem)(reply, 429, "rate-limited", result.error, {
|
|
150
110
|
limit: result.limit,
|
|
151
111
|
resetSeconds: result.resetSeconds,
|
|
152
112
|
});
|
|
@@ -1,26 +1,15 @@
|
|
|
1
|
-
export type LicenseTier = "community" | "enterprise" | "sovereign";
|
|
2
|
-
export interface TenantQuota {
|
|
3
|
-
readonly tier: LicenseTier;
|
|
4
|
-
readonly maxRequestsPerMinute: number;
|
|
5
|
-
readonly maxBytesPerPayload: number;
|
|
6
|
-
readonly allowQuantumOperations: boolean;
|
|
7
|
-
readonly allowComplianceAudit: boolean;
|
|
8
|
-
}
|
|
9
1
|
export interface TenantUsage {
|
|
10
2
|
tokens: number;
|
|
11
3
|
lastRefillMs: number;
|
|
12
4
|
totalRequests: number;
|
|
13
5
|
totalBytes: number;
|
|
14
|
-
tier: LicenseTier;
|
|
15
6
|
}
|
|
16
7
|
export interface MeteringCheckResult {
|
|
17
8
|
readonly allowed: boolean;
|
|
18
9
|
readonly limit: number;
|
|
19
10
|
readonly remaining: number;
|
|
20
11
|
readonly resetSeconds: number;
|
|
21
|
-
readonly tier: LicenseTier;
|
|
22
12
|
readonly error?: string;
|
|
23
|
-
readonly statusCode?: number;
|
|
24
13
|
}
|
|
25
14
|
export interface AlgorithmDeprecationRecord {
|
|
26
15
|
readonly algorithm: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/enterprise/types.ts"],"names":[],"mappings":"AAUA,MAAM,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/enterprise/types.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -6,42 +6,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
const telemetry_1 = require("./lib/telemetry");
|
|
8
8
|
(0, telemetry_1.initTelemetry)();
|
|
9
|
-
const env_1 = require("./config/env");
|
|
10
|
-
const server_1 = require("./server");
|
|
11
9
|
const logger_1 = __importDefault(require("./lib/logger"));
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
return;
|
|
22
|
-
isShuttingDown = true;
|
|
23
|
-
logger_1.default.info(`Received ${signal} — shutting down gracefully...`);
|
|
24
|
-
const forceTimer = setTimeout(() => {
|
|
25
|
-
logger_1.default.error(`Shutdown timed out after ${env_1.config.shutdownTimeoutMs}ms — forcing exit`);
|
|
26
|
-
process.exit(1);
|
|
27
|
-
}, env_1.config.shutdownTimeoutMs);
|
|
28
|
-
forceTimer.unref();
|
|
29
|
-
try {
|
|
30
|
-
await server.close();
|
|
31
|
-
await (0, telemetry_1.shutdownTelemetry)();
|
|
32
|
-
logger_1.default.info("All connections drained. Goodbye.");
|
|
33
|
-
process.exit(0);
|
|
34
|
-
}
|
|
35
|
-
catch (err) {
|
|
36
|
-
logger_1.default.error("Error during shutdown", err instanceof Error ? err : undefined);
|
|
37
|
-
process.exit(1);
|
|
38
|
-
}
|
|
39
|
-
};
|
|
40
|
-
process.on("SIGTERM", () => shutdown("SIGTERM"));
|
|
41
|
-
process.on("SIGINT", () => shutdown("SIGINT"));
|
|
42
|
-
};
|
|
43
|
-
main().catch((err) => {
|
|
44
|
-
logger_1.default.error(`Server failed to start: ${err instanceof Error ? err.message : "Unknown error"}`);
|
|
10
|
+
const lifecycle_1 = require("./lib/lifecycle");
|
|
11
|
+
(0, lifecycle_1.start)({
|
|
12
|
+
env: process.env,
|
|
13
|
+
log: logger_1.default,
|
|
14
|
+
exit: (code) => process.exit(code),
|
|
15
|
+
onClosed: telemetry_1.shutdownTelemetry,
|
|
16
|
+
signals: process,
|
|
17
|
+
}).catch((err) => {
|
|
18
|
+
logger_1.default.error({ err }, "Server failed to start");
|
|
45
19
|
process.exit(1);
|
|
46
20
|
});
|
|
47
21
|
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { FastifyInstance, FastifyRequest } from "fastify";
|
|
2
|
+
export interface AuditRecord {
|
|
3
|
+
action: string;
|
|
4
|
+
principal: string;
|
|
5
|
+
status: number;
|
|
6
|
+
outcome: "success" | "failure";
|
|
7
|
+
keyId?: string;
|
|
8
|
+
provider?: string;
|
|
9
|
+
}
|
|
10
|
+
declare module "fastify" {
|
|
11
|
+
interface FastifyRequest {
|
|
12
|
+
auditKeyId: string | undefined;
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
export declare function noteAuditKey(request: FastifyRequest, keyId: string): void;
|
|
16
|
+
export declare function auditRecord(request: FastifyRequest, route: string, status: number): AuditRecord;
|
|
17
|
+
export declare function registerAudit(app: FastifyInstance): void;
|
|
18
|
+
//# sourceMappingURL=audit.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"audit.d.ts","sourceRoot":"","sources":["../../src/lib/audit.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAsB/D,MAAM,WAAW,WAAW;IAE1B,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,EAAE,MAAM,CAAC;IAElB,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,SAAS,GAAG,SAAS,CAAC;IAE/B,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,cAAc;QAEtB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;KAChC;CACF;AAGD,wBAAgB,YAAY,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAEzE;AAoBD,wBAAgB,WAAW,CACzB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,WAAW,CAYb;AAGD,wBAAgB,aAAa,CAAC,GAAG,EAAE,eAAe,GAAG,IAAI,CAUxD"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.noteAuditKey = noteAuditKey;
|
|
4
|
+
exports.auditRecord = auditRecord;
|
|
5
|
+
exports.registerAudit = registerAudit;
|
|
6
|
+
const AUDITED_ROUTES = new Set([
|
|
7
|
+
"/v1/generate",
|
|
8
|
+
"/v1/revoke",
|
|
9
|
+
"/v2/keys/generate",
|
|
10
|
+
"/v2/keys/export",
|
|
11
|
+
"/v2/keys/delete",
|
|
12
|
+
"/v2/pq/keygen",
|
|
13
|
+
"/v2/pq/dsa/keygen",
|
|
14
|
+
"/v2/pq/slh-dsa/keygen",
|
|
15
|
+
"/v2/pq/hybrid/keygen",
|
|
16
|
+
"/v2/hpke/keygen",
|
|
17
|
+
"/v2/opaque/register/init",
|
|
18
|
+
"/v2/opaque/register/finish",
|
|
19
|
+
]);
|
|
20
|
+
const IDENTIFIER = /^[A-Za-z0-9._:/-]{1,256}$/;
|
|
21
|
+
function noteAuditKey(request, keyId) {
|
|
22
|
+
request.auditKeyId = keyId;
|
|
23
|
+
}
|
|
24
|
+
function identifier(body, field) {
|
|
25
|
+
const value = body?.[field];
|
|
26
|
+
return typeof value === "string" && IDENTIFIER.test(value)
|
|
27
|
+
? value
|
|
28
|
+
: undefined;
|
|
29
|
+
}
|
|
30
|
+
function audited(route, body) {
|
|
31
|
+
return (AUDITED_ROUTES.has(route) ||
|
|
32
|
+
route.startsWith("/v2/kms/") ||
|
|
33
|
+
identifier(body, "keyId") !== undefined);
|
|
34
|
+
}
|
|
35
|
+
function auditRecord(request, route, status) {
|
|
36
|
+
const auth = request.auth;
|
|
37
|
+
const keyId = request.auditKeyId ?? identifier(request.body, "keyId");
|
|
38
|
+
const provider = identifier(request.body, "provider");
|
|
39
|
+
return {
|
|
40
|
+
action: `${request.method} ${route}`,
|
|
41
|
+
principal: auth?.sub ?? "unauthenticated",
|
|
42
|
+
status,
|
|
43
|
+
outcome: status < 400 ? "success" : "failure",
|
|
44
|
+
...(keyId === undefined ? {} : { keyId }),
|
|
45
|
+
...(provider === undefined ? {} : { provider }),
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
function registerAudit(app) {
|
|
49
|
+
app.decorateRequest("auditKeyId", undefined);
|
|
50
|
+
app.addHook("onResponse", async (request, reply) => {
|
|
51
|
+
const route = request.routeOptions.url;
|
|
52
|
+
if (route === undefined || !audited(route, request.body))
|
|
53
|
+
return;
|
|
54
|
+
request.log.info({ audit: auditRecord(request, route, reply.statusCode) }, "audit");
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
//# sourceMappingURL=audit.js.map
|
package/dist/lib/auth.d.ts
CHANGED
|
@@ -8,6 +8,10 @@ export interface AuthPayload {
|
|
|
8
8
|
iat?: number;
|
|
9
9
|
exp?: number;
|
|
10
10
|
}
|
|
11
|
+
export declare const RESERVED_SUBJECTS: ReadonlySet<string>;
|
|
12
|
+
export declare function hasUsableSubject(payload: {
|
|
13
|
+
sub?: unknown;
|
|
14
|
+
}): boolean;
|
|
11
15
|
export declare function registerAuth(app: FastifyInstance): Promise<void>;
|
|
12
16
|
export declare function exceedsLifetime(payload: AuthPayload, maxAgeSeconds: number, nowSeconds?: number): boolean;
|
|
13
17
|
export declare function authenticate(request: FastifyRequest, reply: FastifyReply): Promise<AuthPayload | null>;
|
package/dist/lib/auth.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/lib/auth.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAc7E,eAAO,MAAM,MAAM,iKAUT,CAAC;AAGX,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;AAO5C,eAAO,MAAM,eAAe,EAAE,SAAS,KAAK,EAA2B,CAAC;AAGxE,MAAM,WAAW,WAAW;IAE1B,GAAG,EAAE,MAAM,CAAC;IAEZ,MAAM,EAAE,KAAK,EAAE,CAAC;IAEhB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/lib/auth.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAc7E,eAAO,MAAM,MAAM,iKAUT,CAAC;AAGX,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;AAO5C,eAAO,MAAM,eAAe,EAAE,SAAS,KAAK,EAA2B,CAAC;AAGxE,MAAM,WAAW,WAAW;IAE1B,GAAG,EAAE,MAAM,CAAC;IAEZ,MAAM,EAAE,KAAK,EAAE,CAAC;IAEhB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAYD,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC,MAAM,CAGhD,CAAC;AAMH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAMpE;AASD,wBAAsB,YAAY,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CA4BtE;AAOD,wBAAgB,eAAe,CAC7B,OAAO,EAAE,WAAW,EACpB,aAAa,EAAE,MAAM,EACrB,UAAU,GAAE,MAAsC,GACjD,OAAO,CAIT;AA6DD,wBAAsB,YAAY,CAChC,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CA0B7B;AAKD,wBAAgB,QAAQ,CAAC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,GAAG,OAAO,CAOvE;AAKD,wBAAgB,YAAY,CAC1B,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,YAAY,GAClB,OAAO,CAMT;AASD,wBAAgB,cAAc,CAC5B,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,WAAW,GACnB,OAAO,CAeT"}
|
package/dist/lib/auth.js
CHANGED
|
@@ -33,7 +33,8 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
exports.EXPLICIT_SCOPES = exports.SCOPES = void 0;
|
|
36
|
+
exports.RESERVED_SUBJECTS = exports.EXPLICIT_SCOPES = exports.SCOPES = void 0;
|
|
37
|
+
exports.hasUsableSubject = hasUsableSubject;
|
|
37
38
|
exports.registerAuth = registerAuth;
|
|
38
39
|
exports.exceedsLifetime = exceedsLifetime;
|
|
39
40
|
exports.authenticate = authenticate;
|
|
@@ -57,6 +58,15 @@ exports.SCOPES = [
|
|
|
57
58
|
];
|
|
58
59
|
exports.EXPLICIT_SCOPES = ["crypto:keys:export"];
|
|
59
60
|
const IAT_CLOCK_SKEW_SECONDS = 60;
|
|
61
|
+
exports.RESERVED_SUBJECTS = new Set([
|
|
62
|
+
"api-key",
|
|
63
|
+
"anonymous",
|
|
64
|
+
]);
|
|
65
|
+
function hasUsableSubject(payload) {
|
|
66
|
+
return (typeof payload.sub === "string" &&
|
|
67
|
+
payload.sub.length > 0 &&
|
|
68
|
+
!exports.RESERVED_SUBJECTS.has(payload.sub));
|
|
69
|
+
}
|
|
60
70
|
async function registerAuth(app) {
|
|
61
71
|
const jwtSecret = process.env["JWT_SECRET"];
|
|
62
72
|
if (!jwtSecret)
|
|
@@ -71,6 +81,7 @@ async function registerAuth(app) {
|
|
|
71
81
|
verify: {
|
|
72
82
|
algorithms: ["HS256"],
|
|
73
83
|
requiredClaims: [
|
|
84
|
+
"sub",
|
|
74
85
|
"exp",
|
|
75
86
|
"iat",
|
|
76
87
|
...(policy.issuer ? ["iss"] : []),
|
|
@@ -95,6 +106,9 @@ async function verifyBearer(request, reply) {
|
|
|
95
106
|
if (exceedsLifetime(decoded, maxAgeSeconds)) {
|
|
96
107
|
throw new Error("token lifetime exceeds JWT_MAX_AGE");
|
|
97
108
|
}
|
|
109
|
+
if (!hasUsableSubject(decoded)) {
|
|
110
|
+
throw new Error("token subject is missing or reserved");
|
|
111
|
+
}
|
|
98
112
|
return decoded;
|
|
99
113
|
}
|
|
100
114
|
catch {
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
export interface WorkerLimits {
|
|
2
|
+
readonly threads: number;
|
|
3
|
+
readonly maxQueue: number;
|
|
4
|
+
readonly taskTimeoutMs: number;
|
|
5
|
+
}
|
|
6
|
+
export declare const KDF_LIMITS: WorkerLimits;
|
|
7
|
+
export declare const SIGNING_LIMITS: WorkerLimits;
|
|
8
|
+
export declare const MODULES: {
|
|
9
|
+
readonly modern: string;
|
|
10
|
+
readonly highLevel: string;
|
|
11
|
+
readonly keys: string;
|
|
12
|
+
};
|
|
13
|
+
export type WorkerModule = keyof typeof MODULES;
|
|
14
|
+
export declare class CryptoWorkers {
|
|
15
|
+
private readonly limits;
|
|
16
|
+
private pool;
|
|
17
|
+
constructor(limits: WorkerLimits);
|
|
18
|
+
run<T>(module: WorkerModule, functionName: string, ...args: unknown[]): Promise<T>;
|
|
19
|
+
close(): Promise<void>;
|
|
20
|
+
}
|
|
21
|
+
declare module "fastify" {
|
|
22
|
+
interface FastifyInstance {
|
|
23
|
+
kdf: CryptoWorkers;
|
|
24
|
+
signer: CryptoWorkers;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=crypto-workers.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"crypto-workers.d.ts","sourceRoot":"","sources":["../../src/lib/crypto-workers.ts"],"names":[],"mappings":"AAuBA,MAAM,WAAW,YAAY;IAE3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;CAChC;AAMD,eAAO,MAAM,UAAU,EAAE,YAIvB,CAAC;AAMH,eAAO,MAAM,cAAc,EAAE,YAI3B,CAAC;AAQH,eAAO,MAAM,OAAO;;;;CAIV,CAAC;AAGX,MAAM,MAAM,YAAY,GAAG,MAAM,OAAO,OAAO,CAAC;AAMhD,qBAAa,aAAa;IAGZ,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFnC,OAAO,CAAC,IAAI,CAAyB;gBAER,MAAM,EAAE,YAAY;IAOjD,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE;IAc/D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7B;AAED,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,eAAe;QAEvB,GAAG,EAAE,aAAa,CAAC;QAEnB,MAAM,EAAE,aAAa,CAAC;KACvB;CACF"}
|