cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor keyserver class structure, use AutoValue for ParcelableHkpKeyserver

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-07-24 22:01:02 +02:00
parent 6e18531920
commit b8d01bf9d2
34 changed files with 389 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/EmailKeyHelper.java
View File

@@ -17,22 +17,30 @@
package org.sufficientlysecure.keychain.util;
import android.content.Context;
import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
import org.sufficientlysecure.keychain.keyimport.Keyserver;
import org.sufficientlysecure.keychain.keyimport.ParcelableHkpKeyserver;
import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
import org.sufficientlysecure.keychain.service.ImportKeyringParcel;
import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import android.content.Context;
import de.measite.minidns.Client;
import de.measite.minidns.Question;
import de.measite.minidns.Record;
import de.measite.minidns.record.SRV;
import org.sufficientlysecure.keychain.keyimport.HkpKeyserverAddress;
import org.sufficientlysecure.keychain.keyimport.HkpKeyserverClient;
import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
import org.sufficientlysecure.keychain.keyimport.KeyserverClient;
import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
import org.sufficientlysecure.keychain.service.ImportKeyringParcel;
import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
public class EmailKeyHelper {
// TODO: Make this not require a proxy in it's constructor, redesign when it is to be used
// to import keys, simply use CryptoOperationHelper with this callback
@@ -40,15 +48,15 @@ public class EmailKeyHelper {
implements CryptoOperationHelper.Callback<ImportKeyringParcel, ImportKeyResult> {
private ArrayList<ParcelableKeyRing> mKeyList;
private ParcelableHkpKeyserver mKeyserver;
private HkpKeyserverAddress mKeyserver;
public ImportContactKeysCallback(Context context, ParcelableHkpKeyserver keyserver,
public ImportContactKeysCallback(Context context, HkpKeyserverAddress keyserver,
ParcelableProxy proxy) {
this(context, new ContactHelper(context).getContactMails(), keyserver, proxy);
}
public ImportContactKeysCallback(Context context, List<String> mails,
ParcelableHkpKeyserver keyserver, ParcelableProxy proxy) {
HkpKeyserverAddress keyserver, ParcelableProxy proxy) {
Set<ImportKeysListEntry> entries = new HashSet<>();
for (String mail : mails) {
entries.addAll(getEmailKeys(context, mail, proxy));
@@ -76,7 +84,7 @@ public class EmailKeyHelper {
// Try _hkp._tcp SRV record first
String[] mailparts = mail.split("@");
if (mailparts.length == 2) {
ParcelableHkpKeyserver hkp = ParcelableHkpKeyserver.resolve(mailparts[1]);
HkpKeyserverAddress hkp = findKeyserverFromDns(mailparts[1]);
if (hkp != null) {
keys.addAll(getEmailKeys(mail, hkp, proxy));
}
@@ -84,7 +92,7 @@ public class EmailKeyHelper {
if (keys.isEmpty()) {
// Most users don't have the SRV record, so ask a default server as well
ParcelableHkpKeyserver server = Preferences.getPreferences(context).getPreferredKeyserver();
HkpKeyserverAddress server = Preferences.getPreferences(context).getPreferredKeyserver();
if (server != null) {
keys.addAll(getEmailKeys(mail, server, proxy));
}
@@ -92,11 +100,12 @@ public class EmailKeyHelper {
return keys;
}
public static List<ImportKeysListEntry> getEmailKeys(String mail, Keyserver keyServer,
public static List<ImportKeysListEntry> getEmailKeys(String mail, HkpKeyserverAddress keyServer,
ParcelableProxy proxy) {
Set<ImportKeysListEntry> keys = new HashSet<>();
try {
for (ImportKeysListEntry key : keyServer.search(mail, proxy)) {
for (ImportKeysListEntry key : HkpKeyserverClient
.fromHkpKeyserverAddress(keyServer).search(mail, proxy)) {
if (key.isRevokedOrExpiredOrInsecure()) continue;
for (String userId : key.getUserIds()) {
if (userId.toLowerCase().contains(mail.toLowerCase(Locale.ENGLISH))) {
@@ -104,8 +113,31 @@ public class EmailKeyHelper {
}
}
}
} catch (Keyserver.CloudSearchFailureException ignored) {
} catch (KeyserverClient.CloudSearchFailureException ignored) {
}
return new ArrayList<>(keys);
}
public static HkpKeyserverAddress findKeyserverFromDns(String domain) {
try {
Record[] records = new Client().query(new Question("_hkp._tcp." + domain, Record.TYPE.SRV)).getAnswers();
if (records.length > 0) {
Arrays.sort(records, new Comparator<Record>() {
@Override
public int compare(Record lhs, Record rhs) {
if (lhs.getPayload().getType() != Record.TYPE.SRV) return 1;
if (rhs.getPayload().getType() != Record.TYPE.SRV) return -1;
return ((SRV) lhs.getPayload()).getPriority() - ((SRV) rhs.getPayload()).getPriority();
}
});
Record record = records[0]; // This is our best choice
if (record.getPayload().getType() == Record.TYPE.SRV) {
SRV payload = (SRV) record.getPayload();
return HkpKeyserverAddress.createFromUri(payload.getName() + ":" + payload.getPort());
}
}
} catch (Exception ignored) {
}
return null;
}
}

40
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
View File

@@ -32,7 +32,7 @@ import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.Constants.Pref;
import org.sufficientlysecure.keychain.KeychainApplication;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.keyimport.ParcelableHkpKeyserver;
import org.sufficientlysecure.keychain.keyimport.HkpKeyserverAddress;
import org.sufficientlysecure.keychain.service.KeyserverSyncAdapterService;
import java.io.Serializable;
@@ -128,13 +128,13 @@ public class Preferences {
editor.commit();
}
public ArrayList<ParcelableHkpKeyserver> getKeyServers() {
public ArrayList<HkpKeyserverAddress> getKeyServers() {
String rawData = mSharedPreferences.getString(Constants.Pref.KEY_SERVERS,
Constants.Defaults.KEY_SERVERS);
if ("".equals(rawData)) {
return new ArrayList<>();
}
ArrayList<ParcelableHkpKeyserver> servers = new ArrayList<>();
ArrayList<HkpKeyserverAddress> servers = new ArrayList<>();
String[] entries = rawData.split(",");
for (String entry : entries) {
String[] addresses = entry.trim().split(";");
@@ -145,20 +145,20 @@ public class Preferences {
continue;
}
servers.add(new ParcelableHkpKeyserver(url, onion));
servers.add(HkpKeyserverAddress.createWithOnionProxy(url, onion));
}
return servers;
}
public ParcelableHkpKeyserver getPreferredKeyserver() {
ArrayList<ParcelableHkpKeyserver> keyservers = getKeyServers();
public HkpKeyserverAddress getPreferredKeyserver() {
ArrayList<HkpKeyserverAddress> keyservers = getKeyServers();
return keyservers.size() == 0 ? null : keyservers.get(0);
}
public void setKeyServers(ArrayList<ParcelableHkpKeyserver> keyservers) {
public void setKeyServers(ArrayList<HkpKeyserverAddress> keyservers) {
SharedPreferences.Editor editor = mSharedPreferences.edit();
String rawData = "";
for (ParcelableHkpKeyserver server : keyservers) {
for (HkpKeyserverAddress server : keyservers) {
if (server.getUrl().isEmpty()) {
continue;
}
@@ -381,7 +381,7 @@ public class Preferences {
public final boolean searchKeyserver;
public final boolean searchKeybase;
public final boolean searchFacebook;
public final ParcelableHkpKeyserver keyserver;
public final HkpKeyserverAddress keyserver;
/**
* @param searchKeyserver should passed keyserver be searched
@@ -389,7 +389,7 @@ public class Preferences {
* @param keyserver the keyserver url authority to search on
*/
public CloudSearchPrefs(boolean searchKeyserver, boolean searchKeybase,
boolean searchFacebook, ParcelableHkpKeyserver keyserver) {
boolean searchFacebook, HkpKeyserverAddress keyserver) {
this.searchKeyserver = searchKeyserver;
this.searchKeybase = searchKeybase;
this.searchFacebook = searchFacebook;
@@ -400,7 +400,7 @@ public class Preferences {
searchKeyserver = in.readByte() != 0x00;
searchKeybase = in.readByte() != 0x00;
searchFacebook = in.readByte() != 0x00;
keyserver = in.readParcelable(ParcelableHkpKeyserver.class.getClassLoader());
keyserver = in.readParcelable(HkpKeyserverAddress.class.getClassLoader());
}
@Override
@@ -467,22 +467,22 @@ public class Preferences {
// fall through
case 3: {
// migrate keyserver to hkps
ArrayList<ParcelableHkpKeyserver> servers = getKeyServers();
ListIterator<ParcelableHkpKeyserver> it = servers.listIterator();
ArrayList<HkpKeyserverAddress> servers = getKeyServers();
ListIterator<HkpKeyserverAddress> it = servers.listIterator();
while (it.hasNext()) {
ParcelableHkpKeyserver server = it.next();
HkpKeyserverAddress server = it.next();
if (server == null) {
continue;
}
switch (server.getUrl()) {
case "pool.sks-keyservers.net": {
// use HKPS!
it.set(new ParcelableHkpKeyserver("hkps://hkps.pool.sks-keyservers.net", null));
it.set(HkpKeyserverAddress.createFromUri("hkps://hkps.pool.sks-keyservers.net"));
break;
}
case "pgp.mit.edu": {
// use HKPS!
it.set(new ParcelableHkpKeyserver("hkps://pgp.mit.edu", null));
it.set(HkpKeyserverAddress.createFromUri("hkps://pgp.mit.edu"));
break;
}
case "subkeys.pgp.net": {
@@ -509,15 +509,15 @@ public class Preferences {
// fall through
case 7: {
// add onion address to sks-keyservers.net
ArrayList<ParcelableHkpKeyserver> servers = getKeyServers();
ListIterator<ParcelableHkpKeyserver> it = servers.listIterator();
ArrayList<HkpKeyserverAddress> servers = getKeyServers();
ListIterator<HkpKeyserverAddress> it = servers.listIterator();
while (it.hasNext()) {
ParcelableHkpKeyserver server = it.next();
HkpKeyserverAddress server = it.next();
if (server == null) {
continue;
}
if ("hkps://hkps.pool.sks-keyservers.net".equals(server.getUrl())) {
it.set(new ParcelableHkpKeyserver(
it.set(HkpKeyserverAddress.createWithOnionProxy(
"hkps://hkps.pool.sks-keyservers.net",
"hkp://jirk5u4osbsr34t5.onion"));
}