PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2025-12-10 06:11:08 +01:00
Code Issues Releases Wiki Activity

Increase test coverage by writing bunch of JUnit tests

Browse source
This commit is contained in:
Paul Schaub 2021-01-22 20:03:20 +01:00
parent ee1f90e850
commit bec2fb5ce1
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
15 changed files with 457 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pgpainless-core/src/main/java/org/pgpainless/key/protection/CallbackBasedKeyringProtector.java
View file

@ -40,7 +40,7 @@ public class CallbackBasedKeyringProtector implements SecretKeyRingProtector2 {
@Override
public PBESecretKeyDecryptor getDecryptor(PGPSecretKey key) throws PGPException {
Passphrase passphrase = lookupPassphraseInCache(key);
if (passphrase != null) {
if (passphrase == null) {
passphrase = callback.getPassphraseFor(key);
passphraseCache.put(key.getKeyID(), passphrase);
}

3
pgpainless-core/src/main/java/org/pgpainless/key/protection/PassphraseMapKeyRingProtector.java
View file

@ -72,6 +72,9 @@ public class PassphraseMapKeyRingProtector implements SecretKeyRingProtector, Se
public Passphrase getPassphraseFor(Long keyId) {
Passphrase passphrase = cache.get(keyId);
if (passphrase == null || !passphrase.isValid()) {
if (provider == null) {
return null;
}
passphrase = provider.getPassphraseFor(keyId);
if (passphrase != null) {
cache.put(keyId, passphrase);

7
pgpainless-core/src/main/java/org/pgpainless/key/protection/SecretKeyRingProtector.java
View file

@ -16,6 +16,7 @@
package org.pgpainless.key.protection;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.Nullable;
import org.bouncycastle.openpgp.PGPException;
@ -52,7 +53,11 @@ public interface SecretKeyRingProtector {
@Nullable PBESecretKeyEncryptor getEncryptor(Long keyId) throws PGPException;
static SecretKeyRingProtector unlockAllKeysWith(Passphrase passphrase, PGPSecretKeyRing keys) {
return PasswordBasedSecretKeyRingProtector.forKey(keys, passphrase);
Map<Long, Passphrase> map = new ConcurrentHashMap<>();
for (PGPSecretKey secretKey : keys) {
map.put(secretKey.getKeyID(), passphrase);
}
return fromPassphraseMap(map);
}
static SecretKeyRingProtector unlockSingleKeyWith(Passphrase passphrase, PGPSecretKey key) {

8
pgpainless-core/src/main/java/org/pgpainless/key/selection/key/impl/SignedByMasterKey.java → pgpainless-core/src/main/java/org/pgpainless/key/selection/key/impl/KeyBelongsToKeyRing.java
View file

@ -24,12 +24,12 @@ import java.util.logging.Logger;
import org.bouncycastle.openpgp.PGPException;
import org.bouncycastle.openpgp.PGPPublicKey;
import org.bouncycastle.openpgp.PGPSignature;
import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider;
import org.pgpainless.implementation.ImplementationFactory;
import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
public class SignedByMasterKey {
public class KeyBelongsToKeyRing {
private static final Logger LOGGER = Logger.getLogger(SignedByMasterKey.class.getName());
private static final Logger LOGGER = Logger.getLogger(KeyBelongsToKeyRing.class.getName());
public static class PubkeySelectionStrategy extends PublicKeySelectionStrategy {
@ -51,7 +51,7 @@ public class SignedByMasterKey {
PGPSignature signature = signatures.next();
if (signature.getSignatureType() == PGPSignature.SUBKEY_BINDING) {
try {
signature.init(new BcPGPContentVerifierBuilderProvider(), masterKey);
signature.init(ImplementationFactory.getInstance().getPGPContentVerifierBuilderProvider(), masterKey);
return signature.verifyCertification(masterKey, key);
} catch (PGPException e) {
LOGGER.log(Level.WARNING, "Could not verify subkey signature of key " +

6
pgpainless-core/src/main/java/org/pgpainless/util/BCUtil.java
View file

@ -42,7 +42,7 @@ import org.bouncycastle.util.io.Streams;
import org.pgpainless.algorithm.KeyFlag;
import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
import org.pgpainless.key.selection.key.impl.NoRevocation;
import org.pgpainless.key.selection.key.impl.SignedByMasterKey;
import org.pgpainless.key.selection.key.impl.KeyBelongsToKeyRing;
import org.pgpainless.key.selection.key.util.And;
public class BCUtil {
@ -136,7 +136,7 @@ public class BCUtil {
}
// Only select keys which are signed by the master key and not revoked.
PublicKeySelectionStrategy selector = new And.PubKeySelectionStrategy(
new SignedByMasterKey.PubkeySelectionStrategy(masterKey),
new KeyBelongsToKeyRing.PubkeySelectionStrategy(masterKey),
new NoRevocation.PubKeySelectionStrategy());
PGPPublicKeyRing cleaned = ring;
@ -167,7 +167,7 @@ public class BCUtil {
}
// Only select keys which are signed by the master key and not revoked.
PublicKeySelectionStrategy selector = new And.PubKeySelectionStrategy(
new SignedByMasterKey.PubkeySelectionStrategy(masterKey),
new KeyBelongsToKeyRing.PubkeySelectionStrategy(masterKey),
new NoRevocation.PubKeySelectionStrategy());
PGPSecretKeyRing cleaned = ring;

20
pgpainless-core/src/main/java/org/pgpainless/util/NotYetImplementedException.java
View file

@ -1,20 +0,0 @@
/*
* Copyright 2020 Paul Schaub.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.pgpainless.util;
public class NotYetImplementedException extends AssertionError {
}

23
pgpainless-core/src/main/java/org/pgpainless/util/Passphrase.java
View file

@ -110,4 +110,27 @@ public class Passphrase {
public static Passphrase emptyPassphrase() {
return new Passphrase(null);
}
@Override
public int hashCode() {
if (getChars() == null) {
return 0;
}
return new String(getChars()).hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) {
return false;
}
if (this == obj) {
return true;
}
if (!(obj instanceof Passphrase)) {
return false;
}
Passphrase other = (Passphrase) obj;
return Arrays.equals(getChars(), other.getChars());
}
}

159
pgpainless-core/src/main/java/org/pgpainless/util/SubpacketsInspector.java
View file

@ -1,159 +0,0 @@
/*
* Copyright 2021 Paul Schaub.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.pgpainless.util;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import org.bouncycastle.bcpg.sig.Features;
import org.bouncycastle.bcpg.sig.IntendedRecipientFingerprint;
import org.bouncycastle.bcpg.sig.NotationData;
import org.bouncycastle.openpgp.PGPSignatureSubpacketVector;
import org.pgpainless.algorithm.KeyFlag;
import org.pgpainless.algorithm.SignatureSubpacket;
import org.pgpainless.key.OpenPgpV4Fingerprint;
public class SubpacketsInspector {
public static StringBuilder toString(PGPSignatureSubpacketVector vector) {
StringBuilder sb = new StringBuilder();
optAppendSignatureCreationTime(sb, vector);
optAppendSignatureExpirationTime(sb, vector);
optAppendFlags(sb, vector);
optAppendFeatures(sb, vector);
optAppendIssuerKeyID(sb, vector);
optAppendSignerUserID(sb, vector);
optAppendKeyExpirationTime(sb, vector);
optAppendIntendedRecipientFingerprint(sb, vector);
optAppendNotationDataOccurrences(sb, vector);
optAppendCriticalTags(sb, vector);
return sb;
}
private static StringBuilder optAppendCriticalTags(StringBuilder sb, PGPSignatureSubpacketVector v) {
int[] criticalTagCodes = v.getCriticalTags();
if (criticalTagCodes.length == 0) {
return sb;
}
sb.append("Critical Tags: ").append('[');
for (int i = 0; i < criticalTagCodes.length; i++) {
int tag = criticalTagCodes[i];
try {
sb.append(SignatureSubpacket.fromCode(tag)).append(i == criticalTagCodes.length - 1 ? "" : ", ");
} catch (IllegalArgumentException e) {
}
}
return sb.append(']').append('\n');
}
private static StringBuilder optAppendNotationDataOccurrences(StringBuilder sb, PGPSignatureSubpacketVector v) {
NotationData[] notationData = v.getNotationDataOccurrences();
if (notationData.length == 0) {
return sb;
}
sb.append("Notation Data: [").append('\n');
for (int i = 0; i < notationData.length; i++) {
NotationData n = notationData[i];
sb.append('\'').append(n.getNotationName())
.append("' = '").append(n.getNotationValue())
.append(i == notationData.length - 1 ? "'" : "', ");
}
return sb.append('\n');
}
private static StringBuilder optAppendSignatureCreationTime(StringBuilder sb, PGPSignatureSubpacketVector v) {
return sb.append("Sig created: ").append(v.getSignatureCreationTime()).append('\n');
}
private static StringBuilder optAppendSignatureExpirationTime(StringBuilder sb, PGPSignatureSubpacketVector v) {
long time = v.getSignatureExpirationTime();
sb.append("Sig expires: ");
if (time == 0) {
sb.append("never");
} else {
Date creationTime = v.getSignatureCreationTime();
if (creationTime != null) {
long seconds = creationTime.getTime() / 1000;
Date expirationDate = new Date((seconds + time) * 1000);
sb.append(expirationDate).append(" (").append(time).append(')');
} else {
sb.append(time);
}
}
return sb.append('\n');
}
private static StringBuilder optAppendFlags(StringBuilder sb, PGPSignatureSubpacketVector v) {
List<KeyFlag> flagList = KeyFlag.fromBitmask(v.getKeyFlags());
sb.append("Flags: ").append(Arrays.toString(flagList.toArray())).append('\n');
return sb;
}
private static StringBuilder optAppendFeatures(StringBuilder sb, PGPSignatureSubpacketVector v) {
Features features = v.getFeatures();
if (features == null) {
return sb;
}
sb.append("Features: ");
sb.append('[');
if (features.supportsModificationDetection()) {
sb.append("Modification Detection");
}
sb.append(']');
return sb.append('\n');
}
private static StringBuilder optAppendIssuerKeyID(StringBuilder sb, PGPSignatureSubpacketVector v) {
long keyId = v.getIssuerKeyID();
if (keyId == 0) {
return sb;
}
return sb.append("Issuer KeyID: ").append(Long.toHexString(keyId)).append('\n');
}
private static StringBuilder optAppendSignerUserID(StringBuilder sb, PGPSignatureSubpacketVector v) {
String userID = v.getSignerUserID();
if (userID == null) {
return sb;
}
return sb.append("Signer UserID: ").append(userID).append('\n');
}
private static StringBuilder optAppendKeyExpirationTime(StringBuilder sb, PGPSignatureSubpacketVector v) {
long expirationTime = v.getKeyExpirationTime();
sb.append("Key Expiration Time: ");
if (expirationTime == 0) {
sb.append("never");
} else {
sb.append(expirationTime).append(" seconds after creation");
}
return sb.append('\n');
}
private static StringBuilder optAppendIntendedRecipientFingerprint(StringBuilder sb, PGPSignatureSubpacketVector v) {
IntendedRecipientFingerprint fingerprint = v.getIntendedRecipientFingerprint();
if (fingerprint == null) {
return sb;
}
return sb.append("Intended Recipient Fingerprint: ")
.append(new OpenPgpV4Fingerprint(fingerprint.getFingerprint()))
.append('\n');
}
}