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

dns resource is parametrized by fqdn, class and type

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-01-16 13:57:18 +01:00
parent 6935509d22
commit b6a1463161
2 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java
View File

@@ -17,16 +17,26 @@ import de.measite.minidns.Client;
import de.measite.minidns.DNSMessage;
import de.measite.minidns.Question;
import de.measite.minidns.Record;
import de.measite.minidns.Record.CLASS;
import de.measite.minidns.Record.TYPE;
import de.measite.minidns.record.TXT;
public class DnsResource extends LinkedResource {
static Pattern magicPattern =
final static Pattern magicPattern =
Pattern.compile("pgpid\\+cookie=([a-zA-Z0-9]+)(?:#|;)([a-zA-Z0-9]+)");
DnsResource(Set<String> flags, HashMap<String, String> params, URI uri) {
String mFqdn;
CLASS mClass;
TYPE mType;
DnsResource(Set<String> flags, HashMap<String, String> params, URI uri,
String fqdn, CLASS clazz, TYPE type) {
super(flags, params, uri);
mFqdn = fqdn;
mClass = clazz;
mType = type;
}
public static String generateText (Context context, byte[] fingerprint, String nonce) {
@@ -49,14 +59,33 @@ public class DnsResource extends LinkedResource {
&& (params == null || params.isEmpty()))) {
return null;
}
return new DnsResource(flags, params, uri);
//
String spec = uri.getSchemeSpecificPart();
// If there are // at the beginning, this includes an authority - we don't support those!
if (spec.startsWith("//")) {
return null;
}
String[] pieces = spec.split("\\?", 2);
// In either case, part before a ? is the fqdn
String fqdn = pieces[0];
// There may be a query part
if (pieces.length > 1) {
// TODO parse CLASS and TYPE query paramters
}
CLASS clazz = CLASS.IN;
TYPE type = TYPE.TXT;
return new DnsResource(flags, params, uri, fqdn, clazz, type);
}
@Override
protected String fetchResource (OperationLog log, int indent) {
Client c = new Client();
DNSMessage msg = c.query(new Question("mugenguild.com", TYPE.TXT));
DNSMessage msg = c.query(new Question(mFqdn, mType, mClass));
Record aw = msg.getAnswers()[0];
TXT txt = (TXT) aw.getPayload();
return txt.getText().toLowerCase();

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep1Fragment.java
View File

@@ -121,7 +121,7 @@ public class LinkedIdCreateDnsStep1Fragment extends Fragment {
}
});
mEditDns.setText("mugenguild.com");
mEditDns.setText("test.mugenguild.com");
return view;
}