Merge pull request #147 from Brenne/fix/credentials

Fixes #146 credentials of index-url parameter end up in stdout
xvik · Nov 6, 2024 · 3a093c9 · 3a093c9
2 parents 7ae5ddd + ef92bde
commit 3a093c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/groovy/ru/vyarus/gradle/plugin/python/util/CliUtils.groovy b/src/main/groovy/ru/vyarus/gradle/plugin/python/util/CliUtils.groovy
@@ -22,7 +22,7 @@ final class CliUtils {
     private static final String SPACE = ' '
     private static final String VERSION_SPLIT = '\\.'
     private static final String BACKSLASH = '\\'
-    private static final Pattern PIP_CREDENTIALS = Pattern.compile(' --extra-index-url +https?://[^:]+:([^@]+)@')
+    private static final Pattern PIP_CREDENTIALS = Pattern.compile(' --(?>extra-)?index-url +https?://[^:]+:([^@]+)@')
 
     private CliUtils() {
     }
@@ -291,7 +291,7 @@ final class CliUtils {
      * @return string with cleared passwords
      */
     static String hidePipCredentials(String cmd) {
-        if (!cmd.contains(' --extra-index-url ')) {
+        if (!cmd.contains(' --extra-index-url ') && !cmd.contains(' --index-url ')) {
             return cmd
         }
         int lastIndex = 0

diff --git a/src/test/groovy/ru/vyarus/gradle/plugin/python/util/CliUtilsTest.groovy b/src/test/groovy/ru/vyarus/gradle/plugin/python/util/CliUtilsTest.groovy
@@ -136,9 +136,12 @@ class CliUtilsTest extends Specification {
         'something else'                                                                                                            | 'something else'
         '-m pip no urls'                                                                                                            | '-m pip no urls'
         '-m pip something --extra-index-url http://some-url.com'                                                                    | '-m pip something --extra-index-url http://some-url.com'
+        '-m pip something --index-url http://some-url.com'                                                                          | '-m pip something --index-url http://some-url.com'
         '-m pip something --extra-index-url http://user:[email protected]'                                                          | '-m pip something --extra-index-url http://user:*****@some-url.com'
+        '-m pip something --index-url http://user:[email protected]'                                                                | '-m pip something --index-url http://user:*****@some-url.com'
         '-m pip something --extra-index-url  http://user:[email protected]'                                                         | '-m pip something --extra-index-url  http://user:*****@some-url.com'
         '-m pip something --extra-index-url http://user:[email protected] --extra-index-url http://user2:[email protected]'     | '-m pip something --extra-index-url http://user:*****@some-url.com --extra-index-url http://user2:*****@another-url.com'
+        '-m pip something --index-url http://user:[email protected] --extra-index-url http://user2:[email protected]'           | '-m pip something --index-url http://user:*****@some-url.com --extra-index-url http://user2:*****@another-url.com'
         '-m pip something --extra-index-url https://user:[email protected]'                                                         | '-m pip something --extra-index-url https://user:*****@some-url.com'
         '-m pip something --extra-index-url http://user:[email protected] something else'                                           | '-m pip something --extra-index-url http://user:*****@some-url.com something else'
         '-m pip --extra-index-url http://user:[email protected] something --extra-index-url http://user2:[email protected] end' | '-m pip --extra-index-url http://user:*****@some-url.com something --extra-index-url http://user2:*****@another-url.com end'