Skip to content

Fix KeePassXC Secret Service support #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
urrpurr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix KeePassXC Secret Service support #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/main/java/de/swiesend/secretservice/handlers/MessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,19 @@ public Object[] send(String service, String path, String iface, String method, S
if (response instanceof org.freedesktop.dbus.messages.Error) {

String error = response.getName();
// Some Secret Service implementations (e.g. KeePassXC) return
// error replies with an empty body, so parameters may be
// zero-length; guard before reading parameters[0] to avoid
// ArrayIndexOutOfBoundsException.
String detail = (parameters != null && parameters.length > 0) ? String.valueOf(parameters[0]) : "";
switch (error) {
case "org.freedesktop.Secret.Error.NoSession":
case "org.freedesktop.Secret.Error.NoSuchObject":
log.warn(error + ": " + parameters[0]);
log.warn(error + ": " + detail);
return null;
case "org.gnome.keyring.Error.Denied":
case "org.freedesktop.Secret.Error.IsLocked":
log.info(error + ": " + parameters[0]);
log.info(error + ": " + detail);
return null;
case "org.freedesktop.DBus.Error.NoReply":
case "org.freedesktop.DBus.Error.UnknownMethod":
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/de/swiesend/secretservice/simple/SimpleCollection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,14 @@ public char[] getSecret(String objectPath) {

final Item item = getItem(objectPath);

// Some Secret Service implementations (e.g. KeePassXC) lock items
// independently of the collection: the collection can report unlocked
// while the item is still locked, so the unlock() above is a no-op and
// the read below returns IsLocked. Unlock the item explicitly first.
if (item != null && item.isLocked()) {
performPrompt(service.unlock(Arrays.asList(item.getPath())).b);
}

char[] decrypted = null;
try (final Secret secret = item.getSecret(session.getPath())) {
decrypted = transport.decrypt(secret);
Expand Down