lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-05-03 11:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ssh-quotes' into 23-release

Browse Source
This commit is contained in:
crschnick
2026-04-21 19:48:13 +00:00
parent 31f205ae18
commit 533236cb86
12 changed files with 64 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/xpipe/app/cred/CustomAgentStrategy.java
+4 -4
View File
@@ -132,13 +132,13 @@ public class CustomAgentStrategy implements SshIdentityAgentStrategy {
public List<KeyValue> configOptions(ShellControl sc) throws Exception {
var file = SshIdentityStrategy.getPublicKeyPath(sc, publicKey);
var l = new ArrayList<>(List.of(
new KeyValue("IdentitiesOnly", file.isPresent() ? "yes" : "no"),
new KeyValue("IdentityFile", file.isPresent() ? file.get().toString() : "none"),
new KeyValue("PKCS11Provider", "none")));
KeyValue.raw("IdentitiesOnly", file.isPresent() ? "yes" : "no"),
KeyValue.raw("IdentityFile", file.isPresent() ? file.get().toString() : "none"),
KeyValue.raw("PKCS11Provider", "none")));
var agent = determinetAgentSocketLocation(sc);
if (agent != null) {
l.add(new KeyValue("IdentityAgent", "\"" + agent + "\""));
l.add(KeyValue.escape("IdentityAgent", agent));
}
return l;
app/src/main/java/io/xpipe/app/cred/CustomPkcs11LibraryStrategy.java
+4 -4
View File
@@ -110,10 +110,10 @@ public class CustomPkcs11LibraryStrategy implements SshIdentityStrategy {
@Override
public List<KeyValue> configOptions(ShellControl sc) {
return List.of(
new KeyValue("IdentitiesOnly", "no"),
new KeyValue("PKCS11Provider", "\"" + file.toString() + "\""),
new KeyValue("IdentityFile", "none"),
new KeyValue("IdentityAgent", "none"));
KeyValue.raw("IdentitiesOnly", "no"),
KeyValue.escape("PKCS11Provider", file),
KeyValue.raw("IdentityFile", "none"),
KeyValue.raw("IdentityAgent", "none"));
}
public PublicKeyStrategy getPublicKeyStrategy() {
app/src/main/java/io/xpipe/app/cred/GpgAgentStrategy.java
+4 -4
View File
@@ -96,13 +96,13 @@ public class GpgAgentStrategy implements SshIdentityAgentStrategy {
public List<KeyValue> configOptions(ShellControl sc) throws Exception {
var file = SshIdentityStrategy.getPublicKeyPath(sc, publicKey);
var l = new ArrayList<>(List.of(
new KeyValue("IdentitiesOnly", file.isPresent() ? "yes" : "no"),
new KeyValue("IdentityFile", file.isPresent() ? file.get().toString() : "none"),
new KeyValue("PKCS11Provider", "none")));
KeyValue.raw("IdentitiesOnly", file.isPresent() ? "yes" : "no"),
KeyValue.escape("IdentityFile", file.isPresent() ? file.get() : "none"),
KeyValue.raw("PKCS11Provider", "none")));
var agent = determinetAgentSocketLocation(sc);
if (agent != null) {
l.add(new KeyValue("IdentityAgent", "\"" + agent + "\""));
l.add(KeyValue.escape("IdentityAgent", agent));
}
return l;
app/src/main/java/io/xpipe/app/cred/InPlaceKeyStrategy.java
+4 -4
View File
@@ -167,10 +167,10 @@ public class InPlaceKeyStrategy implements SshIdentityStrategy {
@Override
public List<KeyValue> configOptions(ShellControl sc) {
return List.of(
new KeyValue("IdentitiesOnly", "yes"),
new KeyValue("IdentityAgent", "none"),
new KeyValue("IdentityFile", "\"" + getTargetFilePath(sc) + "\""),
new KeyValue("PKCS11Provider", "none"));
KeyValue.raw("IdentitiesOnly", "yes"),
KeyValue.raw("IdentityAgent", "none"),
KeyValue.escape("IdentityFile", getTargetFilePath(sc)),
KeyValue.raw("PKCS11Provider", "none"));
}
@Override
app/src/main/java/io/xpipe/app/cred/KeyFileStrategy.java
+4 -4
View File
@@ -249,10 +249,10 @@ public class KeyFileStrategy implements SshIdentityStrategy {
@Override
public List<KeyValue> configOptions(ShellControl sc) {
return List.of(
new KeyValue("IdentitiesOnly", "yes"),
new KeyValue("IdentityAgent", "none"),
new KeyValue("IdentityFile", "\"" + resolveFilePath(sc).toString() + "\""),
new KeyValue("PKCS11Provider", "none"));
KeyValue.raw("IdentitiesOnly", "yes"),
KeyValue.raw("IdentityAgent", "none"),
KeyValue.escape("IdentityFile", resolveFilePath(sc)),
KeyValue.raw("PKCS11Provider", "none"));
}
@Override
app/src/main/java/io/xpipe/app/cred/NoIdentityStrategy.java
+4 -4
View File
@@ -23,10 +23,10 @@ public class NoIdentityStrategy implements SshIdentityStrategy {
public List<KeyValue> configOptions(ShellControl sc) {
// Don't use any agent keys to prevent too many authentication failures
return List.of(
new KeyValue("IdentitiesOnly", "yes"),
new KeyValue("IdentityAgent", "none"),
new KeyValue("IdentityFile", "none"),
new KeyValue("PKCS11Provider", "none"));
KeyValue.raw("IdentitiesOnly", "yes"),
KeyValue.raw("IdentityAgent", "none"),
KeyValue.raw("IdentityFile", "none"),
KeyValue.raw("PKCS11Provider", "none"));
}
@Override
app/src/main/java/io/xpipe/app/cred/OpenSshAgentStrategy.java
+4 -4
View File
@@ -80,13 +80,13 @@ public class OpenSshAgentStrategy implements SshIdentityAgentStrategy {
public List<KeyValue> configOptions(ShellControl sc) throws Exception {
var file = SshIdentityStrategy.getPublicKeyPath(sc, publicKey);
var l = new ArrayList<>(List.of(
new KeyValue("IdentitiesOnly", file.isPresent() ? "yes" : "no"),
new KeyValue("IdentityFile", file.isPresent() ? file.get().toString() : "none"),
new KeyValue("PKCS11Provider", "none")));
KeyValue.raw("IdentitiesOnly", file.isPresent() ? "yes" : "no"),
KeyValue.escape("IdentityFile", file.isPresent() ? file.get() : "none"),
KeyValue.raw("PKCS11Provider", "none")));
var agent = determinetAgentSocketLocation(sc);
if (agent != null) {
l.add(new KeyValue("IdentityAgent", "\"" + agent + "\""));
l.add(KeyValue.escape("IdentityAgent", agent));
}
return l;
app/src/main/java/io/xpipe/app/cred/OtherExternalAgentStrategy.java
+3 -3
View File
@@ -60,9 +60,9 @@ public class OtherExternalAgentStrategy implements SshIdentityAgentStrategy {
public List<KeyValue> configOptions(ShellControl sc) throws Exception {
var file = SshIdentityStrategy.getPublicKeyPath(sc, publicKey);
return List.of(
new KeyValue("IdentitiesOnly", file.isPresent() ? "yes" : "no"),
new KeyValue("IdentityFile", file.isPresent() ? file.get().toString() : "none"),
new KeyValue("PKCS11Provider", "none"));
KeyValue.raw("IdentitiesOnly", file.isPresent() ? "yes" : "no"),
KeyValue.escape("IdentityFile", file.isPresent() ? file.get() : "none"),
KeyValue.raw("PKCS11Provider", "none"));
}
public PublicKeyStrategy getPublicKeyStrategy() {
app/src/main/java/io/xpipe/app/cred/PageantStrategy.java
+4 -4
View File
@@ -102,13 +102,13 @@ public class PageantStrategy implements SshIdentityAgentStrategy {
public List<KeyValue> configOptions(ShellControl sc) throws Exception {
var file = SshIdentityStrategy.getPublicKeyPath(sc, publicKey);
var l = new ArrayList<>(List.of(
new KeyValue("IdentitiesOnly", file.isPresent() ? "yes" : "no"),
new KeyValue("IdentityFile", file.isPresent() ? file.get().toString() : "none"),
new KeyValue("PKCS11Provider", "none")));
KeyValue.raw("IdentitiesOnly", file.isPresent() ? "yes" : "no"),
KeyValue.escape("IdentityFile", file.isPresent() ? file.get() : "none"),
KeyValue.raw("PKCS11Provider", "none")));
var agent = determinetAgentSocketLocation(sc);
if (agent != null) {
l.add(new KeyValue("IdentityAgent", "\"" + agent + "\""));
l.add(KeyValue.escape("IdentityAgent", agent));
}
return l;
app/src/main/java/io/xpipe/app/cred/YubikeyPivStrategy.java
+4 -4
View File
@@ -74,10 +74,10 @@ public class YubikeyPivStrategy implements SshIdentityStrategy {
@Override
public List<KeyValue> configOptions(ShellControl sc) {
return List.of(
new KeyValue("IdentitiesOnly", "no"),
new KeyValue("PKCS11Provider", "\"" + getFile(sc) + "\""),
new KeyValue("IdentityFile", "none"),
new KeyValue("IdentityAgent", "none"));
KeyValue.raw("IdentitiesOnly", "no"),
KeyValue.escape("PKCS11Provider", getFile(sc)),
KeyValue.raw("IdentityFile", "none"),
KeyValue.raw("IdentityAgent", "none"));
}
@Override
app/src/main/java/io/xpipe/app/pwman/PasswordManagerKeyStrategy.java
+5 -6
View File
@@ -216,13 +216,12 @@ public interface PasswordManagerKeyStrategy {
public List<KeyValue> configOptions(ShellControl sc) throws Exception {
var file = SshIdentityStrategy.getPublicKeyPath(sc, publicKey);
var l = new ArrayList<>(List.of(
new KeyValue("IdentitiesOnly", file.isPresent() ? "yes" : "no"),
new KeyValue("ForwardAgent", forward ? "yes" : "no"),
new KeyValue(
"IdentityFile", file.isPresent() ? file.get().toString() : "none"),
new KeyValue("PKCS11Provider", "none")));
KeyValue.raw("IdentitiesOnly", file.isPresent() ? "yes" : "no"),
KeyValue.raw("ForwardAgent", forward ? "yes" : "no"),
KeyValue.escape("IdentityFile", file.isPresent() ? file.get() : "none"),
KeyValue.raw("PKCS11Provider", "none")));
if (socket != null) {
l.add(new KeyValue("IdentityAgent", "\"" + socket + "\""));
l.add(KeyValue.escape("IdentityAgent", socket));
}
return l;
}
core/src/main/java/io/xpipe/core/KeyValue.java
+20 -1
View File
@@ -1,5 +1,6 @@
package io.xpipe.core;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Value;
@@ -8,8 +9,26 @@ import lombok.extern.jackson.Jacksonized;
@Value
@Builder
@Jacksonized
@AllArgsConstructor
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class KeyValue {
public static KeyValue raw(String key, String value) {
return new KeyValue(key, value);
}
public static KeyValue escape(String key, Object value) {
var string = value.toString();
string = string.replaceAll("\\\\", "\\\\\\\\");
var isQuoted = string.startsWith("\"") && string.endsWith("\"");
if (!isQuoted && string.contains(" ")) {
string = "\"" + string + "\"";
}
return new KeyValue(key, string);
}
String key;
String value;
}