Merge branch 'next'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brightsec/cli",
-  "version": "12.4.0",
+  "version": "12.5.0-next.2",
   "private": false,
   "repository": {
     "type": "git",

src/Commands/GetEntryPoints.ts

@@ -58,7 +58,8 @@ export class GetEntryPoints implements CommandModule {
             insecure: args.insecure as boolean,
             baseURL: args.api as string,
             apiKey: args.token as string,
-            proxyURL: (args.proxyBright ?? args.proxy) as string
+            proxyURL: (args.proxyBright ?? args.proxy) as string,
+            timeout: args.timeout as number
           }
         })
       );

src/Commands/PollingScanStatus.ts

@@ -53,7 +53,8 @@ export class PollingScanStatus implements CommandModule {
             insecure: args.insecure as boolean,
             baseURL: args.api as string,
             apiKey: args.token as string,
-            proxyURL: (args.proxyBright ?? args.proxy) as string
+            proxyURL: (args.proxyBright ?? args.proxy) as string,
+            timeout: args.timeout as number
           }
         })
       );

src/Commands/RetestScan.ts

@@ -27,7 +27,8 @@ export class RetestScan implements CommandModule {
             insecure: args.insecure as boolean,
             baseURL: args.api as string,
             apiKey: args.token as string,
-            proxyURL: (args.proxyBright ?? args.proxy) as string
+            proxyURL: (args.proxyBright ?? args.proxy) as string,
+            timeout: args.timeout as number
           }
         })
       );

src/Commands/RunRepeater.ts

@@ -141,8 +141,8 @@ export class RunRepeater implements CommandModule {
         daemon: 'remove-daemon',
         ntlm: [
           'proxy',
-          'proxy-external',
-          'proxy-internal',
+          'proxy-bright',
+          'proxy-target',
           'experimental-connection-reuse'
         ]
       })
@@ -205,7 +205,7 @@ export class RunRepeater implements CommandModule {
               useValue: {
                 uri: args.repeaterServer as string,
                 token: args.token as string,
-                connectTimeout: 10000,
+                connectTimeout: args.timeout as number,
                 proxyUrl: (args.proxyBright ?? args.proxy) as string,
                 insecure: args.insecure as boolean
               }

src/Commands/RunScan.ts

@@ -171,7 +171,8 @@ export class RunScan implements CommandModule {
             insecure: args.insecure as boolean,
             baseURL: args.api as string,
             apiKey: args.token as string,
-            proxyURL: (args.proxyBright ?? args.proxy) as string
+            proxyURL: (args.proxyBright ?? args.proxy) as string,
+            timeout: args.timeout as number
           }
         })
       );

src/Commands/StopScan.ts

@@ -27,7 +27,8 @@ export class StopScan implements CommandModule {
             insecure: args.insecure as boolean,
             baseURL: args.api as string,
             apiKey: args.token as string,
-            proxyURL: (args.proxyBright ?? args.proxy) as string
+            proxyURL: (args.proxyBright ?? args.proxy) as string,
+            timeout: args.timeout as number
           }
         })
       );

src/Commands/UploadArchive.ts

@@ -86,7 +86,8 @@ export class UploadArchive implements CommandModule {
             insecure: args.insecure as boolean,
             baseURL: args.api as string,
             apiKey: args.token as string,
-            proxyURL: (args.proxyBright ?? args.proxy) as string
+            proxyURL: (args.proxyBright ?? args.proxy) as string,
+            timeout: args.timeout as number
           }
         });
       });

src/Config/CliBuilder.ts

@@ -65,19 +65,25 @@ export class CliBuilder {
           'Specify a proxy URL to route all traffic through. This should be an HTTP(S), SOCKS4, or SOCKS5 URL. By default, if you specify SOCKS://<URL>, then SOCKS5h is applied.'
       })
       .option('proxy-bright', {
-        alias: 'proxy-external',
         requiresArg: true,
         describe:
           'Specify a proxy URL to route all outbound traffic through. For more information, see the --proxy option.'
       })
       .option('proxy-target', {
-        alias: 'proxy-internal',
         requiresArg: true,
         describe:
           'Specify a proxy URL to route all inbound traffic through. For more information, see the --proxy option.'
       })
+      .option('timeout', {
+        describe: 'Request timeout in seconds',
+        default: 30,
+        type: 'number',
+        coerce(arg: number) {
+          return arg * 1000;
+        }
+      })
       .conflicts({
-        proxy: ['proxy-internal', 'proxy-external'],
+        proxy: ['proxy-bright', 'proxy-target'],
         hostname: 'cluster'
       })
       .middleware((args: Arguments) => {

src/EntryPoint/RestEntryPoints.ts

@@ -24,13 +24,7 @@ export class RestEntryPoints implements EntryPoints {
   constructor(
     @inject(ProxyFactory) private readonly proxyFactory: ProxyFactory,
     @inject(RestProjectsOptions)
-    {
-      baseURL,
-      apiKey,
-      insecure,
-      proxyURL,
-      timeout = 10000
-    }: RestProjectsOptions
+    { baseURL, apiKey, insecure, proxyURL, timeout }: RestProjectsOptions
   ) {
     const {
       httpAgent = new http.Agent(),

src/Scan/RestScans.ts

@@ -35,7 +35,7 @@ export class RestScans implements Scans {
     @inject(delay(() => CliInfo)) private readonly info: CliInfo,
     @inject(ProxyFactory) private readonly proxyFactory: ProxyFactory,
     @inject(RestScansOptions)
-    { baseURL, apiKey, insecure, proxyURL, timeout = 10000 }: RestScansOptions
+    { baseURL, apiKey, insecure, proxyURL, timeout }: RestScansOptions
   ) {
     const {
       httpAgent = new http.Agent(),