ensure ssh private key ends with newline (#213)

jenkinsci · Jul 12, 2022 · a991d19 · a991d19
1 parent c564958
commit a991d19
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...ain/java/com/datapipe/jenkins/vault/credentials/common/VaultSSHUserPrivateKeyBinding.java b/...ain/java/com/datapipe/jenkins/vault/credentials/common/VaultSSHUserPrivateKeyBinding.java
@@ -67,7 +67,6 @@ public MultiEnvironment bind(Run<?, ?> build, FilePath workspace, Launcher launc
         StringBuilder contents = new StringBuilder();
         for (String key : sshKey.getPrivateKeys()) {
             contents.append(key);
-            contents.append('\n');
         }
         keyFile.write(contents.toString(), "UTF-8");
         if (launcher.isUnix()) {

diff --git a/src/main/java/com/datapipe/jenkins/vault/credentials/common/VaultSSHUserPrivateKeyImpl.java b/src/main/java/com/datapipe/jenkins/vault/credentials/common/VaultSSHUserPrivateKeyImpl.java
@@ -90,7 +90,10 @@ public String getPrivateKey() {
     @NonNull
     @Override
     public List<String> getPrivateKeys() {
-        return Collections.singletonList(getPrivateKey());
+        String key = getPrivateKey();
+        // ensure keys end with newline to match the reference implementation
+        // https://github.com/jenkinsci/ssh-credentials-plugin/blob/d141a312701bc9a04de18ac9f97dffdbae19f978/src/main/java/com/cloudbees/jenkins/plugins/sshcredentials/impl/BasicSSHUserPrivateKey.java#L177
+        return Collections.singletonList(key.endsWith("\n") ? key : key + "\n");
     }
 
     @NonNull