Increase pwd obfuscation min length [ci fast]

Signed-off-by: Paolo Di Tommaso <[email protected]>

Author: pditommaso

modules/nextflow/src/main/groovy/nextflow/util/ProxyConfig.groovy

@@ -41,7 +41,7 @@ class ProxyConfig {
         def result = protocol ? "protocol=$protocol; host=$host" : "host=$host"
         if( port ) result += "; port=$port"
         if( username ) result += "; username=$username"
-        if( password ) result += "; password=${password.redact()}"
+        if( password ) result += "; password=${StringUtils.redact(password)}"
         return "ProxyConfig[$result]"
     }
 

modules/nextflow/src/test/groovy/nextflow/scm/RepositoryProviderTest.groovy

@@ -80,8 +80,8 @@ class RepositoryProviderTest extends Specification {
         when:
         result = provider.getAuthObfuscated()
         then:
-        provider.getUser() >> 'foo123'
-        provider.getPassword() >> 'bar456'
+        provider.getUser() >> 'foo1234567890'
+        provider.getPassword() >> 'bar4567890'
         and:
         result == 'foo****:bar****'
 

modules/nf-commons/src/main/nextflow/extension/Bolts.groovy

@@ -893,6 +893,7 @@ class Bolts {
         }
     }
 
+    @Deprecated
     static redact(String self, int max=5, String suffix='...') {
         if( !self )
             return self

modules/nf-commons/src/main/nextflow/util/StringUtils.groovy

@@ -98,7 +98,7 @@ class StringUtils {
         if( !value )
             return '(empty)'
         final str = value.toString()
-        return str.length()>=5 ? str[0..2] + '****' : '****'
+        return str.length()>=10 ? str[0..2] + '****' : '****'
     }
 
     static String redactUrlPassword(value) {

modules/nf-commons/src/test/nextflow/util/StringUtilsTest.groovy

@@ -86,12 +86,12 @@ class StringUtilsTest extends Specification {
         [foo:'Hello']                           | [foo:'Hello']
         [foo: [bar: 'World']]                   | [foo: [bar: 'World']]
         [foo: [password:'hola', token:'hi']]    | [foo: [password:'****', token:'****']]
-        [foo: [password:'12345678']]            | [foo: [password:'123****']]
+        [foo: [password:'1234567890']]          | [foo: [password:'123****']]
         [foo: [customPassword:'hola']]          | [foo: [customPassword:'****']]
         [foo: [towerLicense:'hola']]            | [foo: [towerLicense:'****']]
         [url: 'redis://host:port']              | [url: 'redis://host:port']
-        [url: 'redis://secret@host:port']       | [url: 'redis://sec****@host:port']
-        [url: 'ftp://secret@host:port/x/y']     | [url: 'ftp://sec****@host:port/x/y']
+        [url: 'redis://secret@host:port']       | [url: 'redis://****@host:port']
+        [url: 'ftp://secretlong@host:port/x/y'] | [url: 'ftp://sec****@host:port/x/y']
     }
 
     @Unroll
@@ -117,9 +117,9 @@ class StringUtilsTest extends Specification {
         where:
         SECRET          | EXPECTED
         'hi'            | '****'
-        'Hello'         | 'Hel****'
-        'World'         | 'Wor****'
-        '12345678'      | '123****'
+        'Hello'         | '****'
+        'World'         | '****'
+        '1234567890'    | '123****'
         'hola'          | '****'
         null            | '(null)'
         ''              | '(empty)'
@@ -134,7 +134,7 @@ class StringUtilsTest extends Specification {
         SECRET                  | EXPECTED
         'hi'                    | 'hi'
         'http://foo/bar'        | 'http://foo/bar'
-        'http://secret@foo/bar' | 'http://sec****@foo/bar'
+        'http://secret@foo/bar' | 'http://****@foo/bar'
     }
 
     def 'should check ipv6' () {

plugins/nf-azure/src/main/nextflow/cloud/azure/config/AzBatchOpts.groovy

@@ -23,6 +23,8 @@ import java.util.regex.Pattern
 import groovy.transform.CompileStatic
 import nextflow.cloud.CloudTransferOptions
 import nextflow.util.Duration
+import nextflow.util.StringUtils
+
 /**
  * Model Azure Batch pool config settings
  *
@@ -88,7 +90,7 @@ class AzBatchOpts implements CloudTransferOptions {
     }
 
     String toString() {
-        "endpoint=$endpoint; account-name=$accountName; account-key=${accountKey?.redact()}"
+        "endpoint=$endpoint; account-name=$accountName; account-key=${StringUtils.redact(accountKey)}"
     }
 
     private List<String> endpointParts() {