lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-09-24 09:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
crschnick
2026-03-16 10:54:02 +00:00
parent f5ffcb219c
commit b2875cab56
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/xpipe/app/pwman/BitwardenPasswordManager.java
+2 -2
View File
@@ -124,7 +124,7 @@ public class BitwardenPasswordManager implements PasswordManager {
public Path getConfigLocation() {
return AppSystemInfo.ofMacOs()
.getUserHome()
.resolve("Library", "Application Support", "Bitwarden CLI", "data.json");
.resolve("Library", "Application Support", "Bitwarden", "data.json");
}
},
@@ -139,7 +139,7 @@ public class BitwardenPasswordManager implements PasswordManager {
public Path getConfigLocation() {
return AppSystemInfo.ofMacOs()
.getUserHome()
.resolve("Library", "Application Support", "Bitwarden CLI", "data.json");
.resolve("Library", "Application Support", "Bitwarden", "data.json");
}
};
app/src/main/java/io/xpipe/app/pwman/KeeperPasswordManager.java
+8 -3
View File
@@ -30,6 +30,7 @@ import lombok.ToString;
import lombok.Value;
import lombok.extern.jackson.Jacksonized;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Duration;
import java.util.*;
@@ -45,7 +46,11 @@ 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.MacOs ignored -> AppSystemInfo.ofMacOs().getTemp().resolve("keeper-ssh-agent.sock");
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"));
yield l.stream().filter(Files::exists).findFirst().orElse(l.getFirst());
}
case OsType.Windows ignored -> null;
};
return socket;
@@ -58,7 +63,7 @@ public class KeeperPasswordManager implements PasswordManager {
@Override
public boolean selectInitial() throws Exception {
return LocalShell.getShell().view().findProgram("keeper-commander").isPresent();
return LocalShell.getShell().view().findProgram(getExecutable()).isPresent();
}
@Override
@@ -481,7 +486,7 @@ public class KeeperPasswordManager implements PasswordManager {
key = key.replaceFirst("https://\\w+\\.\\w+/vault/#detail/", "");
try {
CommandSupport.isInLocalPathOrThrow("Keeper Commander CLI", "keeper-commander");
CommandSupport.isInLocalPathOrThrow("Keeper Commander CLI", getExecutable());
} catch (Exception e) {
ErrorEventFactory.fromThrowable(e)
.link("https://docs.keeper.io/en/keeperpam/commander-cli/commander-installation-setup")
lang/strings/translations_en.properties
Generated
+1 -1
View File
@@ -2018,7 +2018,7 @@ keePassXcOpenSshAgent=Use OpenSSH agent
keePassXcPageant=Use Pageant
passwordManagerSshAgentSocket=SSH agent socket
passwordManagerSshAgentSocketDescription=The socket that should be used to communicate with the agent.
passwordManagerSshKeysNotSupported=The current password manager configuration does not support retrieving SSH keys
passwordManagerSshKeysNotSupported=The current password manager configuration does not support retrieving SSH keys via an agent
passwordManagerAdditionalKey=Additional SSH key
passwordManagerAdditionalKeyDescription=The SSH key to use in addition to the credentials from the password manager
multiIdentity.displayName=Multi identity