@netacea/netaceaintegrationbase 2.0.52 → 2.0.54

package/dist/index.cjs

@@ -122,7 +122,8 @@ const matchMap = {
     6: 'organisation_',
     7: 'asn_',
     8: 'country_',
-    9: 'combination_'
+    9: 'combination_',
+    11: 'headerFP_' // b (base36)
 };
 const mitigateMap = {
     0: '',
@@ -202,7 +203,7 @@ var dictionary = /*#__PURE__*/Object.freeze({
 // & a new MITIGATE cookie will be set
 const ingestIgnoredIpValue = 'ignored';
 const BASE_62_CHARSET = '1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');
-const mitataCookieRegExp = /^(.*)_\/@#\/(.*)_\/@#\/(.*)_\/@#\/(.*)_\/@#\/((\d)(\d)(\d))$/;
+const mitataCookieRegExp = /^(.*)_\/@#\/(.*)_\/@#\/(.*)_\/@#\/(.*)_\/@#\/((\d|[a-z])(\d)(\d))$/i;
 function matchMitataCookie(netaceaCookie) {
     if (netaceaCookie === undefined) {
         return undefined;
@@ -216,7 +217,7 @@ function matchMitataCookie(netaceaCookie) {
             userId,
             ipHash,
             mitigationType,
-            match: parseInt(match),
+            match: parseInt(match, 36),
             mitigate: parseInt(mitigate),
             captcha: parseInt(captcha)
         };
@@ -591,6 +592,45 @@ const lib = {
     }
 };
 
+class HashGenerator {
+    constructor(crypto) {
+        this.crypto = crypto;
+    }
+    async hashString(algorithm, data, sort = false) {
+        const headers = sort ? [...data].sort() : [...data];
+        const dataEncoded = new TextEncoder().encode(headers.join(','));
+        const hashBuffer = await this.crypto.subtle.digest(algorithm, dataEncoded);
+        const hashArray = Array.from(new Uint8Array(hashBuffer));
+        const hashHex = hashArray
+            .map(b => b.toString(16).padStart(2, '0'))
+            .join('')
+            .substring(0, 12);
+        return 'h' + (sort ? 's' : '') + `_${data.length}_${hashHex}`;
+    }
+    static filterHeaderNames(headerNames) {
+        const keys = headerNames
+            .filter(headerName => {
+            const lower = headerName.toLowerCase();
+            return !['', 'cookie', 'referer'].includes(lower) && lower.match(/^(x-netacea-|cloudfront-)/i) === null;
+        });
+        return keys;
+    }
+    async hashHeaders(headerNames, sort = false) {
+        const filteredHeaderNames = HashGenerator.filterHeaderNames(headerNames);
+        if (filteredHeaderNames.length === 0) {
+            return '';
+        }
+        try {
+            return await this.hashString('SHA-256', filteredHeaderNames, sort);
+        }
+        catch (e) {
+            console.error(e);
+            return '';
+        }
+    }
+}
+
+exports.HashGenerator = HashGenerator;
 exports.checkMitataCookie = checkMitataCookie;
 exports.checkNetaceaCookieV3 = checkNetaceaCookieV3;
 exports.configureMitataExpiry = configureMitataExpiry;

package/dist/index.d.ts

@@ -98,6 +98,10 @@ interface MakeRequestArgs {
      * Request timeout value in ms
      */
     timeout?: number;
+    /**
+     * Request URL parameters
+     */
+    params?: Record<string, string> | URLSearchParams;
 }
 interface MakeRequestResponse {
     /**
@@ -302,6 +306,7 @@ interface IngestArgs {
     mitigationLatency?: number;
     mitigationStatus?: number;
     netaceaCookieStatus?: number;
+    workerInstanceId?: string;
 }
 interface WebLog {
     Request: string;
@@ -317,12 +322,14 @@ interface WebLog {
     IntegrationType?: string;
     IntegrationVersion?: string;
     XForwardedFor?: string;
+    WorkerInstanceId?: string;
     optional?: Record<string, unknown>;
     ProtectionMode?: string;
     RequestHost?: string;
     ProtectorLatencyMs?: number;
     ProtectorStatus?: number;
     NetaceaUserIdCookieStatus?: number;
+    HeaderHash?: string;
 }
 interface V2WebLog {
     '@timestamp': string;
@@ -350,6 +357,7 @@ interface V2WebLog {
     user_agent: string;
     user_id?: string;
     x_forwarded_for?: string;
+    worker_instance_id?: string;
     optional?: Record<string, unknown>;
 }
 interface NetaceaResponseBase {
@@ -615,4 +623,18 @@ declare const lib: {
     };
 };
 
-export { type APICallResponse, type CheckCookieResponse, type ComposeResultResponse, type CookiesAttributes, type FindBestMitigationResponse, type IngestArgs, type InjectHeaders, type InjectResponse, type MakeCaptchaApiCallResponse, type MakeMitigateAPICallResponse, type MakeRequestArgs, type MakeRequestResponse, type MitataCookie, type MitigateResponse, type NetaceaBaseArgs, type NetaceaCookieV3, NetaceaCookieV3IssueReason, type NetaceaCookieV3OptionalFeatures, NetaceaIngestType, NetaceaLogVersion, type NetaceaMitigationResponse, NetaceaMitigationType, type NetaceaParts, type NetaceaResponseBase, type NetaceaWorker, type ProcessMitigateRequestArgs, type SlicedCookieAttributes, type V2WebLog, type WebLog, checkMitataCookie, checkNetaceaCookieV3, configureMitataExpiry, cookieIsNetaceaV3Format, correctTimeout, createMitataCookie, createNetaceaCookieV3, defaultInvalidResponse, dictionary_d as dictionary, generateId, hexSha256, ingestIgnoredIpValue, lib, matchMitataCookie, matchNetaceaCookieV3, objectIsNetaceaCookieV3, safeParseInt, warmupCookie };
+type CryptoAlgorithm = 'SHA-1' | 'SHA-256' | 'SHA-384' | 'SHA-512';
+interface CryptoLike {
+    subtle: {
+        digest: (algorithm: CryptoAlgorithm, data: ArrayBuffer | ArrayBufferView) => Promise<ArrayBuffer>;
+    };
+}
+declare class HashGenerator {
+    crypto: CryptoLike;
+    constructor(crypto: CryptoLike);
+    hashString(algorithm: CryptoAlgorithm, data: string[], sort?: boolean): Promise<string>;
+    static filterHeaderNames(headerNames: string[]): string[];
+    hashHeaders(headerNames: string[], sort?: boolean): Promise<string>;
+}
+
+export { type APICallResponse, type CheckCookieResponse, type ComposeResultResponse, type CookiesAttributes, type FindBestMitigationResponse, HashGenerator, type IngestArgs, type InjectHeaders, type InjectResponse, type MakeCaptchaApiCallResponse, type MakeMitigateAPICallResponse, type MakeRequestArgs, type MakeRequestResponse, type MitataCookie, type MitigateResponse, type NetaceaBaseArgs, type NetaceaCookieV3, NetaceaCookieV3IssueReason, type NetaceaCookieV3OptionalFeatures, NetaceaIngestType, NetaceaLogVersion, type NetaceaMitigationResponse, NetaceaMitigationType, type NetaceaParts, type NetaceaResponseBase, type NetaceaWorker, type ProcessMitigateRequestArgs, type SlicedCookieAttributes, type V2WebLog, type WebLog, checkMitataCookie, checkNetaceaCookieV3, configureMitataExpiry, cookieIsNetaceaV3Format, correctTimeout, createMitataCookie, createNetaceaCookieV3, defaultInvalidResponse, dictionary_d as dictionary, generateId, hexSha256, ingestIgnoredIpValue, lib, matchMitataCookie, matchNetaceaCookieV3, objectIsNetaceaCookieV3, safeParseInt, warmupCookie };

package/dist/index.mjs

@@ -120,7 +120,8 @@ const matchMap = {
     6: 'organisation_',
     7: 'asn_',
     8: 'country_',
-    9: 'combination_'
+    9: 'combination_',
+    11: 'headerFP_' // b (base36)
 };
 const mitigateMap = {
     0: '',
@@ -200,7 +201,7 @@ var dictionary = /*#__PURE__*/Object.freeze({
 // & a new MITIGATE cookie will be set
 const ingestIgnoredIpValue = 'ignored';
 const BASE_62_CHARSET = '1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');
-const mitataCookieRegExp = /^(.*)_\/@#\/(.*)_\/@#\/(.*)_\/@#\/(.*)_\/@#\/((\d)(\d)(\d))$/;
+const mitataCookieRegExp = /^(.*)_\/@#\/(.*)_\/@#\/(.*)_\/@#\/(.*)_\/@#\/((\d|[a-z])(\d)(\d))$/i;
 function matchMitataCookie(netaceaCookie) {
     if (netaceaCookie === undefined) {
         return undefined;
@@ -214,7 +215,7 @@ function matchMitataCookie(netaceaCookie) {
             userId,
             ipHash,
             mitigationType,
-            match: parseInt(match),
+            match: parseInt(match, 36),
             mitigate: parseInt(mitigate),
             captcha: parseInt(captcha)
         };
@@ -589,4 +590,42 @@ const lib = {
     }
 };
 
-export { NetaceaCookieV3IssueReason, NetaceaIngestType, NetaceaLogVersion, NetaceaMitigationType, checkMitataCookie, checkNetaceaCookieV3, configureMitataExpiry, cookieIsNetaceaV3Format, correctTimeout, createMitataCookie, createNetaceaCookieV3, defaultInvalidResponse, dictionary, generateId, hexSha256, ingestIgnoredIpValue, lib, matchMitataCookie, matchNetaceaCookieV3, objectIsNetaceaCookieV3, safeParseInt, warmupCookie };
+class HashGenerator {
+    constructor(crypto) {
+        this.crypto = crypto;
+    }
+    async hashString(algorithm, data, sort = false) {
+        const headers = sort ? [...data].sort() : [...data];
+        const dataEncoded = new TextEncoder().encode(headers.join(','));
+        const hashBuffer = await this.crypto.subtle.digest(algorithm, dataEncoded);
+        const hashArray = Array.from(new Uint8Array(hashBuffer));
+        const hashHex = hashArray
+            .map(b => b.toString(16).padStart(2, '0'))
+            .join('')
+            .substring(0, 12);
+        return 'h' + (sort ? 's' : '') + `_${data.length}_${hashHex}`;
+    }
+    static filterHeaderNames(headerNames) {
+        const keys = headerNames
+            .filter(headerName => {
+            const lower = headerName.toLowerCase();
+            return !['', 'cookie', 'referer'].includes(lower) && lower.match(/^(x-netacea-|cloudfront-)/i) === null;
+        });
+        return keys;
+    }
+    async hashHeaders(headerNames, sort = false) {
+        const filteredHeaderNames = HashGenerator.filterHeaderNames(headerNames);
+        if (filteredHeaderNames.length === 0) {
+            return '';
+        }
+        try {
+            return await this.hashString('SHA-256', filteredHeaderNames, sort);
+        }
+        catch (e) {
+            console.error(e);
+            return '';
+        }
+    }
+}
+
+export { HashGenerator, NetaceaCookieV3IssueReason, NetaceaIngestType, NetaceaLogVersion, NetaceaMitigationType, checkMitataCookie, checkNetaceaCookieV3, configureMitataExpiry, cookieIsNetaceaV3Format, correctTimeout, createMitataCookie, createNetaceaCookieV3, defaultInvalidResponse, dictionary, generateId, hexSha256, ingestIgnoredIpValue, lib, matchMitataCookie, matchNetaceaCookieV3, objectIsNetaceaCookieV3, safeParseInt, warmupCookie };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@netacea/netaceaintegrationbase",
-    "version": "2.0.52",
+    "version": "2.0.54",
     "description": "Base package for Netacea CDN integrations.",
     "type": "module",
     "types": "dist/index.d.ts",
@@ -24,7 +24,7 @@
     },
     "license": "UNLICENSED",
     "dependencies": {
-        "@netacea/kinesisingest": "^1.5.70"
+        "@netacea/kinesisingest": "^1.5.72"
     },
-    "gitHead": "80732378d96f2330deec92daa70ad0effa4e066a"
+    "gitHead": "86f4865b9ce674da9b9a6e03cfa94fc1b9e384c1"
 }