[JGIT PATCH] Add support for ~/.ssh/config PreferredAuthentications
From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:45:22
Subsystem:
the rest · Maintainer:
Linus Torvalds
Some configurations may wish to disable interactive methods of authentication, such as when running from automated cron or batch style jobs that have no user available. Typically in an OpenSSH based system this would be configured on a per-host basis in the current user's ~/.ssh/config file, by setting PreferredAuthentications to the list of authentication methods (e.g. just "publickey") that are reasonable. JSch honors this configuration setting, but we need to transfer it from our own OpenSshConfig class, otherwise it has no knowledge of the setting. http://code.google.com/p/egit/issues/detail?id=33 Signed-off-by: Shawn O. Pearce <redacted> --- .../spearce/egit/ui/EclipseSshSessionFactory.java | 4 ++++ .../jgit/transport/DefaultSshSessionFactory.java | 4 ++++ .../org/spearce/jgit/transport/OpenSshConfig.java | 12 ++++++++++++ 3 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/EclipseSshSessionFactory.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/EclipseSshSessionFactory.java
index 640a165..67c5f16 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/EclipseSshSessionFactory.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/EclipseSshSessionFactory.java@@ -50,6 +50,10 @@ if (pass != null) session.setPassword(pass); else new UserInfoPrompter(session); + + final String pauth = hc.getPreferredAuthentications(); + if (pauth != null) + session.setConfig("PreferredAuthentications", pauth); return session; }
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/DefaultSshSessionFactory.java b/org.spearce.jgit/src/org/spearce/jgit/transport/DefaultSshSessionFactory.java
index 74fca66..b6f58f0 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/DefaultSshSessionFactory.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/DefaultSshSessionFactory.java@@ -103,6 +103,10 @@ if (pass != null) session.setPassword(pass); else session.setUserInfo(new AWT_UserInfo()); + + final String pauth = hc.getPreferredAuthentications(); + if (pauth != null) + session.setConfig("PreferredAuthentications", pauth); return session; }
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/OpenSshConfig.java b/org.spearce.jgit/src/org/spearce/jgit/transport/OpenSshConfig.java
index cf7c388..748199c 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/OpenSshConfig.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/OpenSshConfig.java@@ -278,6 +278,8 @@ if (ret.isAbsolute()) String user; + String preferredAuthentications; + void copyFrom(final Host src) { if (hostName == null) hostName = src.hostName;
@@ -287,6 +289,8 @@ if (identityFile == null) identityFile = src.identityFile; if (user == null) user = src.user; + if (preferredAuthentications == null) + preferredAuthentications = src.preferredAuthentications; } /**
@@ -317,5 +321,13 @@ public File getIdentityFile() { public String getUser() { return user; } + + /** + * @return return the preferred authentication methods, separated by + * commas if more than one authentication method is preferred. + */ + public String getPreferredAuthentications() { + return preferredAuthentications; + } } }
--
1.6.0.1.337.g5c7d67