Add support of auth with sonar.login/sonar.password

Author: henryju

lib/src/main/java/org/sonarsource/scanner/lib/ScannerProperties.java

@@ -46,4 +46,14 @@ public interface ScannerProperties {
    */
   String SONAR_TOKEN = "sonar.token";
 
+  /**
+   * Authentication username for connecting to the Sonar server.
+   */
+  String SONAR_LOGIN = "sonar.login";
+
+  /**
+   * Authentication password for connecting to the Sonar server.
+   */
+  String SONAR_PASSWORD = "sonar.password";
+
 }

lib/src/main/java/org/sonarsource/scanner/lib/internal/http/ServerConnection.java

@@ -39,19 +39,19 @@
 import org.sonarsource.scanner.lib.internal.cache.Logger;
 
 import static java.lang.String.format;
-import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class ServerConnection {
 
   private final String baseUrlWithoutTrailingSlash;
   private final String userAgent;
   private final OkHttpClient httpClient;
 
-  private final String token;
+  @Nullable
+  private final String credentials;
   private final Logger logger;
 
-  ServerConnection(String baseUrl, String userAgent, @Nullable String token, Logger logger, Map<String, String> bootstrapProperties, SonarUserHome sonarUserHome) {
-    this.token = token;
+  ServerConnection(String baseUrl, String userAgent, @Nullable String credentials, Logger logger, Map<String, String> bootstrapProperties, SonarUserHome sonarUserHome) {
+    this.credentials = credentials;
     this.logger = logger;
     this.baseUrlWithoutTrailingSlash = removeTrailingSlash(baseUrl);
     this.userAgent = userAgent;
@@ -66,7 +66,12 @@ public static ServerConnection create(Map<String, String> bootstrapProperties, L
     String serverUrl = bootstrapProperties.get("sonar.host.url");
     String userAgent = format("%s/%s", bootstrapProperties.get(InternalProperties.SCANNER_APP), bootstrapProperties.get(InternalProperties.SCANNER_APP_VERSION));
     String token = bootstrapProperties.get(ScannerProperties.SONAR_TOKEN);
-    return new ServerConnection(serverUrl, userAgent, token, logger, bootstrapProperties, sonarUserHome);
+    String login = bootstrapProperties.getOrDefault(ScannerProperties.SONAR_LOGIN, token);
+    String credentials = null;
+    if (login != null) {
+      credentials = Credentials.basic(login, bootstrapProperties.getOrDefault(ScannerProperties.SONAR_PASSWORD, ""));
+    }
+    return new ServerConnection(serverUrl, userAgent, credentials, logger, bootstrapProperties, sonarUserHome);
   }
 
   /**
@@ -118,8 +123,8 @@ private ResponseBody callUrl(String url) throws IOException {
         .get()
         .url(url)
         .addHeader("User-Agent", userAgent);
-      if (token != null) {
-        requestBuilder.header("Authorization", Credentials.basic(token, "", UTF_8));
+      if (credentials != null) {
+        requestBuilder.header("Authorization", credentials);
       }
       Request request = requestBuilder.build();
       Response response = httpClient.newCall(request).execute();

lib/src/test/java/org/sonarsource/scanner/lib/internal/http/ServerConnectionTest.java

@@ -23,6 +23,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
@@ -33,7 +34,9 @@
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -129,6 +132,37 @@ void should_support_server_url_with_trailing_slash() throws Exception {
     assertThat(content).isEqualTo(HELLO_WORLD);
   }
 
+  @Test
+  void should_authenticate_with_token() throws Exception {
+    Map<String, String> props = new HashMap<>();
+    props.put("sonar.host.url", sonarqube.baseUrl());
+    props.put("sonar.token", "some_token");
+    ServerConnection connection = ServerConnection.create(props, logger, new SonarUserHome(sonarUserHome));
+
+    answer(HELLO_WORLD);
+    String content = connection.downloadString("/batch/index.txt");
+    assertThat(content).isEqualTo(HELLO_WORLD);
+
+    sonarqube.verify(getRequestedFor(anyUrl())
+      .withHeader("Authorization", equalTo("Basic " + Base64.getEncoder().encodeToString("some_token:".getBytes(StandardCharsets.UTF_8)))));
+  }
+
+  @Test
+  void should_authenticate_with_username_password() throws Exception {
+    Map<String, String> props = new HashMap<>();
+    props.put("sonar.host.url", sonarqube.baseUrl());
+    props.put("sonar.login", "some_username");
+    props.put("sonar.password", "some_password");
+    ServerConnection connection = ServerConnection.create(props, logger, new SonarUserHome(sonarUserHome));
+
+    answer(HELLO_WORLD);
+    String content = connection.downloadString("/batch/index.txt");
+    assertThat(content).isEqualTo(HELLO_WORLD);
+
+    sonarqube.verify(getRequestedFor(anyUrl())
+      .withHeader("Authorization", equalTo("Basic " + Base64.getEncoder().encodeToString("some_username:some_password".getBytes(StandardCharsets.UTF_8)))));
+  }
+
   private ServerConnection create() {
     return new ServerConnection(sonarqube.baseUrl(), "user-agent", null, logger, Map.of(), new SonarUserHome(sonarUserHome));
   }