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@xxxxxxxxxxx>
---
"Shawn O. Pearce" <spearce@xxxxxxxxxxx> wrote:
> Marek Zawirski <marek.zawirski@xxxxxxxxx> wrote:
> > Shawn O. Pearce wrote:
> >> diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/DefaultSshSessionFactory.java b/org.spearce.jgit/src/org/spearce/jgit/transport/DefaultSshSessionFactory.java
> > (...)
> >> + try {
> >> + addIdentity(k);
> >> + } catch (JSchException e) {
> >> + if (e.getMessage().startsWith("invalid privatekey: "))
> >> + continue;
> >> + throw e;
> >> + }
> >
> > That's extreme error handling with JSch;) Do you really think it's
> > better to rely on internal error message instead of continuing in any
> > case? Which other exceptions we would like to pass level up?
>
> I guess I can just change this to ignore everything.
.../jgit/transport/DefaultSshSessionFactory.java | 11 +++++++++--
1 files changed, 9 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..74fca66 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,21 @@ 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) {
+ continue;
+ }
}
}
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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
