[JGIT PATCH 1/2] Ignore unreadable SSH private keys when autoloading identities
- From
Shawn O. Pearce <spearce@spearce.org>
- Date
- Aug 27, 2008, 23:02 UTC
- Message-ID
- <1219878126-18622-1-git-send-email-spearce@spearce.org>
During SSH startup we read all keys in the user's ~/.ssh, even if we may not need them for this particular transport session.
If a file is not really a key, or it contains a key that JSch doesn't recognize we shouldn't crash the transport. Instead we should skip the file and move on. Later on we just don't have that identity available to us, or we'll crash if we try to add that identity file explicitly from ~/.ssh/config.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org> --- .../jgit/transport/DefaultSshSessionFactory.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-)
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 a2437c2..aa72357 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/transport/DefaultSshSessionFactory.java +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/DefaultSshSessionFactory.java @@ -165,14 +165,23 @@ private void identities() throws JSchException { final File k = new File(sshdir, n.substring(0, n.length() - 4)); if (!k.isFile()) continue; - addIdentity(k); + + try { + addIdentity(k); + } catch (JSchException e) { + if (e.getMessage().startsWith("invalid privatekey: ")) + continue; + throw e; + } } } private void addIdentity(final File identityFile) throws JSchException { final String path = identityFile.getAbsolutePath(); - if (loadedIdentities.add(path)) + if (!loadedIdentities.contains(path)) { userJSch.addIdentity(path); + loadedIdentities.add(path); + } } private static class AWT_UserInfo implements UserInfo,
-- 1.6.0.174.gd789c