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

Check if passphrase is needed in PassphraseCacheService, extend documentation

Browse Source
This commit is contained in:
Dominik Schürmann 2013-05-29 13:57:28 +02:00
parent 61451fa5b5
commit 438ccd480e
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
View File

@ -48,6 +48,12 @@ import android.os.Messenger;
import android.os.RemoteException; import android.os.RemoteException;
import android.util.Log; import android.util.Log;
/**
* This service runs in its own process, but is available to all other processes as the main
* passphrase cache. Use the static methods addCachedPassphrase and getCachedPassphrase for
* convenience.
*
*/
public class PassphraseCacheService extends Service { public class PassphraseCacheService extends Service {
public static final String TAG = Constants.TAG + ": PassphraseCacheService"; public static final String TAG = Constants.TAG + ": PassphraseCacheService";
@ -74,9 +80,9 @@ public class PassphraseCacheService extends Service {
Context mContext; Context mContext;
/** /**
* This caches a new passphrase by sending a new command to the service. An android service is * This caches a new passphrase in memory by sending a new command to the service. An android
* only run once. Thus, when the service is already started, new commands just add new events to * service is only run once. Thus, when the service is already started, new commands just add
* the alarm manager for new passphrases to let them timeout in the future. * new events to the alarm manager for new passphrases to let them timeout in the future.
* *
* @param context * @param context
* @param keyId * @param keyId
@ -95,21 +101,23 @@ public class PassphraseCacheService extends Service {
} }
/** /**
* Gets a cached passphrase from memory, blocking method * Gets a cached passphrase from memory by sending an intent to the service. This method is
* designed to wait until the service returns the passphrase.
* *
* @param context * @param context
* @param keyId * @param keyId
* @return * @return passphrase or null (if no passphrase is cached for this keyId)
*/ */
public static String getCachedPassphrase(Context context, long keyId) { public static String getCachedPassphrase(Context context, long keyId) {
Log.d(TAG, "getCachedPassphrase() get masterKeyId for " + keyId); Log.d(TAG, "getCachedPassphrase() get masterKeyId for " + keyId);
Intent intent = new Intent(context, PassphraseCacheService.class); Intent intent = new Intent(context, PassphraseCacheService.class);
intent.setAction(ACTION_PASSPHRASE_CACHE_GET); intent.setAction(ACTION_PASSPHRASE_CACHE_GET);
final Object mutex = new Object(); final Object mutex = new Object();
final Bundle returnBundle = new Bundle(); final Bundle returnBundle = new Bundle();
HandlerThread handlerThread = new HandlerThread("getPassphrase"); HandlerThread handlerThread = new HandlerThread("getPassphraseThread");
handlerThread.start(); handlerThread.start();
Handler returnHandler = new Handler(handlerThread.getLooper()) { Handler returnHandler = new Handler(handlerThread.getLooper()) {
@Override @Override
@ -121,6 +129,7 @@ public class PassphraseCacheService extends Service {
synchronized (mutex) { synchronized (mutex) {
mutex.notify(); mutex.notify();
} }
// quit handlerThread
getLooper().quit(); getLooper().quit();
} }
}; };
@ -147,6 +156,12 @@ public class PassphraseCacheService extends Service {
} }
} }
/**
* Internal implementation to get cached passphrase.
*
* @param keyId
* @return
*/
private String getCachedPassphraseImpl(long keyId) { private String getCachedPassphraseImpl(long keyId) {
Log.d(TAG, "getCachedPassphraseImpl() get masterKeyId for " + keyId); Log.d(TAG, "getCachedPassphraseImpl() get masterKeyId for " + keyId);
@ -168,15 +183,15 @@ public class PassphraseCacheService extends Service {
// get cached passphrase // get cached passphrase
String cachedPassphrase = mPassphraseCache.get(masterKeyId); String cachedPassphrase = mPassphraseCache.get(masterKeyId);
if (cachedPassphrase == null) { if (cachedPassphrase == null) {
// TODO: fix! // if key has no passphrase -> cache and return empty passphrase
// check if secret key has a passphrase if (!hasPassphrase(this, masterKeyId)) {
// if (!hasPassphrase(context, masterKeyId)) { Log.d(Constants.TAG, "Key has no passphrase! Caches and returns empty passphrase!");
// // cache empty passphrase
// addCachedPassphrase(context, masterKeyId, ""); addCachedPassphrase(this, masterKeyId, "");
// return ""; return "";
// } else { } else {
return null; return null;
// } }
} }
// set it again to reset the cache life cycle // set it again to reset the cache life cycle
Log.d(TAG, "Cache passphrase again when getting it!"); Log.d(TAG, "Cache passphrase again when getting it!");
@ -196,17 +211,10 @@ public class PassphraseCacheService extends Service {
try { try {
PGPSecretKey secretKey = PgpHelper.getMasterKey(ProviderHelper PGPSecretKey secretKey = PgpHelper.getMasterKey(ProviderHelper
.getPGPSecretKeyRingByKeyId(context, secretKeyId)); .getPGPSecretKeyRingByKeyId(context, secretKeyId));
Log.d(Constants.TAG, "Check if key has no passphrase...");
PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder().setProvider( PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder().setProvider(
"SC").build("".toCharArray()); "SC").build("".toCharArray());
PGPPrivateKey testKey = secretKey.extractPrivateKey(keyDecryptor); PGPPrivateKey testKey = secretKey.extractPrivateKey(keyDecryptor);
if (testKey != null) { if (testKey != null) {
Log.d(Constants.TAG, "Key has no passphrase! Caches empty passphrase!");
// cache empty passphrase
PassphraseCacheService.addCachedPassphrase(context, secretKey.getKeyID(), "");
return false; return false;
} }
} catch (PGPException e) { } catch (PGPException e) {