@morojs/moro 1.0.0 → 1.0.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 +1 -1
- package/dist/core/config/index.d.ts +5 -5
- package/dist/core/config/index.js +1 -1
- package/dist/core/config/index.js.map +1 -1
- package/dist/core/config/loader.d.ts +1 -1
- package/dist/core/config/loader.js +58 -82
- package/dist/core/config/loader.js.map +1 -1
- package/dist/core/config/schema.d.ts +1 -1
- package/dist/core/config/schema.js +52 -111
- package/dist/core/config/schema.js.map +1 -1
- package/dist/core/config/utils.d.ts +2 -2
- package/dist/core/config/utils.js +18 -18
- package/dist/core/config/utils.js.map +1 -1
- package/dist/core/database/adapters/drizzle.d.ts +1 -1
- package/dist/core/database/adapters/drizzle.js +39 -55
- package/dist/core/database/adapters/drizzle.js.map +1 -1
- package/dist/core/database/adapters/index.d.ts +7 -7
- package/dist/core/database/adapters/index.js +11 -11
- package/dist/core/database/adapters/index.js.map +1 -1
- package/dist/core/database/adapters/mongodb.d.ts +1 -1
- package/dist/core/database/adapters/mongodb.js +19 -23
- package/dist/core/database/adapters/mongodb.js.map +1 -1
- package/dist/core/database/adapters/mysql.d.ts +1 -1
- package/dist/core/database/adapters/mysql.js +31 -27
- package/dist/core/database/adapters/mysql.js.map +1 -1
- package/dist/core/database/adapters/postgresql.d.ts +1 -1
- package/dist/core/database/adapters/postgresql.js +27 -35
- package/dist/core/database/adapters/postgresql.js.map +1 -1
- package/dist/core/database/adapters/redis.d.ts +1 -1
- package/dist/core/database/adapters/redis.js +24 -24
- package/dist/core/database/adapters/redis.js.map +1 -1
- package/dist/core/database/adapters/sqlite.d.ts +1 -1
- package/dist/core/database/adapters/sqlite.js +36 -36
- package/dist/core/database/adapters/sqlite.js.map +1 -1
- package/dist/core/database/index.d.ts +2 -2
- package/dist/core/docs/index.d.ts +7 -7
- package/dist/core/docs/index.js +13 -15
- package/dist/core/docs/index.js.map +1 -1
- package/dist/core/docs/openapi-generator.d.ts +5 -5
- package/dist/core/docs/openapi-generator.js +93 -94
- package/dist/core/docs/openapi-generator.js.map +1 -1
- package/dist/core/docs/simple-docs.d.ts +1 -1
- package/dist/core/docs/simple-docs.js +25 -28
- package/dist/core/docs/simple-docs.js.map +1 -1
- package/dist/core/docs/swagger-ui.d.ts +2 -2
- package/dist/core/docs/swagger-ui.js +46 -51
- package/dist/core/docs/swagger-ui.js.map +1 -1
- package/dist/core/docs/zod-to-openapi.d.ts +1 -1
- package/dist/core/docs/zod-to-openapi.js +115 -125
- package/dist/core/docs/zod-to-openapi.js.map +1 -1
- package/dist/core/events/event-bus.d.ts +1 -1
- package/dist/core/events/event-bus.js +15 -21
- package/dist/core/events/event-bus.js.map +1 -1
- package/dist/core/events/index.d.ts +2 -2
- package/dist/core/framework.d.ts +5 -5
- package/dist/core/framework.js +55 -60
- package/dist/core/framework.js.map +1 -1
- package/dist/core/http/http-server.d.ts +2 -2
- package/dist/core/http/http-server.js +228 -261
- package/dist/core/http/http-server.js.map +1 -1
- package/dist/core/http/index.d.ts +3 -3
- package/dist/core/http/router.d.ts +1 -1
- package/dist/core/http/router.js +15 -17
- package/dist/core/http/router.js.map +1 -1
- package/dist/core/logger/filters.d.ts +1 -1
- package/dist/core/logger/filters.js +16 -16
- package/dist/core/logger/filters.js.map +1 -1
- package/dist/core/logger/index.d.ts +3 -3
- package/dist/core/logger/logger.d.ts +1 -1
- package/dist/core/logger/logger.js +48 -59
- package/dist/core/logger/logger.js.map +1 -1
- package/dist/core/logger/outputs.d.ts +4 -4
- package/dist/core/logger/outputs.js +16 -20
- package/dist/core/logger/outputs.js.map +1 -1
- package/dist/core/middleware/built-in/adapters/cache/file.d.ts +1 -1
- package/dist/core/middleware/built-in/adapters/cache/file.js +19 -19
- package/dist/core/middleware/built-in/adapters/cache/file.js.map +1 -1
- package/dist/core/middleware/built-in/adapters/cache/index.d.ts +4 -4
- package/dist/core/middleware/built-in/adapters/cache/index.js +3 -3
- package/dist/core/middleware/built-in/adapters/cache/index.js.map +1 -1
- package/dist/core/middleware/built-in/adapters/cache/memory.d.ts +1 -1
- package/dist/core/middleware/built-in/adapters/cache/memory.js +5 -5
- package/dist/core/middleware/built-in/adapters/cache/memory.js.map +1 -1
- package/dist/core/middleware/built-in/adapters/cache/redis.d.ts +1 -1
- package/dist/core/middleware/built-in/adapters/cache/redis.js +18 -18
- package/dist/core/middleware/built-in/adapters/cache/redis.js.map +1 -1
- package/dist/core/middleware/built-in/adapters/cdn/azure.d.ts +1 -1
- package/dist/core/middleware/built-in/adapters/cdn/azure.js +8 -8
- package/dist/core/middleware/built-in/adapters/cdn/azure.js.map +1 -1
- package/dist/core/middleware/built-in/adapters/cdn/cloudflare.d.ts +1 -1
- package/dist/core/middleware/built-in/adapters/cdn/cloudflare.js +14 -14
- package/dist/core/middleware/built-in/adapters/cdn/cloudflare.js.map +1 -1
- package/dist/core/middleware/built-in/adapters/cdn/cloudfront.d.ts +1 -1
- package/dist/core/middleware/built-in/adapters/cdn/cloudfront.js +13 -15
- package/dist/core/middleware/built-in/adapters/cdn/cloudfront.js.map +1 -1
- package/dist/core/middleware/built-in/adapters/cdn/index.d.ts +4 -4
- package/dist/core/middleware/built-in/adapters/cdn/index.js +3 -3
- package/dist/core/middleware/built-in/adapters/index.d.ts +4 -4
- package/dist/core/middleware/built-in/auth.d.ts +1 -1
- package/dist/core/middleware/built-in/auth.js +14 -14
- package/dist/core/middleware/built-in/cache.d.ts +2 -2
- package/dist/core/middleware/built-in/cache.js +43 -45
- package/dist/core/middleware/built-in/cache.js.map +1 -1
- package/dist/core/middleware/built-in/cdn.d.ts +2 -2
- package/dist/core/middleware/built-in/cdn.js +27 -29
- package/dist/core/middleware/built-in/cdn.js.map +1 -1
- package/dist/core/middleware/built-in/cookie.d.ts +2 -2
- package/dist/core/middleware/built-in/cookie.js +17 -17
- package/dist/core/middleware/built-in/cookie.js.map +1 -1
- package/dist/core/middleware/built-in/cors.d.ts +1 -1
- package/dist/core/middleware/built-in/cors.js +13 -13
- package/dist/core/middleware/built-in/csp.d.ts +1 -1
- package/dist/core/middleware/built-in/csp.js +22 -25
- package/dist/core/middleware/built-in/csp.js.map +1 -1
- package/dist/core/middleware/built-in/csrf.d.ts +1 -1
- package/dist/core/middleware/built-in/csrf.js +21 -24
- package/dist/core/middleware/built-in/csrf.js.map +1 -1
- package/dist/core/middleware/built-in/error-tracker.js +2 -2
- package/dist/core/middleware/built-in/index.d.ts +14 -14
- package/dist/core/middleware/built-in/performance-monitor.js +2 -2
- package/dist/core/middleware/built-in/rate-limit.d.ts +1 -1
- package/dist/core/middleware/built-in/rate-limit.js +12 -12
- package/dist/core/middleware/built-in/request-logger.js.map +1 -1
- package/dist/core/middleware/built-in/session.d.ts +5 -5
- package/dist/core/middleware/built-in/session.js +35 -38
- package/dist/core/middleware/built-in/session.js.map +1 -1
- package/dist/core/middleware/built-in/sse.d.ts +1 -1
- package/dist/core/middleware/built-in/sse.js +20 -22
- package/dist/core/middleware/built-in/sse.js.map +1 -1
- package/dist/core/middleware/built-in/validation.d.ts +1 -1
- package/dist/core/middleware/built-in/validation.js +13 -13
- package/dist/core/middleware/index.d.ts +5 -5
- package/dist/core/middleware/index.js +16 -16
- package/dist/core/middleware/index.js.map +1 -1
- package/dist/core/modules/auto-discovery.d.ts +2 -2
- package/dist/core/modules/auto-discovery.js +12 -13
- package/dist/core/modules/auto-discovery.js.map +1 -1
- package/dist/core/modules/index.d.ts +2 -2
- package/dist/core/modules/index.js.map +1 -1
- package/dist/core/modules/modules.d.ts +3 -3
- package/dist/core/modules/modules.js +3 -6
- package/dist/core/modules/modules.js.map +1 -1
- package/dist/core/networking/index.d.ts +2 -2
- package/dist/core/networking/index.js.map +1 -1
- package/dist/core/networking/service-discovery.d.ts +2 -2
- package/dist/core/networking/service-discovery.js +27 -27
- package/dist/core/networking/service-discovery.js.map +1 -1
- package/dist/core/networking/websocket-manager.d.ts +3 -3
- package/dist/core/networking/websocket-manager.js +15 -16
- package/dist/core/networking/websocket-manager.js.map +1 -1
- package/dist/core/routing/app-integration.d.ts +2 -2
- package/dist/core/routing/app-integration.js +13 -13
- package/dist/core/routing/app-integration.js.map +1 -1
- package/dist/core/routing/index.d.ts +3 -3
- package/dist/core/routing/index.js +43 -52
- package/dist/core/routing/index.js.map +1 -1
- package/dist/core/runtime/aws-lambda-adapter.d.ts +3 -3
- package/dist/core/runtime/aws-lambda-adapter.js +14 -16
- package/dist/core/runtime/aws-lambda-adapter.js.map +1 -1
- package/dist/core/runtime/base-adapter.d.ts +2 -2
- package/dist/core/runtime/base-adapter.js +11 -12
- package/dist/core/runtime/base-adapter.js.map +1 -1
- package/dist/core/runtime/cloudflare-workers-adapter.d.ts +3 -3
- package/dist/core/runtime/cloudflare-workers-adapter.js +20 -21
- package/dist/core/runtime/cloudflare-workers-adapter.js.map +1 -1
- package/dist/core/runtime/index.d.ts +9 -9
- package/dist/core/runtime/index.js +4 -4
- package/dist/core/runtime/index.js.map +1 -1
- package/dist/core/runtime/node-adapter.d.ts +5 -5
- package/dist/core/runtime/node-adapter.js +35 -35
- package/dist/core/runtime/node-adapter.js.map +1 -1
- package/dist/core/runtime/vercel-edge-adapter.d.ts +3 -3
- package/dist/core/runtime/vercel-edge-adapter.js +12 -15
- package/dist/core/runtime/vercel-edge-adapter.js.map +1 -1
- package/dist/core/utilities/circuit-breaker.js +6 -6
- package/dist/core/utilities/container.d.ts +1 -1
- package/dist/core/utilities/container.js +17 -22
- package/dist/core/utilities/container.js.map +1 -1
- package/dist/core/utilities/hooks.d.ts +3 -3
- package/dist/core/utilities/hooks.js +11 -11
- package/dist/core/utilities/hooks.js.map +1 -1
- package/dist/core/utilities/index.d.ts +4 -4
- package/dist/core/validation/index.d.ts +3 -3
- package/dist/core/validation/index.js +15 -15
- package/dist/core/validation/index.js.map +1 -1
- package/dist/index.d.ts +31 -30
- package/dist/index.js +28 -1
- package/dist/index.js.map +1 -1
- package/dist/moro.d.ts +14 -14
- package/dist/moro.js +79 -88
- package/dist/moro.js.map +1 -1
- package/dist/types/cache.d.ts +1 -1
- package/dist/types/core.d.ts +2 -2
- package/dist/types/events.d.ts +19 -19
- package/dist/types/hooks.d.ts +1 -1
- package/dist/types/http.d.ts +2 -2
- package/dist/types/logger.d.ts +3 -3
- package/dist/types/module.d.ts +2 -2
- package/dist/types/runtime.d.ts +2 -2
- package/dist/types/session.d.ts +4 -4
- package/package.json +180 -164
- package/src/core/config/index.ts +7 -9
- package/src/core/config/loader.ts +86 -158
- package/src/core/config/schema.ts +59 -122
- package/src/core/config/utils.ts +27 -45
- package/src/core/database/adapters/drizzle.ts +53 -75
- package/src/core/database/adapters/index.ts +26 -29
- package/src/core/database/adapters/mongodb.ts +31 -54
- package/src/core/database/adapters/mysql.ts +40 -50
- package/src/core/database/adapters/postgresql.ts +32 -42
- package/src/core/database/adapters/redis.ts +31 -36
- package/src/core/database/adapters/sqlite.ts +43 -51
- package/src/core/database/index.ts +2 -2
- package/src/core/docs/index.ts +25 -39
- package/src/core/docs/openapi-generator.ts +104 -117
- package/src/core/docs/simple-docs.ts +29 -39
- package/src/core/docs/swagger-ui.ts +57 -76
- package/src/core/docs/zod-to-openapi.ts +121 -153
- package/src/core/events/event-bus.ts +22 -45
- package/src/core/events/index.ts +2 -2
- package/src/core/framework.ts +119 -197
- package/src/core/http/http-server.ts +260 -360
- package/src/core/http/index.ts +3 -8
- package/src/core/http/router.ts +19 -31
- package/src/core/logger/filters.ts +19 -22
- package/src/core/logger/index.ts +3 -3
- package/src/core/logger/logger.ts +59 -100
- package/src/core/logger/outputs.ts +23 -27
- package/src/core/middleware/built-in/adapters/cache/file.ts +21 -23
- package/src/core/middleware/built-in/adapters/cache/index.ts +11 -14
- package/src/core/middleware/built-in/adapters/cache/memory.ts +7 -7
- package/src/core/middleware/built-in/adapters/cache/redis.ts +21 -24
- package/src/core/middleware/built-in/adapters/cdn/azure.ts +10 -18
- package/src/core/middleware/built-in/adapters/cdn/cloudflare.ts +19 -36
- package/src/core/middleware/built-in/adapters/cdn/cloudfront.ts +17 -26
- package/src/core/middleware/built-in/adapters/cdn/index.ts +10 -10
- package/src/core/middleware/built-in/adapters/index.ts +4 -4
- package/src/core/middleware/built-in/auth.ts +16 -16
- package/src/core/middleware/built-in/cache.ts +50 -67
- package/src/core/middleware/built-in/cdn.ts +34 -61
- package/src/core/middleware/built-in/cookie.ts +23 -28
- package/src/core/middleware/built-in/cors.ts +17 -17
- package/src/core/middleware/built-in/csp.ts +25 -31
- package/src/core/middleware/built-in/csrf.ts +24 -29
- package/src/core/middleware/built-in/error-tracker.ts +3 -3
- package/src/core/middleware/built-in/index.ts +28 -28
- package/src/core/middleware/built-in/performance-monitor.ts +4 -4
- package/src/core/middleware/built-in/rate-limit.ts +15 -15
- package/src/core/middleware/built-in/request-logger.ts +1 -3
- package/src/core/middleware/built-in/session.ts +47 -70
- package/src/core/middleware/built-in/sse.ts +23 -28
- package/src/core/middleware/built-in/validation.ts +15 -15
- package/src/core/middleware/index.ts +26 -37
- package/src/core/modules/auto-discovery.ts +21 -31
- package/src/core/modules/index.ts +2 -5
- package/src/core/modules/modules.ts +11 -20
- package/src/core/networking/index.ts +2 -6
- package/src/core/networking/service-discovery.ts +41 -61
- package/src/core/networking/websocket-manager.ts +27 -36
- package/src/core/routing/app-integration.ts +19 -32
- package/src/core/routing/index.ts +57 -88
- package/src/core/runtime/aws-lambda-adapter.ts +20 -30
- package/src/core/runtime/base-adapter.ts +17 -27
- package/src/core/runtime/cloudflare-workers-adapter.ts +28 -42
- package/src/core/runtime/index.ts +21 -33
- package/src/core/runtime/node-adapter.ts +59 -73
- package/src/core/runtime/vercel-edge-adapter.ts +18 -29
- package/src/core/utilities/circuit-breaker.ts +7 -7
- package/src/core/utilities/container.ts +52 -89
- package/src/core/utilities/hooks.ts +17 -23
- package/src/core/utilities/index.ts +4 -4
- package/src/core/validation/index.ts +25 -51
- package/src/index.ts +58 -60
- package/src/moro.ts +119 -191
- package/src/types/cache.ts +1 -1
- package/src/types/core.ts +2 -2
- package/src/types/database.ts +2 -10
- package/src/types/events.ts +23 -31
- package/src/types/hooks.ts +1 -1
- package/src/types/http.ts +5 -8
- package/src/types/logger.ts +7 -23
- package/src/types/module.ts +2 -2
- package/src/types/runtime.ts +6 -21
- package/src/types/session.ts +4 -4
|
@@ -2,26 +2,26 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.csp = void 0;
|
|
4
4
|
const logger_1 = require("../../logger");
|
|
5
|
-
const logger = (0, logger_1.createFrameworkLogger)(
|
|
5
|
+
const logger = (0, logger_1.createFrameworkLogger)('CSPMiddleware');
|
|
6
6
|
const csp = (options = {}) => ({
|
|
7
|
-
name:
|
|
8
|
-
version:
|
|
7
|
+
name: 'csp',
|
|
8
|
+
version: '1.0.0',
|
|
9
9
|
metadata: {
|
|
10
|
-
name:
|
|
11
|
-
version:
|
|
12
|
-
description:
|
|
13
|
-
author:
|
|
10
|
+
name: 'csp',
|
|
11
|
+
version: '1.0.0',
|
|
12
|
+
description: 'Content Security Policy middleware with nonce support and violation reporting',
|
|
13
|
+
author: 'MoroJS Team',
|
|
14
14
|
},
|
|
15
15
|
install: async (hooks, middlewareOptions = {}) => {
|
|
16
|
-
logger.debug(
|
|
17
|
-
hooks.before(
|
|
16
|
+
logger.debug('Installing CSP middleware', 'Installation');
|
|
17
|
+
hooks.before('request', async (context) => {
|
|
18
18
|
const req = context.request;
|
|
19
19
|
const res = context.response;
|
|
20
20
|
const directives = options.directives || {
|
|
21
21
|
defaultSrc: ["'self'"],
|
|
22
22
|
scriptSrc: ["'self'"],
|
|
23
23
|
styleSrc: ["'self'", "'unsafe-inline'"],
|
|
24
|
-
imgSrc: ["'self'",
|
|
24
|
+
imgSrc: ["'self'", 'data:', 'https:'],
|
|
25
25
|
connectSrc: ["'self'"],
|
|
26
26
|
fontSrc: ["'self'"],
|
|
27
27
|
objectSrc: ["'none'"],
|
|
@@ -31,30 +31,27 @@ const csp = (options = {}) => ({
|
|
|
31
31
|
// Generate nonce if requested
|
|
32
32
|
let nonce;
|
|
33
33
|
if (options.nonce) {
|
|
34
|
-
const crypto = require(
|
|
35
|
-
nonce = crypto.randomBytes(16).toString(
|
|
34
|
+
const crypto = require('crypto');
|
|
35
|
+
nonce = crypto.randomBytes(16).toString('base64');
|
|
36
36
|
req.cspNonce = nonce;
|
|
37
37
|
}
|
|
38
38
|
// Build CSP header value
|
|
39
39
|
const cspParts = [];
|
|
40
40
|
for (const [directive, sources] of Object.entries(directives)) {
|
|
41
|
-
if (directive ===
|
|
42
|
-
cspParts.push(
|
|
41
|
+
if (directive === 'upgradeInsecureRequests' && sources === true) {
|
|
42
|
+
cspParts.push('upgrade-insecure-requests');
|
|
43
43
|
}
|
|
44
|
-
else if (directive ===
|
|
45
|
-
cspParts.push(
|
|
44
|
+
else if (directive === 'blockAllMixedContent' && sources === true) {
|
|
45
|
+
cspParts.push('block-all-mixed-content');
|
|
46
46
|
}
|
|
47
47
|
else if (Array.isArray(sources)) {
|
|
48
|
-
let sourceList = sources.join(
|
|
48
|
+
let sourceList = sources.join(' ');
|
|
49
49
|
// Add nonce to script-src and style-src if enabled
|
|
50
|
-
if (nonce &&
|
|
51
|
-
(directive === "scriptSrc" || directive === "styleSrc")) {
|
|
50
|
+
if (nonce && (directive === 'scriptSrc' || directive === 'styleSrc')) {
|
|
52
51
|
sourceList += ` 'nonce-${nonce}'`;
|
|
53
52
|
}
|
|
54
53
|
// Convert camelCase to kebab-case
|
|
55
|
-
const kebabDirective = directive
|
|
56
|
-
.replace(/([A-Z])/g, "-$1")
|
|
57
|
-
.toLowerCase();
|
|
54
|
+
const kebabDirective = directive.replace(/([A-Z])/g, '-$1').toLowerCase();
|
|
58
55
|
cspParts.push(`${kebabDirective} ${sourceList}`);
|
|
59
56
|
}
|
|
60
57
|
}
|
|
@@ -62,10 +59,10 @@ const csp = (options = {}) => ({
|
|
|
62
59
|
if (options.reportUri) {
|
|
63
60
|
cspParts.push(`report-uri ${options.reportUri}`);
|
|
64
61
|
}
|
|
65
|
-
const cspValue = cspParts.join(
|
|
62
|
+
const cspValue = cspParts.join('; ');
|
|
66
63
|
const headerName = options.reportOnly
|
|
67
|
-
?
|
|
68
|
-
:
|
|
64
|
+
? 'Content-Security-Policy-Report-Only'
|
|
65
|
+
: 'Content-Security-Policy';
|
|
69
66
|
res.setHeader(headerName, cspValue);
|
|
70
67
|
});
|
|
71
68
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"csp.js","sourceRoot":"","sources":["../../../../src/core/middleware/built-in/csp.ts"],"names":[],"mappings":";;;AAEA,yCAAqD;AAErD,MAAM,MAAM,GAAG,IAAA,8BAAqB,EAAC,eAAe,CAAC,CAAC;AAE/C,MAAM,GAAG,GAAG,CACjB,UAoBI,EAAE,EACe,EAAE,CAAC,CAAC;IACzB,IAAI,EAAE,KAAK;IACX,OAAO,EAAE,OAAO;IAChB,QAAQ,EAAE;QACR,IAAI,EAAE,KAAK;QACX,OAAO,EAAE,OAAO;QAChB,WAAW,
|
|
1
|
+
{"version":3,"file":"csp.js","sourceRoot":"","sources":["../../../../src/core/middleware/built-in/csp.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,31 +2,31 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.csrf = void 0;
|
|
4
4
|
const logger_1 = require("../../logger");
|
|
5
|
-
const logger = (0, logger_1.createFrameworkLogger)(
|
|
5
|
+
const logger = (0, logger_1.createFrameworkLogger)('CSRFMiddleware');
|
|
6
6
|
const csrf = (options = {}) => ({
|
|
7
|
-
name:
|
|
8
|
-
version:
|
|
7
|
+
name: 'csrf',
|
|
8
|
+
version: '1.0.0',
|
|
9
9
|
metadata: {
|
|
10
|
-
name:
|
|
11
|
-
version:
|
|
12
|
-
description:
|
|
13
|
-
author:
|
|
10
|
+
name: 'csrf',
|
|
11
|
+
version: '1.0.0',
|
|
12
|
+
description: 'CSRF protection middleware with token generation and validation',
|
|
13
|
+
author: 'MoroJS Team',
|
|
14
14
|
},
|
|
15
15
|
install: async (hooks, middlewareOptions = {}) => {
|
|
16
|
-
logger.debug(
|
|
17
|
-
const secret = options.secret ||
|
|
16
|
+
logger.debug('Installing CSRF middleware', 'Installation');
|
|
17
|
+
const secret = options.secret || 'moro-csrf-secret';
|
|
18
18
|
const tokenLength = options.tokenLength || 32;
|
|
19
|
-
const cookieName = options.cookieName ||
|
|
20
|
-
const headerName = options.headerName ||
|
|
21
|
-
const ignoreMethods = options.ignoreMethods || [
|
|
19
|
+
const cookieName = options.cookieName || '_csrf';
|
|
20
|
+
const headerName = options.headerName || 'x-csrf-token';
|
|
21
|
+
const ignoreMethods = options.ignoreMethods || ['GET', 'HEAD', 'OPTIONS'];
|
|
22
22
|
const generateToken = () => {
|
|
23
|
-
const crypto = require(
|
|
24
|
-
return crypto.randomBytes(tokenLength).toString(
|
|
23
|
+
const crypto = require('crypto');
|
|
24
|
+
return crypto.randomBytes(tokenLength).toString('hex');
|
|
25
25
|
};
|
|
26
26
|
const verifyToken = (token, sessionToken) => {
|
|
27
27
|
return token && sessionToken && token === sessionToken;
|
|
28
28
|
};
|
|
29
|
-
hooks.before(
|
|
29
|
+
hooks.before('request', async (context) => {
|
|
30
30
|
const req = context.request;
|
|
31
31
|
const res = context.response;
|
|
32
32
|
// Add CSRF token generation method
|
|
@@ -36,9 +36,8 @@ const csrf = (options = {}) => ({
|
|
|
36
36
|
// Set token in cookie
|
|
37
37
|
res.cookie(cookieName, req._csrfToken, {
|
|
38
38
|
httpOnly: true,
|
|
39
|
-
sameSite: options.sameSite !== false ?
|
|
40
|
-
secure: req.headers[
|
|
41
|
-
req.socket.encrypted,
|
|
39
|
+
sameSite: options.sameSite !== false ? 'strict' : undefined,
|
|
40
|
+
secure: req.headers['x-forwarded-proto'] === 'https' || req.socket.encrypted,
|
|
42
41
|
});
|
|
43
42
|
}
|
|
44
43
|
return req._csrfToken;
|
|
@@ -48,15 +47,13 @@ const csrf = (options = {}) => ({
|
|
|
48
47
|
return;
|
|
49
48
|
}
|
|
50
49
|
// Get token from header or body
|
|
51
|
-
const token = req.headers[headerName] ||
|
|
52
|
-
(req.body && req.body._csrf) ||
|
|
53
|
-
(req.query && req.query._csrf);
|
|
50
|
+
const token = req.headers[headerName] || (req.body && req.body._csrf) || (req.query && req.query._csrf);
|
|
54
51
|
// Get session token from cookie
|
|
55
52
|
const sessionToken = req.cookies?.[cookieName];
|
|
56
|
-
if (!verifyToken(token, sessionToken ||
|
|
57
|
-
const error = new Error(
|
|
53
|
+
if (!verifyToken(token, sessionToken || '')) {
|
|
54
|
+
const error = new Error('Invalid CSRF token');
|
|
58
55
|
error.status = 403;
|
|
59
|
-
error.code =
|
|
56
|
+
error.code = 'CSRF_TOKEN_MISMATCH';
|
|
60
57
|
throw error;
|
|
61
58
|
}
|
|
62
59
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"csrf.js","sourceRoot":"","sources":["../../../../src/core/middleware/built-in/csrf.ts"],"names":[],"mappings":";;;AAEA,yCAAqD;AAErD,MAAM,MAAM,GAAG,IAAA,8BAAqB,EAAC,gBAAgB,CAAC,CAAC;AAEhD,MAAM,IAAI,GAAG,CAClB,UAOI,EAAE,EACe,EAAE,CAAC,CAAC;IACzB,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,OAAO;IAChB,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,OAAO;QAChB,WAAW,
|
|
1
|
+
{"version":3,"file":"csrf.js","sourceRoot":"","sources":["../../../../src/core/middleware/built-in/csrf.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.errorTracker = void 0;
|
|
4
4
|
// Error tracking middleware
|
|
5
5
|
const logger_1 = require("../../logger");
|
|
6
|
-
const logger = (0, logger_1.createFrameworkLogger)(
|
|
6
|
+
const logger = (0, logger_1.createFrameworkLogger)('ErrorTracker');
|
|
7
7
|
const errorTracker = async (context) => {
|
|
8
8
|
context.onError = (error) => {
|
|
9
|
-
logger.error(
|
|
9
|
+
logger.error('Request error', 'ErrorTracking', {
|
|
10
10
|
error: error.message,
|
|
11
11
|
stack: error.stack,
|
|
12
12
|
url: context.request?.url,
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
export { auth } from
|
|
2
|
-
export { rateLimit } from
|
|
3
|
-
export { cors } from
|
|
4
|
-
export { validation } from
|
|
5
|
-
export { requestLogger } from
|
|
6
|
-
export { performanceMonitor } from
|
|
7
|
-
export { errorTracker } from
|
|
8
|
-
export { cookie } from
|
|
9
|
-
export { csrf } from
|
|
10
|
-
export { csp } from
|
|
11
|
-
export { sse } from
|
|
12
|
-
export { session } from
|
|
13
|
-
export { cache } from
|
|
14
|
-
export { cdn } from
|
|
1
|
+
export { auth } from './auth';
|
|
2
|
+
export { rateLimit } from './rate-limit';
|
|
3
|
+
export { cors } from './cors';
|
|
4
|
+
export { validation } from './validation';
|
|
5
|
+
export { requestLogger } from './request-logger';
|
|
6
|
+
export { performanceMonitor } from './performance-monitor';
|
|
7
|
+
export { errorTracker } from './error-tracker';
|
|
8
|
+
export { cookie } from './cookie';
|
|
9
|
+
export { csrf } from './csrf';
|
|
10
|
+
export { csp } from './csp';
|
|
11
|
+
export { sse } from './sse';
|
|
12
|
+
export { session } from './session';
|
|
13
|
+
export { cache } from './cache';
|
|
14
|
+
export { cdn } from './cdn';
|
|
15
15
|
export declare const builtInMiddleware: {
|
|
16
16
|
auth: (options?: any) => import("..").MiddlewareInterface;
|
|
17
17
|
rateLimit: (options?: {
|
|
@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.performanceMonitor = void 0;
|
|
4
4
|
// Performance monitoring middleware
|
|
5
5
|
const logger_1 = require("../../logger");
|
|
6
|
-
const logger = (0, logger_1.createFrameworkLogger)(
|
|
6
|
+
const logger = (0, logger_1.createFrameworkLogger)('PerformanceMonitor');
|
|
7
7
|
const performanceMonitor = async (context) => {
|
|
8
8
|
const startTime = Date.now();
|
|
9
9
|
context.onComplete = () => {
|
|
10
10
|
const duration = Date.now() - startTime;
|
|
11
11
|
// Log slow requests
|
|
12
12
|
if (duration > 1000) {
|
|
13
|
-
logger.warn(`Slow request detected: ${context.request?.path} took ${duration}ms`,
|
|
13
|
+
logger.warn(`Slow request detected: ${context.request?.path} took ${duration}ms`, 'SlowRequest', {
|
|
14
14
|
path: context.request?.path,
|
|
15
15
|
method: context.request?.method,
|
|
16
16
|
duration,
|
|
@@ -2,26 +2,26 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.rateLimit = void 0;
|
|
4
4
|
const logger_1 = require("../../logger");
|
|
5
|
-
const logger = (0, logger_1.createFrameworkLogger)(
|
|
5
|
+
const logger = (0, logger_1.createFrameworkLogger)('RateLimitMiddleware');
|
|
6
6
|
const rateLimit = (options = {}) => ({
|
|
7
|
-
name:
|
|
8
|
-
version:
|
|
7
|
+
name: 'rate-limit',
|
|
8
|
+
version: '1.0.0',
|
|
9
9
|
metadata: {
|
|
10
|
-
name:
|
|
11
|
-
version:
|
|
12
|
-
description:
|
|
13
|
-
author:
|
|
10
|
+
name: 'rate-limit',
|
|
11
|
+
version: '1.0.0',
|
|
12
|
+
description: 'Rate limiting middleware with configurable windows',
|
|
13
|
+
author: 'MoroJS Team',
|
|
14
14
|
},
|
|
15
15
|
install: async (hooks, options = {}) => {
|
|
16
|
-
logger.debug(
|
|
16
|
+
logger.debug('Installing rate limit middleware', 'Installation', {
|
|
17
17
|
options,
|
|
18
18
|
});
|
|
19
19
|
const windowMs = options.windowMs || 60000; // 1 minute default
|
|
20
20
|
const max = options.max || 100; // 100 requests per window
|
|
21
21
|
const clientCounts = new Map();
|
|
22
|
-
hooks.before(
|
|
22
|
+
hooks.before('request', async (context) => {
|
|
23
23
|
const req = context.request;
|
|
24
|
-
const clientId = req.connection?.remoteAddress ||
|
|
24
|
+
const clientId = req.connection?.remoteAddress || 'unknown';
|
|
25
25
|
const now = Date.now();
|
|
26
26
|
if (!clientCounts.has(clientId)) {
|
|
27
27
|
clientCounts.set(clientId, { count: 0, resetTime: now + windowMs });
|
|
@@ -33,12 +33,12 @@ const rateLimit = (options = {}) => ({
|
|
|
33
33
|
}
|
|
34
34
|
client.count++;
|
|
35
35
|
if (client.count > max) {
|
|
36
|
-
logger.warn(`Rate limit exceeded for ${clientId}`,
|
|
36
|
+
logger.warn(`Rate limit exceeded for ${clientId}`, 'RateLimit', {
|
|
37
37
|
clientId,
|
|
38
38
|
count: client.count,
|
|
39
39
|
max,
|
|
40
40
|
});
|
|
41
|
-
throw new Error(options.message ||
|
|
41
|
+
throw new Error(options.message || 'Too many requests');
|
|
42
42
|
}
|
|
43
43
|
});
|
|
44
44
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-logger.js","sourceRoot":"","sources":["../../../../src/core/middleware/built-in/request-logger.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AAC7B,MAAM,aAAa,GAAG,KAAK,EAAE,OAAY,EAAiB,EAAE;IACjE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE7B,OAAO,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"request-logger.js","sourceRoot":"","sources":["../../../../src/core/middleware/built-in/request-logger.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AAC7B,MAAM,aAAa,GAAG,KAAK,EAAE,OAAY,EAAiB,EAAE;IACjE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE7B,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,OAAO,EAAE,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAEjG,gCAAgC;IAChC,OAAO,CAAC,UAAU,GAAG,GAAG,EAAE;QACxB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,wBAAwB,QAAQ,IAAI,CAAC,CAAC;IACpD,CAAC,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,aAAa,iBAUxB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { MiddlewareInterface } from
|
|
2
|
-
import { CacheAdapter } from
|
|
1
|
+
import { MiddlewareInterface } from '../../../types/hooks';
|
|
2
|
+
import { CacheAdapter } from '../../../types/cache';
|
|
3
3
|
export interface SessionOptions {
|
|
4
|
-
store?:
|
|
4
|
+
store?: 'memory' | 'redis' | 'file' | CacheAdapter;
|
|
5
5
|
storeOptions?: {
|
|
6
6
|
host?: string;
|
|
7
7
|
port?: number;
|
|
@@ -21,12 +21,12 @@ export interface SessionOptions {
|
|
|
21
21
|
expires?: Date;
|
|
22
22
|
httpOnly?: boolean;
|
|
23
23
|
secure?: boolean;
|
|
24
|
-
sameSite?:
|
|
24
|
+
sameSite?: 'strict' | 'lax' | 'none';
|
|
25
25
|
domain?: string;
|
|
26
26
|
path?: string;
|
|
27
27
|
};
|
|
28
28
|
proxy?: boolean;
|
|
29
|
-
unset?:
|
|
29
|
+
unset?: 'destroy' | 'keep';
|
|
30
30
|
}
|
|
31
31
|
export interface SessionData {
|
|
32
32
|
[key: string]: any;
|
|
@@ -5,7 +5,7 @@ const logger_1 = require("../../logger");
|
|
|
5
5
|
const memory_1 = require("./adapters/cache/memory");
|
|
6
6
|
const redis_1 = require("./adapters/cache/redis");
|
|
7
7
|
const file_1 = require("./adapters/cache/file");
|
|
8
|
-
const logger = (0, logger_1.createFrameworkLogger)(
|
|
8
|
+
const logger = (0, logger_1.createFrameworkLogger)('SessionMiddleware');
|
|
9
9
|
class Session {
|
|
10
10
|
constructor(id, store, options, isNew = false) {
|
|
11
11
|
this.data = {};
|
|
@@ -58,21 +58,21 @@ class Session {
|
|
|
58
58
|
await this.store.set(this.id, this.data, ttl);
|
|
59
59
|
this.isModified = false;
|
|
60
60
|
this.isNew = false;
|
|
61
|
-
logger.debug(`Session saved: ${this.id}`,
|
|
61
|
+
logger.debug(`Session saved: ${this.id}`, 'SessionSave');
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
64
|
async destroy() {
|
|
65
65
|
await this.store.del(this.id);
|
|
66
66
|
this.data = {};
|
|
67
67
|
this.isModified = false;
|
|
68
|
-
logger.debug(`Session destroyed: ${this.id}`,
|
|
68
|
+
logger.debug(`Session destroyed: ${this.id}`, 'SessionDestroy');
|
|
69
69
|
}
|
|
70
70
|
async regenerate() {
|
|
71
71
|
await this.destroy();
|
|
72
72
|
this.id = this.generateId();
|
|
73
73
|
this.isNew = true;
|
|
74
74
|
this.isModified = true;
|
|
75
|
-
logger.debug(`Session regenerated: ${this.id}`,
|
|
75
|
+
logger.debug(`Session regenerated: ${this.id}`, 'SessionRegenerate');
|
|
76
76
|
return this.id;
|
|
77
77
|
}
|
|
78
78
|
async touch() {
|
|
@@ -85,29 +85,29 @@ class Session {
|
|
|
85
85
|
if (this.options.genid) {
|
|
86
86
|
return this.options.genid();
|
|
87
87
|
}
|
|
88
|
-
const crypto = require(
|
|
89
|
-
return crypto.randomBytes(24).toString(
|
|
88
|
+
const crypto = require('crypto');
|
|
89
|
+
return crypto.randomBytes(24).toString('hex');
|
|
90
90
|
}
|
|
91
91
|
get sessionID() {
|
|
92
92
|
return this.id;
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
95
|
const session = (options = {}) => ({
|
|
96
|
-
name:
|
|
97
|
-
version:
|
|
96
|
+
name: 'session',
|
|
97
|
+
version: '1.0.0',
|
|
98
98
|
metadata: {
|
|
99
|
-
name:
|
|
100
|
-
version:
|
|
101
|
-
description:
|
|
102
|
-
author:
|
|
99
|
+
name: 'session',
|
|
100
|
+
version: '1.0.0',
|
|
101
|
+
description: 'Session management middleware with multiple store adapters',
|
|
102
|
+
author: 'MoroJS Team',
|
|
103
103
|
},
|
|
104
104
|
install: async (hooks, middlewareOptions = {}) => {
|
|
105
|
-
logger.debug(
|
|
105
|
+
logger.debug('Installing session middleware', 'Installation');
|
|
106
106
|
// Merge options
|
|
107
107
|
const config = {
|
|
108
|
-
store:
|
|
109
|
-
name:
|
|
110
|
-
secret:
|
|
108
|
+
store: 'memory',
|
|
109
|
+
name: 'connect.sid',
|
|
110
|
+
secret: 'moro-session-secret',
|
|
111
111
|
rolling: false,
|
|
112
112
|
resave: false,
|
|
113
113
|
saveUninitialized: false,
|
|
@@ -115,29 +115,29 @@ const session = (options = {}) => ({
|
|
|
115
115
|
maxAge: 24 * 60 * 60 * 1000, // 24 hours
|
|
116
116
|
httpOnly: true,
|
|
117
117
|
secure: false,
|
|
118
|
-
sameSite:
|
|
119
|
-
path:
|
|
118
|
+
sameSite: 'lax',
|
|
119
|
+
path: '/',
|
|
120
120
|
},
|
|
121
|
-
unset:
|
|
121
|
+
unset: 'keep',
|
|
122
122
|
...options,
|
|
123
123
|
...middlewareOptions,
|
|
124
124
|
};
|
|
125
125
|
// Initialize store
|
|
126
126
|
let store;
|
|
127
|
-
if (typeof config.store ===
|
|
127
|
+
if (typeof config.store === 'string') {
|
|
128
128
|
switch (config.store) {
|
|
129
|
-
case
|
|
129
|
+
case 'redis':
|
|
130
130
|
store = new redis_1.RedisCacheAdapter({
|
|
131
|
-
keyPrefix:
|
|
131
|
+
keyPrefix: 'sess:',
|
|
132
132
|
...config.storeOptions,
|
|
133
133
|
});
|
|
134
134
|
break;
|
|
135
|
-
case
|
|
135
|
+
case 'file':
|
|
136
136
|
store = new file_1.FileCacheAdapter({
|
|
137
|
-
cacheDir: config.storeOptions?.path ||
|
|
137
|
+
cacheDir: config.storeOptions?.path || './sessions',
|
|
138
138
|
});
|
|
139
139
|
break;
|
|
140
|
-
case
|
|
140
|
+
case 'memory':
|
|
141
141
|
default:
|
|
142
142
|
store = new memory_1.MemoryCacheAdapter();
|
|
143
143
|
break;
|
|
@@ -151,10 +151,10 @@ const session = (options = {}) => ({
|
|
|
151
151
|
if (config.genid) {
|
|
152
152
|
return config.genid();
|
|
153
153
|
}
|
|
154
|
-
const crypto = require(
|
|
155
|
-
return crypto.randomBytes(24).toString(
|
|
154
|
+
const crypto = require('crypto');
|
|
155
|
+
return crypto.randomBytes(24).toString('hex');
|
|
156
156
|
};
|
|
157
|
-
hooks.before(
|
|
157
|
+
hooks.before('request', async (context) => {
|
|
158
158
|
const req = context.request;
|
|
159
159
|
const res = context.response;
|
|
160
160
|
// Get session ID from cookie
|
|
@@ -164,10 +164,10 @@ const session = (options = {}) => ({
|
|
|
164
164
|
if (sessionId) {
|
|
165
165
|
try {
|
|
166
166
|
sessionData = (await store.get(sessionId)) || {};
|
|
167
|
-
logger.debug(`Session loaded: ${sessionId}`,
|
|
167
|
+
logger.debug(`Session loaded: ${sessionId}`, 'SessionLoad');
|
|
168
168
|
}
|
|
169
169
|
catch (error) {
|
|
170
|
-
logger.warn(`Failed to load session: ${sessionId}`,
|
|
170
|
+
logger.warn(`Failed to load session: ${sessionId}`, 'SessionLoadError', { error });
|
|
171
171
|
sessionId = generateSessionId();
|
|
172
172
|
isNew = true;
|
|
173
173
|
}
|
|
@@ -182,27 +182,24 @@ const session = (options = {}) => ({
|
|
|
182
182
|
if (isNew || config.rolling) {
|
|
183
183
|
res.cookie(config.name, sessionId, {
|
|
184
184
|
...config.cookie,
|
|
185
|
-
secure: config.cookie?.secure ||
|
|
186
|
-
(config.proxy && req.headers["x-forwarded-proto"] === "https"),
|
|
185
|
+
secure: config.cookie?.secure || (config.proxy && req.headers['x-forwarded-proto'] === 'https'),
|
|
187
186
|
});
|
|
188
187
|
}
|
|
189
188
|
});
|
|
190
|
-
hooks.after(
|
|
189
|
+
hooks.after('response', async (context) => {
|
|
191
190
|
const req = context.request;
|
|
192
191
|
if (req.session) {
|
|
193
192
|
try {
|
|
194
|
-
if (config.saveUninitialized ||
|
|
195
|
-
!req.session.isNew ||
|
|
196
|
-
req.session.isModified) {
|
|
193
|
+
if (config.saveUninitialized || !req.session.isNew || req.session.isModified) {
|
|
197
194
|
await req.session.save();
|
|
198
195
|
}
|
|
199
196
|
}
|
|
200
197
|
catch (error) {
|
|
201
|
-
logger.error(
|
|
198
|
+
logger.error('Failed to save session', 'SessionSaveError', { error });
|
|
202
199
|
}
|
|
203
200
|
}
|
|
204
201
|
});
|
|
205
|
-
logger.info(`Session middleware installed with ${config.store} store`,
|
|
202
|
+
logger.info(`Session middleware installed with ${config.store} store`, 'Installation');
|
|
206
203
|
},
|
|
207
204
|
});
|
|
208
205
|
exports.session = session;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../src/core/middleware/built-in/session.ts"],"names":[],"mappings":";;;AAEA,yCAAqD;AAErD,oDAA6D;AAC7D,kDAA2D;AAC3D,gDAAyD;AAEzD,MAAM,MAAM,GAAG,IAAA,8BAAqB,EAAC,mBAAmB,CAAC,CAAC;AAoD1D,MAAM,OAAO;IAQX,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../src/core/middleware/built-in/session.ts"],"names":[],"mappings":"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"}
|