SONAR-22365 Fix SSF-571

1 files changed, 18 insertions, 6 deletions

diff --git a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubGlobalSettingsValidator.java b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubGlobalSettingsValidator.java
index f6758823fb9..780c184612d 100644
--- a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubGlobalSettingsValidator.java
+++ b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubGlobalSettingsValidator.java
@@ -20,6 +20,8 @@
 package org.sonar.alm.client.github;
 
 import java.util.Optional;
+import javax.annotation.Nullable;
+import org.apache.commons.lang3.StringUtils;
 import org.sonar.api.config.internal.Encryption;
 import org.sonar.api.config.internal.Settings;
 import org.sonar.api.server.ServerSide;
@@ -40,25 +42,35 @@ public class GithubGlobalSettingsValidator {
     this.githubApplicationClient = githubApplicationClient;
   }
 
-  public GithubAppConfiguration validate(AlmSettingDto settings) {
+  public GithubAppConfiguration validate(AlmSettingDto almSettingDto) {
+    return validate(almSettingDto.getAppId(), almSettingDto.getClientId(), almSettingDto.getClientSecret(), almSettingDto.getPrivateKey(), almSettingDto.getUrl());
+  }
+
+  public GithubAppConfiguration validate(@Nullable String applicationId, @Nullable String clientId, String clientSecret, String privateKey,  @Nullable String url) {
     long appId;
     try {
-      appId = Long.parseLong(Optional.ofNullable(settings.getAppId()).orElseThrow(() -> new IllegalArgumentException("Missing appId")));
+      appId = Long.parseLong(Optional.ofNullable(applicationId).orElseThrow(() -> new IllegalArgumentException("Missing appId")));
     } catch (NumberFormatException e) {
       throw new IllegalArgumentException("Invalid appId; " + e.getMessage());
     }
-    if (isBlank(settings.getClientId())) {
+    if (isBlank(clientId)) {
       throw new IllegalArgumentException("Missing Client Id");
     }
-    if (isBlank(settings.getDecryptedClientSecret(encryption))) {
+    if (isBlank(getDecryptedSettingValue(clientSecret))) {
       throw new IllegalArgumentException("Missing Client Secret");
     }
-    GithubAppConfiguration configuration = new GithubAppConfiguration(appId, settings.getDecryptedPrivateKey(encryption),
-      settings.getUrl());
+    GithubAppConfiguration configuration = new GithubAppConfiguration(appId, getDecryptedSettingValue(privateKey), url);
 
     githubApplicationClient.checkApiEndpoint(configuration);
     githubApplicationClient.checkAppPermissions(configuration);
 
     return configuration;
   }
+
+  private String getDecryptedSettingValue(String setting) {
+    if (StringUtils.isNotEmpty(setting) && encryption.isEncrypted(setting)) {
+      return encryption.decrypt(setting);
+    }
+    return setting;
+  }
 }