moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 16:38:50 -05:00
Code Issues Releases Wiki Activity

Add ability to resolve HkpKeyserver from _hkp._tcp SRV record

Browse Source
This commit is contained in:
mar-v-in 2014-05-27 19:45:58 +02:00
parent 7865b92285
commit 3110122a85
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenKeychain/build.gradle
View File

@ -10,6 +10,7 @@ sourceSets {
dependencies { dependencies {
compile 'com.android.support:support-v4:19.1.0' compile 'com.android.support:support-v4:19.1.0'
compile 'com.android.support:appcompat-v7:19.1.0' compile 'com.android.support:appcompat-v7:19.1.0'
compile 'dnsjava:dnsjava:2.1.1'
compile project(':extern:openpgp-api-lib') compile project(':extern:openpgp-api-lib')
compile project(':extern:openkeychain-api-lib') compile project(':extern:openkeychain-api-lib')
compile project(':extern:html-textview') compile project(':extern:html-textview')

38
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
View File

@ -33,6 +33,10 @@ import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.pgp.PgpHelper; import org.sufficientlysecure.keychain.pgp.PgpHelper;
import org.sufficientlysecure.keychain.pgp.PgpKeyHelper; import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Log;
import org.xbill.DNS.Lookup;
import org.xbill.DNS.Record;
import org.xbill.DNS.SRVRecord;
import org.xbill.DNS.Type;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -45,6 +49,8 @@ import java.net.URLDecoder;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -336,4 +342,36 @@ public class HkpKeyserver extends Keyserver {
client.getConnectionManager().shutdown(); client.getConnectionManager().shutdown();
} }
} }
@Override
public String toString() {
return mHost + ":" + mPort;
}
/**
* Tries to find a server responsible for a given domain
*
* @return A responsible Keyserver or null if not found.
*/
public static HkpKeyserver resolve(String domain) {
try {
Record[] records = new Lookup("_hkp._tcp." + domain, Type.SRV).run();
if (records.length > 0) {
Arrays.sort(records, new Comparator<Record>() {
@Override
public int compare(Record lhs, Record rhs) {
if (!(lhs instanceof SRVRecord)) return 1;
if (!(rhs instanceof SRVRecord)) return -1;
return ((SRVRecord) lhs).getPriority() - ((SRVRecord) rhs).getPriority();
}
});
Record record = records[0]; // This is our best choice
if (record instanceof SRVRecord) {
return new HkpKeyserver(((SRVRecord) record).getTarget().toString(), (short) ((SRVRecord) record).getPort());
}
}
} catch (Exception ignored) {
}
return null;
}
} }