Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2021-10-19 07:07:14 +0000
committerThomas Wolf2021-10-19 07:07:14 +0000
commitf8b0c00e6a8f5628babff6dd37254a21589b6e44 (patch)
treeea41db1d77d77fd3d9d1ced1f8b7b2bb9f082755
parent7d4f3c22ab26b98b703873c3554fec514f109752 (diff)
downloadjgit-f8b0c00e6a8f5628babff6dd37254a21589b6e44.tar.gz
jgit-f8b0c00e6a8f5628babff6dd37254a21589b6e44.tar.xz
jgit-f8b0c00e6a8f5628babff6dd37254a21589b6e44.zip
Set JSch global config values only if not set already
Bug: 576604 Change-Id: I04415f07bf2023bc8435c097d1d3c65221d563f1 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
-rw-r--r--org.eclipse.jgit.ssh.jsch/src/org/eclipse/jgit/transport/ssh/jsch/JschConfigSessionFactory.java17
1 files changed, 15 insertions, 2 deletions
diff --git a/org.eclipse.jgit.ssh.jsch/src/org/eclipse/jgit/transport/ssh/jsch/JschConfigSessionFactory.java b/org.eclipse.jgit.ssh.jsch/src/org/eclipse/jgit/transport/ssh/jsch/JschConfigSessionFactory.java
index 453433e0c4..77b68bb034 100644
--- a/org.eclipse.jgit.ssh.jsch/src/org/eclipse/jgit/transport/ssh/jsch/JschConfigSessionFactory.java
+++ b/org.eclipse.jgit.ssh.jsch/src/org/eclipse/jgit/transport/ssh/jsch/JschConfigSessionFactory.java
@@ -45,6 +45,7 @@ import org.eclipse.jgit.transport.SshConstants;
import org.eclipse.jgit.transport.SshSessionFactory;
import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.util.FS;
+import org.eclipse.jgit.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -417,14 +418,26 @@ public class JschConfigSessionFactory extends SshSessionFactory {
*/
protected JSch createDefaultJSch(FS fs) throws JSchException {
final JSch jsch = new JSch();
- JSch.setConfig("ssh-rsa", JSch.getConfig("signature.rsa")); //$NON-NLS-1$ //$NON-NLS-2$
- JSch.setConfig("ssh-dss", JSch.getConfig("signature.dss")); //$NON-NLS-1$ //$NON-NLS-2$
+ // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=537790 and
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=576604
+ copyGlobalConfigIfNotSet("signature.rsa", "ssh-rsa"); //$NON-NLS-1$ //$NON-NLS-2$
+ copyGlobalConfigIfNotSet("signature.dss", "ssh-dss"); //$NON-NLS-1$ //$NON-NLS-2$
configureJSch(jsch);
knownHosts(jsch, fs);
identities(jsch, fs);
return jsch;
}
+ private void copyGlobalConfigIfNotSet(String from, String to) {
+ String toValue = JSch.getConfig(to);
+ if (StringUtils.isEmptyOrNull(toValue)) {
+ String fromValue = JSch.getConfig(from);
+ if (!StringUtils.isEmptyOrNull(fromValue)) {
+ JSch.setConfig(to, fromValue);
+ }
+ }
+ }
+
private static void knownHosts(JSch sch, FS fs) throws JSchException {
final File home = fs.userHome();
if (home == null)

Back to the top