Merge branch 'next'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brightsec/cli",
-  "version": "11.2.0",
+  "version": "11.3.0-next.1",
   "private": false,
   "repository": {
     "type": "git",
@@ -35,8 +35,9 @@
     "better-ajv-errors": "^1.2.0",
     "chalk": "^4.1.2",
     "ci-info": "^3.8.0",
-    "content-type": "^1.0.4",
+    "fast-content-type-parse": "^1.1.0",
     "find-up": "^5.0.0",
+    "iconv-lite": "^0.6.3",
     "js-yaml": "^4.1.0",
     "ms": "^2.1.3",
     "reflect-metadata": "^0.1.13",
@@ -60,7 +61,6 @@
     "@semantic-release/exec": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "@types/amqplib": "~0.8.2",
-    "@types/content-type": "^1.1.5",
     "@types/har-format": "^1.2.7",
     "@types/jest": "^28.1.7",
     "@types/js-yaml": "^4.0.2",

src/Archive/Validators/HarValidator.ts

@@ -47,7 +47,7 @@ export class HarValidator implements Validator<Har> {
       .map(this.parseEntry, this)
       .filter((item: string) => !!item);
 
-    const targets: string[] = [...new Set(urls).values()];
+    const targets: string[] = [...new Set(urls)];
 
     return targets.length !== 0;
   }

src/Handlers/Events/ForwardResponse.ts

@@ -10,20 +10,23 @@ export class ForwardResponse implements Event {
   public readonly protocol?: Protocol;
   public readonly headers?: Record<string, string | string[]>;
   public readonly body?: string;
+  public readonly encoding?: 'base64';
 
   constructor(
     protocol: Protocol,
     body: string,
     headers: Record<string, string | string[]>,
     statusCode?: number,
     errorCode?: string,
-    message?: string
+    message?: string,
+    encoding?: 'base64'
   ) {
     this.protocol = protocol;
     this.body = body;
     this.headers = headers;
     this.status_code = statusCode;
     this.error_code = errorCode;
     this.message = message;
+    this.encoding = encoding;
   }
 }

src/Handlers/SendRequestHandler.ts

@@ -19,16 +19,24 @@ export class SendRequestHandler
       new Request({ ...event, correlationIdRegex: event.correlation_id_regex })
     );
 
-    const { statusCode, message, errorCode, body, headers, protocol } =
-      response;
+    const {
+      statusCode,
+      message,
+      errorCode,
+      body,
+      headers,
+      protocol,
+      encoding
+    } = response;
 
     return new ForwardResponse(
       protocol,
       body,
       headers,
       statusCode,
       errorCode,
-      message
+      message,
+      encoding
     );
   }
 }

src/Repeater/RepeaterServer.ts

@@ -12,6 +12,9 @@ export interface RepeaterServerRequestEvent {
   headers?: Record<string, string | string[]>;
   correlationIdRegex?: string;
   body?: string;
+  encoding?: 'base64';
+  maxContentSize?: number;
+  timeout?: number;
 }
 
 export type RepeaterServerNetworkTestEvent =

src/Repeater/ServerRepeaterLauncher.ts

@@ -187,16 +187,24 @@ export class ServerRepeaterLauncher implements RepeaterLauncher {
       new Request({ ...event })
     );
 
-    const { statusCode, message, errorCode, body, headers, protocol } =
-      response;
+    const {
+      statusCode,
+      message,
+      errorCode,
+      body,
+      headers,
+      protocol,
+      encoding
+    } = response;
 
     return {
       protocol,
       body,
       headers,
       statusCode,
       errorCode,
-      message
+      message,
+      encoding
     };
   }
 }