SCANJLIB-209, SCANJLIB-210, SCANJLIB-211 Support http properties

This is ported from the scanner engine

Author: henryju

lib/pom.xml

@@ -44,6 +44,11 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.github.hakky54</groupId>
+      <artifactId>sslcontext-kickstart</artifactId>
+      <version>8.3.4</version>
+    </dependency>
 
     <!-- unit tests -->
     <dependency>
@@ -78,6 +83,12 @@
       <version>3.5.4</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit-pioneer</groupId>
+      <artifactId>junit-pioneer</artifactId>
+      <version>2.2.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -110,6 +121,20 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <!-- Some tests are asserting on localized messages or dates -->
+          <systemPropertyVariables>
+            <user.language>en</user.language>
+            <user.country>US</user.country>
+          </systemPropertyVariables>
+          <environmentVariables>
+            <LANGUAGE>en_US</LANGUAGE>
+          </environmentVariables>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>

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

@@ -36,6 +36,7 @@ public class EnvironmentConfig {
   private static final String GENERIC_ENV_PREFIX = "SONAR_SCANNER_";
   private static final String SONAR_HOST_URL_ENV_VAR = "SONAR_HOST_URL";
   private static final String SONAR_USER_HOME_ENV_VAR = "SONAR_USER_HOME";
+  private static final String TOKEN_ENV_VARIABLE = "SONAR_TOKEN";
 
   private EnvironmentConfig() {
     // only static methods
@@ -49,6 +50,7 @@ static Map<String, String> load(Map<String, String> env, LogOutput logger) {
     var loadedProps = new HashMap<String, String>();
     Optional.ofNullable(env.get(SONAR_HOST_URL_ENV_VAR)).ifPresent(url -> loadedProps.put(ScannerProperties.HOST_URL, url));
     Optional.ofNullable(env.get(SONAR_USER_HOME_ENV_VAR)).ifPresent(path -> loadedProps.put(ScannerProperties.SONAR_USER_HOME, path));
+    Optional.ofNullable(env.get(TOKEN_ENV_VARIABLE)).ifPresent(path -> loadedProps.put(ScannerProperties.SONAR_TOKEN, path));
     env.forEach((key, value) -> {
       if (!key.equals(SONAR_SCANNER_JSON_PARAMS) && key.startsWith(GENERIC_ENV_PREFIX)) {
         processEnvVariable(key, value, loadedProps, logger);

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

@@ -19,6 +19,7 @@
  */
 package org.sonarsource.scanner.lib;
 
+import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -27,20 +28,19 @@
 import org.sonarsource.scanner.lib.internal.ClassloadRules;
 import org.sonarsource.scanner.lib.internal.InternalProperties;
 import org.sonarsource.scanner.lib.internal.IsolatedLauncherFactory;
+import org.sonarsource.scanner.lib.internal.SonarUserHome;
 
 /**
  * Entry point to run a Sonar analysis programmatically.
  */
 public class ScannerEngineBootstrapper {
 
   private static final String SONARCLOUD_HOST = "https://sonarcloud.io";
-  private final IsolatedLauncherFactory launcherFactory;
   private final LogOutput logOutput;
   private final Map<String, String> bootstrapProperties = new HashMap<>();
 
   public ScannerEngineBootstrapper(String app, String version, final LogOutput logOutput) {
     this.logOutput = logOutput;
-    this.launcherFactory = new IsolatedLauncherFactory(new LoggerAdapter(logOutput));
     this.setBootstrapProperty(InternalProperties.SCANNER_APP, app)
       .setBootstrapProperty(InternalProperties.SCANNER_APP_VERSION, version);
   }
@@ -71,6 +71,8 @@ public ScannerEngineFacade bootstrap() {
     ClassloadRules rules = new ClassloadRules(Collections.emptySet(), unmaskRules);
     var properties = Map.copyOf(bootstrapProperties);
     var isSonarCloud = getSonarCloudUrl().equals(properties.get(ScannerProperties.HOST_URL));
+    var sonarUserHome = properties.getOrDefault(ScannerProperties.SONAR_USER_HOME, Paths.get("").resolve(".sonar").toString());
+    var launcherFactory = new IsolatedLauncherFactory(new LoggerAdapter(logOutput), new SonarUserHome(Paths.get(sonarUserHome)));
     var launcher = launcherFactory.createLauncher(properties, rules);
     return new ScannerEngineFacade(properties, launcher, logOutput, isSonarCloud);
   }

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

@@ -41,4 +41,9 @@ public interface ScannerProperties {
    */
   String SONAR_USER_HOME = "sonar.userHome";
 
+  /**
+   * Authentication token for connecting to the Sonar server.
+   */
+  String SONAR_TOKEN = "sonar.token";
+
 }

lib/src/main/java/org/sonarsource/scanner/lib/internal/BootstrapIndexDownloader.java

@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import org.sonarsource.scanner.lib.internal.cache.Logger;
+import org.sonarsource.scanner.lib.internal.http.ServerConnection;
 
 class BootstrapIndexDownloader {
   private final ServerConnection conn;

lib/src/main/java/org/sonarsource/scanner/lib/internal/IsolatedLauncherFactory.java

@@ -26,24 +26,27 @@
 import javax.annotation.Nullable;
 import org.sonarsource.scanner.lib.internal.batch.IsolatedLauncher;
 import org.sonarsource.scanner.lib.internal.cache.Logger;
+import org.sonarsource.scanner.lib.internal.http.ServerConnection;
 
 public class IsolatedLauncherFactory {
   static final String ISOLATED_LAUNCHER_IMPL = "org.sonarsource.scanner.lib.internal.batch.BatchIsolatedLauncher";
   private final TempCleaning tempCleaning;
   private final String launcherImplClassName;
   private final Logger logger;
+  private final SonarUserHome sonarUserHome;
 
   /**
    * For unit tests
    */
-  IsolatedLauncherFactory(String isolatedLauncherClassName, TempCleaning tempCleaning, Logger logger) {
+  IsolatedLauncherFactory(String isolatedLauncherClassName, TempCleaning tempCleaning, Logger logger, SonarUserHome sonarUserHome) {
     this.tempCleaning = tempCleaning;
     this.launcherImplClassName = isolatedLauncherClassName;
     this.logger = logger;
+    this.sonarUserHome = sonarUserHome;
   }
 
-  public IsolatedLauncherFactory(Logger logger) {
-    this(ISOLATED_LAUNCHER_IMPL, new TempCleaning(logger), logger);
+  public IsolatedLauncherFactory(Logger logger, SonarUserHome sonarUserHome) {
+    this(ISOLATED_LAUNCHER_IMPL, new TempCleaning(logger), logger, sonarUserHome);
   }
 
   private IsolatedClassloader createClassLoader(List<File> jarFiles, ClassloadRules maskRules) {
@@ -61,8 +64,8 @@ public IsolatedLauncherAndClassloader createLauncher(Map<String, String> props,
       }
       return new IsolatedLauncherAndClassloader(new SimulatedLauncher(version, logger), null);
     }
-    ServerConnection serverConnection = ServerConnection.create(props, logger);
-    JarDownloader jarDownloader = new JarDownloaderFactory(serverConnection, logger, props.get("sonar.userHome")).create();
+    ServerConnection serverConnection = ServerConnection.create(props, logger, sonarUserHome);
+    JarDownloader jarDownloader = new JarDownloaderFactory(serverConnection, logger, sonarUserHome).create();
 
     return createLauncher(jarDownloader, rules);
   }

lib/src/main/java/org/sonarsource/scanner/lib/internal/JarDownloader.java

@@ -28,6 +28,7 @@
 import org.sonarsource.scanner.lib.internal.BootstrapIndexDownloader.JarEntry;
 import org.sonarsource.scanner.lib.internal.cache.FileCache;
 import org.sonarsource.scanner.lib.internal.cache.Logger;
+import org.sonarsource.scanner.lib.internal.http.ServerConnection;
 
 import static java.lang.String.format;
 

lib/src/main/java/org/sonarsource/scanner/lib/internal/JarDownloaderFactory.java

@@ -19,25 +19,24 @@
  */
 package org.sonarsource.scanner.lib.internal;
 
-import javax.annotation.Nullable;
 import org.sonarsource.scanner.lib.internal.cache.FileCache;
 import org.sonarsource.scanner.lib.internal.cache.FileCacheBuilder;
 import org.sonarsource.scanner.lib.internal.cache.Logger;
+import org.sonarsource.scanner.lib.internal.http.ServerConnection;
 
 class JarDownloaderFactory {
   private final ServerConnection serverConnection;
   private final Logger logger;
-  private final String userHome;
+  private final SonarUserHome sonarUserHome;
 
-  JarDownloaderFactory(ServerConnection conn, Logger logger, @Nullable String userHome) {
+  JarDownloaderFactory(ServerConnection conn, Logger logger, SonarUserHome sonarUserHome) {
     this.serverConnection = conn;
     this.logger = logger;
-    this.userHome = userHome;
+    this.sonarUserHome = sonarUserHome;
   }
 
   JarDownloader create() {
-    FileCache fileCache = new FileCacheBuilder(logger)
-      .setSonarUserHome(userHome)
+    FileCache fileCache = new FileCacheBuilder(logger, sonarUserHome)
       .build();
     BootstrapIndexDownloader bootstrapIndexDownloader = new BootstrapIndexDownloader(serverConnection, logger);
     JarDownloader.ScannerFileDownloader scannerFileDownloader = new JarDownloader.ScannerFileDownloader(serverConnection);