diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2021-11-13 18:10:13 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2021-11-15 22:26:20 +0100 |
| commit | 057f1d9123f43aceecf413acc5e759e4a97dc8e4 (patch) | |
| tree | b03299110e190dd720cadb7111615fcd15ec092c /org.eclipse.jgit/src/org | |
| parent | 180bc67e28f333a8b23413a0789b6563c3a5b9de (diff) | |
| download | jgit-057f1d9123f43aceecf413acc5e759e4a97dc8e4.tar.gz jgit-057f1d9123f43aceecf413acc5e759e4a97dc8e4.zip | |
ssh: Handle "ProxyJump none" from SSH config file
Since OpenSSH 7.8, the ProxyJump directive accepts the value "none"[1]
to override and clear a setting that might otherwise be contributed by
another (wildcard) host entry.
[1] https://bugzilla.mindrot.org/show_bug.cgi?id=2869
Change-Id: Ia35e82c6f8c58d5c6b8040cda7a07b220f43fc21
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.jgit/src/org')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/transport/SshConstants.java | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshConstants.java index 5cd5b334ab..212a4e46c1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshConstants.java @@ -191,6 +191,26 @@ public final class SshConstants { /** Flag value. */ public static final String FALSE = "false"; + /** + * Property value. Some keys accept a special 'none' value to override and + * clear a setting otherwise contributed by another host entry, for instance + * {@link #PROXY_COMMAND} or {@link #PROXY_JUMP}. Example: + * + * <pre> + * Host bastion.example.org + * ProxyJump none + * + * Host *.example.org + * ProxyJump bastion.example.org + * </pre> + * <p> + * OpenSSH supports this since OpenSSH 7.8. + * </p> + * + * @since 6.0 + */ + public static final String NONE = "none"; + // Default identity file names /** Name of the default RSA private identity file. */ @@ -202,7 +222,7 @@ public final class SshConstants { /** Name of the default ECDSA private identity file. */ public static final String ID_ECDSA = "id_ecdsa"; - /** Name of the default ECDSA private identity file. */ + /** Name of the default ED25519 private identity file. */ public static final String ID_ED25519 = "id_ed25519"; /** All known default identity file names. */ |