Fix missing dependency on directly used trilead-api (#284)

jenkinsci · Mar 25, 2024 · c73117e · c73117e
1 parent ff80157
commit c73117e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -205,6 +205,10 @@ THE SOFTWARE.
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>ssh-credentials</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>trilead-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>scm-api</artifactId>

diff --git a/src/main/java/hudson/scm/SubversionSCM.java b/src/main/java/hudson/scm/SubversionSCM.java
@@ -68,6 +68,7 @@
 import hudson.init.InitMilestone;
 
 import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -128,6 +129,7 @@
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -139,7 +141,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
-import java.util.Random;
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.UUID;
@@ -195,9 +196,7 @@
 
 import com.trilead.ssh2.DebugLogger;
 import com.trilead.ssh2.SCPClient;
-import com.trilead.ssh2.crypto.Base64;
 import static java.util.stream.Collectors.toList;
-import edu.umd.cs.findbugs.annotations.NonNull;
 import jenkins.MasterToSlaveFileCallable;
 import jenkins.util.JenkinsJVM;
 import org.kohsuke.stapler.interceptor.RequirePOST;
@@ -2070,20 +2069,16 @@ public static final class SslClientCertificateCredential extends Credential {
 
             public SslClientCertificateCredential(File certificate, String password) throws IOException {
                 this.password = Secret.fromString(Scrambler.scramble(password));
-                this.certificate = Secret.fromString(new String(Base64.encode(FileUtils.readFileToByteArray(certificate))));
+                this.certificate = Secret.fromString(new String(Base64.getEncoder().encode(FileUtils.readFileToByteArray(certificate)), StandardCharsets.UTF_8));
             }
 
             @Override
             public SVNAuthentication createSVNAuthentication(String kind) {
                 if(kind.equals(ISVNAuthenticationManager.SSL))
-                    try {
-                        return SVNSSLAuthentication.newInstance(
-                                Base64.decode(certificate.getPlainText().toCharArray()),
-                                Scrambler.descramble(Secret.toString(password)).toCharArray(),
-                                false, null, false);
-                    } catch (IOException e) {
-                        throw new Error(e); // can't happen
-                    }
+                    return SVNSSLAuthentication.newInstance(
+                            Base64.getDecoder().decode(certificate.getPlainText()),
+                            Scrambler.descramble(Secret.toString(password)).toCharArray(),
+                            false, null, false);
                 else
                     return null; // unexpected authentication type
             }
@@ -3324,6 +3319,8 @@ public FormValidation doCheckLocal(@QueryParameter String value) throws IOExcept
      * Enables trace logging of Ganymed SSH library.
      * <p>
      * Intended to be invoked from Groovy console.
+     * @deprecated
+     *      Logging all goes to JDK java.util.logging
      */
     public static void enableSshDebug(Level level) {
         if(level==null)     level= Level.FINEST; // default