@celljs/web 4.3.0 → 4.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +48 -4
- package/cell.schema.json +266 -0
- package/cell.yml +12 -17
- package/esm/common/constants.d.ts +3 -3
- package/esm/common/constants.js +3 -3
- package/esm/common/constants.js.map +1 -1
- package/esm/node/body/body-middleware.js +1 -1
- package/esm/node/body/body-middleware.js.map +1 -1
- package/esm/node/body/body-parser.d.ts +5 -0
- package/esm/node/body/body-parser.js +7 -0
- package/esm/node/body/body-parser.js.map +1 -1
- package/esm/node/body/body-protocol.d.ts +1 -1
- package/esm/node/context.d.ts +4 -0
- package/esm/node/context.js +11 -11
- package/esm/node/context.js.map +1 -1
- package/esm/node/cookies/cookies-factory.js +2 -2
- package/esm/node/cookies/cookies-factory.js.map +1 -1
- package/esm/node/cookies/cookies-protocol.d.ts +1 -1
- package/esm/node/cookies/cookies-security-check.d.ts +13 -0
- package/esm/node/cookies/cookies-security-check.js +55 -0
- package/esm/node/cookies/cookies-security-check.js.map +1 -0
- package/esm/node/cookies/cookies.d.ts +1 -1
- package/esm/node/cookies/cookies.js +1 -1
- package/esm/node/cookies/index.d.ts +1 -0
- package/esm/node/cookies/index.js +1 -0
- package/esm/node/cookies/index.js.map +1 -1
- package/esm/node/cors/cors-middleware.d.ts +1 -1
- package/esm/node/cors/cors-middleware.js +1 -1
- package/esm/node/cors/cors-middleware.js.map +1 -1
- package/esm/node/cors/cors-protocol.d.ts +1 -1
- package/esm/node/dispatcher/dispatcher.d.ts +10 -0
- package/esm/node/dispatcher/dispatcher.js +36 -3
- package/esm/node/dispatcher/dispatcher.js.map +1 -1
- package/esm/node/error/error-handler-provider.d.ts +6 -2
- package/esm/node/error/error-handler-provider.js +17 -9
- package/esm/node/error/error-handler-provider.js.map +1 -1
- package/esm/node/error/error-message-resolver.d.ts +11 -0
- package/esm/node/error/error-message-resolver.js +43 -0
- package/esm/node/error/error-message-resolver.js.map +1 -0
- package/esm/node/error/error-protocol.d.ts +12 -2
- package/esm/node/error/error-protocol.js +3 -2
- package/esm/node/error/error-protocol.js.map +1 -1
- package/esm/node/error/error-response-util.d.ts +8 -0
- package/esm/node/error/error-response-util.js +24 -0
- package/esm/node/error/error-response-util.js.map +1 -0
- package/esm/node/error/http-error.d.ts +9 -1
- package/esm/node/error/http-error.js +6 -2
- package/esm/node/error/http-error.js.map +1 -1
- package/esm/node/error/index.d.ts +2 -0
- package/esm/node/error/index.js +2 -0
- package/esm/node/error/index.js.map +1 -1
- package/esm/node/health/health-executor.js +8 -12
- package/esm/node/health/health-executor.js.map +1 -1
- package/esm/node/health/health-middleware.js +1 -1
- package/esm/node/health/health-middleware.js.map +1 -1
- package/esm/node/matcher/request-matcher.js +2 -2
- package/esm/node/matcher/request-matcher.js.map +1 -1
- package/esm/node/session/session-manager.js +2 -2
- package/esm/node/session/session-manager.js.map +1 -1
- package/esm/node/session/session-middleware.js +1 -1
- package/esm/node/session/session-middleware.js.map +1 -1
- package/esm/node/session/session-store.js +1 -1
- package/esm/node/session/session-store.js.map +1 -1
- package/esm/node/session/session-strategy.js +1 -1
- package/esm/node/session/session-strategy.js.map +1 -1
- package/esm/node/session/session.d.ts +14 -2
- package/esm/node/session/session.js +33 -4
- package/esm/node/session/session.js.map +1 -1
- package/esm/node/trace/trace-id-resolver.js +2 -2
- package/esm/node/trace/trace-id-resolver.js.map +1 -1
- package/esm/node/trace/trace-protocol.d.ts +2 -2
- package/esm/node/trace/trace-protocol.js +2 -2
- package/esm/node/trace/trace-protocol.js.map +1 -1
- package/lib/common/constants.d.ts +3 -3
- package/lib/common/constants.d.ts.map +1 -1
- package/lib/common/constants.js +3 -3
- package/lib/common/constants.js.map +1 -1
- package/lib/node/body/body-middleware.js +1 -1
- package/lib/node/body/body-middleware.js.map +1 -1
- package/lib/node/body/body-parser.d.ts +5 -0
- package/lib/node/body/body-parser.d.ts.map +1 -1
- package/lib/node/body/body-parser.js +7 -0
- package/lib/node/body/body-parser.js.map +1 -1
- package/lib/node/body/body-protocol.d.ts +1 -1
- package/lib/node/body/body-protocol.d.ts.map +1 -1
- package/lib/node/context.d.ts +4 -0
- package/lib/node/context.d.ts.map +1 -1
- package/lib/node/context.js +11 -11
- package/lib/node/context.js.map +1 -1
- package/lib/node/context.spec.d.ts +2 -0
- package/lib/node/context.spec.d.ts.map +1 -0
- package/lib/node/context.spec.js +25 -0
- package/lib/node/context.spec.js.map +1 -0
- package/lib/node/cookies/cookies-factory.js +2 -2
- package/lib/node/cookies/cookies-factory.js.map +1 -1
- package/lib/node/cookies/cookies-protocol.d.ts +1 -1
- package/lib/node/cookies/cookies-protocol.d.ts.map +1 -1
- package/lib/node/cookies/cookies-security-check.d.ts +14 -0
- package/lib/node/cookies/cookies-security-check.d.ts.map +1 -0
- package/lib/node/cookies/cookies-security-check.js +58 -0
- package/lib/node/cookies/cookies-security-check.js.map +1 -0
- package/lib/node/cookies/cookies-security-check.spec.d.ts +2 -0
- package/lib/node/cookies/cookies-security-check.spec.d.ts.map +1 -0
- package/lib/node/cookies/cookies-security-check.spec.js +21 -0
- package/lib/node/cookies/cookies-security-check.spec.js.map +1 -0
- package/lib/node/cookies/cookies.d.ts +1 -1
- package/lib/node/cookies/cookies.js +1 -1
- package/lib/node/cookies/index.d.ts +1 -0
- package/lib/node/cookies/index.d.ts.map +1 -1
- package/lib/node/cookies/index.js +1 -0
- package/lib/node/cookies/index.js.map +1 -1
- package/lib/node/cors/cors-middleware.d.ts +1 -1
- package/lib/node/cors/cors-middleware.d.ts.map +1 -1
- package/lib/node/cors/cors-middleware.js +1 -1
- package/lib/node/cors/cors-middleware.js.map +1 -1
- package/lib/node/cors/cors-protocol.d.ts +1 -1
- package/lib/node/cors/cors-protocol.d.ts.map +1 -1
- package/lib/node/dispatcher/dispatcher.d.ts +10 -0
- package/lib/node/dispatcher/dispatcher.d.ts.map +1 -1
- package/lib/node/dispatcher/dispatcher.js +36 -3
- package/lib/node/dispatcher/dispatcher.js.map +1 -1
- package/lib/node/dispatcher/dispatcher.spec.d.ts +2 -0
- package/lib/node/dispatcher/dispatcher.spec.d.ts.map +1 -0
- package/lib/node/dispatcher/dispatcher.spec.js +105 -0
- package/lib/node/dispatcher/dispatcher.spec.js.map +1 -0
- package/lib/node/error/error-handler-provider.d.ts +6 -2
- package/lib/node/error/error-handler-provider.d.ts.map +1 -1
- package/lib/node/error/error-handler-provider.js +16 -8
- package/lib/node/error/error-handler-provider.js.map +1 -1
- package/lib/node/error/error-message-resolver.d.ts +12 -0
- package/lib/node/error/error-message-resolver.d.ts.map +1 -0
- package/lib/node/error/error-message-resolver.js +46 -0
- package/lib/node/error/error-message-resolver.js.map +1 -0
- package/lib/node/error/error-message-resolver.spec.d.ts +2 -0
- package/lib/node/error/error-message-resolver.spec.d.ts.map +1 -0
- package/lib/node/error/error-message-resolver.spec.js +42 -0
- package/lib/node/error/error-message-resolver.spec.js.map +1 -0
- package/lib/node/error/error-protocol.d.ts +12 -2
- package/lib/node/error/error-protocol.d.ts.map +1 -1
- package/lib/node/error/error-protocol.js +4 -3
- package/lib/node/error/error-protocol.js.map +1 -1
- package/lib/node/error/error-response-util.d.ts +9 -0
- package/lib/node/error/error-response-util.d.ts.map +1 -0
- package/lib/node/error/error-response-util.js +27 -0
- package/lib/node/error/error-response-util.js.map +1 -0
- package/lib/node/error/http-error.d.ts +9 -1
- package/lib/node/error/http-error.d.ts.map +1 -1
- package/lib/node/error/http-error.js +6 -2
- package/lib/node/error/http-error.js.map +1 -1
- package/lib/node/error/index.d.ts +2 -0
- package/lib/node/error/index.d.ts.map +1 -1
- package/lib/node/error/index.js +2 -0
- package/lib/node/error/index.js.map +1 -1
- package/lib/node/health/health-executor.d.ts.map +1 -1
- package/lib/node/health/health-executor.js +8 -12
- package/lib/node/health/health-executor.js.map +1 -1
- package/lib/node/health/health-executor.spec.d.ts +2 -0
- package/lib/node/health/health-executor.spec.d.ts.map +1 -0
- package/lib/node/health/health-executor.spec.js +44 -0
- package/lib/node/health/health-executor.spec.js.map +1 -0
- package/lib/node/health/health-middleware.js +1 -1
- package/lib/node/health/health-middleware.js.map +1 -1
- package/lib/node/matcher/request-matcher.js +2 -2
- package/lib/node/matcher/request-matcher.js.map +1 -1
- package/lib/node/session/session-manager.js +2 -2
- package/lib/node/session/session-manager.js.map +1 -1
- package/lib/node/session/session-middleware.js +1 -1
- package/lib/node/session/session-middleware.js.map +1 -1
- package/lib/node/session/session-store.js +1 -1
- package/lib/node/session/session-store.js.map +1 -1
- package/lib/node/session/session-strategy.js +1 -1
- package/lib/node/session/session-strategy.js.map +1 -1
- package/lib/node/session/session.d.ts +14 -2
- package/lib/node/session/session.d.ts.map +1 -1
- package/lib/node/session/session.js +33 -4
- package/lib/node/session/session.js.map +1 -1
- package/lib/node/session/session.spec.js +21 -0
- package/lib/node/session/session.spec.js.map +1 -1
- package/lib/node/trace/trace-id-resolver.js +1 -1
- package/lib/node/trace/trace-id-resolver.js.map +1 -1
- package/lib/node/trace/trace-protocol.d.ts +2 -2
- package/lib/node/trace/trace-protocol.d.ts.map +1 -1
- package/lib/node/trace/trace-protocol.js +2 -2
- package/lib/node/trace/trace-protocol.js.map +1 -1
- package/package.json +5 -4
- package/src/common/constants.ts +3 -3
- package/src/node/body/body-middleware.ts +1 -1
- package/src/node/body/body-parser.ts +8 -0
- package/src/node/body/body-protocol.ts +1 -1
- package/src/node/context.spec.ts +25 -0
- package/src/node/context.ts +9 -9
- package/src/node/cookies/cookies-factory.ts +2 -2
- package/src/node/cookies/cookies-protocol.ts +1 -1
- package/src/node/cookies/cookies-security-check.spec.ts +21 -0
- package/src/node/cookies/cookies-security-check.ts +44 -0
- package/src/node/cookies/cookies.ts +1 -1
- package/src/node/cookies/index.ts +1 -1
- package/src/node/cors/cors-middleware.ts +1 -1
- package/src/node/cors/cors-protocol.ts +1 -1
- package/src/node/dispatcher/dispatcher.spec.ts +110 -0
- package/src/node/dispatcher/dispatcher.ts +37 -4
- package/src/node/error/error-handler-provider.ts +17 -11
- package/src/node/error/error-message-resolver.spec.ts +44 -0
- package/src/node/error/error-message-resolver.ts +31 -0
- package/src/node/error/error-protocol.ts +14 -3
- package/src/node/error/error-response-util.ts +24 -0
- package/src/node/error/http-error.ts +14 -2
- package/src/node/error/index.ts +1 -1
- package/src/node/health/health-executor.spec.ts +40 -0
- package/src/node/health/health-executor.ts +8 -13
- package/src/node/health/health-middleware.ts +1 -1
- package/src/node/matcher/request-matcher.ts +2 -2
- package/src/node/session/session-manager.ts +2 -2
- package/src/node/session/session-middleware.ts +1 -1
- package/src/node/session/session-store.ts +1 -1
- package/src/node/session/session-strategy.ts +1 -1
- package/src/node/session/session.spec.ts +24 -0
- package/src/node/session/session.ts +41 -7
- package/src/node/trace/trace-id-resolver.ts +2 -2
- package/src/node/trace/trace-protocol.ts +2 -2
|
@@ -1,22 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SessionImpl = void 0;
|
|
4
|
-
const
|
|
4
|
+
const node_crypto_1 = require("node:crypto");
|
|
5
|
+
/** What JSON.stringify leaves out: a key holding it does not make a session changed. */
|
|
6
|
+
function isSerialized(value) {
|
|
7
|
+
return value !== undefined && typeof value !== 'function' && typeof value !== 'symbol';
|
|
8
|
+
}
|
|
5
9
|
class SessionImpl {
|
|
10
|
+
/**
|
|
11
|
+
* Every request without a session gets a new one, so a new session is cheap: no serialization, and
|
|
12
|
+
* `changed` compares its few values instead of JSON. A restored session is serialized once to compare.
|
|
13
|
+
*/
|
|
6
14
|
constructor(sessionOptions, obj) {
|
|
7
|
-
this.id = (0, uuid_1.generateUUUID)();
|
|
8
15
|
this.isNew = true;
|
|
9
16
|
if (obj) {
|
|
10
17
|
this.isNew = false;
|
|
11
18
|
for (const key of Object.keys(obj)) {
|
|
12
19
|
this[key] = obj[key];
|
|
13
20
|
}
|
|
21
|
+
this._snapshot = this.serialize();
|
|
14
22
|
}
|
|
15
23
|
else {
|
|
24
|
+
this.id = (0, node_crypto_1.randomUUID)();
|
|
16
25
|
this.expire = sessionOptions.maxAge + Date.now();
|
|
17
26
|
this.maxAge = sessionOptions.maxAge;
|
|
27
|
+
this._created = { id: this.id, expire: this.expire, maxAge: this.maxAge };
|
|
18
28
|
}
|
|
19
|
-
this._snapshot = this.serialize();
|
|
20
29
|
}
|
|
21
30
|
serialize() {
|
|
22
31
|
return JSON.stringify(this.toJSON());
|
|
@@ -30,8 +39,28 @@ class SessionImpl {
|
|
|
30
39
|
}
|
|
31
40
|
return obj;
|
|
32
41
|
}
|
|
42
|
+
/** Whether the serialized session differs from the one created or restored. */
|
|
33
43
|
get changed() {
|
|
34
|
-
|
|
44
|
+
const created = this._created;
|
|
45
|
+
if (!created) {
|
|
46
|
+
return this._snapshot !== this.serialize();
|
|
47
|
+
}
|
|
48
|
+
// A new session holds only id, expire and maxAge: anything else that would be serialized is a change.
|
|
49
|
+
for (const key of Object.keys(this)) {
|
|
50
|
+
if (key === 'isNew' || key[0] === '_') {
|
|
51
|
+
continue;
|
|
52
|
+
}
|
|
53
|
+
const value = this[key];
|
|
54
|
+
if (key === 'id' || key === 'expire' || key === 'maxAge') {
|
|
55
|
+
if (value !== created[key]) {
|
|
56
|
+
return true;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
else if (isSerialized(value)) {
|
|
60
|
+
return true;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
return false;
|
|
35
64
|
}
|
|
36
65
|
}
|
|
37
66
|
exports.SessionImpl = SessionImpl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/node/session/session.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/node/session/session.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAGzC,wFAAwF;AACxF,SAAS,YAAY,CAAC,KAAc;IAChC,OAAO,KAAK,KAAK,SAAS,IAAI,OAAO,KAAK,KAAK,UAAU,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC;AAC3F,CAAC;AAED;IAWI;;;OAGG;IACH,YAAY,cAAmB,EAAE,GAAS;QAZ1C,UAAK,GAAG,IAAI,CAAC;QAaT,IAAI,GAAG,EAAE,CAAC;YACN,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBAChC,IAAY,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;YAClC,CAAC;YACD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,EAAE,GAAG,IAAA,wBAAU,GAAE,CAAC;YACvB,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACjD,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;YACpC,IAAI,CAAC,QAAQ,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;QAC9E,CAAC;IACL,CAAC;IAES,SAAS;QACf,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,MAAM;QACF,MAAM,GAAG,GAAQ,EAAE,CAAC;QACpB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,IAAI,GAAG,KAAK,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBACpC,GAAG,CAAC,GAAG,CAAC,GAAI,IAAY,CAAC,GAAG,CAAC,CAAC;YAClC,CAAC;QACL,CAAC;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAED,+EAA+E;IAC/E,IAAI,OAAO;QACP,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;QAC/C,CAAC;QACD,sGAAsG;QACtG,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,IAAI,GAAG,KAAK,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBACpC,SAAS;YACb,CAAC;YACD,MAAM,KAAK,GAAI,IAAY,CAAC,GAAG,CAAC,CAAC;YACjC,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;gBACvD,IAAI,KAAK,KAAK,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;oBACzB,OAAO,IAAI,CAAC;gBAChB,CAAC;YACL,CAAC;iBAAM,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC7B,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CAEJ"}
|
|
@@ -30,6 +30,27 @@ function inContext(fn) {
|
|
|
30
30
|
session.user = 'tom';
|
|
31
31
|
(0, chai_1.expect)(session.changed).to.equal(true);
|
|
32
32
|
});
|
|
33
|
+
(0, bun_test_1.it)('a new session changes like its JSON does: undefined values do not count, a new expiry does', () => {
|
|
34
|
+
const session = new session_1.SessionImpl(options);
|
|
35
|
+
session.nothing = undefined;
|
|
36
|
+
session.callback = () => undefined;
|
|
37
|
+
(0, chai_1.expect)(session.changed).to.equal(false);
|
|
38
|
+
session.expire += 1000;
|
|
39
|
+
(0, chai_1.expect)(session.changed).to.equal(true);
|
|
40
|
+
});
|
|
41
|
+
(0, bun_test_1.it)('a restored session keeps its id and notices changes inside its values', () => {
|
|
42
|
+
const restored = new session_1.SessionImpl(options, { id: 'kept', expire: 1, maxAge: 1000, user: { name: 'tom' } });
|
|
43
|
+
(0, chai_1.expect)(restored.id).to.equal('kept');
|
|
44
|
+
(0, chai_1.expect)(restored.isNew).to.equal(false);
|
|
45
|
+
(0, chai_1.expect)(restored.changed).to.equal(false);
|
|
46
|
+
restored.user.name = 'jerry';
|
|
47
|
+
(0, chai_1.expect)(restored.changed).to.equal(true);
|
|
48
|
+
});
|
|
49
|
+
(0, bun_test_1.it)('new sessions get distinct random ids', () => {
|
|
50
|
+
const ids = new Set(Array.from({ length: 100 }, () => new session_1.SessionImpl(options).id));
|
|
51
|
+
(0, chai_1.expect)(ids.size).to.equal(100);
|
|
52
|
+
(0, chai_1.expect)([...ids][0]).to.match(/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/);
|
|
53
|
+
});
|
|
33
54
|
(0, bun_test_1.it)('serializes its values without isNew and private fields', () => {
|
|
34
55
|
const session = new session_1.SessionImpl(options);
|
|
35
56
|
session.user = 'tom';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.spec.js","sourceRoot":"","sources":["../../../src/node/session/session.spec.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session.spec.js","sourceRoot":"","sources":["../../../src/node/session/session.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ let TraceIdResolverImpl = class TraceIdResolverImpl {
|
|
|
21
21
|
return Promise.resolve(traceId);
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
-
return Promise.resolve((0, core_1.
|
|
24
|
+
return Promise.resolve((0, core_1.generateUUID)());
|
|
25
25
|
}
|
|
26
26
|
};
|
|
27
27
|
exports.TraceIdResolverImpl = TraceIdResolverImpl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace-id-resolver.js","sourceRoot":"","sources":["../../../src/node/trace/trace-id-resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"trace-id-resolver.js","sourceRoot":"","sources":["../../../src/node/trace/trace-id-resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAA8D;AAC9D,qDAA2E;AAC3E,wCAAqC;AAG9B,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAI5B,OAAO;QACH,IAAI,iBAAO,CAAC,UAAU,EAAE,IAAI,IAAI,CAAC,UAAU,EAAG,CAAC;YAC3C,MAAM,OAAO,GAAG,iBAAO,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1D,IAAI,OAAO,EAAE,CAAC;gBACV,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACpC,CAAC;QACL,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAA,mBAAY,GAAE,CAAC,CAAC;IAC3C,CAAC;CACJ,CAAA;;AAXsB;IADlB,IAAA,YAAK,EAAC,uCAAsB,CAAC;;uDACQ;8BAF7B,mBAAmB;IAD/B,IAAA,gBAAS,EAAC,gCAAe,CAAC;GACd,mBAAmB,CAa/B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export declare const TRACE_MIDDLEWARE_PRIORITY = 2200;
|
|
2
|
-
export declare const TRACE_ID_REQUEST_FIELD = "
|
|
3
|
-
export declare const TRACE_ID_RESPONSE_FIELD = "
|
|
2
|
+
export declare const TRACE_ID_REQUEST_FIELD = "web.trace.requestField";
|
|
3
|
+
export declare const TRACE_ID_RESPONSE_FIELD = "web.trace.responseField";
|
|
4
4
|
export declare const TraceIdResolver: unique symbol;
|
|
5
5
|
export interface TraceIdResolver {
|
|
6
6
|
resolve(): Promise<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace-protocol.d.ts","sourceRoot":"","sources":["../../../src/node/trace/trace-protocol.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,yBAAyB,OAAO,CAAC;AAE9C,eAAO,MAAM,sBAAsB,
|
|
1
|
+
{"version":3,"file":"trace-protocol.d.ts","sourceRoot":"","sources":["../../../src/node/trace/trace-protocol.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,yBAAyB,OAAO,CAAC;AAE9C,eAAO,MAAM,sBAAsB,2BAA2B,CAAC;AAC/D,eAAO,MAAM,uBAAuB,4BAA4B,CAAC;AAEjE,eAAO,MAAM,eAAe,eAA4B,CAAC;AAEzD,MAAM,WAAW,eAAe;IAC5B,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC9B"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TraceIdResolver = exports.TRACE_ID_RESPONSE_FIELD = exports.TRACE_ID_REQUEST_FIELD = exports.TRACE_MIDDLEWARE_PRIORITY = void 0;
|
|
4
4
|
// Be sure this middleware is always at first position
|
|
5
5
|
exports.TRACE_MIDDLEWARE_PRIORITY = 2200;
|
|
6
|
-
exports.TRACE_ID_REQUEST_FIELD = '
|
|
7
|
-
exports.TRACE_ID_RESPONSE_FIELD = '
|
|
6
|
+
exports.TRACE_ID_REQUEST_FIELD = 'web.trace.requestField';
|
|
7
|
+
exports.TRACE_ID_RESPONSE_FIELD = 'web.trace.responseField';
|
|
8
8
|
exports.TraceIdResolver = Symbol('TraceIdResolver');
|
|
9
9
|
//# sourceMappingURL=trace-protocol.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace-protocol.js","sourceRoot":"","sources":["../../../src/node/trace/trace-protocol.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACzC,QAAA,yBAAyB,GAAG,IAAI,CAAC;AAEjC,QAAA,sBAAsB,GAAG,
|
|
1
|
+
{"version":3,"file":"trace-protocol.js","sourceRoot":"","sources":["../../../src/node/trace/trace-protocol.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACzC,QAAA,yBAAyB,GAAG,IAAI,CAAC;AAEjC,QAAA,sBAAsB,GAAG,wBAAwB,CAAC;AAClD,QAAA,uBAAuB,GAAG,yBAAyB,CAAC;AAEpD,QAAA,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@celljs/web",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.4.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cell-component"
|
|
@@ -23,7 +23,8 @@
|
|
|
23
23
|
"lib",
|
|
24
24
|
"esm",
|
|
25
25
|
"src",
|
|
26
|
-
"cell.yml"
|
|
26
|
+
"cell.yml",
|
|
27
|
+
"cell.schema.json"
|
|
27
28
|
],
|
|
28
29
|
"scripts": {
|
|
29
30
|
"build": "tsc -b && bun ../../scripts/build-esm.ts",
|
|
@@ -32,8 +33,8 @@
|
|
|
32
33
|
"watch": "tsc -b -w --preserveWatchOutput"
|
|
33
34
|
},
|
|
34
35
|
"dependencies": {
|
|
35
|
-
"@celljs/core": "4.
|
|
36
|
-
"@celljs/http": "4.
|
|
36
|
+
"@celljs/core": "4.4.1",
|
|
37
|
+
"@celljs/http": "4.4.1"
|
|
37
38
|
},
|
|
38
39
|
"publishConfig": {
|
|
39
40
|
"access": "public"
|
package/src/common/constants.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
|
|
2
|
-
export const ENDPOINT = '
|
|
3
|
-
export const SERVER_PATH = '
|
|
4
|
-
export const CORS = '
|
|
2
|
+
export const ENDPOINT = 'server.endpoint';
|
|
3
|
+
export const SERVER_PATH = 'server.path';
|
|
4
|
+
export const CORS = 'web.cors';
|
|
5
5
|
export const AOP_POINTCUT = 'Endpoint';
|
|
@@ -76,6 +76,14 @@ export class BodyParser {
|
|
|
76
76
|
request._body = true;
|
|
77
77
|
}
|
|
78
78
|
|
|
79
|
+
/**
|
|
80
|
+
* The body of the request as the client sent it (decompressed, at most `limit` bytes), whatever its content type,
|
|
81
|
+
* without parsing it: for signatures computed over the raw bytes, as webhooks have. The request must not have been read.
|
|
82
|
+
*/
|
|
83
|
+
raw(request: any): Promise<Buffer> {
|
|
84
|
+
return this.read(request, request.headers);
|
|
85
|
+
}
|
|
86
|
+
|
|
79
87
|
protected contentType(header: string | undefined): { type: string, charset?: string } {
|
|
80
88
|
if (!header) {
|
|
81
89
|
return { type: '' };
|
|
@@ -2,7 +2,7 @@ import { CORS_MIDDLEWARE_PRIORITY } from '../cors';
|
|
|
2
2
|
|
|
3
3
|
export const BODY_MIDDLEWARE_PRIORITY = CORS_MIDDLEWARE_PRIORITY - 100;
|
|
4
4
|
|
|
5
|
-
/** `
|
|
5
|
+
/** `web.body`: how request bodies are read. */
|
|
6
6
|
export interface BodyOptions {
|
|
7
7
|
/** Largest body, in bytes or as `'100kb'`, `'5mb'` (after decompression). Default `'100kb'`. */
|
|
8
8
|
limit?: number | string;
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { describe, it } from 'bun:test';
|
|
2
|
+
import { expect } from 'chai';
|
|
3
|
+
import { AttributeScope, Context } from './context';
|
|
4
|
+
|
|
5
|
+
describe('web Context attributes', () => {
|
|
6
|
+
const inRequest = (fn: () => void) => Context.run(() => {
|
|
7
|
+
Context.setCurrent(new Context({} as any, {} as any));
|
|
8
|
+
fn();
|
|
9
|
+
});
|
|
10
|
+
|
|
11
|
+
it('without a session, the session scope is empty instead of throwing', () => inRequest(() => {
|
|
12
|
+
expect(Context.getAttr('missing')).to.equal(undefined);
|
|
13
|
+
expect(Context.getAttr('missing', AttributeScope.Session)).to.equal(undefined);
|
|
14
|
+
}));
|
|
15
|
+
|
|
16
|
+
it('falsy request values count as set; the session comes before the app', () => inRequest(() => {
|
|
17
|
+
Context.setAttr('count', 0);
|
|
18
|
+
expect(Context.getAttr('count')).to.equal(0);
|
|
19
|
+
Context.setSession({ 'ctx-spec-user': 'alice' } as any);
|
|
20
|
+
Context.setAttr('ctx-spec-user', 'app', AttributeScope.App);
|
|
21
|
+
expect(Context.getAttr('ctx-spec-user')).to.equal('alice');
|
|
22
|
+
Context.setAttr('flag', false, AttributeScope.Session);
|
|
23
|
+
expect(Context.getAttr('flag')).to.equal(false);
|
|
24
|
+
}));
|
|
25
|
+
});
|
package/src/node/context.ts
CHANGED
|
@@ -79,18 +79,18 @@ export class Context extends BaseContext {
|
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
81
|
|
|
82
|
+
/**
|
|
83
|
+
* The attribute of `scope`; without one, the first scope that has the key: request, session, app.
|
|
84
|
+
* Falsy values (0, false, '') count as set. Without a session (no session middleware) the session scope is empty.
|
|
85
|
+
*/
|
|
82
86
|
static override getAttr<T>(key: string, scope?: AttributeScope): T {
|
|
87
|
+
if (scope === AttributeScope.Session) {
|
|
88
|
+
return Context.getSession()?.[key];
|
|
89
|
+
}
|
|
83
90
|
if (scope !== undefined) {
|
|
84
|
-
|
|
85
|
-
return Context.getSession()[key];
|
|
86
|
-
} else {
|
|
87
|
-
return BaseContext.getAttr<T>(key, scope);
|
|
88
|
-
}
|
|
89
|
-
} else {
|
|
90
|
-
let value = BaseContext.getAttr<T>(key, AttributeScope.Request);
|
|
91
|
-
value = value ? value : Context.getSession()[key];
|
|
92
|
-
return value ? value : BaseContext.getAttr<T>(key, AttributeScope.App);
|
|
91
|
+
return BaseContext.getAttr<T>(key, scope);
|
|
93
92
|
}
|
|
93
|
+
return BaseContext.getAttr<T>(key, AttributeScope.Request) ?? Context.getSession()?.[key] ?? BaseContext.getAttr<T>(key, AttributeScope.App);
|
|
94
94
|
}
|
|
95
95
|
|
|
96
96
|
}
|
|
@@ -6,10 +6,10 @@ import { CookiesImpl } from './cookies';
|
|
|
6
6
|
@Component()
|
|
7
7
|
export class CookiesFactory {
|
|
8
8
|
|
|
9
|
-
@Value('
|
|
9
|
+
@Value('web.cookies.keys')
|
|
10
10
|
protected keys?: string[];
|
|
11
11
|
|
|
12
|
-
@Value('
|
|
12
|
+
@Value('web.cookies.secure')
|
|
13
13
|
protected secure?: boolean;
|
|
14
14
|
|
|
15
15
|
async create(): Promise<Cookies> {
|
|
@@ -5,7 +5,7 @@ export const COOKIES_MIDDLEWARE_PRIORITY = HTTP_MIDDLEWARE_PRIORITY - 100;
|
|
|
5
5
|
export const Cookies = Symbol('Cookies');
|
|
6
6
|
|
|
7
7
|
export interface CookieGetOptions {
|
|
8
|
-
/** Check the `<name>.sig` signature; default: whether `
|
|
8
|
+
/** Check the `<name>.sig` signature; default: whether `web.cookies.keys` are set. Without options nothing is checked. */
|
|
9
9
|
signed?: boolean;
|
|
10
10
|
}
|
|
11
11
|
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { describe, it } from 'bun:test';
|
|
2
|
+
import { expect } from 'chai';
|
|
3
|
+
import { CookiesSecurityCheck } from './cookies-security-check';
|
|
4
|
+
|
|
5
|
+
function codes(keys?: unknown[]): string[] {
|
|
6
|
+
return Object.assign(new CookiesSecurityCheck(), { keys }).check().map(warning => warning.code);
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
describe('CookiesSecurityCheck', () => {
|
|
10
|
+
it('warns about missing, default and short keys', () => {
|
|
11
|
+
expect(codes(undefined)).to.deep.equal(['CELL_SECURITY_COOKIE_KEYS_MISSING']);
|
|
12
|
+
expect(codes([])).to.deep.equal(['CELL_SECURITY_COOKIE_KEYS_MISSING']);
|
|
13
|
+
expect(codes(['abcdef'])).to.deep.equal(['CELL_SECURITY_DEFAULT_COOKIE_KEYS']);
|
|
14
|
+
expect(codes(['a-new-random-key-of-32-chars-xyz', 'abcdef'])).to.deep.equal(['CELL_SECURITY_DEFAULT_COOKIE_KEYS']);
|
|
15
|
+
expect(codes(['short'])).to.deep.equal(['CELL_SECURITY_WEAK_COOKIE_KEYS']);
|
|
16
|
+
});
|
|
17
|
+
|
|
18
|
+
it('accepts long random keys', () => {
|
|
19
|
+
expect(codes(['q8Yx0lJr6S1v4m3Wz7Nc2Bp9Kd5Hf0Ta'])).to.deep.equal([]);
|
|
20
|
+
});
|
|
21
|
+
});
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { Component, SecurityCheck, SecurityWarning, Value } from '@celljs/core';
|
|
2
|
+
|
|
3
|
+
/** The key in the cell.yml of @celljs/web, for development only. */
|
|
4
|
+
export const DEFAULT_COOKIE_KEYS: readonly string[] = ['abcdef'];
|
|
5
|
+
|
|
6
|
+
/** Shorter keys can be guessed; 32 characters of `openssl rand -base64 32` are plenty. */
|
|
7
|
+
export const MIN_COOKIE_KEY_LENGTH = 16;
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* `web.cookies.keys` sign the cookies, the session cookie among them: whoever knows a key can write a
|
|
11
|
+
* session (with the security context in it) that the server accepts.
|
|
12
|
+
*/
|
|
13
|
+
@Component(SecurityCheck)
|
|
14
|
+
export class CookiesSecurityCheck implements SecurityCheck {
|
|
15
|
+
|
|
16
|
+
@Value('web.cookies.keys')
|
|
17
|
+
protected readonly keys?: string[];
|
|
18
|
+
|
|
19
|
+
check(): SecurityWarning[] {
|
|
20
|
+
const keys = (this.keys ?? []).map(String);
|
|
21
|
+
if (keys.length === 0) {
|
|
22
|
+
return [{
|
|
23
|
+
code: 'CELL_SECURITY_COOKIE_KEYS_MISSING',
|
|
24
|
+
message: 'web.cookies.keys is empty, so cookies are not signed: clients can edit the session cookie and everything in it.',
|
|
25
|
+
hint: 'Set web.cookies.keys to a random secret from the environment, e.g. keys: ["${env.COOKIE_KEY}"] with COOKIE_KEY from openssl rand -base64 32.'
|
|
26
|
+
}];
|
|
27
|
+
}
|
|
28
|
+
if (keys.some(key => DEFAULT_COOKIE_KEYS.includes(key))) {
|
|
29
|
+
return [{
|
|
30
|
+
code: 'CELL_SECURITY_DEFAULT_COOKIE_KEYS',
|
|
31
|
+
message: 'web.cookies.keys holds the development key of @celljs/web, which is public: anyone can sign a session cookie the server accepts.',
|
|
32
|
+
hint: 'Set web.cookies.keys to a random secret from the environment, e.g. keys: ["${env.COOKIE_KEY}"] with COOKIE_KEY from openssl rand -base64 32.'
|
|
33
|
+
}];
|
|
34
|
+
}
|
|
35
|
+
if (keys.some(key => key.length < MIN_COOKIE_KEY_LENGTH)) {
|
|
36
|
+
return [{
|
|
37
|
+
code: 'CELL_SECURITY_WEAK_COOKIE_KEYS',
|
|
38
|
+
message: `A key of web.cookies.keys is shorter than ${MIN_COOKIE_KEY_LENGTH} characters and can be guessed.`,
|
|
39
|
+
hint: 'Use random keys of at least 32 characters, e.g. from openssl rand -base64 32; keep the old key after the new one while sessions signed with it expire.'
|
|
40
|
+
}];
|
|
41
|
+
}
|
|
42
|
+
return [];
|
|
43
|
+
}
|
|
44
|
+
}
|
|
@@ -25,7 +25,7 @@ function escape(name: string): string {
|
|
|
25
25
|
}
|
|
26
26
|
|
|
27
27
|
/**
|
|
28
|
-
* Cookies of the current request and response. Signed cookies (when `
|
|
28
|
+
* Cookies of the current request and response. Signed cookies (when `web.cookies.keys` are set) carry a
|
|
29
29
|
* `<name>.sig` cookie made with the first key; any of the keys verifies it, and a cookie signed with an
|
|
30
30
|
* older key is signed again with the first.
|
|
31
31
|
*/
|
|
@@ -35,7 +35,7 @@ function isAllowed(origin: string, allowed: CorsOrigin): boolean {
|
|
|
35
35
|
return !!allowed;
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
-
/** CORS headers from `
|
|
38
|
+
/** CORS headers from `web.cors`, with the options and defaults of the `cors` package of express. */
|
|
39
39
|
@Component(Middleware)
|
|
40
40
|
export class CorsMiddleware implements Middleware {
|
|
41
41
|
|
|
@@ -3,7 +3,7 @@ export const CORS_MIDDLEWARE_PRIORITY = TRACE_MIDDLEWARE_PRIORITY - 100;
|
|
|
3
3
|
|
|
4
4
|
export type CorsOrigin = boolean | string | RegExp | (string | RegExp)[];
|
|
5
5
|
|
|
6
|
-
/** `
|
|
6
|
+
/** `web.cors`, with the options and defaults of the `cors` package of express. */
|
|
7
7
|
export interface CorsOptions {
|
|
8
8
|
/**
|
|
9
9
|
* `'*'` (default): any origin; a string: that origin; `true`: the origin of the request; a RegExp or a list:
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
import { describe, it } from 'bun:test';
|
|
2
|
+
import { expect } from 'chai';
|
|
3
|
+
import { MockLogger } from '@celljs/core/lib/common/test/mock-logger';
|
|
4
|
+
import { DispatcherImpl } from './dispatcher';
|
|
5
|
+
import { HttpError, NotFoundError } from '../error';
|
|
6
|
+
import { DefaultErrorHandler, HttpErrorHandler } from '../error/error-handler-provider';
|
|
7
|
+
import { ErrorMessageResolverImpl } from '../error/error-message-resolver';
|
|
8
|
+
import { Context } from '../context';
|
|
9
|
+
|
|
10
|
+
class RecordingLogger extends MockLogger {
|
|
11
|
+
readonly lines: [string, any][] = [];
|
|
12
|
+
override error(message: any): void {
|
|
13
|
+
this.lines.push(['error', message]);
|
|
14
|
+
}
|
|
15
|
+
override debug(message: any): void {
|
|
16
|
+
this.lines.push(['debug', String(message)]);
|
|
17
|
+
}
|
|
18
|
+
override isEnabled(): boolean {
|
|
19
|
+
return true;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
function dispatcher(): { dispatcher: DispatcherImpl, logger: RecordingLogger } {
|
|
24
|
+
const logger = new RecordingLogger();
|
|
25
|
+
return { dispatcher: Object.assign(new DispatcherImpl(), { logger }), logger };
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
describe('DispatcherImpl', () => {
|
|
29
|
+
it('logs a server error with its stack, a client error only at the debug level', () => {
|
|
30
|
+
const { dispatcher: d, logger } = dispatcher();
|
|
31
|
+
d['logError'](new Error('boom'));
|
|
32
|
+
d['logError'](new NotFoundError('/favicon.ico'));
|
|
33
|
+
d['logError'](new HttpError(503, 'unavailable'));
|
|
34
|
+
expect(logger.lines.map(([level]) => level)).to.deep.equal(['error', 'debug', 'error']);
|
|
35
|
+
// The Error itself goes to the logger, which writes its stack and causes.
|
|
36
|
+
expect(logger.lines[0][1]).to.be.instanceOf(Error);
|
|
37
|
+
expect(logger.lines[0][1].message).to.equal('boom');
|
|
38
|
+
expect(logger.lines[1][1]).to.equal('404 /favicon.ico');
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
it('logs an error a handler answered with a redirect or a 4xx at the debug level', () => {
|
|
42
|
+
const { dispatcher: d, logger } = dispatcher();
|
|
43
|
+
d['logError'](new Error('Unauthorized'), 401);
|
|
44
|
+
d['logError'](new Error('login required'), 302);
|
|
45
|
+
d['logError'](new Error('boom'), 500);
|
|
46
|
+
d['logError'](new Error('wrapped by a template'), 200);
|
|
47
|
+
expect(logger.lines.map(([level]) => level)).to.deep.equal(['debug', 'debug', 'error', 'error']);
|
|
48
|
+
expect(logger.lines[0][1]).to.equal('401 Unauthorized');
|
|
49
|
+
});
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
describe('error handlers', () => {
|
|
53
|
+
function handler<T extends object>(type: new () => T, exposeMessages?: boolean): T {
|
|
54
|
+
return Object.assign(new type(), { errorMessageResolver: Object.assign(new ErrorMessageResolverImpl(), { exposeMessages }) });
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
function response(headersSent: boolean) {
|
|
58
|
+
const calls: unknown[][] = [];
|
|
59
|
+
return {
|
|
60
|
+
calls,
|
|
61
|
+
statusCode: 200,
|
|
62
|
+
headersSent,
|
|
63
|
+
writableEnded: false,
|
|
64
|
+
end(...args: unknown[]) {
|
|
65
|
+
calls.push(args);
|
|
66
|
+
this.writableEnded = true;
|
|
67
|
+
}
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
it('answer with the status and message of an HttpError', async () => {
|
|
72
|
+
const res = response(false);
|
|
73
|
+
await handler(HttpErrorHandler).handle({ response: res } as unknown as Context, new HttpError(409, 'conflict'));
|
|
74
|
+
expect(res.statusCode).to.equal(409);
|
|
75
|
+
expect(res.calls).to.deep.equal([['conflict']]);
|
|
76
|
+
});
|
|
77
|
+
|
|
78
|
+
it('only end a response whose headers were sent, and leave an ended one alone', async () => {
|
|
79
|
+
const started = response(true);
|
|
80
|
+
await handler(HttpErrorHandler).handle({ response: started } as unknown as Context, new HttpError(409, 'conflict'));
|
|
81
|
+
expect(started.statusCode).to.equal(200);
|
|
82
|
+
expect(started.calls).to.deep.equal([[]]);
|
|
83
|
+
await handler(HttpErrorHandler).handle({ response: started } as unknown as Context, new HttpError(409, 'again'));
|
|
84
|
+
expect(started.calls).to.have.length(1);
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
it('answer a 500 with the status text unless messages are exposed', async () => {
|
|
88
|
+
const hidden = response(false);
|
|
89
|
+
await handler(DefaultErrorHandler, false).handle({ response: hidden } as unknown as Context, new Error('password authentication failed for user "app"'));
|
|
90
|
+
expect(hidden.statusCode).to.equal(500);
|
|
91
|
+
expect(hidden.calls).to.deep.equal([['Internal Server Error']]);
|
|
92
|
+
const shown = response(false);
|
|
93
|
+
await handler(DefaultErrorHandler, true).handle({ response: shown } as unknown as Context, new Error('boom'));
|
|
94
|
+
expect(shown.calls).to.deep.equal([['boom']]);
|
|
95
|
+
});
|
|
96
|
+
});
|
|
97
|
+
|
|
98
|
+
describe('DispatcherImpl.handleError', () => {
|
|
99
|
+
it('ends the response with 500 when no handler answers, and does not log an error a handler gives back twice', async () => {
|
|
100
|
+
const logger = new RecordingLogger();
|
|
101
|
+
const failure = new Error('boom');
|
|
102
|
+
const rethrowing = { priority: 1, canHandle: async () => true, handle: async (_: unknown, err: Error) => { throw err; } };
|
|
103
|
+
const d = Object.assign(new DispatcherImpl(), { logger, errorHandlerProvider: { provide: () => [rethrowing] } });
|
|
104
|
+
const res = { statusCode: 200, headersSent: false, writableEnded: false, body: undefined as unknown, end(body?: unknown) { this.body = body; this.writableEnded = true; } };
|
|
105
|
+
await d['handleError']({ response: res } as unknown as Context, failure);
|
|
106
|
+
expect(res.statusCode).to.equal(500);
|
|
107
|
+
expect(res.body).to.equal('Internal Server Error');
|
|
108
|
+
expect(logger.lines).to.have.length(0);
|
|
109
|
+
});
|
|
110
|
+
});
|
|
@@ -4,6 +4,10 @@ import { ErrorHandlerProvider } from '../error/error-handler-provider';
|
|
|
4
4
|
import { Dispatcher } from './dispatcher-protocol';
|
|
5
5
|
import { Component, Autowired, Logger } from '@celljs/core';
|
|
6
6
|
import { HandlerExecutionChain, HandlerMapping } from '../handler/handler-protocol';
|
|
7
|
+
import { STATUS_CODES } from 'node:http';
|
|
8
|
+
import { HttpStatus } from '@celljs/http';
|
|
9
|
+
import { HttpError } from '../error/http-error';
|
|
10
|
+
import { ErrorResponseUtil } from '../error/error-response-util';
|
|
7
11
|
|
|
8
12
|
@Component(Dispatcher)
|
|
9
13
|
export class DispatcherImpl implements Dispatcher<Context> {
|
|
@@ -29,11 +33,36 @@ export class DispatcherImpl implements Dispatcher<Context> {
|
|
|
29
33
|
const middlewares = this.middlewareProvider.provide();
|
|
30
34
|
await this.handlerExecutionChain.execute(middlewares, () => this.handlerMapping.handle());
|
|
31
35
|
} catch (err) {
|
|
32
|
-
|
|
33
|
-
|
|
36
|
+
try {
|
|
37
|
+
await this.handleError(ctx, err);
|
|
38
|
+
} finally {
|
|
39
|
+
// After the handlers: the status they answered tells a refused request from a failure.
|
|
40
|
+
this.logError(err, ctx.response.statusCode);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/**
|
|
46
|
+
* Server errors with their stack at the error level. Client errors are answers, not failures, and only
|
|
47
|
+
* go to the debug level: a 4xx `HttpError` (a 404 for an unknown path), or any error a handler answered
|
|
48
|
+
* with a redirect or a 4xx (login required, access denied).
|
|
49
|
+
*/
|
|
50
|
+
protected logError(err: unknown, status?: number): void {
|
|
51
|
+
const answered = status !== undefined && status >= 300 && status < 500;
|
|
52
|
+
if ((err instanceof HttpError && err.statusCode < 500) || answered) {
|
|
53
|
+
if (this.logger.isEnabled('debug')) {
|
|
54
|
+
this.logger.debug(`${err instanceof HttpError ? err.statusCode : status} ${err instanceof Error ? err.message : String(err)}`);
|
|
55
|
+
}
|
|
56
|
+
return;
|
|
34
57
|
}
|
|
58
|
+
// The logger writes an error with its stack and causes.
|
|
59
|
+
this.logger.error(err instanceof Error ? err : String(err));
|
|
35
60
|
}
|
|
36
61
|
|
|
62
|
+
/**
|
|
63
|
+
* The handler with the highest priority that can handle the error answers; when its `handle` throws,
|
|
64
|
+
* the next one is tried. When none answers, the response ends with a bare 500, so no request hangs.
|
|
65
|
+
*/
|
|
37
66
|
protected async handleError(ctx: Context, err: Error): Promise<void> {
|
|
38
67
|
const errorHandlers = this.errorHandlerProvider.provide();
|
|
39
68
|
for (const handler of errorHandlers) {
|
|
@@ -41,11 +70,15 @@ export class DispatcherImpl implements Dispatcher<Context> {
|
|
|
41
70
|
try {
|
|
42
71
|
await handler.handle(ctx, err);
|
|
43
72
|
} catch (error) {
|
|
44
|
-
|
|
73
|
+
// A handler that gives the error back (it cannot answer it) is not a second failure.
|
|
74
|
+
if (error !== err) {
|
|
75
|
+
this.logError(error);
|
|
76
|
+
}
|
|
45
77
|
continue;
|
|
46
78
|
}
|
|
47
79
|
return;
|
|
48
80
|
}
|
|
49
81
|
}
|
|
82
|
+
ErrorResponseUtil.end(ctx, HttpStatus.INTERNAL_SERVER_ERROR, STATUS_CODES[HttpStatus.INTERNAL_SERVER_ERROR]!);
|
|
50
83
|
}
|
|
51
|
-
}
|
|
84
|
+
}
|