JENKINS-44050: Git SSH credentials are not passed to the plugin

Fixed SSH credentials handling (private key was not passed to the plugin)
jenkinsci · May 5, 2017 · 72b5182 · 72b5182
1 parent e7e7daa
commit 72b5182
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/main/java/com/itemis/jenkins/plugins/unleash/UnleashMavenBuildWrapper.java b/src/main/java/com/itemis/jenkins/plugins/unleash/UnleashMavenBuildWrapper.java
@@ -84,6 +84,7 @@ public class UnleashMavenBuildWrapper extends BuildWrapper {
   private static String ENV_VAR_SCM_USERNAME = "UNLEASH_SCM_USERNAME";
   private static String ENV_VAR_SCM_PASSWORD = "UNLEASH_SCM_PASSWORD";
   private static String ENV_VAR_SCM_SSH_PASSPHRASE = "UNLEASH_SCM_SSH_PASSPHRASE";
+  private static String ENV_VAR_SCM_SSH_PRIVATE_KEY = "UNLEASH_SCM_SSH_PRIVATE_KEY";
 
   private String goals = DescriptorImpl.DEFAULT_GOALS;
   private String profiles = DescriptorImpl.DEFAULT_PROFILES;
@@ -222,6 +223,7 @@ private Map<String, String> updateCommandWithScmCredentials(AbstractBuild build,
     String scmUsername = null;
     String scmPassword = null;
     String scmSshPassphrase = null;
+    String scmSshPrivateKey = null;
     if (StringUtils.isNotBlank(this.credentialsId)) {
       StandardUsernameCredentials credentials = CredentialsProvider.findCredentialById(this.credentialsId,
           StandardUsernameCredentials.class, build, URIRequirementBuilder.create().build());
@@ -233,6 +235,7 @@ private Map<String, String> updateCommandWithScmCredentials(AbstractBuild build,
         SSHUserPrivateKey c = (SSHUserPrivateKey) credentials;
         Secret passphrase = c.getPassphrase();
         scmSshPassphrase = passphrase != null ? passphrase.getPlainText() : null;
+        scmSshPrivateKey = c.getPrivateKey();
       }
     }
 
@@ -249,6 +252,10 @@ private Map<String, String> updateCommandWithScmCredentials(AbstractBuild build,
       command.append(" -Dunleash.scmSshPassphraseEnvVar=" + ENV_VAR_SCM_SSH_PASSPHRASE);
       scmEnv.put(ENV_VAR_SCM_SSH_PASSPHRASE, scmSshPassphrase);
     }
+    if (scmSshPrivateKey != null) {
+      command.append(" -Dunleash.scmSshPrivateKeyEnvVar=" + ENV_VAR_SCM_SSH_PRIVATE_KEY);
+      scmEnv.put(ENV_VAR_SCM_SSH_PRIVATE_KEY, scmSshPrivateKey);
+    }
     return scmEnv;
   }