mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-12-24 07:58:50 -05:00
involve user attributes in unit tests for merge and canonicalize!
This commit is contained in:
parent
73feaa974c
commit
2e04888d36
@ -104,6 +104,12 @@ public class UncachedKeyringCanonicalizeTest {
|
|||||||
|
|
||||||
parcel.mAddUserIds.add("twi");
|
parcel.mAddUserIds.add("twi");
|
||||||
parcel.mAddUserIds.add("pink");
|
parcel.mAddUserIds.add("pink");
|
||||||
|
{
|
||||||
|
WrappedUserAttribute uat = WrappedUserAttribute.fromSubpacket(100,
|
||||||
|
"sunshine, sunshine, ladybugs awake~".getBytes());
|
||||||
|
parcel.mAddUserAttribute.add(uat);
|
||||||
|
}
|
||||||
|
|
||||||
// passphrase is tested in PgpKeyOperationTest, just use empty here
|
// passphrase is tested in PgpKeyOperationTest, just use empty here
|
||||||
parcel.mNewUnlock = new ChangeUnlockParcel("");
|
parcel.mNewUnlock = new ChangeUnlockParcel("");
|
||||||
PgpKeyOperation op = new PgpKeyOperation(null);
|
PgpKeyOperation op = new PgpKeyOperation(null);
|
||||||
@ -116,7 +122,7 @@ public class UncachedKeyringCanonicalizeTest {
|
|||||||
staticRing = staticRing.canonicalize(new OperationLog(), 0).getUncachedKeyRing();
|
staticRing = staticRing.canonicalize(new OperationLog(), 0).getUncachedKeyRing();
|
||||||
|
|
||||||
// just for later reference
|
// just for later reference
|
||||||
totalPackets = 9;
|
totalPackets = 11;
|
||||||
|
|
||||||
// we sleep here for a second, to make sure all new certificates have different timestamps
|
// we sleep here for a second, to make sure all new certificates have different timestamps
|
||||||
Thread.sleep(1000);
|
Thread.sleep(1000);
|
||||||
@ -150,8 +156,8 @@ public class UncachedKeyringCanonicalizeTest {
|
|||||||
Assert.assertEquals("packet #4 should be signature",
|
Assert.assertEquals("packet #4 should be signature",
|
||||||
PacketTags.SIGNATURE, it.next().tag);
|
PacketTags.SIGNATURE, it.next().tag);
|
||||||
|
|
||||||
Assert.assertEquals("packet #5 should be secret subkey",
|
Assert.assertEquals("packet #5 should be user id",
|
||||||
PacketTags.SECRET_SUBKEY, it.next().tag);
|
PacketTags.USER_ATTRIBUTE, it.next().tag);
|
||||||
Assert.assertEquals("packet #6 should be signature",
|
Assert.assertEquals("packet #6 should be signature",
|
||||||
PacketTags.SIGNATURE, it.next().tag);
|
PacketTags.SIGNATURE, it.next().tag);
|
||||||
|
|
||||||
@ -160,7 +166,12 @@ public class UncachedKeyringCanonicalizeTest {
|
|||||||
Assert.assertEquals("packet #8 should be signature",
|
Assert.assertEquals("packet #8 should be signature",
|
||||||
PacketTags.SIGNATURE, it.next().tag);
|
PacketTags.SIGNATURE, it.next().tag);
|
||||||
|
|
||||||
Assert.assertFalse("exactly 9 packets total", it.hasNext());
|
Assert.assertEquals("packet #9 should be secret subkey",
|
||||||
|
PacketTags.SECRET_SUBKEY, it.next().tag);
|
||||||
|
Assert.assertEquals("packet #10 should be signature",
|
||||||
|
PacketTags.SIGNATURE, it.next().tag);
|
||||||
|
|
||||||
|
Assert.assertFalse("exactly 11 packets total", it.hasNext());
|
||||||
|
|
||||||
Assert.assertArrayEquals("created keyring should be constant through canonicalization",
|
Assert.assertArrayEquals("created keyring should be constant through canonicalization",
|
||||||
ring.getEncoded(), ring.canonicalize(log, 0).getEncoded());
|
ring.getEncoded(), ring.canonicalize(log, 0).getEncoded());
|
||||||
@ -380,7 +391,7 @@ public class UncachedKeyringCanonicalizeTest {
|
|||||||
@Test public void testSubkeyDestroy() throws Exception {
|
@Test public void testSubkeyDestroy() throws Exception {
|
||||||
|
|
||||||
// signature for second key (first subkey)
|
// signature for second key (first subkey)
|
||||||
UncachedKeyRing modified = KeyringTestingHelper.removePacket(ring, 6);
|
UncachedKeyRing modified = KeyringTestingHelper.removePacket(ring, 8);
|
||||||
|
|
||||||
// canonicalization should fail, because there are no valid uids left
|
// canonicalization should fail, because there are no valid uids left
|
||||||
CanonicalizedKeyRing canonicalized = modified.canonicalize(log, 0);
|
CanonicalizedKeyRing canonicalized = modified.canonicalize(log, 0);
|
||||||
@ -424,7 +435,7 @@ public class UncachedKeyringCanonicalizeTest {
|
|||||||
secretKey.getPublicKey(), pKey.getPublicKey());
|
secretKey.getPublicKey(), pKey.getPublicKey());
|
||||||
|
|
||||||
// inject in the right position
|
// inject in the right position
|
||||||
UncachedKeyRing modified = KeyringTestingHelper.injectPacket(ring, sig.getEncoded(), 6);
|
UncachedKeyRing modified = KeyringTestingHelper.injectPacket(ring, sig.getEncoded(), 8);
|
||||||
|
|
||||||
// canonicalize, and check if we lose the bad signature
|
// canonicalize, and check if we lose the bad signature
|
||||||
CanonicalizedKeyRing canonicalized = modified.canonicalize(log, 0);
|
CanonicalizedKeyRing canonicalized = modified.canonicalize(log, 0);
|
||||||
@ -449,7 +460,7 @@ public class UncachedKeyringCanonicalizeTest {
|
|||||||
secretKey.getPublicKey(), pKey.getPublicKey());
|
secretKey.getPublicKey(), pKey.getPublicKey());
|
||||||
|
|
||||||
// inject in the right position
|
// inject in the right position
|
||||||
UncachedKeyRing modified = KeyringTestingHelper.injectPacket(ring, sig.getEncoded(), 6);
|
UncachedKeyRing modified = KeyringTestingHelper.injectPacket(ring, sig.getEncoded(), 8);
|
||||||
|
|
||||||
// canonicalize, and check if we lose the bad signature
|
// canonicalize, and check if we lose the bad signature
|
||||||
CanonicalizedKeyRing canonicalized = modified.canonicalize(log, 0);
|
CanonicalizedKeyRing canonicalized = modified.canonicalize(log, 0);
|
||||||
@ -481,10 +492,10 @@ public class UncachedKeyringCanonicalizeTest {
|
|||||||
secretKey, PGPSignature.SUBKEY_BINDING, subHashedPacketsGen,
|
secretKey, PGPSignature.SUBKEY_BINDING, subHashedPacketsGen,
|
||||||
secretKey.getPublicKey(), pKey.getPublicKey());
|
secretKey.getPublicKey(), pKey.getPublicKey());
|
||||||
|
|
||||||
UncachedKeyRing modified = KeyringTestingHelper.injectPacket(ring, sig1.getEncoded(), 8);
|
UncachedKeyRing modified = KeyringTestingHelper.injectPacket(ring, sig1.getEncoded(), 10);
|
||||||
modified = KeyringTestingHelper.injectPacket(modified, sig2.getEncoded(), 9);
|
modified = KeyringTestingHelper.injectPacket(modified, sig2.getEncoded(), 11);
|
||||||
modified = KeyringTestingHelper.injectPacket(modified, sig1.getEncoded(), 10);
|
modified = KeyringTestingHelper.injectPacket(modified, sig1.getEncoded(), 12);
|
||||||
modified = KeyringTestingHelper.injectPacket(modified, sig3.getEncoded(), 11);
|
modified = KeyringTestingHelper.injectPacket(modified, sig3.getEncoded(), 13);
|
||||||
|
|
||||||
// canonicalize, and check if we lose the bad signature
|
// canonicalize, and check if we lose the bad signature
|
||||||
CanonicalizedKeyRing canonicalized = modified.canonicalize(log, 0);
|
CanonicalizedKeyRing canonicalized = modified.canonicalize(log, 0);
|
||||||
@ -512,13 +523,13 @@ public class UncachedKeyringCanonicalizeTest {
|
|||||||
|
|
||||||
// get subkey packets
|
// get subkey packets
|
||||||
Iterator<RawPacket> it = KeyringTestingHelper.parseKeyring(ring.getEncoded());
|
Iterator<RawPacket> it = KeyringTestingHelper.parseKeyring(ring.getEncoded());
|
||||||
RawPacket subKey = KeyringTestingHelper.getNth(it, 5);
|
RawPacket subKey = KeyringTestingHelper.getNth(it, 7);
|
||||||
RawPacket subSig = it.next();
|
RawPacket subSig = it.next();
|
||||||
|
|
||||||
// inject at a second position
|
// inject at a second position
|
||||||
UncachedKeyRing modified = ring;
|
UncachedKeyRing modified = ring;
|
||||||
modified = KeyringTestingHelper.injectPacket(modified, subKey.buf, 7);
|
modified = KeyringTestingHelper.injectPacket(modified, subKey.buf, 9);
|
||||||
modified = KeyringTestingHelper.injectPacket(modified, subSig.buf, 8);
|
modified = KeyringTestingHelper.injectPacket(modified, subSig.buf, 10);
|
||||||
|
|
||||||
// canonicalize, and check if we lose the bad signature
|
// canonicalize, and check if we lose the bad signature
|
||||||
OperationLog log = new OperationLog();
|
OperationLog log = new OperationLog();
|
||||||
@ -557,7 +568,7 @@ public class UncachedKeyringCanonicalizeTest {
|
|||||||
sKey = new PGPSecretKey(masterSecretKey.getPrivateKey(), subPubKey, sha1Calc, false, keyEncryptor);
|
sKey = new PGPSecretKey(masterSecretKey.getPrivateKey(), subPubKey, sha1Calc, false, keyEncryptor);
|
||||||
}
|
}
|
||||||
|
|
||||||
UncachedKeyRing modified = KeyringTestingHelper.injectPacket(ring, sKey.getEncoded(), 5);
|
UncachedKeyRing modified = KeyringTestingHelper.injectPacket(ring, sKey.getEncoded(), 7);
|
||||||
|
|
||||||
// canonicalize, and check if we lose the bad signature
|
// canonicalize, and check if we lose the bad signature
|
||||||
OperationLog log = new OperationLog();
|
OperationLog log = new OperationLog();
|
||||||
|
@ -46,6 +46,7 @@ import java.io.ByteArrayInputStream;
|
|||||||
import java.security.Security;
|
import java.security.Security;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
/** Tests for the UncachedKeyring.merge method.
|
/** Tests for the UncachedKeyring.merge method.
|
||||||
*
|
*
|
||||||
@ -97,6 +98,12 @@ public class UncachedKeyringMergeTest {
|
|||||||
|
|
||||||
parcel.mAddUserIds.add("twi");
|
parcel.mAddUserIds.add("twi");
|
||||||
parcel.mAddUserIds.add("pink");
|
parcel.mAddUserIds.add("pink");
|
||||||
|
{
|
||||||
|
WrappedUserAttribute uat = WrappedUserAttribute.fromSubpacket(100,
|
||||||
|
"sunshine, sunshine, ladybugs awake~".getBytes());
|
||||||
|
parcel.mAddUserAttribute.add(uat);
|
||||||
|
}
|
||||||
|
|
||||||
// passphrase is tested in PgpKeyOperationTest, just use empty here
|
// passphrase is tested in PgpKeyOperationTest, just use empty here
|
||||||
parcel.mNewUnlock = new ChangeUnlockParcel("");
|
parcel.mNewUnlock = new ChangeUnlockParcel("");
|
||||||
PgpKeyOperation op = new PgpKeyOperation(null);
|
PgpKeyOperation op = new PgpKeyOperation(null);
|
||||||
@ -339,6 +346,36 @@ public class UncachedKeyringMergeTest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testAddedUserAttributeSignature() throws Exception {
|
||||||
|
|
||||||
|
final UncachedKeyRing modified; {
|
||||||
|
parcel.reset();
|
||||||
|
|
||||||
|
Random r = new Random();
|
||||||
|
int type = r.nextInt(110)+1;
|
||||||
|
byte[] data = new byte[r.nextInt(2000)];
|
||||||
|
new Random().nextBytes(data);
|
||||||
|
|
||||||
|
WrappedUserAttribute uat = WrappedUserAttribute.fromSubpacket(type, data);
|
||||||
|
parcel.mAddUserAttribute.add(uat);
|
||||||
|
|
||||||
|
CanonicalizedSecretKeyRing secretRing = new CanonicalizedSecretKeyRing(
|
||||||
|
ringA.getEncoded(), false, 0);
|
||||||
|
modified = op.modifySecretKeyRing(secretRing, parcel, "").getRing();
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
UncachedKeyRing merged = ringA.merge(modified, log, 0);
|
||||||
|
Assert.assertNotNull("merge must succeed", merged);
|
||||||
|
Assert.assertFalse(
|
||||||
|
"merging keyring with extra user attribute into its base should yield that same keyring",
|
||||||
|
KeyringTestingHelper.diffKeyrings(merged.getEncoded(), modified.getEncoded(), onlyA, onlyB)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
private UncachedKeyRing mergeWithChecks(UncachedKeyRing a, UncachedKeyRing b)
|
private UncachedKeyRing mergeWithChecks(UncachedKeyRing a, UncachedKeyRing b)
|
||||||
throws Exception {
|
throws Exception {
|
||||||
return mergeWithChecks(a, b, a);
|
return mergeWithChecks(a, b, a);
|
||||||
|
@ -37,6 +37,7 @@ import java.io.ByteArrayInputStream;
|
|||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19
|
@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19
|
||||||
@ -59,6 +60,15 @@ public class UncachedKeyringTest {
|
|||||||
|
|
||||||
parcel.mAddUserIds.add("twi");
|
parcel.mAddUserIds.add("twi");
|
||||||
parcel.mAddUserIds.add("pink");
|
parcel.mAddUserIds.add("pink");
|
||||||
|
{
|
||||||
|
Random r = new Random();
|
||||||
|
int type = r.nextInt(110)+1;
|
||||||
|
byte[] data = new byte[r.nextInt(2000)];
|
||||||
|
new Random().nextBytes(data);
|
||||||
|
|
||||||
|
WrappedUserAttribute uat = WrappedUserAttribute.fromSubpacket(type, data);
|
||||||
|
parcel.mAddUserAttribute.add(uat);
|
||||||
|
}
|
||||||
// passphrase is tested in PgpKeyOperationTest, just use empty here
|
// passphrase is tested in PgpKeyOperationTest, just use empty here
|
||||||
parcel.mNewUnlock = new ChangeUnlockParcel("");
|
parcel.mNewUnlock = new ChangeUnlockParcel("");
|
||||||
PgpKeyOperation op = new PgpKeyOperation(null);
|
PgpKeyOperation op = new PgpKeyOperation(null);
|
||||||
|
Loading…
Reference in New Issue
Block a user