@prosopo/cli 2.5.1 → 2.5.3
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/RateLimiter.d.ts +8 -0
- package/dist/RateLimiter.d.ts.map +1 -1
- package/dist/RateLimiter.js +8 -0
- package/dist/RateLimiter.js.map +1 -1
- package/dist/argv.d.ts.map +1 -1
- package/dist/argv.js +0 -2
- package/dist/argv.js.map +1 -1
- package/dist/bundle/provider.cli.bundle.js +20686 -19580
- package/dist/start.d.ts.map +1 -1
- package/dist/start.js +6 -3
- package/dist/start.js.map +1 -1
- package/package.json +14 -14
- package/dist/commands/migrateBlockRulesToUserAccessRules.d.ts +0 -20
- package/dist/commands/migrateBlockRulesToUserAccessRules.d.ts.map +0 -1
- package/dist/commands/migrateBlockRulesToUserAccessRules.js +0 -65
- package/dist/commands/migrateBlockRulesToUserAccessRules.js.map +0 -1
package/dist/start.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAMvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAMvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AA8HnD,wBAAsB,KAAK,CAC1B,GAAG,CAAC,EAAE,mBAAmB,EACzB,KAAK,CAAC,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,MAAM,mBAwCb;AAED,wBAAsB,QAAQ,CAAC,GAAG,CAAC,EAAE,mBAAmB,EAAE,KAAK,CAAC,EAAE,OAAO,mBAGxE"}
|
package/dist/start.js
CHANGED
|
@@ -3,7 +3,7 @@ import { loadEnv } from "@prosopo/dotenv";
|
|
|
3
3
|
import { ProviderEnvironment } from "@prosopo/env";
|
|
4
4
|
import { getPairAsync } from "@prosopo/keyring";
|
|
5
5
|
import { i18nMiddleware } from "@prosopo/locale";
|
|
6
|
-
import { createApiAdminRoutesProvider, domainMiddleware, getClientList, headerCheckMiddleware, prosopoRouter, prosopoVerifyRouter, publicRouter, storeCaptchasExternally, } from "@prosopo/provider";
|
|
6
|
+
import { createApiAdminRoutesProvider, domainMiddleware, getClientList, headerCheckMiddleware, ignoreMiddleware, prosopoRouter, prosopoVerifyRouter, publicRouter, requestLoggerMiddleware, robotsMiddleware, storeCaptchasExternally, } from "@prosopo/provider";
|
|
7
7
|
import { authMiddleware, blockMiddleware, ja4Middleware, } from "@prosopo/provider";
|
|
8
8
|
import { ClientApiPaths } from "@prosopo/types";
|
|
9
9
|
import { createApiRuleRoutesProvider, getExpressApiRuleRateLimits, } from "@prosopo/user-access-policy";
|
|
@@ -21,7 +21,7 @@ async function startApi(env, admin = false, port) {
|
|
|
21
21
|
env.logger.info("Starting Prosopo API");
|
|
22
22
|
const apiApp = express();
|
|
23
23
|
const apiPort = port || env.config.server.port;
|
|
24
|
-
const apiEndpointAdapter = createApiExpressDefaultEndpointAdapter(env.
|
|
24
|
+
const apiEndpointAdapter = createApiExpressDefaultEndpointAdapter(env.config.logLevel);
|
|
25
25
|
const apiRuleRoutesProvider = createApiRuleRoutesProvider(env.getDb().getUserAccessRulesStorage());
|
|
26
26
|
const apiAdminRoutesProvider = createApiAdminRoutesProvider(env);
|
|
27
27
|
const clientPathsExcludingVerify = getClientApiPathsExcludingVerify();
|
|
@@ -33,6 +33,9 @@ async function startApi(env, admin = false, port) {
|
|
|
33
33
|
apiApp.use(cors());
|
|
34
34
|
apiApp.use(express.json({ limit: "50mb" }));
|
|
35
35
|
const i18Middleware = await i18nMiddleware({});
|
|
36
|
+
apiApp.use(robotsMiddleware());
|
|
37
|
+
apiApp.use(ignoreMiddleware());
|
|
38
|
+
apiApp.use(requestLoggerMiddleware(env));
|
|
36
39
|
apiApp.use(i18Middleware);
|
|
37
40
|
apiApp.use(ja4Middleware(env));
|
|
38
41
|
apiApp.use(prosopoVerifyRouter(env));
|
|
@@ -46,7 +49,7 @@ async function startApi(env, admin = false, port) {
|
|
|
46
49
|
apiApp.use(apiRulePaths.INSERT_MANY, authMiddleware(env));
|
|
47
50
|
apiApp.use(apiRulePaths.DELETE_MANY, authMiddleware(env));
|
|
48
51
|
apiApp.use(apiExpressRouterFactory.createRouter(apiRuleRoutesProvider, apiEndpointAdapter));
|
|
49
|
-
apiApp.use(apiExpressRouterFactory.createRouter(apiAdminRoutesProvider, createApiExpressDefaultEndpointAdapter(env.
|
|
52
|
+
apiApp.use(apiExpressRouterFactory.createRouter(apiAdminRoutesProvider, createApiExpressDefaultEndpointAdapter(env.config.logLevel, 400)));
|
|
50
53
|
const configRateLimits = env.config.rateLimits;
|
|
51
54
|
const rateLimits = { ...configRateLimits, ...getExpressApiRuleRateLimits() };
|
|
52
55
|
for (const [path, limit] of Object.entries(rateLimits)) {
|
package/dist/start.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAeA,OAAO,EACN,uBAAuB,EACvB,sCAAsC,GACtC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EACN,4BAA4B,EAC5B,gBAAgB,EAChB,aAAa,EACb,qBAAqB,EACrB,aAAa,EACb,mBAAmB,EACnB,YAAY,EACZ,uBAAuB,GACvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACN,cAAc,EACd,eAAe,EACf,aAAa,GACb,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAyB,MAAM,gBAAgB,CAAC;AACvE,OAAO,EACN,2BAA2B,EAC3B,2BAA2B,GAC3B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAE5C,MAAM,gCAAgC,GAAG,GAAG,EAAE;IAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,CACjD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CACvC,CAAC;IACF,OAAO,KAAyB,CAAC;AAClC,CAAC,CAAC;AAEF,KAAK,UAAU,QAAQ,CACtB,GAAwB,EACxB,KAAK,GAAG,KAAK,EACb,IAAa;IAEb,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAExC,MAAM,MAAM,GAAG,OAAO,EAAE,CAAC;IACzB,MAAM,OAAO,GAAG,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;IAE/C,MAAM,kBAAkB,GAAG,sCAAsC,
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/cli",
|
|
3
|
-
"version": "2.5.
|
|
3
|
+
"version": "2.5.3",
|
|
4
4
|
"description": "CLI for Prosopo Provider",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -29,18 +29,18 @@
|
|
|
29
29
|
"@polkadot/keyring": "12.6.2",
|
|
30
30
|
"@polkadot/types-codec": "10.13.1",
|
|
31
31
|
"@polkadot/util-crypto": "12.6.2",
|
|
32
|
-
"@prosopo/api": "2.5.
|
|
33
|
-
"@prosopo/api-express-router": "2.5.
|
|
34
|
-
"@prosopo/common": "2.5.
|
|
35
|
-
"@prosopo/config": "2.5.
|
|
36
|
-
"@prosopo/dotenv": "2.5.
|
|
37
|
-
"@prosopo/env": "2.5.
|
|
38
|
-
"@prosopo/keyring": "2.5.
|
|
39
|
-
"@prosopo/locale": "2.5.
|
|
40
|
-
"@prosopo/provider": "2.5.
|
|
41
|
-
"@prosopo/types": "2.5.
|
|
42
|
-
"@prosopo/user-access-policy": "2.5.
|
|
43
|
-
"@prosopo/util": "2.5.
|
|
32
|
+
"@prosopo/api": "2.5.3",
|
|
33
|
+
"@prosopo/api-express-router": "2.5.3",
|
|
34
|
+
"@prosopo/common": "2.5.3",
|
|
35
|
+
"@prosopo/config": "2.5.3",
|
|
36
|
+
"@prosopo/dotenv": "2.5.3",
|
|
37
|
+
"@prosopo/env": "2.5.3",
|
|
38
|
+
"@prosopo/keyring": "2.5.3",
|
|
39
|
+
"@prosopo/locale": "2.5.3",
|
|
40
|
+
"@prosopo/provider": "2.5.3",
|
|
41
|
+
"@prosopo/types": "2.5.3",
|
|
42
|
+
"@prosopo/user-access-policy": "2.5.3",
|
|
43
|
+
"@prosopo/util": "2.5.3",
|
|
44
44
|
"cors": "2.8.5",
|
|
45
45
|
"cron-parser": "4.9.0",
|
|
46
46
|
"dotenv": "16.4.5",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"zod": "3.23.8"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
|
-
"@prosopo/config": "2.5.
|
|
54
|
+
"@prosopo/config": "2.5.3",
|
|
55
55
|
"@types/cors": "2.8.17",
|
|
56
56
|
"@types/yargs": "17.0.33",
|
|
57
57
|
"@vitest/coverage-v8": "2.1.1",
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
import type { KeyringPair } from "@polkadot/keyring/types";
|
|
2
|
-
import type { BlockRule, ProsopoConfigOutput } from "@prosopo/types";
|
|
3
|
-
import type { IPBlockRuleRecord, UserAccountBlockRuleRecord } from "@prosopo/types-database";
|
|
4
|
-
import type { Rule } from "@prosopo/user-access-policy";
|
|
5
|
-
import type { CommandModule } from "yargs";
|
|
6
|
-
declare class MigrateBlockRuleDbRecordsToUserAccessPolicyCommand implements CommandModule {
|
|
7
|
-
private readonly pair;
|
|
8
|
-
private readonly config;
|
|
9
|
-
command: string;
|
|
10
|
-
describe: string;
|
|
11
|
-
constructor(pair: KeyringPair, config: ProsopoConfigOutput);
|
|
12
|
-
handler: () => Promise<void>;
|
|
13
|
-
protected convertIpBlockRulesToUserAccessRules(ipBlockRules: IPBlockRuleRecord[]): Rule[];
|
|
14
|
-
protected convertUserAccountBlockRulesToUserAccessRules(userAccountBlockRules: UserAccountBlockRuleRecord[]): Rule[];
|
|
15
|
-
protected convertIpBlockRuleToUserAccessRule(ipBlockRule: IPBlockRuleRecord): Rule;
|
|
16
|
-
protected convertUserAccountBlockRuleToUserAccessRule(userAccountBlockRule: UserAccountBlockRuleRecord): Rule;
|
|
17
|
-
protected convertBlockRuleToUserAccessRule(blockRule: BlockRule): Rule;
|
|
18
|
-
}
|
|
19
|
-
export { MigrateBlockRuleDbRecordsToUserAccessPolicyCommand };
|
|
20
|
-
//# sourceMappingURL=migrateBlockRulesToUserAccessRules.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"migrateBlockRulesToUserAccessRules.d.ts","sourceRoot":"","sources":["../../src/commands/migrateBlockRulesToUserAccessRules.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,KAAK,EACX,iBAAiB,EACjB,0BAA0B,EAC1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAExD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAE3C,cAAM,kDACL,YAAW,aAAa;IAMvB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IALjB,OAAO,SAA8C;IACrD,QAAQ,SAA8C;gBAG3C,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,mBAAmB;IAGtC,OAAO,QAAa,OAAO,CAAC,IAAI,CAAC,CAsBtC;IAEF,SAAS,CAAC,oCAAoC,CAC7C,YAAY,EAAE,iBAAiB,EAAE,GAC/B,IAAI,EAAE;IAMT,SAAS,CAAC,6CAA6C,CACtD,qBAAqB,EAAE,0BAA0B,EAAE,GACjD,IAAI,EAAE;IAMT,SAAS,CAAC,kCAAkC,CAC3C,WAAW,EAAE,iBAAiB,GAC5B,IAAI;IAgBP,SAAS,CAAC,2CAA2C,CACpD,oBAAoB,EAAE,0BAA0B,GAC9C,IAAI;IASP,SAAS,CAAC,gCAAgC,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;CAiBtE;AAED,OAAO,EAAE,kDAAkD,EAAE,CAAC"}
|
|
@@ -1,65 +0,0 @@
|
|
|
1
|
-
import { ProviderEnvironment } from "@prosopo/env";
|
|
2
|
-
import { Address4 } from "ip-address";
|
|
3
|
-
class MigrateBlockRuleDbRecordsToUserAccessPolicyCommand {
|
|
4
|
-
constructor(pair, config) {
|
|
5
|
-
this.pair = pair;
|
|
6
|
-
this.config = config;
|
|
7
|
-
this.command = "migrate-block-rules-to-user-access-rules";
|
|
8
|
-
this.describe = "Migrate block rules to user access rules";
|
|
9
|
-
this.handler = async () => {
|
|
10
|
-
const env = new ProviderEnvironment(this.config, this.pair);
|
|
11
|
-
await env.isReady();
|
|
12
|
-
const db = env.getDb();
|
|
13
|
-
const ipBlockRules = await db.getAllIpBlockRules();
|
|
14
|
-
const userAccountBlockRules = await db.getAllUserAccountBlockRules();
|
|
15
|
-
const userAccessRulesFromIpBlockRules = this.convertIpBlockRulesToUserAccessRules(ipBlockRules);
|
|
16
|
-
const userAccessRulesFromUserAccountBlockRules = this.convertUserAccountBlockRulesToUserAccessRules(userAccountBlockRules);
|
|
17
|
-
const newUserAccessRules = [
|
|
18
|
-
...userAccessRulesFromIpBlockRules,
|
|
19
|
-
...userAccessRulesFromUserAccountBlockRules,
|
|
20
|
-
];
|
|
21
|
-
const userAccessRulesStorage = db.getUserAccessRulesStorage();
|
|
22
|
-
await userAccessRulesStorage.insertMany(newUserAccessRules);
|
|
23
|
-
};
|
|
24
|
-
}
|
|
25
|
-
convertIpBlockRulesToUserAccessRules(ipBlockRules) {
|
|
26
|
-
return ipBlockRules.map((ipBlockRule) => this.convertIpBlockRuleToUserAccessRule(ipBlockRule));
|
|
27
|
-
}
|
|
28
|
-
convertUserAccountBlockRulesToUserAccessRules(userAccountBlockRules) {
|
|
29
|
-
return userAccountBlockRules.map((userAccountBlockRule) => this.convertUserAccountBlockRuleToUserAccessRule(userAccountBlockRule));
|
|
30
|
-
}
|
|
31
|
-
convertIpBlockRuleToUserAccessRule(ipBlockRule) {
|
|
32
|
-
const userAccessRule = this.convertBlockRuleToUserAccessRule(ipBlockRule);
|
|
33
|
-
const ipAsBigInt = BigInt(ipBlockRule.ip);
|
|
34
|
-
const ipAddress = Address4.fromBigInt(ipAsBigInt);
|
|
35
|
-
userAccessRule.userIp = {
|
|
36
|
-
v4: {
|
|
37
|
-
asNumeric: ipAsBigInt,
|
|
38
|
-
asString: ipAddress.address.toString(),
|
|
39
|
-
},
|
|
40
|
-
};
|
|
41
|
-
return userAccessRule;
|
|
42
|
-
}
|
|
43
|
-
convertUserAccountBlockRuleToUserAccessRule(userAccountBlockRule) {
|
|
44
|
-
const userAccessRule = this.convertBlockRuleToUserAccessRule(userAccountBlockRule);
|
|
45
|
-
userAccessRule.userId = userAccountBlockRule.userAccount;
|
|
46
|
-
return userAccessRule;
|
|
47
|
-
}
|
|
48
|
-
convertBlockRuleToUserAccessRule(blockRule) {
|
|
49
|
-
const userAccessRule = {
|
|
50
|
-
isUserBlocked: blockRule.hardBlock,
|
|
51
|
-
clientId: blockRule.dappAccount,
|
|
52
|
-
};
|
|
53
|
-
if (undefined !== blockRule.captchaConfig) {
|
|
54
|
-
userAccessRule.config = {
|
|
55
|
-
imageCaptcha: {
|
|
56
|
-
solvedCount: blockRule.captchaConfig.solved.count,
|
|
57
|
-
unsolvedCount: blockRule.captchaConfig.unsolved.count,
|
|
58
|
-
},
|
|
59
|
-
};
|
|
60
|
-
}
|
|
61
|
-
return userAccessRule;
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
export { MigrateBlockRuleDbRecordsToUserAccessPolicyCommand };
|
|
65
|
-
//# sourceMappingURL=migrateBlockRulesToUserAccessRules.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"migrateBlockRulesToUserAccessRules.js","sourceRoot":"","sources":["../../src/commands/migrateBlockRulesToUserAccessRules.ts"],"names":[],"mappings":"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"}
|