Merge remote-tracking branch 'origin/master' into v/multi-decrypt
This commit is contained in:
Vincent Breitmoser
@@ -41,7 +41,9 @@ import org.hamcrest.CoreMatchers;
|
||||
import org.hamcrest.Matcher;
|
||||
import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
|
||||
import org.sufficientlysecure.keychain.pgp.UncachedKeyRing.IteratorWithIOThrow;
|
||||
import org.sufficientlysecure.keychain.provider.KeychainDatabase;
|
||||
import org.sufficientlysecure.keychain.provider.ProviderHelper;
|
||||
import org.sufficientlysecure.keychain.service.PassphraseCacheService;
|
||||
import org.sufficientlysecure.keychain.ui.util.Notify.Style;
|
||||
import org.sufficientlysecure.keychain.util.ProgressScaler;
|
||||
|
||||
@@ -148,5 +150,16 @@ public class TestHelpers {
|
||||
return passbuilder.toString();
|
||||
}
|
||||
|
||||
public static void cleanupForTests(Context context) throws Exception {
|
||||
|
||||
new KeychainDatabase(context).clearDatabase();
|
||||
|
||||
// import these two, make sure they're there
|
||||
importKeysFromResource(context, "x.sec.asc");
|
||||
|
||||
// make sure no passphrases are cached
|
||||
PassphraseCacheService.clearCachedPassphrases(context);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,171 @@
|
||||
package org.sufficientlysecure.keychain.remote;
|
||||
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
|
||||
import android.app.PendingIntent;
|
||||
import android.content.Intent;
|
||||
import android.os.IBinder;
|
||||
import android.support.test.InstrumentationRegistry;
|
||||
import android.support.test.rule.ServiceTestRule;
|
||||
import android.support.test.runner.AndroidJUnit4;
|
||||
import android.test.suitebuilder.annotation.LargeTest;
|
||||
import android.widget.AdapterView;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.openintents.openpgp.IOpenPgpService;
|
||||
import org.openintents.openpgp.util.OpenPgpApi;
|
||||
import org.sufficientlysecure.keychain.R;
|
||||
|
||||
import static android.support.test.espresso.Espresso.onData;
|
||||
import static android.support.test.espresso.Espresso.onView;
|
||||
import static android.support.test.espresso.action.ViewActions.click;
|
||||
import static android.support.test.espresso.action.ViewActions.typeText;
|
||||
import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
|
||||
import static android.support.test.espresso.matcher.ViewMatchers.withId;
|
||||
import static android.support.test.espresso.matcher.ViewMatchers.withText;
|
||||
import static org.hamcrest.core.Is.is;
|
||||
import static org.junit.Assert.assertThat;
|
||||
import static org.sufficientlysecure.keychain.TestHelpers.cleanupForTests;
|
||||
import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withKeyItemId;
|
||||
|
||||
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
@LargeTest
|
||||
public class OpenPgpServiceTest {
|
||||
|
||||
@Rule
|
||||
public final ServiceTestRule mServiceRule = new ServiceTestRule();
|
||||
|
||||
OpenPgpApi mApi;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
|
||||
cleanupForTests(InstrumentationRegistry.getTargetContext());
|
||||
|
||||
Intent serviceIntent = new Intent(InstrumentationRegistry.getTargetContext(), OpenPgpService.class);
|
||||
IBinder binder = mServiceRule.bindService(serviceIntent);
|
||||
|
||||
mApi = new OpenPgpApi(InstrumentationRegistry.getTargetContext(),
|
||||
IOpenPgpService.Stub.asInterface(binder));
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testStuff() throws Exception {
|
||||
|
||||
// TODO why does this not ask for general usage permissions?!
|
||||
|
||||
{
|
||||
Intent intent = new Intent();
|
||||
intent.setAction(OpenPgpApi.ACTION_ENCRYPT);
|
||||
intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
|
||||
intent.putExtra(OpenPgpApi.EXTRA_KEY_IDS, new long[] { 0x9D604D2F310716A3L });
|
||||
|
||||
ByteArrayInputStream is = new ByteArrayInputStream("swag".getBytes());
|
||||
ByteArrayOutputStream os = new ByteArrayOutputStream();
|
||||
|
||||
Intent result = mApi.executeApi(intent, is, os);
|
||||
|
||||
assertThat("result is pending accept",
|
||||
result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR),
|
||||
is(OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED));
|
||||
|
||||
PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT);
|
||||
pi.send();
|
||||
|
||||
onView(withText(R.string.api_register_allow)).perform(click());
|
||||
|
||||
}
|
||||
|
||||
byte[] ciphertext;
|
||||
{
|
||||
Intent intent = new Intent();
|
||||
intent.setAction(OpenPgpApi.ACTION_ENCRYPT);
|
||||
intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
|
||||
intent.putExtra(OpenPgpApi.EXTRA_KEY_IDS, new long[] { 0x9D604D2F310716A3L });
|
||||
|
||||
ByteArrayInputStream is = new ByteArrayInputStream("swag".getBytes());
|
||||
ByteArrayOutputStream os = new ByteArrayOutputStream();
|
||||
|
||||
Intent result = mApi.executeApi(intent, is, os);
|
||||
|
||||
assertThat("result is ok",
|
||||
result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR),
|
||||
is(OpenPgpApi.RESULT_CODE_SUCCESS));
|
||||
|
||||
ciphertext = os.toByteArray();
|
||||
}
|
||||
|
||||
{ // decrypt
|
||||
Intent intent = new Intent();
|
||||
intent.setAction(OpenPgpApi.ACTION_DECRYPT_VERIFY);
|
||||
|
||||
ByteArrayInputStream is = new ByteArrayInputStream(ciphertext);
|
||||
ByteArrayOutputStream os = new ByteArrayOutputStream();
|
||||
|
||||
Intent result = mApi.executeApi(intent, is, os);
|
||||
|
||||
assertThat("result is pending input",
|
||||
result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR),
|
||||
is(OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED));
|
||||
|
||||
PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT);
|
||||
pi.send();
|
||||
|
||||
onData(withKeyItemId(0x9D604D2F310716A3L))
|
||||
.inAdapterView(isAssignableFrom(AdapterView.class))
|
||||
.perform(click());
|
||||
|
||||
onView(withText(R.string.api_settings_save)).perform(click());
|
||||
|
||||
// unfortunately, getting the activity result from the
|
||||
|
||||
}
|
||||
|
||||
{ // decrypt again, this time pending passphrase
|
||||
Intent intent = new Intent();
|
||||
intent.setAction(OpenPgpApi.ACTION_DECRYPT_VERIFY);
|
||||
|
||||
ByteArrayInputStream is = new ByteArrayInputStream(ciphertext);
|
||||
ByteArrayOutputStream os = new ByteArrayOutputStream();
|
||||
|
||||
Intent result = mApi.executeApi(intent, is, os);
|
||||
|
||||
assertThat("result is pending passphrase",
|
||||
result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR),
|
||||
is(OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED));
|
||||
|
||||
PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT);
|
||||
pi.send();
|
||||
|
||||
onView(withId(R.id.passphrase_passphrase)).perform(typeText("x"));
|
||||
onView(withText(R.string.btn_unlock)).perform(click());
|
||||
}
|
||||
|
||||
{ // decrypt again, NOW it should work with passphrase cached =)
|
||||
Intent intent = new Intent();
|
||||
intent.setAction(OpenPgpApi.ACTION_DECRYPT_VERIFY);
|
||||
|
||||
ByteArrayInputStream is = new ByteArrayInputStream(ciphertext);
|
||||
ByteArrayOutputStream os = new ByteArrayOutputStream();
|
||||
|
||||
Intent result = mApi.executeApi(intent, is, os);
|
||||
|
||||
assertThat("result is pending passphrase",
|
||||
result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR),
|
||||
is(OpenPgpApi.RESULT_CODE_SUCCESS));
|
||||
|
||||
byte[] plaintext = os.toByteArray();
|
||||
assertThat("decrypted plaintext matches plaintext", new String(plaintext), is("swag"));
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user