From 32d077b6a13018e30fc01b397b23f3e8e34c740a Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Mon, 11 Apr 2016 10:10:41 +0200 Subject: [PATCH] SONAR-7533 Hide sonar.login property in analysis.log sent in the scanner report --- .../org/sonar/batch/report/AnalysisContextReportPublisher.java | 3 ++- .../sonar/batch/report/AnalysisContextReportPublisherTest.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/AnalysisContextReportPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/AnalysisContextReportPublisher.java index e76d215eb0b..d294f55db65 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/AnalysisContextReportPublisher.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/AnalysisContextReportPublisher.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; import java.util.TreeSet; +import org.sonar.api.CoreProperties; import org.sonar.api.batch.AnalysisMode; import org.sonar.api.batch.BatchSide; import org.sonar.api.batch.bootstrap.ProjectDefinition; @@ -174,6 +175,6 @@ public class AnalysisContextReportPublisher { } private static boolean sensitive(String key) { - return key.contains(".password") || key.contains(".secured"); + return key.equals(CoreProperties.LOGIN) || key.contains(".password") || key.contains(".secured"); } } diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/report/AnalysisContextReportPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/report/AnalysisContextReportPublisherTest.java index 9d82457263c..82e3346ca60 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/batch/report/AnalysisContextReportPublisherTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/report/AnalysisContextReportPublisherTest.java @@ -190,11 +190,13 @@ public class AnalysisContextReportPublisherTest { publisher.dumpModuleSettings(ProjectDefinition.create() .setProperty("sonar.projectKey", "foo") .setProperty("sonar.projectKey", "foo") + .setProperty("sonar.login", "my_token") .setProperty("sonar.password", "azerty") .setProperty("sonar.cpp.license.secured", "AZERTY")); assertThat(FileUtils.readFileToString(writer.getFileStructure().analysisLog())).containsSequence( "sonar.cpp.license.secured=******", + "sonar.login=******", "sonar.password=******", "sonar.projectKey=foo"); } -- 2.39.5