diff options
| author | Julien HENRY <julien.henry@sonarsource.com> | 2014-10-02 17:50:04 +0200 |
|---|---|---|
| committer | Julien HENRY <julien.henry@sonarsource.com> | 2014-10-02 17:52:24 +0200 |
| commit | a5d9aeea1d086bbffb8f2f864651416494abb0b4 (patch) | |
| tree | fbe41af6757604f34540fafc0318c6d6cef3c620 /plugins | |
| parent | 2d60412e140a950436349f80f928c0e3a073c287 (diff) | |
| download | sonarqube-a5d9aeea1d086bbffb8f2f864651416494abb0b4.tar.gz sonarqube-a5d9aeea1d086bbffb8f2f864651416494abb0b4.zip | |
SONAR-5643 Hide SVN password and rework logging
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnBlameCommand.java | 8 | ||||
| -rw-r--r-- | plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnConfiguration.java | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnBlameCommand.java b/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnBlameCommand.java index 147d9644621..11fbf2b9f91 100644 --- a/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnBlameCommand.java +++ b/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnBlameCommand.java @@ -58,7 +58,7 @@ public class SvnBlameCommand implements BlameCommand, BatchComponent { @Override public void blame(final FileSystem fs, Iterable<InputFile> files, final BlameResult result) { - LOG.info("Working directory: " + fs.baseDir().getAbsolutePath()); + LOG.debug("Working directory: " + fs.baseDir().getAbsolutePath()); ExecutorService executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() + 1); List<Future<Void>> tasks = new ArrayList<Future<Void>>(); for (InputFile inputFile : files) { @@ -95,7 +95,7 @@ public class SvnBlameCommand implements BlameCommand, BatchComponent { } public int execute(Command cl, StreamConsumer consumer, StreamConsumer stderr) { - LOG.info("Executing: " + cl); + LOG.debug("Executing: " + cl); return commandExecutor.execute(cl, consumer, stderr, 0); } @@ -121,11 +121,11 @@ public class SvnBlameCommand implements BlameCommand, BatchComponent { String username = configuration.username(); if (username != null) { cl.addArgument("--username"); - cl.addArgument(username); + cl.addMaskedArgument(username); String password = configuration.password(); if (password != null) { cl.addArgument("--password"); - cl.addArgument(password); + cl.addMaskedArgument(password); } } if (configuration.trustServerCert()) { diff --git a/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnConfiguration.java b/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnConfiguration.java index 79da661fe83..6ecb618dce4 100644 --- a/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnConfiguration.java +++ b/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnConfiguration.java @@ -37,7 +37,7 @@ public class SvnConfiguration implements BatchComponent { private static final String CATEGORY_SVN = "SVN"; private static final String USER_PROP_KEY = "sonar.svn.username"; - private static final String PASSWORD_PROP_KEY = "sonar.svn.password"; + private static final String PASSWORD_PROP_KEY = "sonar.svn.password.secured"; private static final String CONFIG_DIR_PROP_KEY = "sonar.svn.config_dir"; private static final String TRUST_SERVER_PROP_KEY = "sonar.svn.trust_server_cert"; private final Settings settings; @@ -60,7 +60,7 @@ public class SvnConfiguration implements BatchComponent { PropertyDefinition.builder(PASSWORD_PROP_KEY) .name("Password") .description("Password to be used for SVN authentication") - .type(PropertyType.STRING) + .type(PropertyType.PASSWORD) .onQualifiers(Qualifiers.PROJECT) .category(CoreProperties.CATEGORY_SCM) .subCategory(CATEGORY_SVN) |