@miqro/core 1.5.16 → 1.5.19
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/dist/common/api-router-utils.js +6 -3
- package/dist/common/api-router-utils.js.map +1 -1
- package/dist/common/config/config.js +12 -0
- package/dist/common/config/config.js.map +1 -1
- package/dist/common/config/loader.js +2 -2
- package/dist/common/config/loader.js.map +1 -1
- package/dist/common/context.d.ts +1 -0
- package/dist/common/context.js +9 -3
- package/dist/common/context.js.map +1 -1
- package/dist/common/router-handler.js +1 -1
- package/dist/common/router-handler.js.map +1 -1
- package/dist/common/session/service.js +4 -1
- package/dist/common/session/service.js.map +1 -1
- package/dist/common/tokenize-match.js +2 -2
- package/dist/common/tokenize-match.js.map +1 -1
- package/dist/proxy.js +11 -1
- package/dist/proxy.js.map +1 -1
- package/package.json +7 -7
- package/src/common/api-router-utils.ts +6 -3
- package/src/common/config/config.ts +12 -0
- package/src/common/config/loader.ts +2 -2
- package/src/common/context.ts +10 -2
- package/src/common/context.unit.test.js +3 -1
- package/src/common/router-handler.ts +1 -1
- package/src/common/session/service.ts +4 -1
- package/src/common/tokenize-match.ts +2 -2
- package/src/proxy.ts +14 -1
|
@@ -10,18 +10,18 @@ const parser_1 = require("@miqro/parser");
|
|
|
10
10
|
exports.APIRouteValidator = {
|
|
11
11
|
name: "string?",
|
|
12
12
|
description: "string?",
|
|
13
|
-
path: "string[]!?",
|
|
14
13
|
method: "string[]!?",
|
|
14
|
+
path: "string[]!?",
|
|
15
15
|
parser: "ParserInterface?",
|
|
16
16
|
headers: "ParseOptions[]!?",
|
|
17
17
|
query: "boolean?|ParseOptions[]!?|string?",
|
|
18
18
|
params: "boolean?|ParseOptions[]!?|string?",
|
|
19
19
|
body: "boolean?|ParseOptions[]!?|string?",
|
|
20
20
|
response: "ParseOptions[]!?|string?",
|
|
21
|
+
handler: "function[]!",
|
|
21
22
|
middleware: "function[]!?",
|
|
22
23
|
session: "function?|SessionHandlerOptions?",
|
|
23
|
-
|
|
24
|
-
handler: "function[]!"
|
|
24
|
+
policy: "GroupPolicy?"
|
|
25
25
|
};
|
|
26
26
|
function traverseAPIRouteDir(featureName, dirname, basePath = "/", features = {}, logger) {
|
|
27
27
|
if (logger) {
|
|
@@ -82,6 +82,9 @@ function traverseAPIRouteDir(featureName, dirname, basePath = "/", features = {}
|
|
|
82
82
|
if (features[newFeatureSubPath]) {
|
|
83
83
|
throw new Error(`${___filePath} feature name collides with ${features[newFeatureSubPath].___filePath}`);
|
|
84
84
|
}
|
|
85
|
+
if (newFeatureSubPath === "__prototype__" || newFeatureSubPath === "__proto__") {
|
|
86
|
+
throw new Error(`invalid feature name ${newFeatureSubPath}`);
|
|
87
|
+
}
|
|
85
88
|
features[newFeatureSubPath] = {
|
|
86
89
|
options: {
|
|
87
90
|
name: route.name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-router-utils.js","sourceRoot":"","sources":["../../src/common/api-router-utils.ts"],"names":[],"mappings":";;;AAAA,2BAA0C;AAC1C,+BAAuD;AAGvD,qDAA+C;AAC/C,qCAA0C;AAC1C,sCAAiC;AAGjC,0CAAoD;AAEvC,QAAA,iBAAiB,GAAmB;IAC/C,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,SAAS;IACtB,
|
|
1
|
+
{"version":3,"file":"api-router-utils.js","sourceRoot":"","sources":["../../src/common/api-router-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,8 +26,14 @@ exports.ConfigPathResolver = ConfigPathResolver;
|
|
|
26
26
|
const processEnvDefined = (typeof process !== "undefined" && typeof process.env !== "undefined");
|
|
27
27
|
class ConfigStore {
|
|
28
28
|
static putConfig(key, value) {
|
|
29
|
+
if (key === "__proto__" || key === "__prototype__") {
|
|
30
|
+
throw new Error("invalid key " + key);
|
|
31
|
+
}
|
|
29
32
|
if (processEnvDefined) {
|
|
30
33
|
Object.defineProperty(process.env, key, {
|
|
34
|
+
writable: true,
|
|
35
|
+
enumerable: true,
|
|
36
|
+
configurable: true,
|
|
31
37
|
value
|
|
32
38
|
}); // this is for webpack
|
|
33
39
|
}
|
|
@@ -39,6 +45,9 @@ class ConfigStore {
|
|
|
39
45
|
return this;
|
|
40
46
|
}
|
|
41
47
|
static clear(key) {
|
|
48
|
+
if (key === "__proto__" || key === "__prototype__") {
|
|
49
|
+
throw new Error("invalid key " + key);
|
|
50
|
+
}
|
|
42
51
|
if (processEnvDefined) {
|
|
43
52
|
delete process.env[key];
|
|
44
53
|
}
|
|
@@ -67,6 +76,9 @@ class ConfigStore {
|
|
|
67
76
|
}
|
|
68
77
|
}
|
|
69
78
|
static getConfig(key, defaultValue) {
|
|
79
|
+
if (key === "__proto__" || key === "__prototype__") {
|
|
80
|
+
throw new Error("invalid key " + key);
|
|
81
|
+
}
|
|
70
82
|
if (processEnvDefined) {
|
|
71
83
|
return process.env[key] !== undefined ? process.env[key] : (defaultValue !== undefined ? defaultValue : null);
|
|
72
84
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/common/config/config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/common/config/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ class ConfigFileNotFoundError extends Error {
|
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
13
|
const loadConfigString = (envFileContent, combined) => {
|
|
14
|
-
const ret =
|
|
14
|
+
const ret = Object.create(null);
|
|
15
15
|
envFileContent.split("\n")
|
|
16
16
|
.filter(value => value && value.length > 0 && value.substring(0, 1) !== "#")
|
|
17
17
|
.forEach((line) => {
|
|
@@ -46,7 +46,7 @@ exports.loadConfigFile = loadConfigFile;
|
|
|
46
46
|
const MISSED_TO_RUNMIQRO_INIT = (configDirname) => `no config loaded. env files in [${configDirname}] doesnt exist!.`;
|
|
47
47
|
const loadConfig = (configDirname = config_1.ConfigPathResolver.getConfigDirname(), logger) => {
|
|
48
48
|
const outputs = [];
|
|
49
|
-
const combined =
|
|
49
|
+
const combined = Object.create(null);
|
|
50
50
|
if ((0, fs_1.existsSync)(configDirname)) {
|
|
51
51
|
const configFiles = (0, fs_1.readdirSync)(configDirname);
|
|
52
52
|
for (const configFile of configFiles) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/common/config/loader.ts"],"names":[],"mappings":";;;AAAA,+BAAsC;AACtC,2BAAyD;AACzD,qCAAsF;AAiBtF,MAAM,uBAAwB,SAAQ,KAAK;IACzC,YAAY,IAAS;QACnB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC;IACxC,CAAC;CACF;AAEM,MAAM,gBAAgB,GAAG,CAAC,cAAsB,EAAE,QAAuB,EAAgB,EAAE;IAChG,MAAM,GAAG,GAAiB,
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/common/config/loader.ts"],"names":[],"mappings":"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"}
|
package/dist/common/context.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { IncomingHttpHeaders, IncomingMessage, OutgoingHttpHeaders, ServerRespon
|
|
|
5
5
|
import { URL } from "url";
|
|
6
6
|
import { CookieSerializeOptions } from "cookie";
|
|
7
7
|
export declare type Method = "get" | "post" | "put" | "delete" | "patch" | "options" | "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS";
|
|
8
|
+
export declare const IGNORE_HEADER: string[];
|
|
8
9
|
export declare type Handler<T = boolean | void | any> = ((ctx: Context) => Promise<T>) | ((ctx: Context) => T);
|
|
9
10
|
export declare type ErrorHandler<T = boolean | void | any> = ((e: unknown, ctx: Context) => Promise<T>) | ((e: unknown, ctx: Context) => T);
|
|
10
11
|
export declare class Context {
|
package/dist/common/context.js
CHANGED
|
@@ -1,26 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Context = void 0;
|
|
3
|
+
exports.Context = exports.IGNORE_HEADER = void 0;
|
|
4
4
|
const tokenize_match_1 = require("./tokenize-match");
|
|
5
5
|
const helpers_1 = require("./helpers");
|
|
6
6
|
const cookie_1 = require("cookie");
|
|
7
|
+
exports.IGNORE_HEADER = ["keep-alive", "connection"];
|
|
7
8
|
class Context {
|
|
8
9
|
constructor(uuid, req, res, logger) {
|
|
9
10
|
this.uuid = uuid;
|
|
10
11
|
this.req = req;
|
|
11
12
|
this.res = res;
|
|
12
13
|
this.logger = logger;
|
|
13
|
-
this.params = {}; // the router will fill this
|
|
14
14
|
this.body = undefined;
|
|
15
15
|
this.res.removeHeader("Date");
|
|
16
16
|
this.url = (0, helpers_1.newURL)(req.url ? req.url : "/", `http://${req.headers.host}`);
|
|
17
17
|
this.method = req.method ? req.method.toUpperCase() : "GET";
|
|
18
18
|
this.path = (0, tokenize_match_1.normalizePath)(this.url.pathname); // normalized path
|
|
19
19
|
this.hash = this.url.hash;
|
|
20
|
+
this.params = Object.create(null);
|
|
20
21
|
this.query = (0, tokenize_match_1.parseSearchParams)(this.url.searchParams);
|
|
21
22
|
//this.buffer = Buffer.from("");
|
|
22
23
|
this.remoteAddress = req.socket.remoteAddress;
|
|
23
|
-
this.cookies =
|
|
24
|
+
this.cookies = Object.create(null); // a middleware will fill
|
|
24
25
|
this.headers = req.headers;
|
|
25
26
|
this.startMS = Date.now();
|
|
26
27
|
this.results = []; // handlers will fill this
|
|
@@ -59,10 +60,15 @@ class Context {
|
|
|
59
60
|
this.res.statusCode = status;
|
|
60
61
|
const keys = Object.keys(headers);
|
|
61
62
|
for (const key of keys) {
|
|
63
|
+
if (exports.IGNORE_HEADER.indexOf(key.toLocaleLowerCase()) !== -1) {
|
|
64
|
+
this.logger.warn("ignoring " + key);
|
|
65
|
+
continue;
|
|
66
|
+
}
|
|
62
67
|
if (headers[key] !== undefined) {
|
|
63
68
|
this.res.setHeader(key, headers[key]);
|
|
64
69
|
}
|
|
65
70
|
}
|
|
71
|
+
this.res.setHeader("connection", "close");
|
|
66
72
|
this.res.end(body !== undefined ? (body instanceof Buffer ? body : String(body)) : undefined, () => {
|
|
67
73
|
resolve();
|
|
68
74
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/common/context.ts"],"names":[],"mappings":";;;AAGA,qDAAkE;AAElE,uCAAiC;AACjC,mCAAyD;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/common/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,7 +70,7 @@ class RouterHandler {
|
|
|
70
70
|
}
|
|
71
71
|
else if (this.options) {
|
|
72
72
|
if (!doc[`${prePath}${nPath}`]) {
|
|
73
|
-
doc[`${prePath}${nPath}`] =
|
|
73
|
+
doc[`${prePath}${nPath}`] = Object.create(null);
|
|
74
74
|
}
|
|
75
75
|
if (doc[`${prePath}${nPath}`][nMethod]) {
|
|
76
76
|
throw new Error("cannot create doc routes override each other");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-handler.js","sourceRoot":"","sources":["../../src/common/router-handler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"router-handler.js","sourceRoot":"","sources":["../../src/common/router-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,9 +40,12 @@ class VerifyEndpointService {
|
|
|
40
40
|
{ name: "url", required: true, type: "string", stringMinLength: 1 },
|
|
41
41
|
{ name: "method", required: true, type: "string", stringMinLength: 1 },
|
|
42
42
|
{ name: "tokenLocation", required: true, type: "enum", enumValues: ["header", "query", "cookie"] },
|
|
43
|
-
{ name: "tokenLocationName", required: true, type: "
|
|
43
|
+
{ name: "tokenLocationName", required: true, type: "string" }
|
|
44
44
|
], "no_extra", "options");
|
|
45
45
|
}
|
|
46
|
+
if (this.options.tokenLocationName && (this.options.tokenLocationName === "__proto__" || this.options.tokenLocationName === "__prototype__")) {
|
|
47
|
+
throw new Error(`invalid tokenLocationName ${this.options.tokenLocationName}`);
|
|
48
|
+
}
|
|
46
49
|
}
|
|
47
50
|
async verify({ token, ctx }) {
|
|
48
51
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/common/session/service.ts"],"names":[],"mappings":";;;AAEA,sCAA4C;AAC5C,oCAA2C;AAC3C,4CAAwE;AACxE,0CAAoC;AACpC,mCAA4C;AAE5C,MAAM,sBAAsB,GAAG,QAAQ,CAAC;AACxC,MAAM,oBAAoB,GAAG,eAAe,CAAC;AAC7C,MAAM,mBAAmB,GAAG,OAAO,CAAC;AACpC,MAAM,oBAAoB,GAAG,eAAe,CAAC;AAa7C,MAAa,qBAAqB;IAIhC,YAAY,OAAsC;QAChD,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,IAAA,0BAAiB,EAAC,CAAC,uBAAuB,EAAE,8BAA8B,CAAC,CAAC,CAAC;YACnG,MAAM,CAAC,mBAAmB,CAAC,GAAG,IAAA,0BAAiB,EAAC,CAAC,uBAAuB,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAC;YACrG,IAAI,iBAAiB,CAAC;YACtB,QAAQ,mBAAmB,EAAE;gBAC3B,KAAK,QAAQ;oBACX,iBAAiB,GAAG,IAAA,0BAAiB,EAAC,CAAC,cAAc,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACnF,MAAM;gBACR,KAAK,OAAO;oBACV,iBAAiB,GAAG,IAAA,0BAAiB,EAAC,CAAC,aAAa,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACjF,MAAM;gBACR,KAAK,QAAQ;oBACX,iBAAiB,GAAG,IAAA,0BAAiB,EAAC,CAAC,cAAc,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACnF,MAAM;gBACR;oBACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,mBAAmB,sCAAsC,CAAC,CAAC;aACvG;YACD,IAAI,CAAC,OAAO,GAAG;gBACb,GAAG,EAAE,MAAM;gBACX,aAAa,EAAE,mBAAmB;gBAClC,iBAAiB;aAClB,CAAA;SACF;aAAM;YACL,IAAI,CAAC,OAAO,GAAG,IAAA,cAAK,EAAC,OAAc,EAAE;gBACnC,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,EAAC;gBACjE,EAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,EAAC;gBACpE,EAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAC;gBAChG,EAAC,IAAI,EAAE,mBAAmB,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/common/session/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.matchTokenizePath = exports.tokenizePath = exports.splitPath = exports.normalizePath = exports.parseSearchParams = void 0;
|
|
4
4
|
function parseSearchParams(search) {
|
|
5
|
-
const query =
|
|
5
|
+
const query = Object.create(null);
|
|
6
6
|
search.forEach((value, key) => {
|
|
7
7
|
query[key] = query[key] instanceof Array ? query[key].concat([value]) : query[key] ? [query[key], value] : value;
|
|
8
8
|
});
|
|
@@ -75,7 +75,7 @@ function matchTokenizePath(checkAsRouter, pathTokens, requestParts) {
|
|
|
75
75
|
const couldBeUsingOptional = (lastTokenIsOptional &&
|
|
76
76
|
((!checkAsRouter && pathTokens.length - 1 === requestParts.length) ||
|
|
77
77
|
(checkAsRouter && pathTokens.length - 1 <= requestParts.length)));
|
|
78
|
-
const params =
|
|
78
|
+
const params = Object.create(null);
|
|
79
79
|
if ((!checkAsRouter && pathTokens.length === requestParts.length) || couldBeUsingOptional || (checkAsRouter && pathTokens.length <= requestParts.length)) {
|
|
80
80
|
// similar count of tokens
|
|
81
81
|
for (let i = 0; i < requestParts.length; i++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenize-match.js","sourceRoot":"","sources":["../../src/common/tokenize-match.ts"],"names":[],"mappings":";;;AAEA,SAAgB,iBAAiB,CAAC,MAAuB;IACvD,MAAM,KAAK,GAA0C,
|
|
1
|
+
{"version":3,"file":"tokenize-match.js","sourceRoot":"","sources":["../../src/common/tokenize-match.ts"],"names":[],"mappings":"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"}
|
package/dist/proxy.js
CHANGED
|
@@ -22,15 +22,25 @@ class ProxyRouter extends router_1.Router {
|
|
|
22
22
|
nUrl.pathname = nUrl.pathname + relative;
|
|
23
23
|
const url = nUrl.toString();
|
|
24
24
|
ctx.logger.info("proxy to %s", url.toString());
|
|
25
|
+
const headers = {
|
|
26
|
+
...ctx.headers
|
|
27
|
+
};
|
|
28
|
+
delete headers["connection"];
|
|
29
|
+
delete headers["keep-alive"];
|
|
25
30
|
const response = await (0, request_1.request)({
|
|
26
31
|
url: url.toString(),
|
|
27
32
|
disableThrow: true,
|
|
28
33
|
rejectUnauthorized: this.rejectUnauthorized,
|
|
29
34
|
disableUserAgent: true,
|
|
30
35
|
method: ctx.method,
|
|
31
|
-
headers
|
|
36
|
+
headers,
|
|
32
37
|
data: ctx.method !== "GET" ? ctx.buffer : undefined
|
|
33
38
|
});
|
|
39
|
+
const responseHeaders = {
|
|
40
|
+
...response.headers
|
|
41
|
+
};
|
|
42
|
+
delete responseHeaders["connection"];
|
|
43
|
+
delete responseHeaders["keep-alive"];
|
|
34
44
|
await ctx.end({
|
|
35
45
|
headers: response.headers,
|
|
36
46
|
body: response.data,
|
package/dist/proxy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":";;;AACA,4CAAuC;AACvC,qCAA+C;AAC/C,4DAAqE;AACrE,6BAAwB;AAOxB,MAAM,WAAY,SAAQ,eAAM;IAI9B,YAAY,OAA2B;QACrC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,MAAM,QAAQ,GAAG,IAAI,SAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACtC,QAAQ,CAAC,QAAQ,GAAG,IAAA,8BAAa,EAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,UAA+C,EAAE,gBAAiC,EAAE;QAE1G,MAAM,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC;QACnC,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;QAEvE,IAAI,cAAc,EAAE;YAClB,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAE9F,MAAM,IAAI,GAAG,IAAI,SAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC/C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;YACzC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YAE/C,MAAM,QAAQ,GAAG,MAAM,IAAA,iBAAO,EAAC;gBAC7B,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;gBACnB,YAAY,EAAE,IAAI;gBAClB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;gBAC3C,gBAAgB,EAAE,IAAI;gBACtB,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,OAAO
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":";;;AACA,4CAAuC;AACvC,qCAA+C;AAC/C,4DAAqE;AACrE,6BAAwB;AAOxB,MAAM,WAAY,SAAQ,eAAM;IAI9B,YAAY,OAA2B;QACrC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,MAAM,QAAQ,GAAG,IAAI,SAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACtC,QAAQ,CAAC,QAAQ,GAAG,IAAA,8BAAa,EAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,UAA+C,EAAE,gBAAiC,EAAE;QAE1G,MAAM,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC;QACnC,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;QAEvE,IAAI,cAAc,EAAE;YAClB,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAE9F,MAAM,IAAI,GAAG,IAAI,SAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC/C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;YACzC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YAE/C,MAAM,OAAO,GAAG;gBACd,GAAG,GAAG,CAAC,OAAO;aACf,CAAC;YAEF,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC;YAC7B,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC;YAE7B,MAAM,QAAQ,GAAG,MAAM,IAAA,iBAAO,EAAC;gBAC7B,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;gBACnB,YAAY,EAAE,IAAI;gBAClB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;gBAC3C,gBAAgB,EAAE,IAAI;gBACtB,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,OAAO;gBACP,IAAI,EAAE,GAAG,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;aACpD,CAAC,CAAC;YAEH,MAAM,eAAe,GAAG;gBACtB,GAAG,QAAQ,CAAC,OAAO;aACpB,CAAC;YACF,OAAO,eAAe,CAAC,YAAY,CAAC,CAAC;YACrC,OAAO,eAAe,CAAC,YAAY,CAAC,CAAC;YAErC,MAAM,GAAG,CAAC,GAAG,CAAC;gBACZ,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,MAAM,EAAE,QAAQ,CAAC,MAAM;aACxB,CAAC,CAAC;SACJ;QACD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC;IAC9B,CAAC;CACF;AAEM,MAAM,KAAK,GAAG,CAAC,OAA2B,EAAE,EAAE;IACnD,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC,CAAA;AAFY,QAAA,KAAK,SAEjB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@miqro/core",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.19",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -16,10 +16,10 @@
|
|
|
16
16
|
"author": "claukers",
|
|
17
17
|
"license": "ISC",
|
|
18
18
|
"devDependencies": {
|
|
19
|
-
"@miqro/test": "0.2.
|
|
20
|
-
"@miqro/test-http": "0.0.
|
|
19
|
+
"@miqro/test": "0.2.1",
|
|
20
|
+
"@miqro/test-http": "0.0.4",
|
|
21
21
|
"@types/node": "17.0.23",
|
|
22
|
-
"typescript": "4.6.
|
|
22
|
+
"typescript": "4.6.4",
|
|
23
23
|
"@types/cookie": "0.4.1",
|
|
24
24
|
"@types/uuid": "8.3.4"
|
|
25
25
|
},
|
|
@@ -28,9 +28,9 @@
|
|
|
28
28
|
"npm": ">=6.0.0"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@miqro/request": "^0.0.
|
|
32
|
-
"@miqro/parser": "^0.1.
|
|
33
|
-
"cookie": "0.
|
|
31
|
+
"@miqro/request": "^0.0.9",
|
|
32
|
+
"@miqro/parser": "^0.1.3",
|
|
33
|
+
"cookie": "0.5.0",
|
|
34
34
|
"uuid": "8.3.2"
|
|
35
35
|
}
|
|
36
36
|
}
|
|
@@ -12,18 +12,18 @@ import {parse, ParseOptionMap} from "@miqro/parser";
|
|
|
12
12
|
export const APIRouteValidator: ParseOptionMap = {
|
|
13
13
|
name: "string?",
|
|
14
14
|
description: "string?",
|
|
15
|
-
path: "string[]!?",
|
|
16
15
|
method: "string[]!?",
|
|
16
|
+
path: "string[]!?",
|
|
17
17
|
parser: "ParserInterface?",
|
|
18
18
|
headers: "ParseOptions[]!?",
|
|
19
19
|
query: "boolean?|ParseOptions[]!?|string?",
|
|
20
20
|
params: "boolean?|ParseOptions[]!?|string?",
|
|
21
21
|
body: "boolean?|ParseOptions[]!?|string?",
|
|
22
22
|
response: "ParseOptions[]!?|string?",
|
|
23
|
+
handler: "function[]!",
|
|
23
24
|
middleware: "function[]!?",
|
|
24
25
|
session: "function?|SessionHandlerOptions?",
|
|
25
|
-
|
|
26
|
-
handler: "function[]!"
|
|
26
|
+
policy: "GroupPolicy?"
|
|
27
27
|
};
|
|
28
28
|
|
|
29
29
|
export function traverseAPIRouteDir(
|
|
@@ -90,6 +90,9 @@ export function traverseAPIRouteDir(
|
|
|
90
90
|
if (features[newFeatureSubPath]) {
|
|
91
91
|
throw new Error(`${___filePath} feature name collides with ${(features[newFeatureSubPath] as any).___filePath}`)
|
|
92
92
|
}
|
|
93
|
+
if (newFeatureSubPath === "__prototype__" || newFeatureSubPath === "__proto__") {
|
|
94
|
+
throw new Error(`invalid feature name ${newFeatureSubPath}`);
|
|
95
|
+
}
|
|
93
96
|
features[newFeatureSubPath] = {
|
|
94
97
|
options: {
|
|
95
98
|
name: route.name,
|
|
@@ -34,8 +34,14 @@ const processEnvDefined = (typeof process !== "undefined" && typeof process.env
|
|
|
34
34
|
export abstract class ConfigStore {
|
|
35
35
|
|
|
36
36
|
public static putConfig(key: string, value: string): ConfigStore {
|
|
37
|
+
if (key === "__proto__" || key === "__prototype__") {
|
|
38
|
+
throw new Error("invalid key " + key);
|
|
39
|
+
}
|
|
37
40
|
if (processEnvDefined) {
|
|
38
41
|
Object.defineProperty(process.env, key, {
|
|
42
|
+
writable: true,
|
|
43
|
+
enumerable: true,
|
|
44
|
+
configurable: true,
|
|
39
45
|
value
|
|
40
46
|
}); // this is for webpack
|
|
41
47
|
} else {
|
|
@@ -47,6 +53,9 @@ export abstract class ConfigStore {
|
|
|
47
53
|
}
|
|
48
54
|
|
|
49
55
|
public static clear(key: string): ConfigStore {
|
|
56
|
+
if (key === "__proto__" || key === "__prototype__") {
|
|
57
|
+
throw new Error("invalid key " + key);
|
|
58
|
+
}
|
|
50
59
|
if (processEnvDefined) {
|
|
51
60
|
delete process.env[key];
|
|
52
61
|
} else {
|
|
@@ -75,6 +84,9 @@ export abstract class ConfigStore {
|
|
|
75
84
|
}
|
|
76
85
|
|
|
77
86
|
public static getConfig(key: string, defaultValue?: string): string | null {
|
|
87
|
+
if (key === "__proto__" || key === "__prototype__") {
|
|
88
|
+
throw new Error("invalid key " + key);
|
|
89
|
+
}
|
|
78
90
|
if (processEnvDefined) {
|
|
79
91
|
return process.env[key] !== undefined ? process.env[key] as string : (defaultValue !== undefined ? defaultValue : null);
|
|
80
92
|
} else {
|
|
@@ -25,7 +25,7 @@ class ConfigFileNotFoundError extends Error {
|
|
|
25
25
|
}
|
|
26
26
|
|
|
27
27
|
export const loadConfigString = (envFileContent: string, combined?: ConfigOutput): ConfigOutput => {
|
|
28
|
-
const ret: ConfigOutput =
|
|
28
|
+
const ret: ConfigOutput = Object.create(null);
|
|
29
29
|
envFileContent.split("\n")
|
|
30
30
|
.filter(value => value && value.length > 0 && value.substring(0, 1) !== "#")
|
|
31
31
|
.forEach((line) => {
|
|
@@ -60,7 +60,7 @@ const MISSED_TO_RUNMIQRO_INIT = (configDirname: string): string => `no config lo
|
|
|
60
60
|
|
|
61
61
|
export const loadConfig = (configDirname: string = ConfigPathResolver.getConfigDirname(), logger?: Logger): LoadConfigOut => {
|
|
62
62
|
const outputs: ConfigOutput[] = [];
|
|
63
|
-
const combined =
|
|
63
|
+
const combined = Object.create(null);
|
|
64
64
|
if (existsSync(configDirname)) {
|
|
65
65
|
const configFiles = readdirSync(configDirname);
|
|
66
66
|
for (const configFile of configFiles) {
|
package/src/common/context.ts
CHANGED
|
@@ -20,6 +20,8 @@ export type Method =
|
|
|
20
20
|
| "PATCH"
|
|
21
21
|
| "OPTIONS";
|
|
22
22
|
|
|
23
|
+
export const IGNORE_HEADER = ["keep-alive", "connection"];
|
|
24
|
+
|
|
23
25
|
export type Handler<T = boolean | void | any> = ((ctx: Context) => Promise<T>) | ((ctx: Context) => T);
|
|
24
26
|
|
|
25
27
|
export type ErrorHandler<T = boolean | void | any> =
|
|
@@ -37,7 +39,7 @@ export class Context {
|
|
|
37
39
|
public headers: IncomingHttpHeaders; // from this.req.headers
|
|
38
40
|
public readonly cookies: { [name: string]: string }; // a middleware will fill this
|
|
39
41
|
public query: { [name: string]: string | string[] }; // parseSearchParams will fill this with this.url.searchParams
|
|
40
|
-
public params: { [name: string]: string | undefined }
|
|
42
|
+
public params: { [name: string]: string | undefined }; // the router will fill this
|
|
41
43
|
public buffer?: Buffer; // empty buffer. middleware must read it
|
|
42
44
|
public readonly remoteAddress?: string;
|
|
43
45
|
public body: any; // a middleware will fill this reading the buffer
|
|
@@ -48,10 +50,11 @@ export class Context {
|
|
|
48
50
|
this.method = req.method ? req.method.toUpperCase() as string : "GET";
|
|
49
51
|
this.path = normalizePath(this.url.pathname); // normalized path
|
|
50
52
|
this.hash = this.url.hash;
|
|
53
|
+
this.params = Object.create(null);
|
|
51
54
|
this.query = parseSearchParams(this.url.searchParams);
|
|
52
55
|
//this.buffer = Buffer.from("");
|
|
53
56
|
this.remoteAddress = req.socket.remoteAddress;
|
|
54
|
-
this.cookies =
|
|
57
|
+
this.cookies = Object.create(null); // a middleware will fill
|
|
55
58
|
this.headers = req.headers;
|
|
56
59
|
this.startMS = Date.now();
|
|
57
60
|
this.results = []; // handlers will fill this
|
|
@@ -98,10 +101,15 @@ export class Context {
|
|
|
98
101
|
this.res.statusCode = status;
|
|
99
102
|
const keys = Object.keys(headers);
|
|
100
103
|
for (const key of keys) {
|
|
104
|
+
if (IGNORE_HEADER.indexOf(key.toLocaleLowerCase()) !== -1) {
|
|
105
|
+
this.logger.warn("ignoring " + key);
|
|
106
|
+
continue;
|
|
107
|
+
}
|
|
101
108
|
if (headers[key] !== undefined) {
|
|
102
109
|
this.res.setHeader(key, headers[key] as any);
|
|
103
110
|
}
|
|
104
111
|
}
|
|
112
|
+
this.res.setHeader("connection", "close");
|
|
105
113
|
this.res.end(body !== undefined ? (body instanceof Buffer ? body : String(body)) : undefined, () => {
|
|
106
114
|
resolve();
|
|
107
115
|
});
|
|
@@ -236,11 +236,13 @@ describe("context unit tests", () => {
|
|
|
236
236
|
});
|
|
237
237
|
strictEqual(res.end.callCount, 1);
|
|
238
238
|
strictEqual(res.end.callArgs[0][0], body);
|
|
239
|
-
strictEqual(res.setHeader.callCount,
|
|
239
|
+
strictEqual(res.setHeader.callCount, 3);
|
|
240
240
|
strictEqual(res.setHeader.callArgs[0][0], "key1");
|
|
241
241
|
strictEqual(res.setHeader.callArgs[0][1], "value1");
|
|
242
242
|
strictEqual(res.setHeader.callArgs[1][0], "key2");
|
|
243
243
|
strictEqual(res.setHeader.callArgs[1][1], "value2");
|
|
244
|
+
strictEqual(res.setHeader.callArgs[2][0], "connection");
|
|
245
|
+
strictEqual(res.setHeader.callArgs[2][1], "close");
|
|
244
246
|
});
|
|
245
247
|
|
|
246
248
|
[{status: "status"}, {status: undefined}].forEach(({status}) => {
|
|
@@ -88,7 +88,7 @@ export class RouterHandler {
|
|
|
88
88
|
router.getJSONDoc(doc, `${prePath}${nPath}`);
|
|
89
89
|
} else if (this.options) {
|
|
90
90
|
if (!doc[`${prePath}${nPath}`]) {
|
|
91
|
-
doc[`${prePath}${nPath}`] =
|
|
91
|
+
doc[`${prePath}${nPath}`] = Object.create(null);
|
|
92
92
|
}
|
|
93
93
|
if (doc[`${prePath}${nPath}`][nMethod]) {
|
|
94
94
|
throw new Error("cannot create doc routes override each other");
|
|
@@ -54,9 +54,12 @@ export class VerifyEndpointService implements VerifyTokenService {
|
|
|
54
54
|
{name: "url", required: true, type: "string", stringMinLength: 1},
|
|
55
55
|
{name: "method", required: true, type: "string", stringMinLength: 1},
|
|
56
56
|
{name: "tokenLocation", required: true, type: "enum", enumValues: ["header", "query", "cookie"]},
|
|
57
|
-
{name: "tokenLocationName", required: true, type: "
|
|
57
|
+
{name: "tokenLocationName", required: true, type: "string"}
|
|
58
58
|
], "no_extra", "options") as any;
|
|
59
59
|
}
|
|
60
|
+
if (this.options.tokenLocationName && (this.options.tokenLocationName === "__proto__" || this.options.tokenLocationName === "__prototype__")) {
|
|
61
|
+
throw new Error(`invalid tokenLocationName ${this.options.tokenLocationName}`);
|
|
62
|
+
}
|
|
60
63
|
}
|
|
61
64
|
|
|
62
65
|
public async verify({token, ctx}: { token: string; ctx: Context }): Promise<Session | null> {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {URLSearchParams} from "url";
|
|
2
2
|
|
|
3
3
|
export function parseSearchParams(search: URLSearchParams): { [name: string]: string | string[] } {
|
|
4
|
-
const query: { [name: string]: string | string[] } =
|
|
4
|
+
const query: { [name: string]: string | string[] } = Object.create(null);
|
|
5
5
|
search.forEach((value: string, key: string) => {
|
|
6
6
|
query[key] = query[key] instanceof Array ? (query[key] as string[]).concat([value]) : query[key] ? [query[key] as string, value] : value;
|
|
7
7
|
});
|
|
@@ -93,7 +93,7 @@ export function matchTokenizePath(checkAsRouter: boolean, pathTokens: PathPartTo
|
|
|
93
93
|
)
|
|
94
94
|
);
|
|
95
95
|
|
|
96
|
-
const params: { [name: string]: string | undefined } =
|
|
96
|
+
const params: { [name: string]: string | undefined } = Object.create(null);
|
|
97
97
|
|
|
98
98
|
if ((!checkAsRouter && pathTokens.length === requestParts.length) || couldBeUsingOptional || (checkAsRouter && pathTokens.length <= requestParts.length)) {
|
|
99
99
|
// similar count of tokens
|
package/src/proxy.ts
CHANGED
|
@@ -34,16 +34,29 @@ class ProxyRouter extends Router {
|
|
|
34
34
|
const url = nUrl.toString();
|
|
35
35
|
ctx.logger.info("proxy to %s", url.toString());
|
|
36
36
|
|
|
37
|
+
const headers = {
|
|
38
|
+
...ctx.headers
|
|
39
|
+
};
|
|
40
|
+
|
|
41
|
+
delete headers["connection"];
|
|
42
|
+
delete headers["keep-alive"];
|
|
43
|
+
|
|
37
44
|
const response = await request({
|
|
38
45
|
url: url.toString(),
|
|
39
46
|
disableThrow: true,
|
|
40
47
|
rejectUnauthorized: this.rejectUnauthorized,
|
|
41
48
|
disableUserAgent: true,
|
|
42
49
|
method: ctx.method,
|
|
43
|
-
headers
|
|
50
|
+
headers,
|
|
44
51
|
data: ctx.method !== "GET" ? ctx.buffer : undefined
|
|
45
52
|
});
|
|
46
53
|
|
|
54
|
+
const responseHeaders = {
|
|
55
|
+
...response.headers
|
|
56
|
+
};
|
|
57
|
+
delete responseHeaders["connection"];
|
|
58
|
+
delete responseHeaders["keep-alive"];
|
|
59
|
+
|
|
47
60
|
await ctx.end({
|
|
48
61
|
headers: response.headers,
|
|
49
62
|
body: response.data,
|