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

keybase cleanups for revised search output format

Browse Source
This commit is contained in:
Tim Bray
2014-05-15 17:14:45 -07:00
parent 9b71791679
commit 148a522694
1 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyServer.java
View File

@@ -35,8 +35,6 @@ import java.util.WeakHashMap;
public class KeybaseKeyServer extends KeyServer { public class KeybaseKeyServer extends KeyServer {
private WeakHashMap<String, String> mKeyCache = new WeakHashMap<String, String>();
@Override @Override
public ArrayList<ImportKeysListEntry> search(String query) throws QueryException, TooManyResponses, public ArrayList<ImportKeysListEntry> search(String query) throws QueryException, TooManyResponses,
InsufficientQuery { InsufficientQuery {
@@ -93,29 +91,18 @@ public class KeybaseKeyServer extends KeyServer {
String keybaseId = JWalk.getString(match, "components", "username", "val"); String keybaseId = JWalk.getString(match, "components", "username", "val");
String fullName = JWalk.getString(match, "components", "full_name", "val"); String fullName = JWalk.getString(match, "components", "full_name", "val");
String fingerprint = JWalk.getString(match, "components", "key_fingerprint", "val"); String fingerprint = JWalk.getString(match, "components", "key_fingerprint", "val");
fingerprint = fingerprint.replace(" ", "").toUpperCase(); fingerprint = fingerprint.replace(" ", "").toUpperCase(); // not strictly necessary but doesn't hurt
entry.setFingerprintHex(fingerprint);
// in anticipation of a full fingerprint, only use the last 16 chars as 64-bit key id // in anticipation of a full fingerprint, only use the last 16 chars as 64-bit key id
entry.setKeyIdHex("0x" + fingerprint.substring(Math.max(0, fingerprint.length() - 16))); entry.setKeyIdHex("0x" + fingerprint.substring(Math.max(0, fingerprint.length() - 16)));
// store extra info, so we can query for the keybase id directly // store extra info, so we can query for the keybase id directly
entry.setExtraData(keybaseId); entry.setExtraData(keybaseId);
// TODO: Fix; have suggested keybase provide this value to avoid search-time crypto calls
final int algorithmId = JWalk.getInt(match, "components", "key_fingerprint", "algo"); final int algorithmId = JWalk.getInt(match, "components", "key_fingerprint", "algo");
entry.setAlgorithm(PgpKeyHelper.getAlgorithmInfo(algorithmId)); entry.setAlgorithm(PgpKeyHelper.getAlgorithmInfo(algorithmId));
final int bitStrength = JWalk.getInt(match, "components", "key_fingerprint", "nbits"); final int bitStrength = JWalk.getInt(match, "components", "key_fingerprint", "nbits");
entry.setBitStrength(bitStrength); entry.setBitStrength(bitStrength);
//entry.setBitStrength(4096);
//entry.setAlgorithm("RSA");
entry.setFingerprintHex(fingerprint);
// key data
// currently there's no need to query the user right away, and it should be avoided, so the
// user doesn't experience lag and doesn't download many keys unnecessarily, but should we
// require to do it at soe point:
// (weakly) remember the key, in case the user tries to import it
//mKeyCache.put(keybaseId, JWalk.getString(match, "them", "public_keys", "primary", "bundle"));
ArrayList<String> userIds = new ArrayList<String>(); ArrayList<String> userIds = new ArrayList<String>();
String name = fullName + " <keybase.io/" + keybaseId + ">"; String name = fullName + " <keybase.io/" + keybaseId + ">";
@@ -176,16 +163,12 @@ public class KeybaseKeyServer extends KeyServer {
@Override @Override
public String get(String id) throws QueryException { public String get(String id) throws QueryException {
String key = mKeyCache.get(id); try {
if (key == null) { JSONObject user = getUser(id);
try { return JWalk.getString(user, "them", "public_keys", "primary", "bundle");
JSONObject user = getUser(id); } catch (Exception e) {
key = JWalk.getString(user, "them", "public_keys", "primary", "bundle"); throw new QueryException(e.getMessage());
} catch (Exception e) {
throw new QueryException(e.getMessage());
}
} }
return key;
} }
@Override @Override