@prosopo/provider 0.3.42 → 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/dist/api/authMiddleware.d.ts +2 -0
- package/dist/api/authMiddleware.d.ts.map +1 -1
- package/dist/api/authMiddleware.js +1 -1
- package/dist/api/authMiddleware.js.map +1 -1
- package/dist/api/captcha.d.ts.map +1 -1
- package/dist/api/captcha.js +3 -73
- package/dist/api/captcha.js.map +1 -1
- package/dist/api/errorHandler.d.ts +2 -1
- package/dist/api/errorHandler.d.ts.map +1 -1
- package/dist/api/errorHandler.js +2 -8
- package/dist/api/errorHandler.js.map +1 -1
- package/dist/api/verify.d.ts +4 -0
- package/dist/api/verify.d.ts.map +1 -0
- package/dist/api/verify.js +108 -0
- package/dist/api/verify.js.map +1 -0
- package/dist/cjs/api/authMiddleware.cjs +1 -0
- package/dist/cjs/api/captcha.cjs +2 -67
- package/dist/cjs/api/errorHandler.cjs +2 -7
- package/dist/cjs/api/verify.cjs +103 -0
- package/dist/cjs/index.cjs +2 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/package.json +14 -14
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { KeyringPair } from '@polkadot/keyring/types';
|
|
1
2
|
import { NextFunction, Request, Response } from 'express';
|
|
2
3
|
import { ProviderEnvironment } from '@prosopo/types-env';
|
|
3
4
|
import { Tasks } from '../index.js';
|
|
4
5
|
export declare const authMiddleware: (tasks: Tasks, env: ProviderEnvironment) => (req: Request, res: Response, next: NextFunction) => Promise<void>;
|
|
6
|
+
export declare const verifySignature: (signature: string, blockNumber: string, pair: KeyringPair) => void;
|
|
5
7
|
//# sourceMappingURL=authMiddleware.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authMiddleware.d.ts","sourceRoot":"","sources":["../../src/api/authMiddleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"authMiddleware.d.ts","sourceRoot":"","sources":["../../src/api/authMiddleware.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAEzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAInC,eAAO,MAAM,cAAc,UAAW,KAAK,OAAO,mBAAmB,WAC9C,OAAO,OAAO,QAAQ,QAAQ,YAAY,kBAkBhE,CAAA;AA6CD,eAAO,MAAM,eAAe,cAAe,MAAM,eAAe,MAAM,QAAQ,WAAW,SAQxF,CAAA"}
|
|
@@ -53,7 +53,7 @@ const verifyBlockNumber = async (blockNumber, tasks) => {
|
|
|
53
53
|
});
|
|
54
54
|
}
|
|
55
55
|
};
|
|
56
|
-
const verifySignature = (signature, blockNumber, pair) => {
|
|
56
|
+
export const verifySignature = (signature, blockNumber, pair) => {
|
|
57
57
|
const u8Sig = hexToU8a(signature);
|
|
58
58
|
if (!pair.verify(blockNumber, u8Sig, pair.publicKey)) {
|
|
59
59
|
throw new ProsopoApiError('GENERAL.INVALID_SIGNATURE', {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authMiddleware.js","sourceRoot":"","sources":["../../src/api/authMiddleware.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"authMiddleware.js","sourceRoot":"","sources":["../../src/api/authMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../src/api/captcha.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../src/api/captcha.ts"],"names":[],"mappings":"AA4BA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAOxD,OAAgB,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAQzC,wBAAgB,aAAa,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CA0L9D"}
|
package/dist/api/captcha.js
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
import { ApiParams, ApiPaths, CaptchaRequestBody, CaptchaSolutionBody, GetPowCaptchaChallengeRequestBody,
|
|
2
|
-
import { CaptchaStatus } from '@prosopo/captcha-contract/types-returns';
|
|
1
|
+
import { ApiParams, ApiPaths, CaptchaRequestBody, CaptchaSolutionBody, GetPowCaptchaChallengeRequestBody, SubmitPowCaptchaSolutionBody, } from '@prosopo/types';
|
|
3
2
|
import { ProsopoApiError } from '@prosopo/common';
|
|
4
3
|
import { Tasks } from '../tasks/tasks.js';
|
|
5
|
-
import { getBlockTimeMs, getCurrentBlockNumber } from '@prosopo/contract';
|
|
6
4
|
import { handleErrors } from './errorHandler.js';
|
|
7
5
|
import { parseBlockNumber } from '../util.js';
|
|
8
6
|
import { parseCaptchaAssets } from '@prosopo/datasets';
|
|
@@ -12,7 +10,7 @@ import express from 'express';
|
|
|
12
10
|
export function prosopoRouter(env) {
|
|
13
11
|
const router = express.Router();
|
|
14
12
|
const tasks = new Tasks(env);
|
|
15
|
-
router.get(`${ApiPaths.
|
|
13
|
+
router.get(`${ApiPaths.GetImageCaptchaChallenge}/:${ApiParams.datasetId}/:${ApiParams.user}/:${ApiParams.dapp}/:${ApiParams.blockNumber}`, async (req, res, next) => {
|
|
16
14
|
try {
|
|
17
15
|
const { blockNumber, datasetId, user, dapp } = CaptchaRequestBody.parse(req.params);
|
|
18
16
|
const api = env.api;
|
|
@@ -41,7 +39,7 @@ export function prosopoRouter(env) {
|
|
|
41
39
|
return next(new ProsopoApiError('API.BAD_REQUEST', { context: { error: err, code: 400 } }));
|
|
42
40
|
}
|
|
43
41
|
});
|
|
44
|
-
router.post(ApiPaths.
|
|
42
|
+
router.post(ApiPaths.SubmitImageCaptchaSolution, async (req, res, next) => {
|
|
45
43
|
let parsed;
|
|
46
44
|
try {
|
|
47
45
|
parsed = CaptchaSolutionBody.parse(req.body);
|
|
@@ -62,74 +60,6 @@ export function prosopoRouter(env) {
|
|
|
62
60
|
return next(new ProsopoApiError('API.UNKNOWN', { context: { code: 400, error: err } }));
|
|
63
61
|
}
|
|
64
62
|
});
|
|
65
|
-
router.post(ApiPaths.VerifyCaptchaSolution, async (req, res, next) => {
|
|
66
|
-
let parsed;
|
|
67
|
-
try {
|
|
68
|
-
parsed = VerifySolutionBody.parse(req.body);
|
|
69
|
-
}
|
|
70
|
-
catch (err) {
|
|
71
|
-
return next(new ProsopoApiError('CAPTCHA.PARSE_ERROR', { context: { code: 400, error: err } }));
|
|
72
|
-
}
|
|
73
|
-
try {
|
|
74
|
-
const solution = await (parsed.commitmentId
|
|
75
|
-
? tasks.getDappUserCommitmentById(parsed.commitmentId)
|
|
76
|
-
: tasks.getDappUserCommitmentByAccount(parsed.user));
|
|
77
|
-
if (!solution) {
|
|
78
|
-
tasks.logger.debug('Not verified - no solution found');
|
|
79
|
-
const noSolutionResponse = {
|
|
80
|
-
[ApiParams.status]: req.t('API.USER_NOT_VERIFIED_NO_SOLUTION'),
|
|
81
|
-
[ApiParams.verified]: false,
|
|
82
|
-
};
|
|
83
|
-
return res.json(noSolutionResponse);
|
|
84
|
-
}
|
|
85
|
-
if (solution.status === CaptchaStatus.disapproved) {
|
|
86
|
-
const disapprovedResponse = {
|
|
87
|
-
[ApiParams.status]: req.t('API.USER_NOT_VERIFIED'),
|
|
88
|
-
[ApiParams.verified]: false,
|
|
89
|
-
};
|
|
90
|
-
return res.json(disapprovedResponse);
|
|
91
|
-
}
|
|
92
|
-
if (parsed.maxVerifiedTime) {
|
|
93
|
-
const currentBlockNumber = await getCurrentBlockNumber(tasks.contract.api);
|
|
94
|
-
const blockTimeMs = getBlockTimeMs(tasks.contract.api);
|
|
95
|
-
const timeSinceCompletion = (currentBlockNumber - solution.completedAt) * blockTimeMs;
|
|
96
|
-
if (timeSinceCompletion > parsed.maxVerifiedTime) {
|
|
97
|
-
const expiredResponse = {
|
|
98
|
-
[ApiParams.status]: req.t('API.USER_NOT_VERIFIED_TIME_EXPIRED'),
|
|
99
|
-
[ApiParams.verified]: false,
|
|
100
|
-
};
|
|
101
|
-
tasks.logger.debug('Not verified - time run out');
|
|
102
|
-
return res.json(expiredResponse);
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
const isApproved = solution.status === CaptchaStatus.approved;
|
|
106
|
-
const response = {
|
|
107
|
-
[ApiParams.status]: req.t(isApproved ? 'API.USER_VERIFIED' : 'API.USER_NOT_VERIFIED'),
|
|
108
|
-
[ApiParams.verified]: isApproved,
|
|
109
|
-
[ApiParams.commitmentId]: solution.id.toString(),
|
|
110
|
-
[ApiParams.blockNumber]: solution.requestedAt,
|
|
111
|
-
};
|
|
112
|
-
return res.json(response);
|
|
113
|
-
}
|
|
114
|
-
catch (err) {
|
|
115
|
-
return next(new ProsopoApiError('API.BAD_REQUEST', { context: { code: 400, error: err } }));
|
|
116
|
-
}
|
|
117
|
-
});
|
|
118
|
-
router.post(ApiPaths.ServerPowCaptchaVerify, async (req, res, next) => {
|
|
119
|
-
try {
|
|
120
|
-
const { challenge, dapp, verifiedTimeout } = ServerPowCaptchaVerifyRequestBody.parse(req.body);
|
|
121
|
-
const approved = await tasks.serverVerifyPowCaptchaSolution(dapp, challenge, verifiedTimeout);
|
|
122
|
-
const verificationResponse = {
|
|
123
|
-
status: req.t(approved ? 'API.USER_VERIFIED' : 'API.USER_NOT_VERIFIED'),
|
|
124
|
-
[ApiParams.verified]: approved,
|
|
125
|
-
};
|
|
126
|
-
return res.json(verificationResponse);
|
|
127
|
-
}
|
|
128
|
-
catch (err) {
|
|
129
|
-
tasks.logger.error(err);
|
|
130
|
-
return next(new ProsopoApiError('API.BAD_REQUEST', { context: { code: 400, error: err } }));
|
|
131
|
-
}
|
|
132
|
-
});
|
|
133
63
|
router.post(ApiPaths.GetPowCaptchaChallenge, async (req, res, next) => {
|
|
134
64
|
try {
|
|
135
65
|
const { user, dapp } = GetPowCaptchaChallengeRequestBody.parse(req.body);
|
package/dist/api/captcha.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captcha.js","sourceRoot":"","sources":["../../src/api/captcha.ts"],"names":[],"mappings":"AAaA,OAAO,EACH,SAAS,EACT,QAAQ,EACR,kBAAkB,EAElB,mBAAmB,EAKnB,iCAAiC,
|
|
1
|
+
{"version":3,"file":"captcha.js","sourceRoot":"","sources":["../../src/api/captcha.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { NextFunction, Request, Response } from 'express';
|
|
2
2
|
import { ProsopoApiError } from '@prosopo/common';
|
|
3
|
-
|
|
3
|
+
import { ZodError } from 'zod';
|
|
4
|
+
export declare const handleErrors: (err: ProsopoApiError | SyntaxError | ZodError, request: Request, response: Response, next: NextFunction) => void;
|
|
4
5
|
//# sourceMappingURL=errorHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorHandler.d.ts","sourceRoot":"","sources":["../../src/api/errorHandler.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACzD,OAAO,EAAE,eAAe,EAAoB,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"errorHandler.d.ts","sourceRoot":"","sources":["../../src/api/errorHandler.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACzD,OAAO,EAAE,eAAe,EAAoB,MAAM,iBAAiB,CAAA;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAA;AAE9B,eAAO,MAAM,YAAY,QAChB,eAAe,GAAG,WAAW,GAAG,QAAQ,WACpC,OAAO,YACN,QAAQ,QACZ,YAAY,SAUrB,CAAA"}
|
package/dist/api/errorHandler.js
CHANGED
|
@@ -4,13 +4,7 @@ export const handleErrors = (err, request, response, next) => {
|
|
|
4
4
|
while (err instanceof ProsopoBaseError && err.context && err.context.error) {
|
|
5
5
|
err = err.context.error;
|
|
6
6
|
}
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
message = JSON.parse(err.message);
|
|
10
|
-
}
|
|
11
|
-
catch {
|
|
12
|
-
console.error(err);
|
|
13
|
-
}
|
|
14
|
-
response.writeHead(code, message, { 'content-type': 'application/json' }).end();
|
|
7
|
+
const message = err.message;
|
|
8
|
+
response.writeHead(code, JSON.stringify(message), { 'content-type': 'application/json' }).end();
|
|
15
9
|
};
|
|
16
10
|
//# sourceMappingURL=errorHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../src/api/errorHandler.ts"],"names":[],"mappings":"AAeA,OAAO,EAAmB,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../src/api/errorHandler.ts"],"names":[],"mappings":"AAeA,OAAO,EAAmB,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAGnE,MAAM,CAAC,MAAM,YAAY,GAAG,CACxB,GAA6C,EAC7C,OAAgB,EAChB,QAAkB,EAClB,IAAkB,EACpB,EAAE;IACA,MAAM,IAAI,GAAG,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAA;IAE3C,OAAO,GAAG,YAAY,gBAAgB,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE;QACxE,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAA;KAC1B;IACD,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAE3B,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC,CAAC,GAAG,EAAE,CAAA;AACnG,CAAC,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../src/api/verify.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAMxD,OAAgB,EAAmC,MAAM,EAAE,MAAM,SAAS,CAAA;AAQ1E,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CA6JpE"}
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
import { ApiParams, ApiPaths, ServerPowCaptchaVerifyRequestBody, VerifySolutionBody, } from '@prosopo/types';
|
|
2
|
+
import { CaptchaStatus } from '@prosopo/captcha-contract/types-returns';
|
|
3
|
+
import { ProsopoApiError } from '@prosopo/common';
|
|
4
|
+
import { Tasks } from '../tasks/tasks.js';
|
|
5
|
+
import { decodeProcaptchaOutput } from '@prosopo/types';
|
|
6
|
+
import { getBlockTimeMs, getCurrentBlockNumber } from '@prosopo/contract';
|
|
7
|
+
import { handleErrors } from './errorHandler.js';
|
|
8
|
+
import { verifySignature } from './authMiddleware.js';
|
|
9
|
+
import express from 'express';
|
|
10
|
+
export function prosopoVerifyRouter(env) {
|
|
11
|
+
const router = express.Router();
|
|
12
|
+
const tasks = new Tasks(env);
|
|
13
|
+
async function verifyImageSolution(res, req, next, isDapp) {
|
|
14
|
+
const parsed = VerifySolutionBody.parse(req.body);
|
|
15
|
+
try {
|
|
16
|
+
const { dappUserSignature, token } = parsed;
|
|
17
|
+
const { user, dapp, blockNumber, commitmentId } = decodeProcaptchaOutput(token);
|
|
18
|
+
const keyPair = isDapp ? env.keyring.addFromAddress(dapp) : env.keyring.addFromAddress(user);
|
|
19
|
+
verifySignature(dappUserSignature, blockNumber.toString(), keyPair);
|
|
20
|
+
const solution = await (commitmentId
|
|
21
|
+
? tasks.getDappUserCommitmentById(commitmentId)
|
|
22
|
+
: tasks.getDappUserCommitmentByAccount(user));
|
|
23
|
+
if (!solution) {
|
|
24
|
+
tasks.logger.debug('Not verified - no solution found');
|
|
25
|
+
const noSolutionResponse = {
|
|
26
|
+
[ApiParams.status]: req.t('API.USER_NOT_VERIFIED_NO_SOLUTION'),
|
|
27
|
+
[ApiParams.verified]: false,
|
|
28
|
+
};
|
|
29
|
+
return res.json(noSolutionResponse);
|
|
30
|
+
}
|
|
31
|
+
if (solution.status === CaptchaStatus.disapproved) {
|
|
32
|
+
const disapprovedResponse = {
|
|
33
|
+
[ApiParams.status]: req.t('API.USER_NOT_VERIFIED'),
|
|
34
|
+
[ApiParams.verified]: false,
|
|
35
|
+
};
|
|
36
|
+
return res.json(disapprovedResponse);
|
|
37
|
+
}
|
|
38
|
+
if (parsed.maxVerifiedTime) {
|
|
39
|
+
const currentBlockNumber = await getCurrentBlockNumber(tasks.contract.api);
|
|
40
|
+
const blockTimeMs = getBlockTimeMs(tasks.contract.api);
|
|
41
|
+
const timeSinceCompletion = (currentBlockNumber - solution.completedAt) * blockTimeMs;
|
|
42
|
+
if (timeSinceCompletion > parsed.maxVerifiedTime) {
|
|
43
|
+
const expiredResponse = {
|
|
44
|
+
[ApiParams.status]: req.t('API.USER_NOT_VERIFIED_TIME_EXPIRED'),
|
|
45
|
+
[ApiParams.verified]: false,
|
|
46
|
+
};
|
|
47
|
+
tasks.logger.debug('Not verified - time run out');
|
|
48
|
+
return res.json(expiredResponse);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
const isApproved = solution.status === CaptchaStatus.approved;
|
|
52
|
+
const response = {
|
|
53
|
+
[ApiParams.status]: req.t(isApproved ? 'API.USER_VERIFIED' : 'API.USER_NOT_VERIFIED'),
|
|
54
|
+
[ApiParams.verified]: isApproved,
|
|
55
|
+
[ApiParams.commitmentId]: solution.id.toString(),
|
|
56
|
+
[ApiParams.blockNumber]: solution.requestedAt,
|
|
57
|
+
};
|
|
58
|
+
return res.json(response);
|
|
59
|
+
}
|
|
60
|
+
catch (err) {
|
|
61
|
+
return next(new ProsopoApiError('API.BAD_REQUEST', { context: { code: 400, error: err } }));
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
router.post(ApiPaths.VerifyImageCaptchaSolutionDapp, async (req, res, next) => {
|
|
65
|
+
try {
|
|
66
|
+
await verifyImageSolution(res, req, next, true);
|
|
67
|
+
}
|
|
68
|
+
catch (err) {
|
|
69
|
+
return next(new ProsopoApiError('CAPTCHA.PARSE_ERROR', { context: { code: 400, error: err } }));
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
router.post(ApiPaths.VerifyImageCaptchaSolutionUser, async (req, res, next) => {
|
|
73
|
+
try {
|
|
74
|
+
await verifyImageSolution(res, req, next, false);
|
|
75
|
+
}
|
|
76
|
+
catch (err) {
|
|
77
|
+
return next(new ProsopoApiError('CAPTCHA.PARSE_ERROR', { context: { code: 400, error: err } }));
|
|
78
|
+
}
|
|
79
|
+
});
|
|
80
|
+
router.post(ApiPaths.VerifyPowCaptchaSolution, async (req, res, next) => {
|
|
81
|
+
try {
|
|
82
|
+
const { token, dappSignature, verifiedTimeout } = ServerPowCaptchaVerifyRequestBody.parse(req.body);
|
|
83
|
+
const { dapp, blockNumber, challenge } = decodeProcaptchaOutput(token);
|
|
84
|
+
if (!challenge) {
|
|
85
|
+
const unverifiedResponse = {
|
|
86
|
+
status: req.t('API.USER_NOT_VERIFIED'),
|
|
87
|
+
[ApiParams.verified]: false,
|
|
88
|
+
};
|
|
89
|
+
return res.json(unverifiedResponse);
|
|
90
|
+
}
|
|
91
|
+
const dappPair = env.keyring.addFromAddress(dapp);
|
|
92
|
+
verifySignature(dappSignature, blockNumber.toString(), dappPair);
|
|
93
|
+
const approved = await tasks.serverVerifyPowCaptchaSolution(dapp, challenge, verifiedTimeout);
|
|
94
|
+
const verificationResponse = {
|
|
95
|
+
status: req.t(approved ? 'API.USER_VERIFIED' : 'API.USER_NOT_VERIFIED'),
|
|
96
|
+
[ApiParams.verified]: approved,
|
|
97
|
+
};
|
|
98
|
+
return res.json(verificationResponse);
|
|
99
|
+
}
|
|
100
|
+
catch (err) {
|
|
101
|
+
tasks.logger.error(err);
|
|
102
|
+
return next(new ProsopoApiError('API.BAD_REQUEST', { context: { code: 400, error: err } }));
|
|
103
|
+
}
|
|
104
|
+
});
|
|
105
|
+
router.use(handleErrors);
|
|
106
|
+
return router;
|
|
107
|
+
}
|
|
108
|
+
//# sourceMappingURL=verify.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../src/api/verify.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/api/captcha.cjs
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
3
|
const types = require("@prosopo/types");
|
|
4
|
-
const typesReturns = require("@prosopo/captcha-contract/types-returns");
|
|
5
4
|
const common = require("@prosopo/common");
|
|
6
5
|
const tasks = require("../tasks/tasks.cjs");
|
|
7
|
-
const contract = require("@prosopo/contract");
|
|
8
6
|
const errorHandler = require("./errorHandler.cjs");
|
|
9
7
|
const util = require("../util.cjs");
|
|
10
8
|
const datasets = require("@prosopo/datasets");
|
|
@@ -15,7 +13,7 @@ function prosopoRouter(env) {
|
|
|
15
13
|
const router = express.Router();
|
|
16
14
|
const tasks$1 = new tasks.Tasks(env);
|
|
17
15
|
router.get(
|
|
18
|
-
`${types.ApiPaths.
|
|
16
|
+
`${types.ApiPaths.GetImageCaptchaChallenge}/:${types.ApiParams.datasetId}/:${types.ApiParams.user}/:${types.ApiParams.dapp}/:${types.ApiParams.blockNumber}`,
|
|
19
17
|
async (req, res, next) => {
|
|
20
18
|
try {
|
|
21
19
|
const { blockNumber, datasetId, user, dapp } = types.CaptchaRequestBody.parse(req.params);
|
|
@@ -45,7 +43,7 @@ function prosopoRouter(env) {
|
|
|
45
43
|
}
|
|
46
44
|
}
|
|
47
45
|
);
|
|
48
|
-
router.post(types.ApiPaths.
|
|
46
|
+
router.post(types.ApiPaths.SubmitImageCaptchaSolution, async (req, res, next) => {
|
|
49
47
|
let parsed;
|
|
50
48
|
try {
|
|
51
49
|
parsed = types.CaptchaSolutionBody.parse(req.body);
|
|
@@ -70,69 +68,6 @@ function prosopoRouter(env) {
|
|
|
70
68
|
return next(new common.ProsopoApiError("API.UNKNOWN", { context: { code: 400, error: err } }));
|
|
71
69
|
}
|
|
72
70
|
});
|
|
73
|
-
router.post(types.ApiPaths.VerifyCaptchaSolution, async (req, res, next) => {
|
|
74
|
-
let parsed;
|
|
75
|
-
try {
|
|
76
|
-
parsed = types.VerifySolutionBody.parse(req.body);
|
|
77
|
-
} catch (err) {
|
|
78
|
-
return next(new common.ProsopoApiError("CAPTCHA.PARSE_ERROR", { context: { code: 400, error: err } }));
|
|
79
|
-
}
|
|
80
|
-
try {
|
|
81
|
-
const solution = await (parsed.commitmentId ? tasks$1.getDappUserCommitmentById(parsed.commitmentId) : tasks$1.getDappUserCommitmentByAccount(parsed.user));
|
|
82
|
-
if (!solution) {
|
|
83
|
-
tasks$1.logger.debug("Not verified - no solution found");
|
|
84
|
-
const noSolutionResponse = {
|
|
85
|
-
[types.ApiParams.status]: req.t("API.USER_NOT_VERIFIED_NO_SOLUTION"),
|
|
86
|
-
[types.ApiParams.verified]: false
|
|
87
|
-
};
|
|
88
|
-
return res.json(noSolutionResponse);
|
|
89
|
-
}
|
|
90
|
-
if (solution.status === typesReturns.CaptchaStatus.disapproved) {
|
|
91
|
-
const disapprovedResponse = {
|
|
92
|
-
[types.ApiParams.status]: req.t("API.USER_NOT_VERIFIED"),
|
|
93
|
-
[types.ApiParams.verified]: false
|
|
94
|
-
};
|
|
95
|
-
return res.json(disapprovedResponse);
|
|
96
|
-
}
|
|
97
|
-
if (parsed.maxVerifiedTime) {
|
|
98
|
-
const currentBlockNumber = await contract.getCurrentBlockNumber(tasks$1.contract.api);
|
|
99
|
-
const blockTimeMs = contract.getBlockTimeMs(tasks$1.contract.api);
|
|
100
|
-
const timeSinceCompletion = (currentBlockNumber - solution.completedAt) * blockTimeMs;
|
|
101
|
-
if (timeSinceCompletion > parsed.maxVerifiedTime) {
|
|
102
|
-
const expiredResponse = {
|
|
103
|
-
[types.ApiParams.status]: req.t("API.USER_NOT_VERIFIED_TIME_EXPIRED"),
|
|
104
|
-
[types.ApiParams.verified]: false
|
|
105
|
-
};
|
|
106
|
-
tasks$1.logger.debug("Not verified - time run out");
|
|
107
|
-
return res.json(expiredResponse);
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
const isApproved = solution.status === typesReturns.CaptchaStatus.approved;
|
|
111
|
-
const response = {
|
|
112
|
-
[types.ApiParams.status]: req.t(isApproved ? "API.USER_VERIFIED" : "API.USER_NOT_VERIFIED"),
|
|
113
|
-
[types.ApiParams.verified]: isApproved,
|
|
114
|
-
[types.ApiParams.commitmentId]: solution.id.toString(),
|
|
115
|
-
[types.ApiParams.blockNumber]: solution.requestedAt
|
|
116
|
-
};
|
|
117
|
-
return res.json(response);
|
|
118
|
-
} catch (err) {
|
|
119
|
-
return next(new common.ProsopoApiError("API.BAD_REQUEST", { context: { code: 400, error: err } }));
|
|
120
|
-
}
|
|
121
|
-
});
|
|
122
|
-
router.post(types.ApiPaths.ServerPowCaptchaVerify, async (req, res, next) => {
|
|
123
|
-
try {
|
|
124
|
-
const { challenge, dapp, verifiedTimeout } = types.ServerPowCaptchaVerifyRequestBody.parse(req.body);
|
|
125
|
-
const approved = await tasks$1.serverVerifyPowCaptchaSolution(dapp, challenge, verifiedTimeout);
|
|
126
|
-
const verificationResponse = {
|
|
127
|
-
status: req.t(approved ? "API.USER_VERIFIED" : "API.USER_NOT_VERIFIED"),
|
|
128
|
-
[types.ApiParams.verified]: approved
|
|
129
|
-
};
|
|
130
|
-
return res.json(verificationResponse);
|
|
131
|
-
} catch (err) {
|
|
132
|
-
tasks$1.logger.error(err);
|
|
133
|
-
return next(new common.ProsopoApiError("API.BAD_REQUEST", { context: { code: 400, error: err } }));
|
|
134
|
-
}
|
|
135
|
-
});
|
|
136
71
|
router.post(types.ApiPaths.GetPowCaptchaChallenge, async (req, res, next) => {
|
|
137
72
|
try {
|
|
138
73
|
const { user, dapp } = types.GetPowCaptchaChallengeRequestBody.parse(req.body);
|
|
@@ -6,12 +6,7 @@ const handleErrors = (err, request, response, next) => {
|
|
|
6
6
|
while (err instanceof common.ProsopoBaseError && err.context && err.context.error) {
|
|
7
7
|
err = err.context.error;
|
|
8
8
|
}
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
message = JSON.parse(err.message);
|
|
12
|
-
} catch {
|
|
13
|
-
console.error(err);
|
|
14
|
-
}
|
|
15
|
-
response.writeHead(code, message, { "content-type": "application/json" }).end();
|
|
9
|
+
const message = err.message;
|
|
10
|
+
response.writeHead(code, JSON.stringify(message), { "content-type": "application/json" }).end();
|
|
16
11
|
};
|
|
17
12
|
exports.handleErrors = handleErrors;
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
|
+
const types = require("@prosopo/types");
|
|
4
|
+
const typesReturns = require("@prosopo/captcha-contract/types-returns");
|
|
5
|
+
const common = require("@prosopo/common");
|
|
6
|
+
const tasks = require("../tasks/tasks.cjs");
|
|
7
|
+
const contract = require("@prosopo/contract");
|
|
8
|
+
const errorHandler = require("./errorHandler.cjs");
|
|
9
|
+
const authMiddleware = require("./authMiddleware.cjs");
|
|
10
|
+
const express = require("express");
|
|
11
|
+
function prosopoVerifyRouter(env) {
|
|
12
|
+
const router = express.Router();
|
|
13
|
+
const tasks$1 = new tasks.Tasks(env);
|
|
14
|
+
async function verifyImageSolution(res, req, next, isDapp) {
|
|
15
|
+
const parsed = types.VerifySolutionBody.parse(req.body);
|
|
16
|
+
try {
|
|
17
|
+
const { dappUserSignature, token } = parsed;
|
|
18
|
+
const { user, dapp, blockNumber, commitmentId } = types.decodeProcaptchaOutput(token);
|
|
19
|
+
const keyPair = isDapp ? env.keyring.addFromAddress(dapp) : env.keyring.addFromAddress(user);
|
|
20
|
+
authMiddleware.verifySignature(dappUserSignature, blockNumber.toString(), keyPair);
|
|
21
|
+
const solution = await (commitmentId ? tasks$1.getDappUserCommitmentById(commitmentId) : tasks$1.getDappUserCommitmentByAccount(user));
|
|
22
|
+
if (!solution) {
|
|
23
|
+
tasks$1.logger.debug("Not verified - no solution found");
|
|
24
|
+
const noSolutionResponse = {
|
|
25
|
+
[types.ApiParams.status]: req.t("API.USER_NOT_VERIFIED_NO_SOLUTION"),
|
|
26
|
+
[types.ApiParams.verified]: false
|
|
27
|
+
};
|
|
28
|
+
return res.json(noSolutionResponse);
|
|
29
|
+
}
|
|
30
|
+
if (solution.status === typesReturns.CaptchaStatus.disapproved) {
|
|
31
|
+
const disapprovedResponse = {
|
|
32
|
+
[types.ApiParams.status]: req.t("API.USER_NOT_VERIFIED"),
|
|
33
|
+
[types.ApiParams.verified]: false
|
|
34
|
+
};
|
|
35
|
+
return res.json(disapprovedResponse);
|
|
36
|
+
}
|
|
37
|
+
if (parsed.maxVerifiedTime) {
|
|
38
|
+
const currentBlockNumber = await contract.getCurrentBlockNumber(tasks$1.contract.api);
|
|
39
|
+
const blockTimeMs = contract.getBlockTimeMs(tasks$1.contract.api);
|
|
40
|
+
const timeSinceCompletion = (currentBlockNumber - solution.completedAt) * blockTimeMs;
|
|
41
|
+
if (timeSinceCompletion > parsed.maxVerifiedTime) {
|
|
42
|
+
const expiredResponse = {
|
|
43
|
+
[types.ApiParams.status]: req.t("API.USER_NOT_VERIFIED_TIME_EXPIRED"),
|
|
44
|
+
[types.ApiParams.verified]: false
|
|
45
|
+
};
|
|
46
|
+
tasks$1.logger.debug("Not verified - time run out");
|
|
47
|
+
return res.json(expiredResponse);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
const isApproved = solution.status === typesReturns.CaptchaStatus.approved;
|
|
51
|
+
const response = {
|
|
52
|
+
[types.ApiParams.status]: req.t(isApproved ? "API.USER_VERIFIED" : "API.USER_NOT_VERIFIED"),
|
|
53
|
+
[types.ApiParams.verified]: isApproved,
|
|
54
|
+
[types.ApiParams.commitmentId]: solution.id.toString(),
|
|
55
|
+
[types.ApiParams.blockNumber]: solution.requestedAt
|
|
56
|
+
};
|
|
57
|
+
return res.json(response);
|
|
58
|
+
} catch (err) {
|
|
59
|
+
return next(new common.ProsopoApiError("API.BAD_REQUEST", { context: { code: 400, error: err } }));
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
router.post(types.ApiPaths.VerifyImageCaptchaSolutionDapp, async (req, res, next) => {
|
|
63
|
+
try {
|
|
64
|
+
await verifyImageSolution(res, req, next, true);
|
|
65
|
+
} catch (err) {
|
|
66
|
+
return next(new common.ProsopoApiError("CAPTCHA.PARSE_ERROR", { context: { code: 400, error: err } }));
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
router.post(types.ApiPaths.VerifyImageCaptchaSolutionUser, async (req, res, next) => {
|
|
70
|
+
try {
|
|
71
|
+
await verifyImageSolution(res, req, next, false);
|
|
72
|
+
} catch (err) {
|
|
73
|
+
return next(new common.ProsopoApiError("CAPTCHA.PARSE_ERROR", { context: { code: 400, error: err } }));
|
|
74
|
+
}
|
|
75
|
+
});
|
|
76
|
+
router.post(types.ApiPaths.VerifyPowCaptchaSolution, async (req, res, next) => {
|
|
77
|
+
try {
|
|
78
|
+
const { token, dappSignature, verifiedTimeout } = types.ServerPowCaptchaVerifyRequestBody.parse(req.body);
|
|
79
|
+
const { dapp, blockNumber, challenge } = types.decodeProcaptchaOutput(token);
|
|
80
|
+
if (!challenge) {
|
|
81
|
+
const unverifiedResponse = {
|
|
82
|
+
status: req.t("API.USER_NOT_VERIFIED"),
|
|
83
|
+
[types.ApiParams.verified]: false
|
|
84
|
+
};
|
|
85
|
+
return res.json(unverifiedResponse);
|
|
86
|
+
}
|
|
87
|
+
const dappPair = env.keyring.addFromAddress(dapp);
|
|
88
|
+
authMiddleware.verifySignature(dappSignature, blockNumber.toString(), dappPair);
|
|
89
|
+
const approved = await tasks$1.serverVerifyPowCaptchaSolution(dapp, challenge, verifiedTimeout);
|
|
90
|
+
const verificationResponse = {
|
|
91
|
+
status: req.t(approved ? "API.USER_VERIFIED" : "API.USER_NOT_VERIFIED"),
|
|
92
|
+
[types.ApiParams.verified]: approved
|
|
93
|
+
};
|
|
94
|
+
return res.json(verificationResponse);
|
|
95
|
+
} catch (err) {
|
|
96
|
+
tasks$1.logger.error(err);
|
|
97
|
+
return next(new common.ProsopoApiError("API.BAD_REQUEST", { context: { code: 400, error: err } }));
|
|
98
|
+
}
|
|
99
|
+
});
|
|
100
|
+
router.use(errorHandler.handleErrors);
|
|
101
|
+
return router;
|
|
102
|
+
}
|
|
103
|
+
exports.prosopoVerifyRouter = prosopoVerifyRouter;
|
package/dist/cjs/index.cjs
CHANGED
|
@@ -4,6 +4,7 @@ require("./tasks/index.cjs");
|
|
|
4
4
|
const util = require("./util.cjs");
|
|
5
5
|
require("./batch/index.cjs");
|
|
6
6
|
const captcha = require("./api/captcha.cjs");
|
|
7
|
+
const verify = require("./api/verify.cjs");
|
|
7
8
|
const admin = require("./api/admin.cjs");
|
|
8
9
|
const errorHandler = require("./api/errorHandler.cjs");
|
|
9
10
|
const tasks = require("./tasks/tasks.cjs");
|
|
@@ -14,6 +15,7 @@ exports.parseBlockNumber = util.parseBlockNumber;
|
|
|
14
15
|
exports.promiseQueue = util.promiseQueue;
|
|
15
16
|
exports.shuffleArray = util.shuffleArray;
|
|
16
17
|
exports.prosopoRouter = captcha.prosopoRouter;
|
|
18
|
+
exports.prosopoVerifyRouter = verify.prosopoVerifyRouter;
|
|
17
19
|
exports.prosopoAdminRouter = admin.prosopoAdminRouter;
|
|
18
20
|
exports.handleErrors = errorHandler.handleErrors;
|
|
19
21
|
exports.Tasks = tasks.Tasks;
|
package/dist/index.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ export * from './tasks/index.js';
|
|
|
2
2
|
export * from './util.js';
|
|
3
3
|
export * from './batch/index.js';
|
|
4
4
|
export * from './api/captcha.js';
|
|
5
|
+
export * from './api/verify.js';
|
|
5
6
|
export * from './api/admin.js';
|
|
6
7
|
export * from './api/errorHandler.js';
|
|
7
8
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,kBAAkB,CAAA;AAChC,cAAc,WAAW,CAAA;AACzB,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,uBAAuB,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,kBAAkB,CAAA;AAChC,cAAc,WAAW,CAAA;AACzB,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,uBAAuB,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -2,6 +2,7 @@ export * from './tasks/index.js';
|
|
|
2
2
|
export * from './util.js';
|
|
3
3
|
export * from './batch/index.js';
|
|
4
4
|
export * from './api/captcha.js';
|
|
5
|
+
export * from './api/verify.js';
|
|
5
6
|
export * from './api/admin.js';
|
|
6
7
|
export * from './api/errorHandler.js';
|
|
7
8
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,kBAAkB,CAAA;AAChC,cAAc,WAAW,CAAA;AACzB,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,uBAAuB,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,kBAAkB,CAAA;AAChC,cAAc,WAAW,CAAA;AACzB,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,uBAAuB,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/provider",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "1.0.1",
|
|
4
4
|
"author": "PROSOPO LIMITED <info@prosopo.io>",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -41,19 +41,19 @@
|
|
|
41
41
|
"@polkadot/types-codec": "10.13.1",
|
|
42
42
|
"@polkadot/util": "12.6.2",
|
|
43
43
|
"@polkadot/util-crypto": "12.6.2",
|
|
44
|
-
"@prosopo/captcha-contract": "0.
|
|
45
|
-
"@prosopo/common": "0.
|
|
46
|
-
"@prosopo/config": "0.
|
|
47
|
-
"@prosopo/contract": "0.
|
|
48
|
-
"@prosopo/database": "0.
|
|
49
|
-
"@prosopo/datasets": "0.
|
|
50
|
-
"@prosopo/env": "0.
|
|
51
|
-
"@prosopo/tx": "0.
|
|
44
|
+
"@prosopo/captcha-contract": "1.0.1",
|
|
45
|
+
"@prosopo/common": "1.0.1",
|
|
46
|
+
"@prosopo/config": "1.0.1",
|
|
47
|
+
"@prosopo/contract": "1.0.1",
|
|
48
|
+
"@prosopo/database": "1.0.1",
|
|
49
|
+
"@prosopo/datasets": "1.0.1",
|
|
50
|
+
"@prosopo/env": "1.0.1",
|
|
51
|
+
"@prosopo/tx": "1.0.1",
|
|
52
52
|
"@prosopo/typechain-types": "1.1.15",
|
|
53
|
-
"@prosopo/types": "0.
|
|
54
|
-
"@prosopo/types-database": "0.
|
|
55
|
-
"@prosopo/types-env": "0.
|
|
56
|
-
"@prosopo/util": "0.
|
|
53
|
+
"@prosopo/types": "1.0.1",
|
|
54
|
+
"@prosopo/types-database": "1.0.1",
|
|
55
|
+
"@prosopo/types-env": "1.0.1",
|
|
56
|
+
"@prosopo/util": "1.0.1",
|
|
57
57
|
"cron": "^2.1.0",
|
|
58
58
|
"express": "^4.18.1",
|
|
59
59
|
"zod": "^3.22.3"
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"@types/node": "^18.0.6",
|
|
65
65
|
"@types/sinon": "^10.0.15",
|
|
66
66
|
"@types/yargs": "^17.0.10",
|
|
67
|
-
"c8": "^
|
|
67
|
+
"c8": "^9.1.0",
|
|
68
68
|
"chai": "^4.3.6",
|
|
69
69
|
"chai-as-promised": "^7.1.1",
|
|
70
70
|
"dotenv": "^16.0.1",
|