From b6a1463161779b820a8b03a9d17c8a35dccea338 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 16 Jan 2015 13:57:18 +0100
Subject: dns resource is parametrized by fqdn, class and type

---
 .../keychain/pgp/linked/resources/DnsResource.java | 37 +++++++++++++++++++---
 .../ui/linked/LinkedIdCreateDnsStep1Fragment.java  |  2 +-
 2 files changed, 34 insertions(+), 5 deletions(-)

(limited to 'OpenKeychain')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java
index 1c66ffeca..a2836e666 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java
@@ -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();
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep1Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep1Fragment.java
index ba57ace4b..973067246 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep1Fragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep1Fragment.java
@@ -121,7 +121,7 @@ public class LinkedIdCreateDnsStep1Fragment extends Fragment {
             }
         });
 
-        mEditDns.setText("mugenguild.com");
+        mEditDns.setText("test.mugenguild.com");
 
         return view;
     }
-- 
cgit v1.2.3