mirror of
https://github.com/xpipe-io/xpipe.git
synced 2026-05-03 11:20:34 +00:00
Rework
This commit is contained in:
@@ -45,7 +45,12 @@ public class KeeperPasswordManager implements PasswordManager {
|
||||
|
||||
private static Path getSocketLocation() {
|
||||
var socket = switch (OsType.ofLocal()) {
|
||||
case OsType.Linux ignored -> AppSystemInfo.ofLinux().getConfigDir().resolve("Keeper Password Manager", "keeper-ssh-agent.sock");
|
||||
case OsType.Linux ignored -> {
|
||||
var l = List.of(
|
||||
AppSystemInfo.ofLinux().getConfigDir().resolve("Keeper Password Manager", "keeper-ssh-agent.sock"),
|
||||
AppSystemInfo.ofLinux().getUserHome().resolve("snap", "keepersecurity", "current", ".config", "Keeper Password Manager", "keeper-ssh-agent.sock"));
|
||||
yield l.stream().filter(Files::exists).findFirst().orElse(l.getFirst());
|
||||
}
|
||||
case OsType.MacOs ignored -> {
|
||||
var l = List.of(AppSystemInfo.ofMacOs().getTemp().resolve("keeper-ssh-agent.sock"),
|
||||
AppSystemInfo.ofMacOs().getUserHome().resolve("Library/Containers/com.callpod.keepermac.lite/Data/tmp/keeper-ssh-agent.sock"));
|
||||
|
||||
+1
@@ -84,6 +84,7 @@ public class PasswordManagerIdentityStoreProvider extends IdentityStoreProvider
|
||||
return PasswordManagerIdentityStore.builder()
|
||||
.key(key.get())
|
||||
.sshKey(sshKey.get())
|
||||
.perUser(perUser.get())
|
||||
.build();
|
||||
},
|
||||
store)
|
||||
|
||||
Generated
+1
-1
@@ -2002,7 +2002,7 @@ prefsRestartTitle=Restart required
|
||||
prefsRestartContent=Some options you changed require an application restart to apply. Do you want to restart XPipe now?
|
||||
bashShell=Bash shell
|
||||
sshKey=SSH key
|
||||
inlineKey=Retrieve directly
|
||||
inlineKey=Retrieve directly from password manager
|
||||
inlineSeparateKey=Retrieve additional key
|
||||
keyAgent=Use agent integration
|
||||
passwordManagerKeyStrategy=SSH key retrieval method
|
||||
|
||||
Reference in New Issue
Block a user