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

work on dns resource, working (dummy) verification

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-01-14 18:32:50 +01:00
parent 55ea957644
commit c03bcc2799
10 changed files with 691 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/affirmation/AffirmationResource.java
View File

@@ -64,7 +64,7 @@ public abstract class AffirmationResource {
return new LinkedVerifyResult(LinkedVerifyResult.RESULT_ERROR, log);
}
Log.d(Constants.TAG, res);
Log.d(Constants.TAG, "Resource data: '" + res + "'");
return verifyString(log, 1, res, nonce, fingerprint);
@@ -72,19 +72,23 @@ public abstract class AffirmationResource {
protected abstract String fetchResource (OperationLog log, int indent);
protected Matcher matchResource (OperationLog log, int indent, String res) {
return magicPattern.matcher(res);
}
protected LinkedVerifyResult verifyString (OperationLog log, int indent,
String res,
String nonce, byte[] fingerprint) {
log.add(LogType.MSG_LV_MATCH, indent);
Matcher match = magicPattern.matcher(res);
Matcher match = matchResource(log, indent+1, res);
if (!match.find()) {
log.add(LogType.MSG_LV_MATCH_ERROR, 2);
return new LinkedVerifyResult(LinkedVerifyResult.RESULT_ERROR, log);
}
String candidateFp = match.group(1);
String nonceCandidate = match.group(2);
String candidateFp = match.group(1).toLowerCase();
String nonceCandidate = match.group(2).toLowerCase();
String fp = KeyFormattingUtils.convertFingerprintToHex(fingerprint);

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/affirmation/LinkedIdentity.java
View File

@@ -167,7 +167,7 @@ public class LinkedIdentity {
// return Hex.toHexString(data);
// debug for now
return "0123456789ABCDEF01234567";
return "0123456789abcdef01234567";
}
}

47
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/affirmation/resources/DnsResouce.java
View File

@@ -1,47 +0,0 @@
package org.sufficientlysecure.keychain.pgp.affirmation.resources;
import android.content.Context;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
import org.sufficientlysecure.keychain.pgp.affirmation.AffirmationResource;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.util.Log;
import java.net.URI;
import java.util.HashMap;
import java.util.Set;
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.TYPE;
import de.measite.minidns.record.TXT;
public class DnsResouce extends AffirmationResource {
DnsResouce(Set<String> flags, HashMap<String,String> params, URI uri) {
super(flags, params, uri);
}
public static String generate (Context context, byte[] fingerprint, String nonce) {
return "pgpid+cookie:"
+ KeyFormattingUtils.convertFingerprintToHex(fingerprint) + ";" + nonce + "";
}
@Override
protected String fetchResource (OperationLog log, int indent) {
Client c = new Client();
DNSMessage msg = c.query(new Question("mugenguild.com", TYPE.TXT));
Record aw = msg.getAnswers()[0];
TXT txt = (TXT) aw.getPayload();
Log.d(Constants.TAG, txt.getText());
return txt.getText();
}
}

70
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/affirmation/resources/DnsResource.java Normal file
View File

@@ -0,0 +1,70 @@
package org.sufficientlysecure.keychain.pgp.affirmation.resources;
import android.content.Context;
import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
import org.sufficientlysecure.keychain.pgp.affirmation.AffirmationResource;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import java.net.URI;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
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.TYPE;
import de.measite.minidns.record.TXT;
public class DnsResource extends AffirmationResource {
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) {
super(flags, params, uri);
}
public static String generateText (Context context, byte[] fingerprint, String nonce) {
return "pgpid+cookie="
+ KeyFormattingUtils.convertFingerprintToHex(fingerprint) + ";" + nonce + "";
}
public static DnsResource createNew (String domain) {
HashSet<String> flags = new HashSet<String>();
HashMap<String,String> params = new HashMap<String,String>();
URI uri = URI.create("dns:" + domain);
return create(flags, params, uri);
}
public static DnsResource create(Set<String> flags, HashMap<String,String> params, URI uri) {
if ( ! ("dns".equals(uri.getScheme())
&& (flags == null || flags.isEmpty())
&& (params == null || params.isEmpty()))) {
return null;
}
return new DnsResource(flags, params, uri);
}
@Override
protected String fetchResource (OperationLog log, int indent) {
Client c = new Client();
DNSMessage msg = c.query(new Question("mugenguild.com", TYPE.TXT));
Record aw = msg.getAnswers()[0];
TXT txt = (TXT) aw.getPayload();
return txt.getText().toLowerCase();
}
@Override
protected Matcher matchResource(OperationLog log, int indent, String res) {
return magicPattern.matcher(res);
}
}