Merge branch 'next'

NeuraLegion · Nov 28, 2023 · ac94776 · ac94776
2 parents 61df16e + 29dbf69
commit ac94776
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@brightsec/cli",
-  "version": "11.3.0",
+  "version": "11.4.0-next.1",
   "private": false,
   "repository": {
     "type": "git",

diff --git a/src/Commands/RunRepeater.ts b/src/Commands/RunRepeater.ts
@@ -115,9 +115,14 @@ export class RunRepeater implements CommandModule {
         }
       })
       .option('experimental-connection-reuse', {
+        deprecate: 'Use --ntlm instead',
         boolean: true,
         describe: 'Configure experimental support for TCP connections reuse'
       })
+      .option('ntlm', {
+        boolean: true,
+        describe: 'Configure ntlm support (enables TCP connection reuse)'
+      })
       .option('daemon', {
         requiresArg: false,
         alias: 'd',
@@ -141,6 +146,9 @@ export class RunRepeater implements CommandModule {
       .conflicts('experimental-connection-reuse', 'proxy')
       .conflicts('experimental-connection-reuse', 'proxy-external')
       .conflicts('experimental-connection-reuse', 'proxy-internal')
+      .conflicts('ntlm', 'proxy')
+      .conflicts('ntlm', 'proxy-external')
+      .conflicts('ntlm', 'proxy-internal')
       .conflicts('proxy-external', 'proxy')
       .conflicts('proxy-internal', 'proxy')
       .env('REPEATER')
@@ -171,7 +179,8 @@ export class RunRepeater implements CommandModule {
               proxyUrl: (args.proxyInternal ?? args.proxy) as string,
               certs: args.cert as Cert[],
               maxContentLength: 100,
-              reuseConnection: !!args.experimentalConnectionReuse,
+              reuseConnection:
+                !!args.ntlm || !!args.experimentalConnectionReuse,
               whitelistMimes: [
                 'text/html',
                 'text/plain',

diff --git a/src/Repeater/ServerRepeaterLauncher.ts b/src/Repeater/ServerRepeaterLauncher.ts
@@ -154,7 +154,11 @@ export class ServerRepeaterLauncher implements RepeaterLauncher {
       )
     );
     this.repeaterServer.reconnectionAttempted(({ attempt, maxAttempts }) =>
-      logger.warn('Failed to connect (attempt %d/%d)', attempt, maxAttempts)
+      logger.warn(
+        'Failed to connect to Bright cloud (attempt %d/%d)',
+        attempt,
+        maxAttempts
+      )
     );
     this.repeaterServer.reconnectionSucceeded(() =>
       logger.log('The Repeater (%s) connected', this.info.version)