mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-17 18:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add access functionality for Gnome login keyring

Browse Source
This commit is contained in:
Ralph Plawetzki
2019-06-29 15:28:26 +02:00
parent af73dab795
commit 63383866ea
4 changed files with 78 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/keychain/pom.xml
View File

@@ -39,7 +39,14 @@
<groupId>com.google.dagger</groupId>
<artifactId>dagger</artifactId>
</dependency>
<!-- secret-service lib -->
<dependency>
<groupId>de.swiesend</groupId>
<artifactId>secret-service</artifactId>
<version>1.0.0-RC.3</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>

4
main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java
View File

@@ -31,8 +31,8 @@ public class KeychainModule {
@Provides
@ElementsIntoSet
Set<KeychainAccessStrategy> provideKeychainAccessStrategies(MacSystemKeychainAccess macKeychain, WindowsProtectedKeychainAccess winKeychain) {
return Sets.newHashSet(macKeychain, winKeychain);
Set<KeychainAccessStrategy> provideKeychainAccessStrategies(MacSystemKeychainAccess macKeychain, WindowsProtectedKeychainAccess winKeychain, LinuxSecretServiceAccess linKeychain) {
return Sets.newHashSet(macKeychain, winKeychain, linKeychain);
}
@Provides

67
main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceAccess.java Normal file
View File

@@ -0,0 +1,67 @@
package org.cryptomator.keychain;
import com.google.common.base.Preconditions;
import org.apache.commons.lang3.SystemUtils;
import org.freedesktop.secret.simple.SimpleCollection;
import javax.inject.Inject;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
public class LinuxSecretServiceAccess implements KeychainAccessStrategy {
private final Optional<SimpleCollection> gnomeLoginKeyring;
@Inject
public LinuxSecretServiceAccess() {
SimpleCollection keyring = null;
try {
keyring = new SimpleCollection();
} catch (Exception e) {
// Accessing secret-service DBus API failed
} finally {
gnomeLoginKeyring = Optional.ofNullable(keyring);
}
}
@Override
public boolean isSupported() {
return SystemUtils.IS_OS_LINUX && gnomeLoginKeyring.isPresent();
}
@Override
public void storePassphrase(String key, CharSequence passphrase) {
Preconditions.checkState(gnomeLoginKeyring.isPresent());
List<String> list = gnomeLoginKeyring.get().getItems(createAttributes(key));
if (list == null) {
gnomeLoginKeyring.get().createItem("Cryptomator", passphrase, createAttributes(key));
}
}
@Override
public char[] loadPassphrase(String key) {
Preconditions.checkState(gnomeLoginKeyring.isPresent());
List<String> list = gnomeLoginKeyring.get().getItems(createAttributes(key));
if (list != null) {
return gnomeLoginKeyring.get().getSecret(list.get(0));
} else {
return null;
}
}
@Override
public void deletePassphrase(String key) {
Preconditions.checkState(gnomeLoginKeyring.isPresent());
List<String> list = gnomeLoginKeyring.get().getItems(createAttributes(key));
if (list != null) {
gnomeLoginKeyring.get().deleteItem(list.get(0));
}
}
private Map<String, String> createAttributes(String key) {
Map<String, String> attributes = new HashMap();
attributes.put("Vault", key);
return attributes;
}
}

2
main/keychain/src/test/java/org/cryptomator/keychain/TestKeychainModule.java
View File

@@ -12,7 +12,7 @@ import com.google.common.collect.Sets;
public class TestKeychainModule extends KeychainModule {
@Override
Set<KeychainAccessStrategy> provideKeychainAccessStrategies(MacSystemKeychainAccess macKeychain, WindowsProtectedKeychainAccess winKeychain) {
Set<KeychainAccessStrategy> provideKeychainAccessStrategies(MacSystemKeychainAccess macKeychain, WindowsProtectedKeychainAccess winKeychain, LinuxSecretServiceAccess linKeychain) {
return Sets.newHashSet(new MapKeychainAccess());
}