@netacea/akamai 5.0.59 → 5.0.60
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/CHANGELOG.md +8 -0
- package/dist/package.json +3 -3
- package/dist/src/AkamaiV2.js +20 -4
- package/dist/src/AkamaiV2.js.map +1 -1
- package/dist/src/CachedEncryption.d.ts +0 -3
- package/dist/src/CachedEncryption.js +0 -11
- package/dist/src/CachedEncryption.js.map +1 -1
- package/dist/src/captchaGet.js +3 -3
- package/dist/src/captchaGet.js.map +1 -1
- package/dist/src/captchaPost.d.ts +3 -0
- package/dist/src/captchaPost.js +24 -0
- package/dist/src/captchaPost.js.map +1 -0
- package/dist/src/helpers/buildCookieFromValues.d.ts +2 -2
- package/dist/src/helpers/buildCookieFromValues.js +3 -4
- package/dist/src/helpers/buildCookieFromValues.js.map +1 -1
- package/dist/src/helpers/buildProtoMitataFromNetaceaHeaders.d.ts +3 -0
- package/dist/src/helpers/buildProtoMitataFromNetaceaHeaders.js +20 -0
- package/dist/src/helpers/buildProtoMitataFromNetaceaHeaders.js.map +1 -0
- package/dist/src/helpers/createMitata.d.ts +2 -3
- package/dist/src/helpers/createMitata.js +2 -2
- package/dist/src/helpers/createMitata.js.map +1 -1
- package/dist/src/helpers/getMitataCaptchaFromHeaders.d.ts +2 -2
- package/dist/src/helpers/getMitataCaptchaFromHeaders.js +2 -2
- package/dist/src/helpers/getMitataCaptchaFromHeaders.js.map +1 -1
- package/dist/src/helpers/logToDataStream.js +1 -1
- package/dist/src/helpers/logToDataStream.js.map +1 -1
- package/dist/src/helpers/readCookie.d.ts +2 -2
- package/dist/src/helpers/readCookie.js +3 -4
- package/dist/src/helpers/readCookie.js.map +1 -1
- package/dist/src/helpers/removeNetaceaHeaders.d.ts +2 -0
- package/dist/src/helpers/removeNetaceaHeaders.js +11 -0
- package/dist/src/helpers/removeNetaceaHeaders.js.map +1 -0
- package/dist/src/helpers/routeRequestToNetaceaProxy.d.ts +2 -0
- package/dist/src/helpers/routeRequestToNetaceaProxy.js +4 -0
- package/dist/src/helpers/routeRequestToNetaceaProxy.js.map +1 -0
- package/dist/src/helpers/setNetaceaCaptchaCookie.d.ts +3 -0
- package/dist/src/helpers/setNetaceaCaptchaCookie.js +30 -0
- package/dist/src/helpers/setNetaceaCaptchaCookie.js.map +1 -0
- package/dist/src/helpers/setNetaceaCookie.d.ts +3 -0
- package/dist/src/helpers/setNetaceaCookie.js +33 -0
- package/dist/src/helpers/setNetaceaCookie.js.map +1 -0
- package/dist/src/helpers/verifyCaptcha.d.ts +3 -0
- package/dist/src/helpers/verifyCaptcha.js +19 -0
- package/dist/src/helpers/verifyCaptcha.js.map +1 -0
- package/dist/src/ingest/ingest.js +2 -2
- package/dist/src/ingest/ingest.js.map +1 -1
- package/dist/src/mitigation/getApiCallResponseFromResponse.d.ts +2 -2
- package/dist/src/mitigation/getApiCallResponseFromResponse.js +2 -2
- package/dist/src/mitigation/getApiCallResponseFromResponse.js.map +1 -1
- package/dist/src/mitigation/mitigationApiCall.js +1 -1
- package/dist/src/mitigation/mitigationApiCall.js.map +1 -1
- package/dist/src/types.d.ts +2 -0
- package/package.json +3 -3
- package/dist/src/helpers/createMitataFromProtoMitata.d.ts +0 -3
- package/dist/src/helpers/createMitataFromProtoMitata.js +0 -31
- package/dist/src/helpers/createMitataFromProtoMitata.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,14 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## 5.0.60 (2023-10-19)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @netacea/akamai
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
6
14
|
## 5.0.59 (2023-10-18)
|
|
7
15
|
|
|
8
16
|
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@netacea/akamai",
|
|
3
|
-
"version": "5.0.
|
|
3
|
+
"version": "5.0.60",
|
|
4
4
|
"description": "Netacea Akamai CDN Integration",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
},
|
|
21
21
|
"license": "ISC",
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@netacea/netaceaintegrationbase": "^1.16.
|
|
23
|
+
"@netacea/netaceaintegrationbase": "^1.16.66",
|
|
24
24
|
"buffer": "^6.0.3",
|
|
25
25
|
"jssha": "^3.3.0"
|
|
26
26
|
},
|
|
@@ -67,5 +67,5 @@
|
|
|
67
67
|
"tslib": "^2.0.3",
|
|
68
68
|
"typescript": "^4.0.3"
|
|
69
69
|
},
|
|
70
|
-
"gitHead": "
|
|
70
|
+
"gitHead": "29e13649874e0232a691d1f8b6fd36c74f54c6da"
|
|
71
71
|
}
|
package/dist/src/AkamaiV2.js
CHANGED
|
@@ -3,37 +3,53 @@ import { httpRequest } from 'http-request';
|
|
|
3
3
|
import { logger } from 'log';
|
|
4
4
|
import { NetaceaIngestType } from '@netacea/netaceaintegrationbase';
|
|
5
5
|
import ConfigLoader from './ConfigLoader';
|
|
6
|
-
import { isUrlCaptchaGet } from './netaceaPaths';
|
|
6
|
+
import { isUrlCaptchaGet, isUrlCaptchaPost } from './netaceaPaths';
|
|
7
7
|
import { handleCaptchaGet } from './captchaGet';
|
|
8
8
|
import { ingest } from './ingest/ingest';
|
|
9
9
|
import { logToDataStream } from './helpers/logToDataStream';
|
|
10
|
-
import {
|
|
10
|
+
import { setNetaceaCookie } from './helpers/setNetaceaCookie';
|
|
11
|
+
import { verifyCaptcha } from './helpers/verifyCaptcha';
|
|
12
|
+
import { CachedEncryption } from './CachedEncryption';
|
|
13
|
+
import { handleCaptchaPost } from './captchaPost';
|
|
11
14
|
export default class Akamai {
|
|
12
15
|
constructor(defaultConfig) {
|
|
13
16
|
this.configLoader = new ConfigLoader(defaultConfig);
|
|
14
17
|
this.defaultDeps = {
|
|
15
18
|
httpRequest,
|
|
16
|
-
logger
|
|
19
|
+
logger,
|
|
20
|
+
cachedEncryption: undefined
|
|
17
21
|
};
|
|
18
22
|
}
|
|
19
23
|
async requestHandler(request) {
|
|
20
24
|
const config = this.configLoader.loadConfig(request);
|
|
25
|
+
if (config.cookieEncryptionKey !== undefined && this.defaultDeps.cachedEncryption === undefined) {
|
|
26
|
+
this.defaultDeps.cachedEncryption = new CachedEncryption({
|
|
27
|
+
encryptionKey: config.cookieEncryptionKey
|
|
28
|
+
});
|
|
29
|
+
}
|
|
21
30
|
if (isUrlCaptchaGet(request.path, request.method, config.netaceaCaptchaPath)) {
|
|
22
31
|
await handleCaptchaGet(this.defaultDeps, config, request);
|
|
23
32
|
return await logToDataStream(this.defaultDeps, config, request);
|
|
24
33
|
}
|
|
34
|
+
else if (isUrlCaptchaPost(request.path, request.method)) {
|
|
35
|
+
await verifyCaptcha(this.defaultDeps, config, request);
|
|
36
|
+
return await logToDataStream(this.defaultDeps, config, request);
|
|
37
|
+
}
|
|
25
38
|
const legacyWorker = new AkamaiLegacyWorker(config, this.defaultDeps);
|
|
26
39
|
return await legacyWorker.requestHandler(request);
|
|
27
40
|
}
|
|
28
41
|
async responseHandler(request, response) {
|
|
29
42
|
const config = this.configLoader.loadConfig(request);
|
|
30
43
|
if (isUrlCaptchaGet(request.path, request.method, config.netaceaCaptchaPath)) {
|
|
31
|
-
await
|
|
44
|
+
await setNetaceaCookie(this.defaultDeps, config, request, response);
|
|
32
45
|
if (config.ingestType === NetaceaIngestType.HTTP) {
|
|
33
46
|
await ingest(this.defaultDeps, config, request, response);
|
|
34
47
|
}
|
|
35
48
|
return;
|
|
36
49
|
}
|
|
50
|
+
else if (isUrlCaptchaPost(request.path, request.method)) {
|
|
51
|
+
return await handleCaptchaPost(this.defaultDeps, config, request, response);
|
|
52
|
+
}
|
|
37
53
|
const legacyWorker = new AkamaiLegacyWorker(config, {
|
|
38
54
|
httpRequest,
|
|
39
55
|
logger
|
package/dist/src/AkamaiV2.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AkamaiV2.js","sourceRoot":"","sources":["../../src/AkamaiV2.ts"],"names":[],"mappings":"AAAA,OAAO,kBAEN,MAAM,YAAY,CAAA;AAEnB,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,YAAY,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"AkamaiV2.js","sourceRoot":"","sources":["../../src/AkamaiV2.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,10 @@
|
|
|
1
|
-
import { AkamaiWorkerConfig } from './types';
|
|
2
1
|
export declare class CachedEncryption {
|
|
3
2
|
private readonly encryptionKey;
|
|
4
3
|
private readonly cache;
|
|
5
|
-
private static instance;
|
|
6
4
|
constructor(args: {
|
|
7
5
|
encryptionKey: string;
|
|
8
6
|
cacheMaxSize?: number;
|
|
9
7
|
});
|
|
10
|
-
static getInstance(config: Readonly<AkamaiWorkerConfig>): CachedEncryption;
|
|
11
8
|
getCacheSize(): number;
|
|
12
9
|
private memoizeFn;
|
|
13
10
|
encrypt(plaintext: string): Promise<string>;
|
|
@@ -28,17 +28,6 @@ export class CachedEncryption {
|
|
|
28
28
|
this.encryptionKey = args.encryptionKey;
|
|
29
29
|
this.cache = new Cache(args.cacheMaxSize ?? 5);
|
|
30
30
|
}
|
|
31
|
-
static getInstance(config) {
|
|
32
|
-
if (this.instance === undefined) {
|
|
33
|
-
if (config.cookieEncryptionKey === undefined) {
|
|
34
|
-
throw new Error('Cookie encryption key is not defined!');
|
|
35
|
-
}
|
|
36
|
-
this.instance = new CachedEncryption({
|
|
37
|
-
encryptionKey: config.cookieEncryptionKey
|
|
38
|
-
});
|
|
39
|
-
}
|
|
40
|
-
return this.instance;
|
|
41
|
-
}
|
|
42
31
|
getCacheSize() {
|
|
43
32
|
return this.cache.getCacheSize();
|
|
44
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CachedEncryption.js","sourceRoot":"","sources":["../../src/CachedEncryption.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"CachedEncryption.js","sourceRoot":"","sources":["../../src/CachedEncryption.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAU7C,MAAM,KAAK;IAIT,YAAa,OAAe;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAA;IACvB,CAAC;IAEM,YAAY;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAA;IAChC,CAAC;IAEM,MAAM,CAAE,GAAW;QACxB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW;aAChC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,GAAG,CAAC,CAAA;IACrC,CAAC;IAEM,GAAG,CAAE,GAAW,EAAE,KAAQ;QAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAChB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;QACrC,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE;YAC1C,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAA;SACzB;IACH,CAAC;IAEM,GAAG,CAAE,GAAW;QACrB,OAAO,IAAI,CAAC,WAAW;aACpB,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,GAAG,CAAC,CAAA;IACnC,CAAC;CACF;AAED,MAAM,OAAO,gBAAgB;IAI3B,YAAa,IAGZ;QACC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAA;QACvC,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC,CAAA;IAChD,CAAC;IAEM,YAAY;QACjB,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAA;IAClC,CAAC;IAEO,KAAK,CAAC,SAAS,CAAE,QAAgB,EAAE,EAAyB;QAClE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAC5C,IAAI,WAAW,KAAK,SAAS,EAAE;YAC7B,OAAO,WAAW,CAAC,KAAK,CAAA;SACzB;QACD,MAAM,MAAM,GAAG,MAAM,EAAE,EAAE,CAAA;QACzB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAChC,OAAO,MAAM,CAAA;IACf,CAAC;IAED,KAAK,CAAC,OAAO,CAAE,SAAiB;QAC9B,MAAM,QAAQ,GAAG,YAAY,SAAS,EAAE,CAAA;QACxC,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAC/C,OAAO,MAAM,SAAS,CAAC;gBACrB,SAAS;gBACT,MAAM,EAAE,IAAI,CAAC,aAAa;aAC3B,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAE,GAAW;QACxB,MAAM,QAAQ,GAAG,YAAY,GAAG,EAAE,CAAA;QAClC,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAC/C,OAAO,MAAM,UAAU,CAAC;gBACtB,GAAG;gBACH,MAAM,EAAE,IAAI,CAAC,aAAa;aAC3B,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;CACF"}
|
package/dist/src/captchaGet.js
CHANGED
|
@@ -6,8 +6,8 @@ import { checkMitataCookie } from './mitataCookie';
|
|
|
6
6
|
import { getQuery } from './helpers/getQuery';
|
|
7
7
|
export async function handleCaptchaGet(deps, config, request) {
|
|
8
8
|
const cookies = getHeaderValueOrDefault(request, 'cookie');
|
|
9
|
-
const mitataCookie = await readCookie(config
|
|
10
|
-
const mitataCaptcha = await readCookie(config
|
|
9
|
+
const mitataCookie = await readCookie(deps, config, cookies, config.netaceaCookieName);
|
|
10
|
+
const mitataCaptcha = await readCookie(deps, config, cookies, config.netaceaCaptchaCookieName);
|
|
11
11
|
const clientIP = getVariableOrDefault(request, 'PMUSER_CLIENT_IP');
|
|
12
12
|
const userAgent = getHeaderValueOrDefault(request, 'user-agent');
|
|
13
13
|
const mitataInfo = await checkMitataCookie(mitataCookie, clientIP, config.secretKey ?? '');
|
|
@@ -27,7 +27,7 @@ export async function handleCaptchaGet(deps, config, request) {
|
|
|
27
27
|
mitigate: 0,
|
|
28
28
|
captcha: 1
|
|
29
29
|
});
|
|
30
|
-
const protoMitata = await readCookie(
|
|
30
|
+
const protoMitata = await readCookie(deps, config, captchaGetResponse.setCookie, '_proto-mitata');
|
|
31
31
|
if (protoMitata !== undefined) {
|
|
32
32
|
request.setVariable(config.protoMitataVariableName, protoMitata);
|
|
33
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captchaGet.js","sourceRoot":"","sources":["../../src/captchaGet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAA;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAG7C,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,IAA+B,EAC/B,MAAoC,EACpC,OAAgC;IAEhC,MAAM,OAAO,GAAG,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC1D,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"captchaGet.js","sourceRoot":"","sources":["../../src/captchaGet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAA;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAG7C,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,IAA+B,EAC/B,MAAoC,EACpC,OAAgC;IAEhC,MAAM,OAAO,GAAG,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC1D,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,iBAA2B,CAAC,CAAA;IAChG,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,wBAAkC,CAAC,CAAA;IACxG,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAA;IAClE,MAAM,SAAS,GAAG,uBAAuB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;IAChE,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,YAAY,EAAE,QAAQ,EAAE,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAA;IAE1F,MAAM,kBAAkB,GAAG,MAAM,iBAAiB,CAChD,IAAI,EACJ,MAAM,EACN;QACE,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;QAC3B,QAAQ;QACR,SAAS;QACT,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,MAAM;QACjC,aAAa,EAAE,aAAa;QAC5B,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,YAAY,CAAC;QACjD,cAAc,EAAE,MAAM,CAAC,cAAc;QACrC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;QACzC,MAAM,EAAE,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC;QAC/D,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,EACD;QACE,KAAK,EAAE,CAAC;QACR,QAAQ,EAAE,CAAC;QACX,OAAO,EAAE,CAAC;KACX,CACF,CAAA;IAED,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,kBAAkB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAA;IACjG,IAAI,WAAW,KAAK,SAAS,EAAE;QAC7B,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAA;KACjE;IAED,MAAM,OAAO,GAA4B,EAAE,CAAA;IAE3C,IAAI,MAAM,CAAC,uBAAuB,KAAK,SAAS,EAAE;QAChD,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAAC,GAAG,MAAM,CAAC,yBAAmC,CAAA;KACrF;IAED,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAA;AAC5D,CAAC"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
/// <reference types="akamai-edgeworkers" />
|
|
2
|
+
import type { AkamaiRuntimeDependencies, AkamaiWorkerConfig } from './types';
|
|
3
|
+
export declare function handleCaptchaPost(deps: AkamaiRuntimeDependencies, config: Readonly<AkamaiWorkerConfig>, request: EW.IngressClientRequest, response: EW.EgressClientResponse): Promise<void>;
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { NetaceaIngestType, dictionary } from '@netacea/netaceaintegrationbase';
|
|
2
|
+
import { setNetaceaCookie } from './helpers/setNetaceaCookie';
|
|
3
|
+
import { setNetaceaCaptchaCookie } from './helpers/setNetaceaCaptchaCookie';
|
|
4
|
+
import { removeNetaceaHeaders } from './helpers/removeNetaceaHeaders';
|
|
5
|
+
import { ingest } from './ingest/ingest';
|
|
6
|
+
export async function handleCaptchaPost(deps, config, request, response) {
|
|
7
|
+
const setCookieHeaders = response.getHeader('set-cookie') ?? undefined;
|
|
8
|
+
response.removeHeader('set-cookie');
|
|
9
|
+
if (response.status === 200) {
|
|
10
|
+
await setNetaceaCaptchaCookie(deps, config, response, setCookieHeaders);
|
|
11
|
+
await setNetaceaCookie(deps, config, request, response);
|
|
12
|
+
const captchaPassCode = String(dictionary.captchaStatusCodes.captchaPass);
|
|
13
|
+
const captchaStatusHeaderName = dictionary.netaceaHeaders.captcha;
|
|
14
|
+
const captchaStatus = response.getHeader(captchaStatusHeaderName)?.[0];
|
|
15
|
+
if (captchaStatus !== captchaPassCode) {
|
|
16
|
+
response.status = 403;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
removeNetaceaHeaders(response);
|
|
20
|
+
if (config.ingestType === NetaceaIngestType.HTTP) {
|
|
21
|
+
await ingest(deps, config, request, response);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=captchaPost.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"captchaPost.js","sourceRoot":"","sources":["../../src/captchaPost.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAA;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAExC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,IAA+B,EAC/B,MAAoC,EACpC,OAAgC,EAChC,QAAiC;IAEjC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,SAAS,CAAA;IAEtE,QAAQ,CAAC,YAAY,CAAC,YAAY,CAAC,CAAA;IAMnC,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;QAC3B,MAAM,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAA;QACvE,MAAM,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;QAOvD,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAA;QACzE,MAAM,uBAAuB,GAAG,UAAU,CAAC,cAAc,CAAC,OAAO,CAAA;QACjE,MAAM,aAAa,GAAG,QAAQ,CAAC,SAAS,CAAC,uBAAuB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QACtE,IAAI,aAAa,KAAK,eAAe,EAAE;YACrC,QAAQ,CAAC,MAAM,GAAG,GAAG,CAAA;SACtB;KACF;IAED,oBAAoB,CAAC,QAAQ,CAAC,CAAA;IAE9B,IAAI,MAAM,CAAC,UAAU,KAAK,iBAAiB,CAAC,IAAI,EAAE;QAChD,MAAM,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;KAC9C;AACH,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type { AkamaiWorkerConfig } from '../types';
|
|
2
|
-
export declare function buildCookieFromValues(config: Readonly<AkamaiWorkerConfig>, cookieName: string, value: string, maxAge: number, path?: string): Promise<string>;
|
|
1
|
+
import type { AkamaiRuntimeDependencies, AkamaiWorkerConfig } from '../types';
|
|
2
|
+
export declare function buildCookieFromValues(deps: AkamaiRuntimeDependencies, config: Readonly<AkamaiWorkerConfig>, cookieName: string, value: string, maxAge: number, path?: string): Promise<string>;
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
export async function buildCookieFromValues(config, cookieName, value, maxAge, path = '/') {
|
|
1
|
+
export async function buildCookieFromValues(deps, config, cookieName, value, maxAge, path = '/') {
|
|
3
2
|
const encryptedCookies = [
|
|
4
3
|
config.netaceaCookieName,
|
|
5
4
|
config.netaceaCaptchaCookieName
|
|
6
5
|
];
|
|
7
|
-
if (encryptedCookies.includes(cookieName)
|
|
8
|
-
const encryptedValue = await
|
|
6
|
+
if (deps.cachedEncryption !== undefined && encryptedCookies.includes(cookieName)) {
|
|
7
|
+
const encryptedValue = await deps.cachedEncryption.encrypt(value);
|
|
9
8
|
return `${cookieName}=${encryptedValue}; Max-Age=${maxAge}; Path=${path}`;
|
|
10
9
|
}
|
|
11
10
|
return `${cookieName}=${value}; Max-Age=${maxAge}; Path=${path}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildCookieFromValues.js","sourceRoot":"","sources":["../../../src/helpers/buildCookieFromValues.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"buildCookieFromValues.js","sourceRoot":"","sources":["../../../src/helpers/buildCookieFromValues.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,IAA+B,EAC/B,MAAoC,EACpC,UAAkB,EAClB,KAAa,EACb,MAAc,EACd,IAAI,GAAG,GAAG;IAEV,MAAM,gBAAgB,GAAG;QACvB,MAAM,CAAC,iBAAiB;QACxB,MAAM,CAAC,wBAAwB;KAChC,CAAA;IACD,IAAI,IAAI,CAAC,gBAAgB,KAAK,SAAS,IAAI,gBAAgB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QAChF,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACjE,OAAO,GAAG,UAAU,IAAI,cAAc,aAAa,MAAM,UAAU,IAAI,EAAE,CAAA;KAC1E;IACD,OAAO,GAAG,UAAU,IAAI,KAAK,aAAa,MAAM,UAAU,IAAI,EAAE,CAAA;AAClE,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { generateId } from '../mitataCookie';
|
|
2
|
+
export function buildProtoMitataFromNetaceaHeaders(request, response) {
|
|
3
|
+
const readNumberFromResponse = (headerName, defaultValue) => {
|
|
4
|
+
return Number(response.getHeader(headerName)?.[0] ?? defaultValue);
|
|
5
|
+
};
|
|
6
|
+
const clientIP = request.getHeader('x-netacea-client-ip')?.[0];
|
|
7
|
+
if (clientIP === undefined || clientIP === null || clientIP === '') {
|
|
8
|
+
throw new Error('Cannot build proto-mitata without Client IP');
|
|
9
|
+
}
|
|
10
|
+
const userId = request.getHeader('x-netacea-userid')?.[0] ?? '';
|
|
11
|
+
return {
|
|
12
|
+
clientIP,
|
|
13
|
+
userId: userId !== '' ? userId : generateId(),
|
|
14
|
+
match: readNumberFromResponse('x-netacea-match', 0),
|
|
15
|
+
mitigate: readNumberFromResponse('x-netacea-mitigate', 0),
|
|
16
|
+
captcha: readNumberFromResponse('x-netacea-captcha', 0),
|
|
17
|
+
mitataMaxAge: readNumberFromResponse('x-netacea-mitata-expiry', 86400)
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=buildProtoMitataFromNetaceaHeaders.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"buildProtoMitataFromNetaceaHeaders.js","sourceRoot":"","sources":["../../../src/helpers/buildProtoMitataFromNetaceaHeaders.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,MAAM,UAAU,kCAAkC,CAChD,OAAgC,EAChC,QAAiC;IAEjC,MAAM,sBAAsB,GAAG,CAAC,UAAkB,EAAE,YAAoB,EAAU,EAAE;QAClF,OAAO,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC,CAAA;IACpE,CAAC,CAAA;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAC9D,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,EAAE,EAAE;QAClE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;KAC/D;IAED,MAAM,MAAM,GAAW,OAAO,CAAC,SAAS,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;IAEvE,OAAO;QACL,QAAQ;QACR,MAAM,EAAE,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,EAAE;QAC7C,KAAK,EAAE,sBAAsB,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACnD,QAAQ,EAAE,sBAAsB,CAAC,oBAAoB,EAAE,CAAC,CAAC;QACzD,OAAO,EAAE,sBAAsB,CAAC,mBAAmB,EAAE,CAAC,CAAC;QACvD,YAAY,EAAE,sBAAsB,CAAC,yBAAyB,EAAE,KAAK,CAAC;KACvE,CAAA;AACH,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AkamaiWorkerConfig } from '../types';
|
|
1
|
+
import { AkamaiRuntimeDependencies, AkamaiWorkerConfig } from '../types';
|
|
2
2
|
interface CreateMitataOptions {
|
|
3
3
|
clientIP: string;
|
|
4
4
|
userId?: string;
|
|
@@ -7,7 +7,6 @@ interface CreateMitataOptions {
|
|
|
7
7
|
captcha: number;
|
|
8
8
|
maxAge: number;
|
|
9
9
|
expiry?: number;
|
|
10
|
-
config: Readonly<AkamaiWorkerConfig>;
|
|
11
10
|
}
|
|
12
|
-
export declare function createMitata({ clientIP, userId, match, mitigate, captcha, maxAge, expiry
|
|
11
|
+
export declare function createMitata(deps: AkamaiRuntimeDependencies, config: Readonly<AkamaiWorkerConfig>, { clientIP, userId, match, mitigate, captcha, maxAge, expiry }: CreateMitataOptions): Promise<string>;
|
|
13
12
|
export {};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { buildCookieFromValues } from './buildCookieFromValues';
|
|
2
2
|
import { createMitataCookie } from '../mitataCookie';
|
|
3
|
-
export async function createMitata({ clientIP, userId, match, mitigate, captcha, maxAge = 86400, expiry = undefined
|
|
3
|
+
export async function createMitata(deps, config, { clientIP, userId, match, mitigate, captcha, maxAge = 86400, expiry = undefined }) {
|
|
4
4
|
const expirySeconds = config.netaceaCookieExpirySeconds;
|
|
5
5
|
const isCaptchaServe = [1, 3, 5].includes(captcha);
|
|
6
6
|
const expiryDelta = isCaptchaServe ? -expirySeconds : expirySeconds;
|
|
@@ -10,6 +10,6 @@ export async function createMitata({ clientIP, userId, match, mitigate, captcha,
|
|
|
10
10
|
}
|
|
11
11
|
const mitataCode = [match, mitigate, captcha].join('');
|
|
12
12
|
const mitataValue = await createMitataCookie(clientIP, userId, mitataExpiry, config.secretKey, mitataCode);
|
|
13
|
-
return await buildCookieFromValues(config, config.netaceaCookieName, mitataValue, maxAge);
|
|
13
|
+
return await buildCookieFromValues(deps, config, config.netaceaCookieName, mitataValue, maxAge);
|
|
14
14
|
}
|
|
15
15
|
//# sourceMappingURL=createMitata.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createMitata.js","sourceRoot":"","sources":["../../../src/helpers/createMitata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"createMitata.js","sourceRoot":"","sources":["../../../src/helpers/createMitata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAapD,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,IAA+B,EAC/B,MAAoC,EACpC,EACE,QAAQ,EACR,MAAM,EACN,KAAK,EACL,QAAQ,EACR,OAAO,EACP,MAAM,GAAG,KAAK,EACd,MAAM,GAAG,SAAS,EACE;IAEtB,MAAM,aAAa,GAAG,MAAM,CAAC,0BAAoC,CAAA;IACjE,MAAM,cAAc,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IAClD,MAAM,WAAW,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAA;IACnE,MAAM,YAAY,GAAG,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,WAAW,CAAA;IAE1E,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE;QAClC,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;KAC3D;IACD,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACtD,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAC1C,QAAQ,EACR,MAAM,EACN,YAAY,EACZ,MAAM,CAAC,SAAS,EAChB,UAAU,CACX,CAAA;IACD,OAAO,MAAM,qBAAqB,CAChC,IAAI,EACJ,MAAM,EACN,MAAM,CAAC,iBAA2B,EAClC,WAAW,EACX,MAAM,CACP,CAAA;AACH,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AkamaiWorkerConfig } from '../types';
|
|
2
|
-
export declare function getMitataCaptchaFromHeaders(config: Readonly<AkamaiWorkerConfig>, headers: {
|
|
1
|
+
import type { AkamaiRuntimeDependencies, AkamaiWorkerConfig } from '../types';
|
|
2
|
+
export declare function getMitataCaptchaFromHeaders(deps: AkamaiRuntimeDependencies, config: Readonly<AkamaiWorkerConfig>, headers: {
|
|
3
3
|
[key: string]: string;
|
|
4
4
|
}): Promise<string | undefined>;
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { dictionary } from '@netacea/netaceaintegrationbase';
|
|
2
2
|
import { buildCookieFromValues } from './buildCookieFromValues';
|
|
3
|
-
export async function getMitataCaptchaFromHeaders(config, headers) {
|
|
3
|
+
export async function getMitataCaptchaFromHeaders(deps, config, headers) {
|
|
4
4
|
if (Object.prototype.hasOwnProperty.call(headers, dictionary.netaceaHeaders.mitataCaptcha)) {
|
|
5
5
|
const mitataCaptcha = headers[dictionary.netaceaHeaders.mitataCaptcha];
|
|
6
6
|
const mitataCaptchaExpiry = parseInt(headers[dictionary.netaceaHeaders.mitataCaptchaExpiry]);
|
|
7
|
-
const mitataCaptchaCookie = await buildCookieFromValues(config, config.netaceaCaptchaCookieName, mitataCaptcha, mitataCaptchaExpiry);
|
|
7
|
+
const mitataCaptchaCookie = await buildCookieFromValues(deps, config, config.netaceaCaptchaCookieName, mitataCaptcha, mitataCaptchaExpiry);
|
|
8
8
|
if (mitataCaptchaCookie !== undefined) {
|
|
9
9
|
return mitataCaptchaCookie;
|
|
10
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getMitataCaptchaFromHeaders.js","sourceRoot":"","sources":["../../../src/helpers/getMitataCaptchaFromHeaders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAG/D,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,MAAoC,EACpC,OAAgC;IAEhC,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE;QAC1F,MAAM,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,aAAa,CAAC,CAAA;QACtE,MAAM,mBAAmB,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC,CAAA;QAC5F,MAAM,mBAAmB,GAAG,MAAM,qBAAqB,CACrD,MAAM,EACN,MAAM,CAAC,wBAAkC,EACzC,aAAa,EACb,mBAAmB,CACpB,CAAA;QAED,IAAI,mBAAmB,KAAK,SAAS,EAAE;YACrC,OAAO,mBAAmB,CAAA;SAC3B;KACF;IACD,OAAO,SAAS,CAAA;AAClB,CAAC"}
|
|
1
|
+
{"version":3,"file":"getMitataCaptchaFromHeaders.js","sourceRoot":"","sources":["../../../src/helpers/getMitataCaptchaFromHeaders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAG/D,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,IAA+B,EAC/B,MAAoC,EACpC,OAAgC;IAEhC,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE;QAC1F,MAAM,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,aAAa,CAAC,CAAA;QACtE,MAAM,mBAAmB,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC,CAAA;QAC5F,MAAM,mBAAmB,GAAG,MAAM,qBAAqB,CACrD,IAAI,EACJ,MAAM,EACN,MAAM,CAAC,wBAAkC,EACzC,aAAa,EACb,mBAAmB,CACpB,CAAA;QAED,IAAI,mBAAmB,KAAK,SAAS,EAAE;YACrC,OAAO,mBAAmB,CAAA;SAC3B;KACF;IACD,OAAO,SAAS,CAAA;AAClB,CAAC"}
|
|
@@ -9,7 +9,7 @@ export async function logToDataStream(deps, config, request) {
|
|
|
9
9
|
try {
|
|
10
10
|
const protoMitata = getProtoMitataFromRequestVar(config, request);
|
|
11
11
|
const cookieHeader = getHeaderValueOrDefault(request, 'cookie');
|
|
12
|
-
const mitataCookie = await readCookie(config
|
|
12
|
+
const mitataCookie = await readCookie(deps, config, cookieHeader, config.netaceaCookieName);
|
|
13
13
|
const cookieInfo = matchMitataCookie(mitataCookie);
|
|
14
14
|
const userId = protoMitata?.userId ?? cookieInfo?.userId ?? '';
|
|
15
15
|
const match = protoMitata?.match ?? cookieInfo?.match ?? 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logToDataStream.js","sourceRoot":"","sources":["../../../src/helpers/logToDataStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAA;AAC7E,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE1C,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,IAA+B,EAC/B,MAAoC,EACpC,OAAgC;IAGhC,IAAI;QACF,MAAM,WAAW,GAAG,4BAA4B,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACjE,MAAM,YAAY,GAAG,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QAC/D,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"logToDataStream.js","sourceRoot":"","sources":["../../../src/helpers/logToDataStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAA;AAC7E,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE1C,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,IAA+B,EAC/B,MAAoC,EACpC,OAAgC;IAGhC,IAAI;QACF,MAAM,WAAW,GAAG,4BAA4B,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACjE,MAAM,YAAY,GAAG,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QAC/D,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,iBAA2B,CAAC,CAAA;QACrG,MAAM,UAAU,GAAG,iBAAiB,CAAC,YAAY,CAAC,CAAA;QAElD,MAAM,MAAM,GAAG,WAAW,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,IAAI,EAAE,CAAA;QAC9D,MAAM,KAAK,GAAG,WAAW,EAAE,KAAK,IAAI,UAAU,EAAE,KAAK,IAAI,CAAC,CAAA;QAC1D,MAAM,QAAQ,GAAG,WAAW,EAAE,QAAQ,IAAI,UAAU,EAAE,QAAQ,IAAI,CAAC,CAAA;QACnE,MAAM,OAAO,GAAG,WAAW,EAAE,OAAO,IAAI,UAAU,EAAE,OAAO,IAAI,CAAC,CAAA;QAEhE,MAAM,EAAE,aAAa,EAAE,GAAG,kBAAkB,CAC1C,MAAM,EACN,KAAK,EACL,QAAQ,EACR,OAAO,EACP,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAC/C,CAAA;QAGD,MAAM,kBAAkB,GAAG;YACzB,MAAM;YACN,aAAa;YACb,IAAI,CAAC,OAAO;SACb,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEX,OAAO,CAAC,WAAW,CAAC,iCAAiC,EAAE,kBAAkB,CAAC,CAAA;KAC3E;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;QAEvB,MAAM,CAAC,GAAG,CAAC,iDAAiD,CAAC,EAAE,CAAC,CAAA;KACjE;AACH,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { AkamaiWorkerConfig } from '../types';
|
|
2
|
-
export declare function readCookie(
|
|
1
|
+
import { AkamaiRuntimeDependencies, AkamaiWorkerConfig } from '../types';
|
|
2
|
+
export declare function readCookie(deps: AkamaiRuntimeDependencies, config: Readonly<AkamaiWorkerConfig>, cookies: string | string[] | null | undefined, cookieName: string): Promise<string | undefined>;
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import { CachedEncryption } from '../CachedEncryption';
|
|
2
1
|
import { isJweEncrypted } from './encryptionCheck';
|
|
3
|
-
export async function readCookie(
|
|
2
|
+
export async function readCookie(deps, config, cookies, cookieName) {
|
|
4
3
|
if (cookies === null || cookies === undefined) {
|
|
5
4
|
return undefined;
|
|
6
5
|
}
|
|
7
6
|
if (typeof cookies === 'string') {
|
|
8
|
-
return await readCookie(
|
|
7
|
+
return await readCookie(deps, config, cookies.split(';'), cookieName);
|
|
9
8
|
}
|
|
10
9
|
const valuePrefix = `${cookieName}=`;
|
|
11
10
|
for (const cookie of cookies) {
|
|
@@ -14,7 +13,7 @@ export async function readCookie(cookieName, cookies, config) {
|
|
|
14
13
|
const cookieValue = trimmedCookie.slice(valuePrefix.length);
|
|
15
14
|
if (config.encryptedCookieNames.includes(cookieName) && isJweEncrypted(cookieValue)) {
|
|
16
15
|
try {
|
|
17
|
-
return await
|
|
16
|
+
return await deps.cachedEncryption?.decrypt(cookieValue);
|
|
18
17
|
}
|
|
19
18
|
catch (_e) {
|
|
20
19
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readCookie.js","sourceRoot":"","sources":["../../../src/helpers/readCookie.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"readCookie.js","sourceRoot":"","sources":["../../../src/helpers/readCookie.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAElD,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAA+B,EAC/B,MAAoC,EACpC,OAA6C,EAC7C,UAAkB;IAElB,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE;QAC7C,OAAO,SAAS,CAAA;KACjB;IAED,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,OAAO,MAAM,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAA;KACtE;IAED,MAAM,WAAW,GAAG,GAAG,UAAU,GAAG,CAAA;IACpC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAE5B,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAA;QAEtD,IAAI,aAAa,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;YACzC,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;YAE3D,IAAI,MAAM,CAAC,oBAAoB,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,cAAc,CAAC,WAAW,CAAC,EAAE;gBACnF,IAAI;oBACF,OAAO,MAAM,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;iBACzD;gBAAC,OAAO,EAAE,EAAE;oBACX,OAAO,SAAS,CAAA;iBACjB;aACF;YAED,OAAO,WAAW,CAAA;SACnB;KACF;IAED,OAAO,SAAS,CAAA;AAClB,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export function removeNetaceaHeaders(response) {
|
|
2
|
+
response.removeHeader('x-netacea-match');
|
|
3
|
+
response.removeHeader('x-netacea-mitigate');
|
|
4
|
+
response.removeHeader('x-netacea-captcha');
|
|
5
|
+
response.removeHeader('x-netacea-mitata-expiry');
|
|
6
|
+
response.removeHeader('x-netacea-mitata-value');
|
|
7
|
+
response.removeHeader('x-netacea-mitatacaptcha-expiry');
|
|
8
|
+
response.removeHeader('x-netacea-mitatacaptcha-value');
|
|
9
|
+
response.removeHeader('x-netacea-event-id');
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=removeNetaceaHeaders.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"removeNetaceaHeaders.js","sourceRoot":"","sources":["../../../src/helpers/removeNetaceaHeaders.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,oBAAoB,CAAE,QAAiC;IACrE,QAAQ,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAA;IACxC,QAAQ,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAA;IAC3C,QAAQ,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAA;IAC1C,QAAQ,CAAC,YAAY,CAAC,yBAAyB,CAAC,CAAA;IAChD,QAAQ,CAAC,YAAY,CAAC,wBAAwB,CAAC,CAAA;IAC/C,QAAQ,CAAC,YAAY,CAAC,gCAAgC,CAAC,CAAA;IACvD,QAAQ,CAAC,YAAY,CAAC,+BAA+B,CAAC,CAAA;IACtD,QAAQ,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAA;AAC7C,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"routeRequestToNetaceaProxy.js","sourceRoot":"","sources":["../../../src/helpers/routeRequestToNetaceaProxy.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,0BAA0B,CAAE,OAAgC;IAC1E,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAA;AAC1C,CAAC"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
/// <reference types="akamai-edgeworkers" />
|
|
2
|
+
import type { AkamaiRuntimeDependencies, AkamaiWorkerConfig } from '../types';
|
|
3
|
+
export declare function setNetaceaCaptchaCookie(deps: AkamaiRuntimeDependencies, config: Readonly<AkamaiWorkerConfig>, response: EW.EgressClientResponse, setCookieHeaders: string[] | undefined): Promise<void>;
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { extractAndRemoveCookieAttr } from '../netaceaCookieAttributes';
|
|
2
|
+
export async function setNetaceaCaptchaCookie(deps, config, response, setCookieHeaders) {
|
|
3
|
+
const mitataCaptchaCookie = setCookieHeaders
|
|
4
|
+
?.find(cookie => cookie.startsWith('_mitatacaptcha='));
|
|
5
|
+
if (mitataCaptchaCookie !== undefined) {
|
|
6
|
+
const setCookiePayload = mitataCaptchaCookie
|
|
7
|
+
.slice(mitataCaptchaCookie.indexOf('=') + 1);
|
|
8
|
+
let [captchaCookieValue, ...attributes] = setCookiePayload.split(/; ?/);
|
|
9
|
+
if (deps.cachedEncryption !== undefined) {
|
|
10
|
+
captchaCookieValue = await deps.cachedEncryption.encrypt(captchaCookieValue);
|
|
11
|
+
}
|
|
12
|
+
let captchaCookie = [
|
|
13
|
+
`${config.netaceaCaptchaCookieName}=${captchaCookieValue}`,
|
|
14
|
+
...attributes
|
|
15
|
+
].join('; ');
|
|
16
|
+
if (config.netaceaCaptchaCookieAttributes !== '') {
|
|
17
|
+
const { extractedAttribute: extractedMaxAge, cookieAttributes } = extractAndRemoveCookieAttr(config.netaceaCaptchaCookieAttributes, 'Max-Age');
|
|
18
|
+
const { extractedAttribute: captchaMaxAge } = extractAndRemoveCookieAttr(captchaCookie, 'Max-Age');
|
|
19
|
+
if (extractedMaxAge !== undefined && captchaMaxAge !== undefined) {
|
|
20
|
+
captchaCookie.replace(`Max-Age=${captchaMaxAge}`, `Max-Age=${extractedMaxAge}`);
|
|
21
|
+
captchaCookie = `${captchaCookie}; ${cookieAttributes}`;
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
captchaCookie = `${captchaCookie}; ${cookieAttributes}`;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
response.addHeader('set-cookie', captchaCookie);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=setNetaceaCaptchaCookie.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setNetaceaCaptchaCookie.js","sourceRoot":"","sources":["../../../src/helpers/setNetaceaCaptchaCookie.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAA;AAEvE,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,IAA+B,EAC/B,MAAoC,EACpC,QAAiC,EACjC,gBAAsC;IAEtC,MAAM,mBAAmB,GAAuB,gBAAgB;QAC9D,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAA;IAExD,IAAI,mBAAmB,KAAK,SAAS,EAAE;QACrC,MAAM,gBAAgB,GAAG,mBAAmB;aACzC,KAAK,CAAC,mBAAmB,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;QAE9C,IAAI,CAAC,kBAAkB,EAAE,GAAG,UAAU,CAAC,GAAG,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAEvE,IAAI,IAAI,CAAC,gBAAgB,KAAK,SAAS,EAAE;YACvC,kBAAkB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAA;SAC7E;QAED,IAAI,aAAa,GAAG;YAClB,GAAG,MAAM,CAAC,wBAAkC,IAAI,kBAAkB,EAAE;YACpE,GAAG,UAAU;SACd,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEZ,IAAI,MAAM,CAAC,8BAA8B,KAAK,EAAE,EAAE;YAChD,MAAM,EACJ,kBAAkB,EAAE,eAAe,EACnC,gBAAgB,EACjB,GAAG,0BAA0B,CAAC,MAAM,CAAC,8BAA8B,EAAE,SAAS,CAAC,CAAA;YAChF,MAAM,EAAE,kBAAkB,EAAE,aAAa,EAAE,GAAG,0BAA0B,CAAC,aAAa,EAAE,SAAS,CAAC,CAAA;YAElG,IAAI,eAAe,KAAK,SAAS,IAAI,aAAa,KAAK,SAAS,EAAE;gBAChE,aAAa,CAAC,OAAO,CAAC,WAAW,aAAa,EAAE,EAAE,WAAW,eAAe,EAAE,CAAC,CAAA;gBAC/E,aAAa,GAAG,GAAG,aAAa,KAAK,gBAAgB,EAAE,CAAA;aACxD;iBAAM;gBACL,aAAa,GAAG,GAAG,aAAa,KAAK,gBAAgB,EAAE,CAAA;aACxD;SACF;QAED,QAAQ,CAAC,SAAS,CAAC,YAAY,EAAE,aAAa,CAAC,CAAA;KAChD;AACH,CAAC"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
/// <reference types="akamai-edgeworkers" />
|
|
2
|
+
import type { AkamaiRuntimeDependencies, AkamaiWorkerConfig } from '../types';
|
|
3
|
+
export declare function setNetaceaCookie(deps: AkamaiRuntimeDependencies, config: Readonly<AkamaiWorkerConfig>, request: EW.IngressClientRequest, response: EW.EgressClientResponse): Promise<void>;
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { isUrlCaptchaPost } from '../netaceaPaths';
|
|
2
|
+
import { buildProtoMitataFromNetaceaHeaders } from './buildProtoMitataFromNetaceaHeaders';
|
|
3
|
+
import { getProtoMitataFromRequestVar } from './getProtoMitataFromRequestVar';
|
|
4
|
+
import { extractAndRemoveCookieAttr } from '../netaceaCookieAttributes';
|
|
5
|
+
import { createMitata } from './createMitata';
|
|
6
|
+
export async function setNetaceaCookie(deps, config, request, response) {
|
|
7
|
+
const protoMitata = isUrlCaptchaPost(request.path, request.method)
|
|
8
|
+
? buildProtoMitataFromNetaceaHeaders(request, response)
|
|
9
|
+
: getProtoMitataFromRequestVar(config, request);
|
|
10
|
+
if (protoMitata !== undefined) {
|
|
11
|
+
let maxAgeAttr;
|
|
12
|
+
let { netaceaCookieAttributes } = config;
|
|
13
|
+
if (netaceaCookieAttributes !== '') {
|
|
14
|
+
const { extractedAttribute: cookieMaxAge, cookieAttributes } = extractAndRemoveCookieAttr(netaceaCookieAttributes, 'Max-Age');
|
|
15
|
+
maxAgeAttr = cookieMaxAge;
|
|
16
|
+
netaceaCookieAttributes = cookieAttributes;
|
|
17
|
+
}
|
|
18
|
+
const cookie = await createMitata(deps, config, {
|
|
19
|
+
clientIP: protoMitata.clientIP,
|
|
20
|
+
userId: protoMitata.userId,
|
|
21
|
+
match: protoMitata.match,
|
|
22
|
+
mitigate: protoMitata.mitigate,
|
|
23
|
+
captcha: protoMitata.captcha,
|
|
24
|
+
maxAge: maxAgeAttr !== undefined ? parseInt(maxAgeAttr, 10) : protoMitata.mitataMaxAge
|
|
25
|
+
});
|
|
26
|
+
const responseCookies = response.getHeader('set-cookie') ?? [];
|
|
27
|
+
response.setHeader('set-cookie', [
|
|
28
|
+
...responseCookies.filter(c => !c.startsWith('_proto-mitata=')),
|
|
29
|
+
netaceaCookieAttributes !== '' ? `${cookie}; ${netaceaCookieAttributes}` : cookie
|
|
30
|
+
]);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
//# sourceMappingURL=setNetaceaCookie.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setNetaceaCookie.js","sourceRoot":"","sources":["../../../src/helpers/setNetaceaCookie.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,kCAAkC,EAAE,MAAM,sCAAsC,CAAA;AACzF,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAA;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,IAA+B,EAC/B,MAAoC,EACpC,OAAgC,EAChC,QAAiC;IAEjC,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC;QAChE,CAAC,CAAC,kCAAkC,CAAC,OAAO,EAAE,QAAQ,CAAC;QACvD,CAAC,CAAC,4BAA4B,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAEjD,IAAI,WAAW,KAAK,SAAS,EAAE;QAC7B,IAAI,UAA8B,CAAA;QAElC,IAAI,EAAE,uBAAuB,EAAE,GAAG,MAAM,CAAA;QACxC,IAAI,uBAAuB,KAAK,EAAE,EAAE;YAClC,MAAM,EACJ,kBAAkB,EAAE,YAAY,EAChC,gBAAgB,EACjB,GAAG,0BAA0B,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAA;YAClE,UAAU,GAAG,YAAY,CAAA;YACzB,uBAAuB,GAAG,gBAAgB,CAAA;SAC3C;QAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAC/B,IAAI,EACJ,MAAM,EACN;YACE,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,MAAM,EAAE,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,YAAY;SACvF,CACF,CAAA;QAED,MAAM,eAAe,GAAG,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,CAAA;QAC9D,QAAQ,CAAC,SAAS,CAAC,YAAY,EAAE;YAC/B,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;YAC/D,uBAAuB,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,MAAM,KAAK,uBAAuB,EAAE,CAAC,CAAC,CAAC,MAAM;SAClF,CAAC,CAAA;KACH;AACH,CAAC"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
/// <reference types="akamai-edgeworkers" />
|
|
2
|
+
import type { AkamaiRuntimeDependencies, AkamaiWorkerConfig } from '../types';
|
|
3
|
+
export declare function verifyCaptcha(deps: AkamaiRuntimeDependencies, config: Readonly<AkamaiWorkerConfig>, request: EW.IngressClientRequest): Promise<void>;
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { getHeaderValueOrDefault } from './getHeaderValueOrDefault';
|
|
2
|
+
import { readCookie } from './readCookie';
|
|
3
|
+
import { checkMitataCookie } from '../mitataCookie';
|
|
4
|
+
import { routeRequestToNetaceaProxy } from './routeRequestToNetaceaProxy';
|
|
5
|
+
export async function verifyCaptcha(deps, config, request) {
|
|
6
|
+
const IP = request.getVariable('PMUSER_CLIENT_IP') ?? '';
|
|
7
|
+
request.setHeader('x-netacea-api-key', config.apiKey);
|
|
8
|
+
request.setHeader('x-netacea-client-ip', IP);
|
|
9
|
+
const cookies = getHeaderValueOrDefault(request, 'cookie');
|
|
10
|
+
const mitataCookie = await readCookie(deps, config, cookies, config.netaceaCookieName) ?? '';
|
|
11
|
+
let userId = '';
|
|
12
|
+
const cookieInfo = await checkMitataCookie(mitataCookie, IP, config.secretKey ?? '');
|
|
13
|
+
if (cookieInfo.isPrimaryHashValid) {
|
|
14
|
+
userId = cookieInfo.mitata?.userId ?? '';
|
|
15
|
+
}
|
|
16
|
+
request.setHeader('x-netacea-userid', userId);
|
|
17
|
+
routeRequestToNetaceaProxy(request);
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=verifyCaptcha.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"verifyCaptcha.js","sourceRoot":"","sources":["../../../src/helpers/verifyCaptcha.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;AAEzE,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAA+B,EAC/B,MAAoC,EACpC,OAAgC;IAEhC,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAA;IACxD,OAAO,CAAC,SAAS,CAAC,mBAAmB,EAAE,MAAM,CAAC,MAAgB,CAAC,CAAA;IAC/D,OAAO,CAAC,SAAS,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAA;IAE5C,MAAM,OAAO,GAAG,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC1D,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,iBAA2B,CAAC,IAAI,EAAE,CAAA;IAEtG,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,YAAY,EAAE,EAAE,EAAE,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAA;IACpF,IAAI,UAAU,CAAC,kBAAkB,EAAE;QACjC,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE,MAAM,IAAI,EAAE,CAAA;KACzC;IACD,OAAO,CAAC,SAAS,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAA;IAC7C,0BAA0B,CAAC,OAAO,CAAC,CAAA;AACrC,CAAC"}
|
|
@@ -11,10 +11,10 @@ export async function ingest(deps, config, request, response) {
|
|
|
11
11
|
const cookieString = setCookie.length !== 0
|
|
12
12
|
? setCookie?.join('; ')
|
|
13
13
|
: getHeaderValueOrDefault(request, 'cookie');
|
|
14
|
-
let mitata = await readCookie(config
|
|
14
|
+
let mitata = await readCookie(deps, config, cookieString, config.netaceaCookieName) ?? '';
|
|
15
15
|
if (mitata === undefined || mitata === '') {
|
|
16
16
|
const cookieString = getHeaderValueOrDefault(request, 'cookie');
|
|
17
|
-
mitata = await readCookie(config
|
|
17
|
+
mitata = await readCookie(deps, config, cookieString, config.netaceaCookieName) ?? '';
|
|
18
18
|
}
|
|
19
19
|
const { match, mitigate, captcha } = matchMitataCookie(mitata) ?? {
|
|
20
20
|
match: 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ingest.js","sourceRoot":"","sources":["../../../src/ingest/ingest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAG7D,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,IAA+B,EAC/B,MAAoC,EACpC,OAAgC,EAChC,QAAiC;IAEjC,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,CAAA;IACxD,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,KAAK,CAAC;QACzC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC;QACvB,CAAC,CAAC,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC9C,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"ingest.js","sourceRoot":"","sources":["../../../src/ingest/ingest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAG7D,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,IAA+B,EAC/B,MAAoC,EACpC,OAAgC,EAChC,QAAiC;IAEjC,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,CAAA;IACxD,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,KAAK,CAAC;QACzC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC;QACvB,CAAC,CAAC,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC9C,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,iBAA2B,CAAC,IAAI,EAAE,CAAA;IACnG,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,EAAE,EAAE;QACzC,MAAM,YAAY,GAAG,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QAC/D,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,iBAA2B,CAAC,IAAI,EAAE,CAAA;KAChG;IAED,MAAM,EACJ,KAAK,EACL,QAAQ,EACR,OAAO,EACR,GAAG,iBAAiB,CAAC,MAAM,CAAC,IAAI;QAC/B,KAAK,EAAE,CAAC;QACR,QAAQ,EAAE,CAAC;QACX,OAAO,EAAE,CAAC;KACX,CAAA;IAED,MAAM,EAAE,aAAa,EAAE,GAAG,kBAAkB,CAC1C,MAAM,EACN,KAAK,EACL,QAAQ,EACR,OAAO,EACP,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAC/C,CAAA;IAED,IAAI;QAEF,UAAU,CACR,IAAI,EACJ,MAAM,EACN;YACE,SAAS,EAAE,uBAAuB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,CAAC;YACnE,EAAE,EAAE,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,EAAE,EAAE,CAAC;YACzD,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,IAAI,EAAE,OAAO,CAAC,GAAG;YACjB,QAAQ,EAAE,uBAAuB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC;YAClE,OAAO,EAAE,uBAAuB,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,CAAC;YACxD,WAAW,EAAE,GAAG;YAChB,aAAa;YACb,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC/B,SAAS,EAAE,uBAAuB,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,CAAC;YAC9D,YAAY,EAAE,MAAM;YACpB,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;YACnD,kBAAkB,EAAE,IAAI,CAAC,OAAO;SACjC,CACF,CAAA;KACF;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;QACvB,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAA;KACxC;AACH,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
+
import type { AkamaiWorkerConfig, AkamaiRuntimeDependencies, CookieCodes } from '../types';
|
|
1
2
|
import { MakeRequestResponse, MakeMitigateAPICallResponse } from '@netacea/netaceaintegrationbase';
|
|
2
|
-
|
|
3
|
-
export declare function getApiCallResponseFromResponse(response: MakeRequestResponse, userId: string | undefined, clientIP: string, config: Readonly<AkamaiWorkerConfig>, defaultMitataCodes?: CookieCodes): Promise<MakeMitigateAPICallResponse>;
|
|
3
|
+
export declare function getApiCallResponseFromResponse(deps: AkamaiRuntimeDependencies, config: Readonly<AkamaiWorkerConfig>, defaultMitataCodes: CookieCodes | undefined, response: MakeRequestResponse, userId: string | undefined, clientIP: string): Promise<MakeMitigateAPICallResponse>;
|
|
@@ -2,7 +2,7 @@ import { dictionary } from '@netacea/netaceaintegrationbase';
|
|
|
2
2
|
import { createProtoMitata } from '../helpers/createProtoMitata';
|
|
3
3
|
import { getMitataCaptchaFromHeaders } from '../helpers/getMitataCaptchaFromHeaders';
|
|
4
4
|
import { APIError } from '../errors/APIError';
|
|
5
|
-
export async function getApiCallResponseFromResponse(
|
|
5
|
+
export async function getApiCallResponseFromResponse(deps, config, defaultMitataCodes, response, userId, clientIP) {
|
|
6
6
|
if (response.status !== 200) {
|
|
7
7
|
throw APIError.fromResponse(response);
|
|
8
8
|
}
|
|
@@ -23,7 +23,7 @@ export async function getApiCallResponseFromResponse(response, userId, clientIP,
|
|
|
23
23
|
mitataMaxAge = 86400;
|
|
24
24
|
}
|
|
25
25
|
const mitata = await createProtoMitata(clientIP, userId, match, mitigate, captcha);
|
|
26
|
-
const mitataCaptcha = await getMitataCaptchaFromHeaders(config, response.headers);
|
|
26
|
+
const mitataCaptcha = await getMitataCaptchaFromHeaders(deps, config, response.headers);
|
|
27
27
|
const setCookie = [
|
|
28
28
|
mitata,
|
|
29
29
|
mitataCaptcha
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getApiCallResponseFromResponse.js","sourceRoot":"","sources":["../../../src/mitigation/getApiCallResponseFromResponse.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getApiCallResponseFromResponse.js","sourceRoot":"","sources":["../../../src/mitigation/getApiCallResponseFromResponse.ts"],"names":[],"mappings":"AACA,OAAO,EAAoD,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAC9G,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAA;AACpF,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAE7C,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,IAA+B,EAC/B,MAAoC,EACpC,kBAA2C,EAC3C,QAA6B,EAC7B,MAA0B,EAC1B,QAAgB;IAEhB,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;QAC3B,MAAM,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;KACtC;IACD,IAAI,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IACvE,IAAI,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC7E,IAAI,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAA;IAE3E,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE;QAChB,KAAK,GAAG,kBAAkB,EAAE,KAAK,IAAI,CAAC,CAAA;KACvC;IACD,IAAI,KAAK,CAAC,QAAQ,CAAC,EAAE;QACnB,QAAQ,GAAG,kBAAkB,EAAE,QAAQ,IAAI,CAAC,CAAA;KAC7C;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE;QAClB,OAAO,GAAG,kBAAkB,EAAE,OAAO,IAAI,CAAC,CAAA;KAC3C;IAED,IAAI,YAAY,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAA;IACrF,IAAI,KAAK,CAAC,YAAY,CAAC,EAAE;QACvB,YAAY,GAAG,KAAK,CAAA;KACrB;IAED,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAClF,MAAM,aAAa,GAAG,MAAM,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;IAEvF,MAAM,SAAS,GAAG;QAChB,MAAM;QACN,aAAa;KACd,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,SAAS,CAAa,CAAA;IAE1C,MAAM,OAAO,GAAuB,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;IACvF,OAAO;QACL,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,KAAK;QACL,QAAQ;QACR,OAAO;QACP,SAAS;QACT,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,OAAO;QACP,YAAY;KACb,CAAA;AACH,CAAC"}
|
|
@@ -28,7 +28,7 @@ async function mitigationAPICallBase(deps, config, opts, path, method, defaultMi
|
|
|
28
28
|
if (isJsonRequest && config.netaceaCaptchaPath !== undefined && host !== undefined) {
|
|
29
29
|
res.body = mitSvcJsonResponseToUrlResponse(res.body, host, config.netaceaCaptchaPath);
|
|
30
30
|
}
|
|
31
|
-
return await getApiCallResponseFromResponse(
|
|
31
|
+
return await getApiCallResponseFromResponse(deps, config, defaultMitataCodes, res, userId, clientIP);
|
|
32
32
|
}
|
|
33
33
|
function composeHeaders(config, opts) {
|
|
34
34
|
const { apiKey, userId, userAgent, captchaCookie, clientIP, captchaSiteKey, captchaSecretKey, accept } = opts;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mitigationApiCall.js","sourceRoot":"","sources":["../../../src/mitigation/mitigationApiCall.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAA;AACjF,OAAO,EAAE,gCAAgC,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAA;AAexH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,IAA+B,EAC/B,MAAoC,EACpC,IAA8B,EAC9B,kBAAgC;IAEhC,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAC7F,OAAO,MAAM,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,eAAe,EAAE,EAAE,KAAK,EAAE,kBAAkB,CAAC,CAAA;AACjH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,IAA+B,EAC/B,MAAoC,EACpC,IAA8B;IAE9B,OAAO,MAAM,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;AACpE,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,IAA+B,EAC/B,MAAoC,EACpC,IAA8B,EAC9B,IAAY,EACZ,MAAyC,EACzC,kBAAgC;IAEhC,MAAM,EACJ,MAAM,EACN,QAAQ,EACR,IAAI,EACL,GAAG,IAAI,CAAA;IACR,MAAM,EAAE,oBAAoB,EAAE,OAAO,EAAE,GAAG,MAAM,CAAA;IAEhD,IAAI,oBAAoB,KAAK,SAAS,EAAE;QACtC,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;KAC1D;IAED,MAAM,OAAO,GAAG,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAC5C,MAAM,aAAa,GAAG,OAAO,CAAC,gCAAgC,CAAC,KAAK,kBAAkB,CAAA;IACtF,MAAM,WAAW,GAAG;QAClB,IAAI,EAAE,oBAAoB;QAC1B,IAAI;QACJ,OAAO;QACP,MAAM;QACN,OAAO;KACR,CAAA;IACD,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,CAAA;IAExD,IAAI,aAAa,IAAI,MAAM,CAAC,kBAAkB,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS,EAAE;QAClF,GAAG,CAAC,IAAI,GAAG,+BAA+B,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAAA;KACtF;IAED,OAAO,MAAM,8BAA8B,CAAC,
|
|
1
|
+
{"version":3,"file":"mitigationApiCall.js","sourceRoot":"","sources":["../../../src/mitigation/mitigationApiCall.ts"],"names":[],"mappings":"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"}
|
package/dist/src/types.d.ts
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import type { RequestBody, HttpResponse } from 'http-request';
|
|
3
3
|
import type { MitigateResponse } from '@netacea/netaceaintegrationbase';
|
|
4
4
|
import type { LegacyAkamaiConstructorArgs } from './AkamaiV1';
|
|
5
|
+
import { CachedEncryption } from './CachedEncryption';
|
|
5
6
|
export interface AkamaiWorkerConfig extends LegacyAkamaiConstructorArgs {
|
|
6
7
|
enableMitigationProxyPass: boolean;
|
|
7
8
|
enableIngestProxyPass: boolean;
|
|
@@ -58,4 +59,5 @@ export declare type AkamaiHttpRequestFn = (url: string, options?: AkamaiHttpRequ
|
|
|
58
59
|
export interface AkamaiRuntimeDependencies {
|
|
59
60
|
logger: Logger;
|
|
60
61
|
httpRequest: AkamaiHttpRequestFn;
|
|
62
|
+
cachedEncryption: CachedEncryption | undefined;
|
|
61
63
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@netacea/akamai",
|
|
3
|
-
"version": "5.0.
|
|
3
|
+
"version": "5.0.60",
|
|
4
4
|
"description": "Netacea Akamai CDN Integration",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
},
|
|
21
21
|
"license": "ISC",
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@netacea/netaceaintegrationbase": "^1.16.
|
|
23
|
+
"@netacea/netaceaintegrationbase": "^1.16.66",
|
|
24
24
|
"buffer": "^6.0.3",
|
|
25
25
|
"jssha": "^3.3.0"
|
|
26
26
|
},
|
|
@@ -67,5 +67,5 @@
|
|
|
67
67
|
"tslib": "^2.0.3",
|
|
68
68
|
"typescript": "^4.0.3"
|
|
69
69
|
},
|
|
70
|
-
"gitHead": "
|
|
70
|
+
"gitHead": "29e13649874e0232a691d1f8b6fd36c74f54c6da"
|
|
71
71
|
}
|
|
@@ -1,31 +0,0 @@
|
|
|
1
|
-
import { getVariableOrDefault } from './getVariable';
|
|
2
|
-
import { extractAndRemoveCookieAttr } from '../netaceaCookieAttributes';
|
|
3
|
-
import { createMitata } from './createMitata';
|
|
4
|
-
export async function createMitataFromProtoMitata(config, request, response) {
|
|
5
|
-
const protoMitataJson = getVariableOrDefault(request, config.protoMitataVariableName);
|
|
6
|
-
const protoMitata = JSON.parse(protoMitataJson);
|
|
7
|
-
if (protoMitata !== undefined) {
|
|
8
|
-
let cookieAttributes = '';
|
|
9
|
-
let maxAge = config.netaceaCookieExpirySeconds ?? 86400;
|
|
10
|
-
if (config.netaceaCookieAttributes !== '') {
|
|
11
|
-
const result = extractAndRemoveCookieAttr(config.netaceaCookieAttributes, 'Max-Age');
|
|
12
|
-
maxAge = typeof result.extractedAttribute === 'string' ? parseInt(result.extractedAttribute, 10) : maxAge;
|
|
13
|
-
cookieAttributes = result.cookieAttributes;
|
|
14
|
-
}
|
|
15
|
-
const cookie = await createMitata({
|
|
16
|
-
clientIP: protoMitata.clientIP,
|
|
17
|
-
userId: protoMitata.userId,
|
|
18
|
-
match: protoMitata.match,
|
|
19
|
-
mitigate: protoMitata.mitigate,
|
|
20
|
-
captcha: protoMitata.captcha,
|
|
21
|
-
maxAge,
|
|
22
|
-
config
|
|
23
|
-
});
|
|
24
|
-
const responseCookies = response.getHeader('set-cookie') ?? [];
|
|
25
|
-
response.setHeader('set-cookie', [
|
|
26
|
-
...responseCookies.filter(c => !c.startsWith('_proto-mitata=')),
|
|
27
|
-
cookieAttributes !== '' ? `${cookie}; ${cookieAttributes}` : cookie
|
|
28
|
-
]);
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
//# sourceMappingURL=createMitataFromProtoMitata.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"createMitataFromProtoMitata.js","sourceRoot":"","sources":["../../../src/helpers/createMitataFromProtoMitata.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAA;AACpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,MAAoC,EACpC,OAAgC,EAChC,QAAiC;IAEjC,MAAM,eAAe,GAAG,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,uBAAuB,CAAC,CAAA;IACrF,MAAM,WAAW,GAAgB,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;IAE5D,IAAI,WAAW,KAAK,SAAS,EAAE;QAC7B,IAAI,gBAAgB,GAAG,EAAE,CAAA;QACzB,IAAI,MAAM,GAAG,MAAM,CAAC,0BAA0B,IAAI,KAAK,CAAA;QAEvD,IAAI,MAAM,CAAC,uBAAuB,KAAK,EAAE,EAAE;YACzC,MAAM,MAAM,GAAG,0BAA0B,CAAC,MAAM,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAA;YACpF,MAAM,GAAG,OAAO,MAAM,CAAC,kBAAkB,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;YACzG,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAA;SAC3C;QAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC;YAChC,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,MAAM;YACN,MAAM;SACP,CAAC,CAAA;QAEF,MAAM,eAAe,GAAG,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,CAAA;QAC9D,QAAQ,CAAC,SAAS,CAAC,YAAY,EAAE;YAC/B,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;YAC/D,gBAAgB,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,MAAM,KAAK,gBAAgB,EAAE,CAAC,CAAC,CAAC,MAAM;SACpE,CAAC,CAAA;KACH;AACH,CAAC"}
|