@webda/core 2.0.0-beta.3 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/application.d.ts +5 -5
- package/lib/application.js +71 -84
- package/lib/application.js.map +1 -1
- package/lib/application.spec.js +121 -140
- package/lib/application.spec.js.map +1 -1
- package/lib/core.d.ts +20 -24
- package/lib/core.js +222 -315
- package/lib/core.js.map +1 -1
- package/lib/core.spec.js +332 -406
- package/lib/core.spec.js.map +1 -1
- package/lib/index.d.ts +49 -48
- package/lib/index.js +53 -70
- package/lib/index.js.map +1 -1
- package/lib/models/aclmodel.d.ts +2 -2
- package/lib/models/aclmodel.js +63 -90
- package/lib/models/aclmodel.js.map +1 -1
- package/lib/models/aclmodel.spec.js +127 -152
- package/lib/models/aclmodel.spec.js.map +1 -1
- package/lib/models/coremodel.d.ts +7 -6
- package/lib/models/coremodel.js +65 -113
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/coremodel.spec.js +88 -107
- package/lib/models/coremodel.spec.js.map +1 -1
- package/lib/models/deployment.js +1 -2
- package/lib/models/ident.d.ts +3 -3
- package/lib/models/ident.js +4 -9
- package/lib/models/ident.js.map +1 -1
- package/lib/models/ident.spec.js +9 -11
- package/lib/models/ident.spec.js.map +1 -1
- package/lib/models/ownermodel.d.ts +2 -2
- package/lib/models/ownermodel.js +39 -62
- package/lib/models/ownermodel.js.map +1 -1
- package/lib/models/ownermodel.spec.js +126 -168
- package/lib/models/ownermodel.spec.js.map +1 -1
- package/lib/models/rolemodel.d.ts +1 -1
- package/lib/models/rolemodel.js +24 -40
- package/lib/models/rolemodel.js.map +1 -1
- package/lib/models/rolemodel.spec.js +44 -63
- package/lib/models/rolemodel.spec.js.map +1 -1
- package/lib/models/user.d.ts +3 -3
- package/lib/models/user.js +3 -8
- package/lib/models/user.js.map +1 -1
- package/lib/models/user.spec.js +14 -16
- package/lib/models/user.spec.js.map +1 -1
- package/lib/queues/filequeue.d.ts +2 -2
- package/lib/queues/filequeue.js +72 -93
- package/lib/queues/filequeue.js.map +1 -1
- package/lib/queues/filequeue.spec.js +53 -70
- package/lib/queues/filequeue.spec.js.map +1 -1
- package/lib/queues/memoryqueue.d.ts +2 -2
- package/lib/queues/memoryqueue.js +37 -61
- package/lib/queues/memoryqueue.js.map +1 -1
- package/lib/queues/memoryqueue.spec.js +142 -165
- package/lib/queues/memoryqueue.spec.js.map +1 -1
- package/lib/queues/pubsubservice.d.ts +2 -2
- package/lib/queues/pubsubservice.js +3 -7
- package/lib/queues/pubsubservice.js.map +1 -1
- package/lib/queues/queue.spec.d.ts +1 -1
- package/lib/queues/queue.spec.js +42 -56
- package/lib/queues/queue.spec.js.map +1 -1
- package/lib/queues/queueservice.d.ts +3 -3
- package/lib/queues/queueservice.js +51 -67
- package/lib/queues/queueservice.js.map +1 -1
- package/lib/router.d.ts +3 -3
- package/lib/router.js +46 -47
- package/lib/router.js.map +1 -1
- package/lib/router.spec.js +64 -61
- package/lib/router.spec.js.map +1 -1
- package/lib/services/asyncevents.d.ts +2 -2
- package/lib/services/asyncevents.js +44 -64
- package/lib/services/asyncevents.js.map +1 -1
- package/lib/services/asyncevents.spec.js +81 -98
- package/lib/services/asyncevents.spec.js.map +1 -1
- package/lib/services/authentication.d.ts +23 -13
- package/lib/services/authentication.js +537 -563
- package/lib/services/authentication.js.map +1 -1
- package/lib/services/authentication.spec.js +411 -447
- package/lib/services/authentication.spec.js.map +1 -1
- package/lib/services/binary.d.ts +7 -5
- package/lib/services/binary.js +211 -244
- package/lib/services/binary.js.map +1 -1
- package/lib/services/binary.spec.d.ts +3 -3
- package/lib/services/binary.spec.js +390 -443
- package/lib/services/binary.spec.js.map +1 -1
- package/lib/services/cloudbinary.d.ts +3 -3
- package/lib/services/cloudbinary.js +45 -70
- package/lib/services/cloudbinary.js.map +1 -1
- package/lib/services/cloudbinary.spec.d.ts +3 -3
- package/lib/services/cloudbinary.spec.js +133 -162
- package/lib/services/cloudbinary.spec.js.map +1 -1
- package/lib/services/configuration.d.ts +1 -1
- package/lib/services/configuration.js +78 -105
- package/lib/services/configuration.js.map +1 -1
- package/lib/services/configuration.spec.js +63 -83
- package/lib/services/configuration.spec.js.map +1 -1
- package/lib/services/cron.d.ts +3 -2
- package/lib/services/cron.js +9 -13
- package/lib/services/cron.js.map +1 -1
- package/lib/services/cron.spec.js +18 -21
- package/lib/services/cron.spec.js.map +1 -1
- package/lib/services/cryptoservice.d.ts +9 -4
- package/lib/services/cryptoservice.js +187 -221
- package/lib/services/cryptoservice.js.map +1 -1
- package/lib/services/cryptoservice.spec.js +88 -115
- package/lib/services/cryptoservice.spec.js.map +1 -1
- package/lib/services/debugmailer.d.ts +1 -1
- package/lib/services/debugmailer.js +13 -34
- package/lib/services/debugmailer.js.map +1 -1
- package/lib/services/debugmailer.spec.js +16 -29
- package/lib/services/debugmailer.spec.js.map +1 -1
- package/lib/services/echo.d.ts +2 -2
- package/lib/services/echo.js +15 -31
- package/lib/services/echo.js.map +1 -1
- package/lib/services/echo.spec.js +27 -40
- package/lib/services/echo.spec.js.map +1 -1
- package/lib/services/filebinary.d.ts +5 -5
- package/lib/services/filebinary.js +165 -210
- package/lib/services/filebinary.js.map +1 -1
- package/lib/services/filebinary.spec.d.ts +2 -1
- package/lib/services/filebinary.spec.js +106 -116
- package/lib/services/filebinary.spec.js.map +1 -1
- package/lib/services/fileconfiguration.d.ts +1 -1
- package/lib/services/fileconfiguration.js +25 -44
- package/lib/services/fileconfiguration.js.map +1 -1
- package/lib/services/fileconfiguration.spec.js +79 -109
- package/lib/services/fileconfiguration.spec.js.map +1 -1
- package/lib/services/invitationservice.d.ts +7 -7
- package/lib/services/invitationservice.js +274 -314
- package/lib/services/invitationservice.js.map +1 -1
- package/lib/services/invitationservice.spec.js +442 -448
- package/lib/services/invitationservice.spec.js.map +1 -1
- package/lib/services/kubernetesconfiguration.d.ts +1 -1
- package/lib/services/kubernetesconfiguration.js +41 -60
- package/lib/services/kubernetesconfiguration.js.map +1 -1
- package/lib/services/kubernetesconfiguration.spec.js +80 -98
- package/lib/services/kubernetesconfiguration.spec.js.map +1 -1
- package/lib/services/mailer.d.ts +4 -4
- package/lib/services/mailer.js +62 -86
- package/lib/services/mailer.js.map +1 -1
- package/lib/services/mailer.spec.js +86 -127
- package/lib/services/mailer.spec.js.map +1 -1
- package/lib/services/notificationservice.d.ts +3 -3
- package/lib/services/notificationservice.js +21 -42
- package/lib/services/notificationservice.js.map +1 -1
- package/lib/services/notificationservice.spec.js +47 -73
- package/lib/services/notificationservice.spec.js.map +1 -1
- package/lib/services/oauth.d.ts +4 -4
- package/lib/services/oauth.js +68 -83
- package/lib/services/oauth.js.map +1 -1
- package/lib/services/oauth.spec.js +130 -156
- package/lib/services/oauth.spec.js.map +1 -1
- package/lib/services/proxy.d.ts +2 -6
- package/lib/services/proxy.js +45 -58
- package/lib/services/proxy.js.map +1 -1
- package/lib/services/proxy.spec.js +34 -53
- package/lib/services/proxy.spec.js.map +1 -1
- package/lib/services/resource.d.ts +2 -2
- package/lib/services/resource.js +12 -18
- package/lib/services/resource.js.map +1 -1
- package/lib/services/resource.spec.js +67 -99
- package/lib/services/resource.spec.js.map +1 -1
- package/lib/services/service.d.ts +26 -3
- package/lib/services/service.js +68 -40
- package/lib/services/service.js.map +1 -1
- package/lib/services/service.spec.js +62 -67
- package/lib/services/service.spec.js.map +1 -1
- package/lib/services/version.d.ts +1 -1
- package/lib/services/version.js +3 -8
- package/lib/services/version.js.map +1 -1
- package/lib/services/version.spec.js +11 -24
- package/lib/services/version.spec.js.map +1 -1
- package/lib/stores/aggregator.d.ts +2 -2
- package/lib/stores/aggregator.js +37 -58
- package/lib/stores/aggregator.js.map +1 -1
- package/lib/stores/file.d.ts +3 -3
- package/lib/stores/file.js +93 -131
- package/lib/stores/file.js.map +1 -1
- package/lib/stores/file.spec.d.ts +2 -2
- package/lib/stores/file.spec.js +261 -289
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/mapper.d.ts +3 -3
- package/lib/stores/mapper.js +110 -137
- package/lib/stores/mapper.js.map +1 -1
- package/lib/stores/mapper.spec.js +131 -150
- package/lib/stores/mapper.spec.js.map +1 -1
- package/lib/stores/memory.d.ts +3 -3
- package/lib/stores/memory.js +98 -144
- package/lib/stores/memory.js.map +1 -1
- package/lib/stores/memory.spec.d.ts +2 -2
- package/lib/stores/memory.spec.js +124 -145
- package/lib/stores/memory.spec.js.map +1 -1
- package/lib/stores/store.d.ts +17 -13
- package/lib/stores/store.js +819 -847
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.d.ts +5 -4
- package/lib/stores/store.spec.js +624 -669
- package/lib/stores/store.spec.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLLexer.d.ts +4 -4
- package/lib/stores/webdaql/WebdaQLLexer.js +9 -13
- package/lib/stores/webdaql/WebdaQLLexer.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserLexer.d.ts +4 -4
- package/lib/stores/webdaql/WebdaQLParserLexer.js +9 -13
- package/lib/stores/webdaql/WebdaQLParserLexer.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserListener.d.ts +2 -2
- package/lib/stores/webdaql/WebdaQLParserListener.js +1 -2
- package/lib/stores/webdaql/WebdaQLParserListener.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserParser.d.ts +10 -10
- package/lib/stores/webdaql/WebdaQLParserParser.js +62 -91
- package/lib/stores/webdaql/WebdaQLParserParser.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserVisitor.d.ts +2 -2
- package/lib/stores/webdaql/WebdaQLParserVisitor.js +1 -2
- package/lib/stores/webdaql/WebdaQLParserVisitor.js.map +1 -1
- package/lib/stores/webdaql/query.d.ts +4 -5
- package/lib/stores/webdaql/query.js +16 -19
- package/lib/stores/webdaql/query.js.map +1 -1
- package/lib/stores/webdaql/query.spec.js +30 -32
- package/lib/stores/webdaql/query.spec.js.map +1 -1
- package/lib/test.d.ts +3 -3
- package/lib/test.js +73 -100
- package/lib/test.js.map +1 -1
- package/lib/unpackedapplication.d.ts +1 -1
- package/lib/unpackedapplication.js +25 -31
- package/lib/unpackedapplication.js.map +1 -1
- package/lib/utils/abstractdeployer.js +1 -5
- package/lib/utils/abstractdeployer.js.map +1 -1
- package/lib/utils/abstractdeployer.spec.js +6 -8
- package/lib/utils/abstractdeployer.spec.js.map +1 -1
- package/lib/utils/context.d.ts +7 -5
- package/lib/utils/context.js +95 -103
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/context.spec.js +139 -163
- package/lib/utils/context.spec.js.map +1 -1
- package/lib/utils/cookie.d.ts +3 -3
- package/lib/utils/cookie.js +42 -61
- package/lib/utils/cookie.js.map +1 -1
- package/lib/utils/cookie.spec.js +42 -64
- package/lib/utils/cookie.spec.js.map +1 -1
- package/lib/utils/esm.d.ts +4 -0
- package/lib/utils/esm.js +10 -0
- package/lib/utils/esm.js.map +1 -0
- package/lib/utils/httpcontext.d.ts +3 -0
- package/lib/utils/httpcontext.js +48 -65
- package/lib/utils/httpcontext.js.map +1 -1
- package/lib/utils/httpcontext.spec.js +37 -56
- package/lib/utils/httpcontext.spec.js.map +1 -1
- package/lib/utils/logger.d.ts +2 -2
- package/lib/utils/logger.js +15 -28
- package/lib/utils/logger.js.map +1 -1
- package/lib/utils/logger.spec.js +9 -11
- package/lib/utils/logger.spec.js.map +1 -1
- package/lib/utils/serializers.js +17 -20
- package/lib/utils/serializers.js.map +1 -1
- package/lib/utils/serializers.spec.js +43 -44
- package/lib/utils/serializers.spec.js.map +1 -1
- package/lib/utils/session.d.ts +6 -6
- package/lib/utils/session.js +37 -59
- package/lib/utils/session.js.map +1 -1
- package/lib/utils/session.spec.js +38 -51
- package/lib/utils/session.spec.js.map +1 -1
- package/lib/utils/waiter.d.ts +1 -1
- package/lib/utils/waiter.js +32 -52
- package/lib/utils/waiter.js.map +1 -1
- package/lib/utils/waiter.spec.js +75 -92
- package/lib/utils/waiter.spec.js.map +1 -1
- package/package.json +17 -12
- package/test/config-invitation.json +1 -3
- package/test/config.json +1 -2
- package/test/config.old.json +1 -2
- package/test/moddas/annotatedservice.js +5 -5
- package/test/moddas/debugmailer.js +2 -3
- package/test/moddas/fakeservice.js +2 -3
- package/test/moddas/voidstore.js +6 -4
- package/test/models/ident.js +2 -6
- package/test/models/task.js +3 -7
- package/test/package.json +2 -1
- package/webda.module.json +956 -189
|
@@ -1,51 +1,37 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
2
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
3
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
4
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
6
|
};
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
15
|
-
});
|
|
16
|
-
};
|
|
17
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.CryptoService = exports.CryptoServiceParameters = void 0;
|
|
19
|
-
const crypto_1 = require("crypto");
|
|
20
|
-
const jwt = require("jsonwebtoken");
|
|
21
|
-
const pem_jwk_1 = require("pem-jwk");
|
|
22
|
-
const serializers_1 = require("../utils/serializers");
|
|
23
|
-
const service_1 = require("./service");
|
|
24
|
-
class CryptoServiceParameters extends service_1.ServiceParameters {
|
|
7
|
+
import { createCipheriv, createDecipheriv, createHmac, generateKeyPairSync, randomBytes } from "crypto";
|
|
8
|
+
import jwt from "jsonwebtoken";
|
|
9
|
+
import { pem2jwk } from "pem-jwk";
|
|
10
|
+
import { JSONUtils } from "../utils/serializers.js";
|
|
11
|
+
import { Inject, Route, Service, ServiceParameters } from "./service.js";
|
|
12
|
+
export class CryptoServiceParameters extends ServiceParameters {
|
|
25
13
|
constructor(params) {
|
|
26
|
-
var _a, _b, _c, _d, _e, _f, _g, _h
|
|
27
|
-
var _p, _q, _r, _s, _t, _u, _v, _w;
|
|
14
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
28
15
|
super(params);
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
(
|
|
34
|
-
(
|
|
35
|
-
(
|
|
36
|
-
(
|
|
37
|
-
(
|
|
38
|
-
(
|
|
39
|
-
(
|
|
40
|
-
|
|
41
|
-
(
|
|
16
|
+
this.symetricKeyLength ?? (this.symetricKeyLength = 256);
|
|
17
|
+
this.symetricCipher ?? (this.symetricCipher = "aes-256-ctr");
|
|
18
|
+
this.asymetricType ?? (this.asymetricType = "rsa");
|
|
19
|
+
this.asymetricOptions ?? (this.asymetricOptions = {});
|
|
20
|
+
(_a = this.asymetricOptions).modulusLength ?? (_a.modulusLength = 2048);
|
|
21
|
+
(_b = this.asymetricOptions).privateKeyEncoding ?? (_b.privateKeyEncoding = {});
|
|
22
|
+
(_c = this.asymetricOptions.privateKeyEncoding).format ?? (_c.format = "pem");
|
|
23
|
+
(_d = this.asymetricOptions.privateKeyEncoding).type ?? (_d.type = "pkcs8");
|
|
24
|
+
(_e = this.asymetricOptions).publicKeyEncoding ?? (_e.publicKeyEncoding = {});
|
|
25
|
+
(_f = this.asymetricOptions.publicKeyEncoding).format ?? (_f.format = "pem");
|
|
26
|
+
(_g = this.asymetricOptions.publicKeyEncoding).type ?? (_g.type = "spki");
|
|
27
|
+
this.jwt ?? (this.jwt = {});
|
|
28
|
+
(_h = this.jwt).algorithm ?? (_h.algorithm = "HS256");
|
|
42
29
|
}
|
|
43
30
|
}
|
|
44
|
-
exports.CryptoServiceParameters = CryptoServiceParameters;
|
|
45
31
|
/**
|
|
46
32
|
* @WebdaModda
|
|
47
33
|
*/
|
|
48
|
-
class CryptoService extends
|
|
34
|
+
export default class CryptoService extends Service {
|
|
49
35
|
constructor() {
|
|
50
36
|
super(...arguments);
|
|
51
37
|
/**
|
|
@@ -62,73 +48,61 @@ class CryptoService extends service_1.Service {
|
|
|
62
48
|
/**
|
|
63
49
|
* @override
|
|
64
50
|
*/
|
|
65
|
-
init() {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
if (!(yield this.load()) && this.parameters.autoRotate) {
|
|
73
|
-
yield this.rotate();
|
|
74
|
-
}
|
|
75
|
-
if (this.parameters.expose) {
|
|
76
|
-
this.addRoute(this.parameters.expose, ["GET"], this.serveJWKS);
|
|
77
|
-
}
|
|
78
|
-
return this;
|
|
79
|
-
});
|
|
51
|
+
async init() {
|
|
52
|
+
await super.init();
|
|
53
|
+
// Load keys
|
|
54
|
+
if (!(await this.load()) && this.parameters.autoCreate) {
|
|
55
|
+
await this.rotate();
|
|
56
|
+
}
|
|
57
|
+
return this;
|
|
80
58
|
}
|
|
81
59
|
/**
|
|
82
60
|
*
|
|
83
61
|
*/
|
|
84
|
-
serveJWKS(context) {
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
})
|
|
103
|
-
});
|
|
62
|
+
async serveJWKS(context) {
|
|
63
|
+
context.write({
|
|
64
|
+
keys: Object.keys(this.keys).map(k => {
|
|
65
|
+
if (!this.jwks[k]) {
|
|
66
|
+
/*
|
|
67
|
+
when Node >= 16
|
|
68
|
+
this.jwks[k] = createPublicKey(this.keys[k].publicKey).export({ format: "jwk" });
|
|
69
|
+
and remove pem-jwk
|
|
70
|
+
*/
|
|
71
|
+
this.jwks[k] = pem2jwk(this.keys[k].publicKey);
|
|
72
|
+
}
|
|
73
|
+
return {
|
|
74
|
+
kty: "RSA",
|
|
75
|
+
kid: k,
|
|
76
|
+
n: this.jwks[k].n,
|
|
77
|
+
e: this.jwks[k].e
|
|
78
|
+
};
|
|
79
|
+
})
|
|
104
80
|
});
|
|
105
81
|
}
|
|
106
82
|
/**
|
|
107
83
|
* Load keys from registry
|
|
108
84
|
*/
|
|
109
|
-
load() {
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
this.keys[k.substring(4)] = load[k];
|
|
120
|
-
});
|
|
121
|
-
this.current = load.current.startsWith("init-") ? undefined : load.current;
|
|
122
|
-
this.age = parseInt(this.current, 36);
|
|
123
|
-
return true;
|
|
85
|
+
async load() {
|
|
86
|
+
let load = await this.registry.get("keys");
|
|
87
|
+
if (!load) {
|
|
88
|
+
return false;
|
|
89
|
+
}
|
|
90
|
+
this.keys = {};
|
|
91
|
+
Object.keys(load)
|
|
92
|
+
.filter(k => k.startsWith("key_"))
|
|
93
|
+
.forEach(k => {
|
|
94
|
+
this.keys[k.substring(4)] = load[k];
|
|
124
95
|
});
|
|
96
|
+
this.current = load.current.startsWith("init-") ? undefined : load.current;
|
|
97
|
+
this.age = parseInt(this.current, 36);
|
|
98
|
+
return true;
|
|
125
99
|
}
|
|
126
100
|
/**
|
|
127
101
|
* Generate asymetric key
|
|
128
102
|
* @returns
|
|
129
103
|
*/
|
|
130
104
|
generateAsymetricKeys() {
|
|
131
|
-
const { publicKey, privateKey } =
|
|
105
|
+
const { publicKey, privateKey } = generateKeyPairSync(
|
|
132
106
|
// @ts-ignore
|
|
133
107
|
this.parameters.asymetricType, this.parameters.asymetricOptions);
|
|
134
108
|
return { publicKey, privateKey };
|
|
@@ -138,18 +112,16 @@ class CryptoService extends service_1.Service {
|
|
|
138
112
|
* @returns
|
|
139
113
|
*/
|
|
140
114
|
generateSymetricKey() {
|
|
141
|
-
return
|
|
115
|
+
return randomBytes(this.parameters.symetricKeyLength / 8).toString("base64");
|
|
142
116
|
}
|
|
143
117
|
/**
|
|
144
118
|
* Return current key set
|
|
145
119
|
*/
|
|
146
|
-
getCurrentKeys() {
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
return { keys: this.keys[this.current], id: this.current };
|
|
152
|
-
});
|
|
120
|
+
async getCurrentKeys() {
|
|
121
|
+
if (!this.keys || !this.current || !this.keys[this.current]) {
|
|
122
|
+
throw new Error("CryptoService not initialized");
|
|
123
|
+
}
|
|
124
|
+
return { keys: this.keys[this.current], id: this.current };
|
|
153
125
|
}
|
|
154
126
|
/**
|
|
155
127
|
* Retrieve a HMAC for a string
|
|
@@ -157,131 +129,120 @@ class CryptoService extends service_1.Service {
|
|
|
157
129
|
* @param keyId to use
|
|
158
130
|
* @returns
|
|
159
131
|
*/
|
|
160
|
-
hmac(data, keyId) {
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
return key.id + "." + (0, crypto_1.createHmac)("sha256", key.keys.symetric).update(data).digest("hex");
|
|
167
|
-
});
|
|
132
|
+
async hmac(data, keyId) {
|
|
133
|
+
if (typeof data !== "string") {
|
|
134
|
+
data = JSONUtils.stringify(data);
|
|
135
|
+
}
|
|
136
|
+
let key = keyId ? { id: keyId, keys: this.keys[keyId] } : await this.getCurrentKeys();
|
|
137
|
+
return key.id + "." + createHmac("sha256", key.keys.symetric).update(data).digest("hex");
|
|
168
138
|
}
|
|
169
139
|
/**
|
|
170
140
|
* Verify a HMAC for a string
|
|
171
141
|
* @param data
|
|
172
142
|
* @returns
|
|
173
143
|
*/
|
|
174
|
-
hmacVerify(data, hmac) {
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
return (0, crypto_1.createHmac)("sha256", this.keys[keyId].symetric).update(data).digest("hex") === mac;
|
|
184
|
-
});
|
|
144
|
+
async hmacVerify(data, hmac) {
|
|
145
|
+
if (typeof data !== "string") {
|
|
146
|
+
data = JSONUtils.stringify(data);
|
|
147
|
+
}
|
|
148
|
+
let [keyId, mac] = hmac.split(".");
|
|
149
|
+
if (!(await this.checkKey(keyId))) {
|
|
150
|
+
return false;
|
|
151
|
+
}
|
|
152
|
+
return createHmac("sha256", this.keys[keyId].symetric).update(data).digest("hex") === mac;
|
|
185
153
|
}
|
|
186
154
|
/**
|
|
187
155
|
* JWT token generation
|
|
188
156
|
*/
|
|
189
|
-
jwtSign(data, options) {
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
res.keyid = "S" + keyInfo.id;
|
|
200
|
-
}
|
|
201
|
-
else {
|
|
202
|
-
key = keyInfo.keys.privateKey;
|
|
203
|
-
res.keyid = "A" + keyInfo.id;
|
|
204
|
-
}
|
|
157
|
+
async jwtSign(data, options) {
|
|
158
|
+
let res = { ...this.parameters.jwt, ...options };
|
|
159
|
+
let key = res.secretOrPublicKey;
|
|
160
|
+
// Default to our current private key
|
|
161
|
+
if (!res.secretOrPublicKey) {
|
|
162
|
+
let keyInfo = await this.getCurrentKeys();
|
|
163
|
+
// Depending on the algo fallback to the right key
|
|
164
|
+
if (res.algorithm.startsWith("HS")) {
|
|
165
|
+
key = keyInfo.keys.symetric;
|
|
166
|
+
res.keyid = "S" + keyInfo.id;
|
|
205
167
|
}
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
168
|
+
else {
|
|
169
|
+
key = keyInfo.keys.privateKey;
|
|
170
|
+
res.keyid = "A" + keyInfo.id;
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
delete res.secretOrPublicKey;
|
|
174
|
+
return jwt.sign(data, key, res);
|
|
209
175
|
}
|
|
210
176
|
/**
|
|
211
177
|
*
|
|
212
178
|
* @param keyId
|
|
213
179
|
* @returns
|
|
214
180
|
*/
|
|
215
|
-
checkKey(keyId) {
|
|
216
|
-
|
|
181
|
+
async checkKey(keyId) {
|
|
182
|
+
if (!this.keys[keyId]) {
|
|
183
|
+
// Key is more recent than current one so try to reload
|
|
184
|
+
if (parseInt(keyId, 36) > this.age) {
|
|
185
|
+
await this.load();
|
|
186
|
+
}
|
|
187
|
+
// Key is still not found
|
|
217
188
|
if (!this.keys[keyId]) {
|
|
218
|
-
|
|
219
|
-
if (parseInt(keyId, 36) > this.age) {
|
|
220
|
-
yield this.load();
|
|
221
|
-
}
|
|
222
|
-
// Key is still not found
|
|
223
|
-
if (!this.keys[keyId]) {
|
|
224
|
-
return false;
|
|
225
|
-
}
|
|
189
|
+
return false;
|
|
226
190
|
}
|
|
227
|
-
|
|
228
|
-
|
|
191
|
+
}
|
|
192
|
+
return true;
|
|
229
193
|
}
|
|
230
194
|
/**
|
|
231
195
|
* Get JWT key based on kid
|
|
232
196
|
*/
|
|
233
|
-
getJWTKey(header, callback) {
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
}
|
|
254
|
-
});
|
|
197
|
+
async getJWTKey(header, callback) {
|
|
198
|
+
if (!header.kid) {
|
|
199
|
+
callback(new Error("Unknown key"));
|
|
200
|
+
return;
|
|
201
|
+
}
|
|
202
|
+
let keyId = header.kid.substring(1);
|
|
203
|
+
if (!(await this.checkKey(keyId))) {
|
|
204
|
+
callback(new Error("Unknown key"));
|
|
205
|
+
return;
|
|
206
|
+
}
|
|
207
|
+
// Check first letter that define Symetric or Asymetric
|
|
208
|
+
if (header.kid.startsWith("S")) {
|
|
209
|
+
callback(null, this.keys[keyId].symetric);
|
|
210
|
+
}
|
|
211
|
+
else if (header.kid.startsWith("A")) {
|
|
212
|
+
callback(null, this.keys[keyId].publicKey);
|
|
213
|
+
}
|
|
214
|
+
else {
|
|
215
|
+
callback(new Error("Unknown key"));
|
|
216
|
+
}
|
|
255
217
|
}
|
|
256
218
|
/**
|
|
257
219
|
* JWT token verification
|
|
258
220
|
*/
|
|
259
|
-
jwtVerify(token, options) {
|
|
260
|
-
return
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
221
|
+
async jwtVerify(token, options) {
|
|
222
|
+
return new Promise((resolve, reject) => {
|
|
223
|
+
jwt.verify(token, options?.secretOrPublicKey || this.getJWTKey.bind(this), {
|
|
224
|
+
...options,
|
|
225
|
+
secretOrPublicKey: undefined
|
|
226
|
+
}, (err, result) => {
|
|
227
|
+
if (err) {
|
|
228
|
+
reject(err);
|
|
229
|
+
}
|
|
230
|
+
else {
|
|
231
|
+
resolve(result);
|
|
232
|
+
}
|
|
270
233
|
});
|
|
271
234
|
});
|
|
272
235
|
}
|
|
273
236
|
/**
|
|
274
237
|
* Encrypt data
|
|
275
238
|
*/
|
|
276
|
-
encrypt(data) {
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
return this.jwtSign(encrypted, { keyid: `S${key.id}`, secretOrPublicKey: key.keys.symetric });
|
|
284
|
-
});
|
|
239
|
+
async encrypt(data) {
|
|
240
|
+
let key = await this.getCurrentKeys();
|
|
241
|
+
// Initialization Vector
|
|
242
|
+
let iv = randomBytes(16);
|
|
243
|
+
let cipher = createCipheriv(this.parameters.symetricCipher, Buffer.from(key.keys.symetric, "base64"), iv);
|
|
244
|
+
let encrypted = Buffer.concat([iv, cipher.update(Buffer.from(JSON.stringify(data))), cipher.final()]).toString("base64");
|
|
245
|
+
return this.jwtSign(encrypted, { keyid: `S${key.id}`, secretOrPublicKey: key.keys.symetric });
|
|
285
246
|
}
|
|
286
247
|
/**
|
|
287
248
|
* Parse the JWT header section
|
|
@@ -292,14 +253,12 @@ class CryptoService extends service_1.Service {
|
|
|
292
253
|
/**
|
|
293
254
|
* Decrypt data
|
|
294
255
|
*/
|
|
295
|
-
decrypt(token) {
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
return JSON.parse(decipher.update(input.slice(16)).toString() + decipher.final().toString());
|
|
302
|
-
});
|
|
256
|
+
async decrypt(token) {
|
|
257
|
+
let input = Buffer.from(await this.jwtVerify(token), "base64");
|
|
258
|
+
let header = this.getJWTHeader(token);
|
|
259
|
+
let iv = input.slice(0, 16);
|
|
260
|
+
let decipher = createDecipheriv(this.parameters.symetricCipher, Buffer.from(this.keys[header.kid.substring(1)].symetric, "base64"), iv);
|
|
261
|
+
return JSON.parse(decipher.update(input.slice(16)).toString() + decipher.final().toString());
|
|
303
262
|
}
|
|
304
263
|
/**
|
|
305
264
|
* Get next id
|
|
@@ -312,35 +271,42 @@ class CryptoService extends service_1.Service {
|
|
|
312
271
|
/**
|
|
313
272
|
* Rotate keys
|
|
314
273
|
*/
|
|
315
|
-
rotate() {
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
}
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
}
|
|
274
|
+
async rotate() {
|
|
275
|
+
const { age, id } = this.getNextId();
|
|
276
|
+
let next = {
|
|
277
|
+
current: id,
|
|
278
|
+
rotationInstance: this.getWebda().getInstanceId()
|
|
279
|
+
};
|
|
280
|
+
next[`key_${id}`] = {
|
|
281
|
+
...this.generateAsymetricKeys(),
|
|
282
|
+
symetric: this.generateSymetricKey()
|
|
283
|
+
};
|
|
284
|
+
if (!(await this.registry.exists("keys"))) {
|
|
285
|
+
this.current = `init-${this.getWebda().getInstanceId()}`;
|
|
286
|
+
await this.registry.put("keys", { current: this.current });
|
|
287
|
+
}
|
|
288
|
+
if (await this.registry.conditionalPatch("keys", next, "current", this.current)) {
|
|
289
|
+
this.keys ?? (this.keys = {});
|
|
290
|
+
this.keys[id] = next[`key_${id}`];
|
|
291
|
+
this.current = id;
|
|
292
|
+
this.age = age;
|
|
293
|
+
}
|
|
294
|
+
else {
|
|
295
|
+
// Reload as something else has modified
|
|
296
|
+
await this.load();
|
|
297
|
+
}
|
|
339
298
|
}
|
|
340
299
|
}
|
|
341
300
|
__decorate([
|
|
342
|
-
|
|
301
|
+
Inject("Registry")
|
|
343
302
|
], CryptoService.prototype, "registry", void 0);
|
|
344
|
-
|
|
345
|
-
|
|
303
|
+
__decorate([
|
|
304
|
+
Route(".", ["GET"], false, {
|
|
305
|
+
description: "Serve JWKS keys",
|
|
306
|
+
get: {
|
|
307
|
+
operationId: "getJWKS"
|
|
308
|
+
}
|
|
309
|
+
})
|
|
310
|
+
], CryptoService.prototype, "serveJWKS", null);
|
|
311
|
+
export { CryptoService };
|
|
346
312
|
//# sourceMappingURL=cryptoservice.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoservice.js","sourceRoot":"","sources":["../../src/services/cryptoservice.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cryptoservice.js","sourceRoot":"","sources":["../../src/services/cryptoservice.ts"],"names":[],"mappings":"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"}
|