@prosopo/provider 2.0.0 → 2.0.2
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/captcha.d.ts.map +1 -1
- package/dist/api/captcha.js +15 -9
- package/dist/api/captcha.js.map +1 -1
- package/dist/api/captchaScheduler.d.ts +1 -1
- package/dist/api/captchaScheduler.d.ts.map +1 -1
- package/dist/api/captchaScheduler.js +10 -4
- package/dist/api/captchaScheduler.js.map +1 -1
- package/dist/api/verify.d.ts.map +1 -1
- package/dist/api/verify.js +22 -9
- package/dist/api/verify.js.map +1 -1
- package/dist/cjs/api/captcha.cjs +51 -39
- package/dist/cjs/api/captchaScheduler.cjs +17 -4
- package/dist/cjs/api/verify.cjs +22 -10
- package/dist/cjs/index.cjs +0 -2
- package/dist/cjs/tasks/dataset/datasetTasks.cjs +69 -10
- package/dist/cjs/tasks/imgCaptcha/imgCaptchaTasks.cjs +35 -34
- package/dist/cjs/tasks/powCaptcha/powTasks.cjs +53 -28
- package/dist/cjs/tasks/powCaptcha/powTasksUtils.cjs +0 -29
- package/dist/cjs/util.cjs +1 -24
- package/dist/tasks/dataset/datasetTasks.d.ts +1 -1
- package/dist/tasks/dataset/datasetTasks.d.ts.map +1 -1
- package/dist/tasks/dataset/datasetTasks.js +42 -7
- package/dist/tasks/dataset/datasetTasks.js.map +1 -1
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts +5 -5
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts.map +1 -1
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.js +22 -27
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.js.map +1 -1
- package/dist/tasks/imgCaptcha/imgCaptchaTasksUtils.d.ts.map +1 -1
- package/dist/tasks/imgCaptcha/imgCaptchaTasksUtils.js.map +1 -1
- package/dist/tasks/powCaptcha/powTasks.d.ts +2 -2
- package/dist/tasks/powCaptcha/powTasks.d.ts.map +1 -1
- package/dist/tasks/powCaptcha/powTasks.js +40 -23
- package/dist/tasks/powCaptcha/powTasks.js.map +1 -1
- package/dist/tasks/powCaptcha/powTasksUtils.d.ts +0 -2
- package/dist/tasks/powCaptcha/powTasksUtils.d.ts.map +1 -1
- package/dist/tasks/powCaptcha/powTasksUtils.js +0 -27
- package/dist/tasks/powCaptcha/powTasksUtils.js.map +1 -1
- package/dist/tests/integration/imgCaptcha.test.js +8 -4
- package/dist/tests/integration/imgCaptcha.test.js.map +1 -1
- package/dist/tests/integration/mocks/solvedTestCaptchas.d.ts +5 -1
- package/dist/tests/integration/mocks/solvedTestCaptchas.d.ts.map +1 -1
- package/dist/tests/integration/mocks/solvedTestCaptchas.js +4 -0
- package/dist/tests/integration/mocks/solvedTestCaptchas.js.map +1 -1
- package/dist/tests/integration/powCaptcha.test.js +11 -9
- package/dist/tests/integration/powCaptcha.test.js.map +1 -1
- package/dist/tests/unit/api/captchaScheduler.test.js +19 -5
- package/dist/tests/unit/api/captchaScheduler.test.js.map +1 -1
- package/dist/tests/unit/tasks/dataset/datasetTasks.test.js +51 -4
- package/dist/tests/unit/tasks/dataset/datasetTasks.test.js.map +1 -1
- package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.test.js +26 -24
- package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.test.js.map +1 -1
- package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.test.js.map +1 -1
- package/dist/tests/unit/tasks/powCaptcha/powTasks.test.js +103 -32
- package/dist/tests/unit/tasks/powCaptcha/powTasks.test.js.map +1 -1
- package/dist/tests/unit/tasks/powCaptcha/powTasksUtils.test.js +5 -34
- package/dist/tests/unit/tasks/powCaptcha/powTasksUtils.test.js.map +1 -1
- package/dist/util.d.ts +0 -7
- package/dist/util.d.ts.map +1 -1
- package/dist/util.js +1 -21
- package/dist/util.js.map +1 -1
- package/package.json +72 -74
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captchaScheduler.test.js","sourceRoot":"","sources":["../../../../src/tests/unit/api/captchaScheduler.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"captchaScheduler.test.js","sourceRoot":"","sources":["../../../../src/tests/unit/api/captchaScheduler.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { saveCaptchaEvent, saveCaptchas } from "@prosopo/database";
|
|
2
2
|
import { parseCaptchaDataset } from "@prosopo/datasets";
|
|
3
|
+
import { ScheduledTaskNames, ScheduledTaskStatus, } from "@prosopo/types";
|
|
3
4
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
4
5
|
import { DatasetManager } from "../../../../tasks/dataset/datasetTasks.js";
|
|
5
6
|
vi.mock("@prosopo/database", () => ({
|
|
@@ -24,8 +25,9 @@ describe("DatasetManager", () => {
|
|
|
24
25
|
mongoCaptchaUri: "mongodb://localhost:27017/captchas",
|
|
25
26
|
};
|
|
26
27
|
logger = {
|
|
27
|
-
info: vi.fn(),
|
|
28
|
-
|
|
28
|
+
info: vi.fn().mockImplementation(console.info),
|
|
29
|
+
debug: vi.fn().mockImplementation(console.debug),
|
|
30
|
+
error: vi.fn().mockImplementation(console.error),
|
|
29
31
|
};
|
|
30
32
|
captchaConfig = {
|
|
31
33
|
solved: { count: 5 },
|
|
@@ -37,6 +39,9 @@ describe("DatasetManager", () => {
|
|
|
37
39
|
markDappUserCommitmentsStored: vi.fn(),
|
|
38
40
|
markDappUserPoWCommitmentsStored: vi.fn(),
|
|
39
41
|
getUnstoredDappUserPoWCommitments: vi.fn().mockResolvedValue([]),
|
|
42
|
+
createScheduledTaskStatus: vi.fn(),
|
|
43
|
+
updateScheduledTaskStatus: vi.fn(),
|
|
44
|
+
getLastScheduledTaskStatus: vi.fn().mockResolvedValue(undefined),
|
|
40
45
|
};
|
|
41
46
|
datasetManager = new DatasetManager(config, logger, captchaConfig, db);
|
|
42
47
|
vi.clearAllMocks();
|
|
@@ -73,9 +78,17 @@ describe("DatasetManager", () => {
|
|
|
73
78
|
expect(db.getUnstoredDappUserCommitments).not.toHaveBeenCalled();
|
|
74
79
|
});
|
|
75
80
|
it("should store commitments externally if mongoCaptchaUri is set", async () => {
|
|
76
|
-
const mockCommitments = [
|
|
77
|
-
|
|
81
|
+
const mockCommitments = [
|
|
82
|
+
{ id: "commitment1" },
|
|
83
|
+
];
|
|
84
|
+
const mockPoWCommitments = [
|
|
85
|
+
{
|
|
86
|
+
challenge: "1234567___userAccount___dappAccount",
|
|
87
|
+
},
|
|
88
|
+
];
|
|
78
89
|
db.getUnstoredDappUserCommitments.mockResolvedValue(mockCommitments);
|
|
90
|
+
db.createScheduledTaskStatus.mockResolvedValue({});
|
|
91
|
+
db.updateScheduledTaskStatus.mockResolvedValue({});
|
|
79
92
|
db.getUnstoredDappUserPoWCommitments.mockResolvedValue(mockPoWCommitments);
|
|
80
93
|
await datasetManager.storeCommitmentsExternal();
|
|
81
94
|
expect(db.getUnstoredDappUserCommitments).toHaveBeenCalled();
|
|
@@ -84,5 +97,39 @@ describe("DatasetManager", () => {
|
|
|
84
97
|
expect(db.markDappUserCommitmentsStored).toHaveBeenCalledWith(mockCommitments.map((c) => c.id));
|
|
85
98
|
expect(db.markDappUserPoWCommitmentsStored).toHaveBeenCalledWith(mockPoWCommitments.map((c) => c.challenge));
|
|
86
99
|
});
|
|
100
|
+
it("should not store commitments externally if they have been stored", async () => {
|
|
101
|
+
const mockCommitments = [{ id: "commitment1", lastUpdatedTimestamp: 1 }];
|
|
102
|
+
const mockPoWCommitments = [
|
|
103
|
+
{
|
|
104
|
+
challenge: "1234567___userAccount___dappAccount",
|
|
105
|
+
lastUpdatedTimestamp: 3,
|
|
106
|
+
},
|
|
107
|
+
];
|
|
108
|
+
const mockLastScheduledTask = {
|
|
109
|
+
updated: 2,
|
|
110
|
+
};
|
|
111
|
+
const mockNewScheduledTask = {
|
|
112
|
+
_id: "testID",
|
|
113
|
+
updated: 4,
|
|
114
|
+
processName: ScheduledTaskNames.StoreCommitmentsExternal,
|
|
115
|
+
};
|
|
116
|
+
db.getUnstoredDappUserCommitments.mockResolvedValue(mockCommitments);
|
|
117
|
+
db.getUnstoredDappUserPoWCommitments.mockResolvedValue(mockPoWCommitments);
|
|
118
|
+
db.getLastScheduledTaskStatus.mockResolvedValue(mockLastScheduledTask);
|
|
119
|
+
db.createScheduledTaskStatus.mockResolvedValue(mockNewScheduledTask._id);
|
|
120
|
+
db.updateScheduledTaskStatus.mockResolvedValue({});
|
|
121
|
+
await datasetManager.storeCommitmentsExternal();
|
|
122
|
+
expect(db.getUnstoredDappUserCommitments).toHaveBeenCalled();
|
|
123
|
+
expect(db.getUnstoredDappUserPoWCommitments).toHaveBeenCalled();
|
|
124
|
+
expect(saveCaptchas).toHaveBeenCalledWith([], mockPoWCommitments, config.mongoCaptchaUri);
|
|
125
|
+
expect(db.markDappUserCommitmentsStored).toHaveBeenCalledWith([]);
|
|
126
|
+
expect(db.markDappUserPoWCommitmentsStored).toHaveBeenCalledWith(mockPoWCommitments.map((c) => c.challenge));
|
|
127
|
+
expect(db.updateScheduledTaskStatus).toHaveBeenCalledWith(mockNewScheduledTask._id, ScheduledTaskStatus.Completed, {
|
|
128
|
+
data: {
|
|
129
|
+
commitments: [],
|
|
130
|
+
powRecords: mockPoWCommitments.map((c) => c.challenge),
|
|
131
|
+
},
|
|
132
|
+
});
|
|
133
|
+
});
|
|
87
134
|
});
|
|
88
135
|
//# sourceMappingURL=datasetTasks.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datasetTasks.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/dataset/datasetTasks.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"datasetTasks.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/dataset/datasetTasks.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -98,26 +98,28 @@ describe("ImgCaptchaManager", () => {
|
|
|
98
98
|
const datasetId = "datasetId";
|
|
99
99
|
const userAccount = "userAccount";
|
|
100
100
|
const dataset = { datasetId, captchas: [] };
|
|
101
|
+
const ipAddress = "0.0.0.0";
|
|
101
102
|
db.getDatasetDetails.mockResolvedValue(dataset);
|
|
102
103
|
db.getRandomCaptcha.mockResolvedValue([]);
|
|
103
104
|
randomAsHex.mockReturnValue("randomSalt");
|
|
104
105
|
computePendingRequestHash.mockReturnValue("computedHash");
|
|
105
|
-
pair.sign.mockReturnValue("
|
|
106
|
-
u8aToHex.mockReturnValue("
|
|
106
|
+
pair.sign.mockReturnValue("hexSignedRequestHash");
|
|
107
|
+
u8aToHex.mockReturnValue("hexSignedRequestHash");
|
|
107
108
|
shuffleArray.mockReturnValue([]);
|
|
108
|
-
const result = await imgCaptchaManager.getRandomCaptchasAndRequestHash(datasetId, userAccount);
|
|
109
|
+
const result = await imgCaptchaManager.getRandomCaptchasAndRequestHash(datasetId, userAccount, ipAddress);
|
|
109
110
|
expect(result).toEqual({
|
|
110
111
|
captchas: [],
|
|
111
112
|
requestHash: "computedHash",
|
|
112
113
|
timestamp: expect.any(Number),
|
|
113
|
-
|
|
114
|
+
signedRequestHash: "hexSignedRequestHash",
|
|
114
115
|
});
|
|
115
116
|
});
|
|
116
117
|
it("should throw an error if dataset details are not found", async () => {
|
|
117
118
|
const datasetId = "datasetId";
|
|
118
119
|
const userAccount = "userAccount";
|
|
120
|
+
const ipAddress = "0.0.0.0";
|
|
119
121
|
db.getDatasetDetails.mockResolvedValue(null);
|
|
120
|
-
await expect(imgCaptchaManager.getRandomCaptchasAndRequestHash(datasetId, userAccount)).rejects.toThrow(new ProsopoEnvError("DATABASE.DATASET_GET_FAILED", {
|
|
122
|
+
await expect(imgCaptchaManager.getRandomCaptchasAndRequestHash(datasetId, userAccount, ipAddress)).rejects.toThrow(new ProsopoEnvError("DATABASE.DATASET_GET_FAILED", {
|
|
121
123
|
context: {
|
|
122
124
|
failedFuncName: "getRandomCaptchasAndRequestHash",
|
|
123
125
|
dataset: null,
|
|
@@ -200,17 +202,16 @@ describe("ImgCaptchaManager", () => {
|
|
|
200
202
|
const dappUserCommitment = {
|
|
201
203
|
id: "commitmentId",
|
|
202
204
|
userAccount: "userAccount",
|
|
203
|
-
|
|
205
|
+
dappAccount: "dappAccount",
|
|
204
206
|
providerAccount: "providerAccount",
|
|
205
207
|
datasetId: "datasetId",
|
|
206
|
-
status: CaptchaStatus.approved,
|
|
207
|
-
userSignature:
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
processed: false,
|
|
211
|
-
batched: false,
|
|
212
|
-
stored: false,
|
|
208
|
+
result: { status: CaptchaStatus.approved },
|
|
209
|
+
userSignature: "",
|
|
210
|
+
userSubmitted: true,
|
|
211
|
+
serverChecked: false,
|
|
213
212
|
requestedAtTimestamp: 0,
|
|
213
|
+
ipAddress: "0.0.0.0",
|
|
214
|
+
lastUpdatedTimestamp: Date.now(),
|
|
214
215
|
};
|
|
215
216
|
db.getDappUserCommitmentById.mockResolvedValue(dappUserCommitment);
|
|
216
217
|
const result = await imgCaptchaManager.getDappUserCommitmentById(commitmentId);
|
|
@@ -228,32 +229,33 @@ describe("ImgCaptchaManager", () => {
|
|
|
228
229
|
});
|
|
229
230
|
it("should get dapp user commitment by account", async () => {
|
|
230
231
|
const userAccount = "userAccount";
|
|
232
|
+
const dappAccount = "dappAccount";
|
|
231
233
|
const dappUserCommitments = [
|
|
232
234
|
{
|
|
233
235
|
id: "commitmentId",
|
|
234
|
-
userAccount
|
|
235
|
-
|
|
236
|
+
userAccount,
|
|
237
|
+
dappAccount,
|
|
236
238
|
providerAccount: "providerAccount",
|
|
237
239
|
datasetId: "datasetId",
|
|
238
|
-
status: CaptchaStatus.approved,
|
|
239
|
-
userSignature:
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
processed: false,
|
|
243
|
-
batched: false,
|
|
244
|
-
stored: false,
|
|
240
|
+
result: { status: CaptchaStatus.approved },
|
|
241
|
+
userSignature: "",
|
|
242
|
+
userSubmitted: true,
|
|
243
|
+
serverChecked: false,
|
|
245
244
|
requestedAtTimestamp: 0,
|
|
245
|
+
ipAddress: "0.0.0.0",
|
|
246
|
+
lastUpdatedTimestamp: Date.now(),
|
|
246
247
|
},
|
|
247
248
|
];
|
|
248
249
|
db.getDappUserCommitmentByAccount.mockResolvedValue(dappUserCommitments);
|
|
249
|
-
const result = await imgCaptchaManager.getDappUserCommitmentByAccount(userAccount);
|
|
250
|
+
const result = await imgCaptchaManager.getDappUserCommitmentByAccount(userAccount, dappAccount);
|
|
250
251
|
expect(result).toEqual(dappUserCommitments[0]);
|
|
251
252
|
});
|
|
252
253
|
it("should return undefined if no approved dapp user commitment is found by account", async () => {
|
|
253
254
|
const userAccount = "userAccount";
|
|
255
|
+
const dappAccount = "dappAccount";
|
|
254
256
|
const dappUserCommitments = [];
|
|
255
257
|
db.getDappUserCommitmentByAccount.mockResolvedValue(dappUserCommitments);
|
|
256
|
-
const result = await imgCaptchaManager.getDappUserCommitmentByAccount(userAccount);
|
|
258
|
+
const result = await imgCaptchaManager.getDappUserCommitmentByAccount(userAccount, dappAccount);
|
|
257
259
|
expect(result).toBeUndefined();
|
|
258
260
|
});
|
|
259
261
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imgCaptchaTasks.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.test.ts"],"names":[],"mappings":"AAcA,OAAO,
|
|
1
|
+
{"version":3,"file":"imgCaptchaTasks.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imgCaptchaTasksUtils.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"imgCaptchaTasksUtils.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.test.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EACL,iBAAiB,EACjB,0BAA0B,GAC3B,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,2BAA2B,EAAE,MAAM,sDAAsD,CAAC;AAEnG,EAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC;IAClC,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;QACnD,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;QACd,IAAI,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE;KACjC,CAAC,CAAC;IACH,0BAA0B,EAAE,EAAE,CAAC,EAAE,EAAE;CACpC,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC3C,MAAM,oBAAoB,GAAG;QAC3B,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE;QACjE,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE;KAClC,CAAC;IAElC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QAExD,0BAAkC;aAChC,mBAAmB,CAAC,iBAAiB,CAAC;aACtC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;QAE1C,MAAM,MAAM,GAAG,2BAA2B,CAAC,oBAAoB,CAAC,CAAC;QAEjE,MAAM,CAAC,iBAAiB,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC7C,MAAM,CAAC,0BAA0B,CAAC,CAAC,oBAAoB,CACrD,oBAAoB,CAAC,CAAC,CAAC,CACxB,CAAC;QACF,MAAM,CAAC,0BAA0B,CAAC,CAAC,oBAAoB,CACrD,oBAAoB,CAAC,CAAC,CAAC,CACxB,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;YACxB,YAAY,EAAE,gBAAgB;SAC/B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAE7D,iBAAyB,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;YACnD,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;YACd,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;SACrB,CAAC,CAAC,CAAC;QAEJ,MAAM,CAAC,GAAG,EAAE,CAAC,2BAA2B,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CACrE,IAAI,eAAe,CACjB,qDAAqD,EACrD;YACE,OAAO,EAAE;gBACP,cAAc,EAAE,6BAA6B;gBAC7C,YAAY,EAAE,IAAI;aACnB;SACF,CACF,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { stringToHex, u8aToHex } from "@polkadot/util";
|
|
2
|
+
import { verifyRecency } from "@prosopo/util";
|
|
2
3
|
import { ProsopoEnvError } from "@prosopo/common";
|
|
3
|
-
import { ApiParams, POW_SEPARATOR } from "@prosopo/types";
|
|
4
|
+
import { ApiParams, CaptchaStatus, POW_SEPARATOR, } from "@prosopo/types";
|
|
4
5
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
5
6
|
import { PowCaptchaManager } from "../../../../tasks/powCaptcha/powTasks.js";
|
|
6
|
-
import { checkPowSignature,
|
|
7
|
+
import { checkPowSignature, validateSolution, } from "../../../../tasks/powCaptcha/powTasksUtils.js";
|
|
7
8
|
vi.mock("@polkadot/util-crypto", () => ({
|
|
8
9
|
signatureVerify: vi.fn(),
|
|
9
10
|
}));
|
|
@@ -11,10 +12,16 @@ vi.mock("@polkadot/util", () => ({
|
|
|
11
12
|
u8aToHex: vi.fn(),
|
|
12
13
|
stringToHex: vi.fn(),
|
|
13
14
|
}));
|
|
15
|
+
vi.mock("@prosopo/util", async (importOriginal) => {
|
|
16
|
+
const actual = (await importOriginal());
|
|
17
|
+
return {
|
|
18
|
+
...actual,
|
|
19
|
+
verifyRecency: vi.fn(),
|
|
20
|
+
};
|
|
21
|
+
});
|
|
14
22
|
vi.mock("../../../../tasks/powCaptcha/powTasksUtils.js", () => ({
|
|
15
|
-
checkRecentPowSolution: vi.fn(),
|
|
16
23
|
checkPowSignature: vi.fn(),
|
|
17
|
-
|
|
24
|
+
validateSolution: vi.fn(),
|
|
18
25
|
}));
|
|
19
26
|
describe("PowCaptchaManager", () => {
|
|
20
27
|
let db;
|
|
@@ -25,6 +32,7 @@ describe("PowCaptchaManager", () => {
|
|
|
25
32
|
storePowCaptchaRecord: vi.fn(),
|
|
26
33
|
getPowCaptchaRecordByChallenge: vi.fn(),
|
|
27
34
|
updatePowCaptchaRecord: vi.fn(),
|
|
35
|
+
markDappUserPoWCommitmentsChecked: vi.fn(),
|
|
28
36
|
};
|
|
29
37
|
pair = {
|
|
30
38
|
sign: vi.fn(),
|
|
@@ -44,30 +52,84 @@ describe("PowCaptchaManager", () => {
|
|
|
44
52
|
const result = await powCaptchaManager.getPowCaptchaChallenge(userAccount, dappAccount, origin);
|
|
45
53
|
expect(result.challenge.match(challengeRegExp)).toBeTruthy();
|
|
46
54
|
expect(result.difficulty).toEqual(4);
|
|
47
|
-
expect(result.
|
|
55
|
+
expect(result.providerSignature).toEqual("hexSignedChallenge");
|
|
48
56
|
expect(pair.sign).toHaveBeenCalledWith(stringToHex(result.challenge));
|
|
49
57
|
});
|
|
50
58
|
});
|
|
51
59
|
describe("verifyPowCaptchaSolution", () => {
|
|
52
60
|
it("should verify a valid PoW captcha solution", async () => {
|
|
53
|
-
const
|
|
61
|
+
const requestedAtTimestamp = 123456789;
|
|
54
62
|
const userAccount = "testUserAccount";
|
|
55
|
-
const challenge = `${
|
|
63
|
+
const challenge = `${requestedAtTimestamp}${POW_SEPARATOR}${userAccount}${POW_SEPARATOR}${pair.address}`;
|
|
56
64
|
const difficulty = 4;
|
|
57
|
-
const
|
|
58
|
-
const
|
|
65
|
+
const providerSignature = "testSignature";
|
|
66
|
+
const userSignature = "testTimestampSignature";
|
|
59
67
|
const nonce = 12345;
|
|
60
68
|
const timeout = 1000;
|
|
61
|
-
|
|
69
|
+
const ipAddress = "ipAddress";
|
|
70
|
+
const challengeRecord = {
|
|
71
|
+
challenge,
|
|
72
|
+
difficulty,
|
|
73
|
+
dappAccount: pair.address,
|
|
74
|
+
userAccount,
|
|
75
|
+
requestedAtTimestamp,
|
|
76
|
+
result: { status: CaptchaStatus.pending },
|
|
77
|
+
userSubmitted: false,
|
|
78
|
+
serverChecked: false,
|
|
79
|
+
ipAddress,
|
|
80
|
+
providerSignature,
|
|
81
|
+
lastUpdatedTimestamp: Date.now(),
|
|
82
|
+
};
|
|
83
|
+
verifyRecency.mockImplementation(() => true);
|
|
62
84
|
checkPowSignature.mockImplementation(() => true);
|
|
63
|
-
|
|
64
|
-
|
|
85
|
+
validateSolution.mockImplementation(() => true);
|
|
86
|
+
db.getPowCaptchaRecordByChallenge.mockResolvedValue(challengeRecord);
|
|
87
|
+
db.updatePowCaptchaRecord.mockResolvedValue(true);
|
|
88
|
+
db.markDappUserPoWCommitmentsChecked.mockResolvedValue(true);
|
|
89
|
+
const verifyPowCaptchaSolutionArgs = [
|
|
90
|
+
challenge,
|
|
91
|
+
difficulty,
|
|
92
|
+
providerSignature,
|
|
93
|
+
nonce,
|
|
94
|
+
timeout,
|
|
95
|
+
userSignature,
|
|
96
|
+
ipAddress,
|
|
97
|
+
];
|
|
98
|
+
const result = await powCaptchaManager.verifyPowCaptchaSolution(...verifyPowCaptchaSolutionArgs);
|
|
65
99
|
expect(result).toBe(true);
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
expect(
|
|
100
|
+
const verifyRecencyArgs = [
|
|
101
|
+
challenge,
|
|
102
|
+
timeout,
|
|
103
|
+
];
|
|
104
|
+
expect(verifyRecency).toHaveBeenCalledWith(...verifyRecencyArgs);
|
|
105
|
+
const checKPowSignatureArgs1 = [
|
|
106
|
+
requestedAtTimestamp.toString(),
|
|
107
|
+
userSignature,
|
|
108
|
+
userAccount,
|
|
109
|
+
ApiParams.timestamp,
|
|
110
|
+
];
|
|
111
|
+
expect(checkPowSignature).toHaveBeenCalledWith(...checKPowSignatureArgs1);
|
|
112
|
+
const checKPowSignatureArgs2 = [
|
|
113
|
+
challenge,
|
|
114
|
+
providerSignature,
|
|
115
|
+
pair.address,
|
|
116
|
+
ApiParams.challenge,
|
|
117
|
+
];
|
|
118
|
+
expect(checkPowSignature).toHaveBeenCalledWith(...checKPowSignatureArgs2);
|
|
119
|
+
const validateSolutionArgs = [
|
|
120
|
+
nonce,
|
|
121
|
+
challenge,
|
|
122
|
+
difficulty,
|
|
123
|
+
];
|
|
124
|
+
expect(validateSolution).toHaveBeenCalledWith(...validateSolutionArgs);
|
|
125
|
+
const updatePowCaptchaRecordArgs = [
|
|
126
|
+
challenge,
|
|
127
|
+
{ status: CaptchaStatus.approved },
|
|
128
|
+
false,
|
|
129
|
+
true,
|
|
130
|
+
userSignature,
|
|
131
|
+
];
|
|
132
|
+
expect(db.updatePowCaptchaRecord).toHaveBeenCalledWith(...updatePowCaptchaRecordArgs);
|
|
71
133
|
});
|
|
72
134
|
it("should throw an error if PoW captcha solution is invalid", async () => {
|
|
73
135
|
const challenge = `${12345}${POW_SEPARATOR}userAccount${POW_SEPARATOR}dappAccount`;
|
|
@@ -76,19 +138,27 @@ describe("PowCaptchaManager", () => {
|
|
|
76
138
|
const nonce = 12345;
|
|
77
139
|
const timeout = 1000;
|
|
78
140
|
const timestampSignature = "testTimestampSignature";
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
141
|
+
const ipAddress = "ipAddress";
|
|
142
|
+
const challengeRecord = {
|
|
143
|
+
challenge,
|
|
144
|
+
dappAccount: pair.address,
|
|
145
|
+
userAccount: "testUserAccount",
|
|
146
|
+
requestedAtTimestamp: 12345,
|
|
147
|
+
result: { status: CaptchaStatus.pending },
|
|
148
|
+
userSubmitted: false,
|
|
149
|
+
serverChecked: false,
|
|
150
|
+
ipAddress,
|
|
151
|
+
providerSignature: "testSignature",
|
|
152
|
+
difficulty,
|
|
153
|
+
lastUpdatedTimestamp: 0,
|
|
154
|
+
};
|
|
155
|
+
verifyRecency.mockImplementation(() => {
|
|
156
|
+
return true;
|
|
85
157
|
});
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
}));
|
|
91
|
-
expect(checkRecentPowSolution).toHaveBeenCalledWith(challenge, timeout);
|
|
158
|
+
db.getPowCaptchaRecordByChallenge.mockResolvedValue(challengeRecord);
|
|
159
|
+
validateSolution.mockImplementation(() => false);
|
|
160
|
+
expect(await powCaptchaManager.verifyPowCaptchaSolution(challenge, difficulty, signature, nonce, timeout, timestampSignature, ipAddress)).toBe(false);
|
|
161
|
+
expect(verifyRecency).toHaveBeenCalledWith(challenge, timeout);
|
|
92
162
|
});
|
|
93
163
|
});
|
|
94
164
|
describe("serverVerifyPowCaptchaSolution", () => {
|
|
@@ -106,12 +176,13 @@ describe("PowCaptchaManager", () => {
|
|
|
106
176
|
checked: false,
|
|
107
177
|
};
|
|
108
178
|
db.getPowCaptchaRecordByChallenge.mockResolvedValue(challengeRecord);
|
|
109
|
-
|
|
179
|
+
verifyRecency.mockImplementation(() => true);
|
|
110
180
|
const result = await powCaptchaManager.serverVerifyPowCaptchaSolution(dappAccount, challenge, timeout);
|
|
111
181
|
expect(result).toBe(true);
|
|
112
182
|
expect(db.getPowCaptchaRecordByChallenge).toHaveBeenCalledWith(challenge);
|
|
113
|
-
expect(
|
|
114
|
-
|
|
183
|
+
expect(verifyRecency).toHaveBeenCalledWith(challenge, timeout);
|
|
184
|
+
const markDappUserPoWCommitmentsCheckedArgs = [[challenge]];
|
|
185
|
+
expect(db.markDappUserPoWCommitmentsChecked).toHaveBeenCalledWith(...markDappUserPoWCommitmentsCheckedArgs);
|
|
115
186
|
});
|
|
116
187
|
it("should throw an error if challenge record is not found", async () => {
|
|
117
188
|
const dappAccount = "dappAccount";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"powTasks.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/powCaptcha/powTasks.test.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,
|
|
1
|
+
{"version":3,"file":"powTasks.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/powCaptcha/powTasks.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import { signatureVerify } from "@polkadot/util-crypto";
|
|
2
2
|
import { ProsopoContractError } from "@prosopo/common";
|
|
3
|
-
import { verifyRecency } from "@prosopo/contract";
|
|
4
3
|
import { describe, expect, it, vi } from "vitest";
|
|
5
|
-
import { checkPowSignature,
|
|
4
|
+
import { checkPowSignature, validateSolution, } from "../../../../tasks/powCaptcha/powTasksUtils.js";
|
|
6
5
|
vi.mock("@polkadot/util-crypto", () => ({
|
|
7
6
|
signatureVerify: vi.fn(),
|
|
8
7
|
}));
|
|
9
|
-
vi.mock("@prosopo/
|
|
8
|
+
vi.mock("@prosopo/util", () => ({
|
|
10
9
|
verifyRecency: vi.fn(),
|
|
11
10
|
}));
|
|
12
11
|
describe("Validation Functions", () => {
|
|
@@ -27,25 +26,17 @@ describe("Validation Functions", () => {
|
|
|
27
26
|
});
|
|
28
27
|
});
|
|
29
28
|
describe("checkPowSolution", () => {
|
|
30
|
-
it("should
|
|
29
|
+
it("should return true for a valid solution", () => {
|
|
31
30
|
const nonce = 377;
|
|
32
31
|
const challenge = "6678154___aZZW9CeVFStJw3si91CXBqaEsGR1sk6h1bBEecJ4EBaSgsx___5C7bfXYwachNuvmasEFtWi9BMS41uBvo6KpYHVSQmad4nWzw";
|
|
33
32
|
const difficulty = 4;
|
|
34
|
-
expect((
|
|
33
|
+
expect(validateSolution(nonce, challenge, difficulty)).to.be.true;
|
|
35
34
|
});
|
|
36
35
|
it("should throw an error for an invalid solution", () => {
|
|
37
36
|
const nonce = 0;
|
|
38
37
|
const challenge = "testChallenge";
|
|
39
38
|
const difficulty = 10;
|
|
40
|
-
expect((
|
|
41
|
-
context: {
|
|
42
|
-
ERROR: "Captcha solution is invalid",
|
|
43
|
-
failedFuncName: "checkPowSolution",
|
|
44
|
-
nonce,
|
|
45
|
-
challenge,
|
|
46
|
-
difficulty,
|
|
47
|
-
},
|
|
48
|
-
}));
|
|
39
|
+
expect(validateSolution(nonce, challenge, difficulty)).to.be.false;
|
|
49
40
|
});
|
|
50
41
|
});
|
|
51
42
|
describe("checkPowSignature", () => {
|
|
@@ -70,25 +61,5 @@ describe("Validation Functions", () => {
|
|
|
70
61
|
}));
|
|
71
62
|
});
|
|
72
63
|
});
|
|
73
|
-
describe("checkRecentPowSolution", () => {
|
|
74
|
-
it("should not throw an error for a recent solution", () => {
|
|
75
|
-
const challenge = "testChallenge";
|
|
76
|
-
const timeout = 1000;
|
|
77
|
-
verifyRecency.mockReturnValueOnce(true);
|
|
78
|
-
expect(() => checkRecentPowSolution(challenge, timeout)).not.toThrow();
|
|
79
|
-
});
|
|
80
|
-
it("should throw an error for a non-recent solution", () => {
|
|
81
|
-
const challenge = "testChallenge";
|
|
82
|
-
const timeout = 1000;
|
|
83
|
-
verifyRecency.mockReturnValueOnce(false);
|
|
84
|
-
expect(() => checkRecentPowSolution(challenge, timeout)).toThrow(new ProsopoContractError("CONTRACT.INVALID_BLOCKHASH", {
|
|
85
|
-
context: {
|
|
86
|
-
ERROR: `Block in which the Provider was selected must be within the last ${timeout / 1000} seconds`,
|
|
87
|
-
failedFuncName: "checkRecentPowSolution",
|
|
88
|
-
challenge,
|
|
89
|
-
},
|
|
90
|
-
}));
|
|
91
|
-
});
|
|
92
|
-
});
|
|
93
64
|
});
|
|
94
65
|
//# sourceMappingURL=powTasksUtils.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"powTasksUtils.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/powCaptcha/powTasksUtils.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"powTasksUtils.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/powCaptcha/powTasksUtils.test.ts"],"names":[],"mappings":"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"}
|