aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.ssh.apache
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2021-06-26 16:39:44 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2021-06-29 20:26:50 +0200
commitb9653ccdad437c5449f8eaf0c4e9cfdd2afe4519 (patch)
tree68d27d7ee22f0235c34241f3c530da23436bbfee /org.eclipse.jgit.ssh.apache
parent6a8afeb9f210f92e17b6c525d989c6072984289f (diff)
parentd46af8c69d598b63301900758e49b6b260168c16 (diff)
downloadjgit-b9653ccdad437c5449f8eaf0c4e9cfdd2afe4519.tar.gz
jgit-b9653ccdad437c5449f8eaf0c4e9cfdd2afe4519.zip
Merge branch 'master' into next
* master: searchForReuse might impact performance in large repositories Retry loose object read upon "Stale file handle" exception Ignore missing javadoc in test bundles Upgrade maven-dependency-plugin to 3.2.0 Upgrade jacoco-maven-plugin to 0.8.7 Upgrade maven-jxr-plugin to 3.1.1 Fix garbage collection failing to delete pack file Fix PathSuffixFilter: can decide only on full paths Update jetty to 9.4.42.v20210604 [sshd] Log the full KEX negotiation result [releng] japicmp: update last release version CONTRIBUTING: add explicit link to ECA CONTRIBUTING: Use standard markdown format Add Eclipse code of conduct and security policy Change-Id: I9e31cb6e22f5398db6e220f71693e87475c598bd
Diffstat (limited to 'org.eclipse.jgit.ssh.apache')
-rw-r--r--org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java19
1 files changed, 19 insertions, 0 deletions
diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java
index 8183a92b9f..f9e80121ed 100644
--- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java
+++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java
@@ -39,6 +39,7 @@ import org.apache.sshd.common.PropertyResolver;
import org.apache.sshd.common.config.keys.KeyUtils;
import org.apache.sshd.common.io.IoSession;
import org.apache.sshd.common.io.IoWriteFuture;
+import org.apache.sshd.common.kex.KexProposalOption;
import org.apache.sshd.common.util.Readable;
import org.apache.sshd.common.util.buffer.Buffer;
import org.eclipse.jgit.errors.InvalidPatternException;
@@ -201,6 +202,24 @@ public class JGitClientSession extends ClientSessionImpl {
}
@Override
+ protected Map<KexProposalOption, String> setNegotiationResult(
+ Map<KexProposalOption, String> guess) {
+ Map<KexProposalOption, String> result = super.setNegotiationResult(
+ guess);
+ // This should be doable with a SessionListener, too, but I don't see
+ // how to add a listener in time to catch the negotiation end for sure
+ // given that the super-constructor already starts KEX.
+ //
+ // TODO: This override can be removed once we use sshd 2.8.0.
+ if (log.isDebugEnabled()) {
+ result.forEach((option, value) -> log.debug(
+ "setNegotiationResult({}) Kex: {} = {}", this, //$NON-NLS-1$
+ option.getDescription(), value));
+ }
+ return result;
+ }
+
+ @Override
protected String resolveAvailableSignaturesProposal(
FactoryManager manager) {
List<String> defaultSignatures = getSignatureFactoriesNames();