From e5b15fe0c2a836b0d0f51d97f4d8dcf7e70e3f55 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Sun, 15 Aug 2021 15:36:37 +0200 Subject: [PATCH] Use String-formatting in Logger statements --- .../DecryptionStreamFactory.java | 18 +++++++++--------- .../SignatureVerifyingInputStream.java | 2 +- .../encryption_signing/EncryptionStream.java | 4 ++-- .../signature/SignatureChainValidator.java | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStreamFactory.java b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStreamFactory.java index 1e2e433b..7a47846e 100644 --- a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStreamFactory.java +++ b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStreamFactory.java @@ -182,7 +182,7 @@ public final class DecryptionStreamFactory { private InputStream processPGPCompressedData(PGPCompressedData pgpCompressedData, int depth) throws PGPException, IOException { CompressionAlgorithm compressionAlgorithm = CompressionAlgorithm.fromId(pgpCompressedData.getAlgorithm()); - LOGGER.log(LEVEL, "Encountered PGPCompressedData: " + compressionAlgorithm); + LOGGER.log(LEVEL, "Encountered PGPCompressedData: {}", compressionAlgorithm); resultBuilder.setCompressionAlgorithm(compressionAlgorithm); InputStream inflatedDataStream = pgpCompressedData.getDataStream(); @@ -194,7 +194,7 @@ public final class DecryptionStreamFactory { private InputStream processOnePassSignatureList(@Nonnull PGPObjectFactory objectFactory, PGPOnePassSignatureList onePassSignatures, int depth) throws PGPException, IOException { - LOGGER.log(LEVEL, "Encountered PGPOnePassSignatureList of size " + onePassSignatures.size()); + LOGGER.log(LEVEL, "Encountered PGPOnePassSignatureList of size {}", onePassSignatures.size()); initOnePassSignatures(onePassSignatures); return processPGPPackets(objectFactory, ++depth); } @@ -261,12 +261,12 @@ public final class DecryptionStreamFactory { if (!options.getDecryptionKeys().isEmpty()) { // Known key id if (keyId != 0) { - LOGGER.log(LEVEL, "PGPEncryptedData is encrypted for key " + Long.toHexString(keyId)); + LOGGER.log(LEVEL, "PGPEncryptedData is encrypted for key {}", Long.toHexString(keyId)); resultBuilder.addRecipientKeyId(keyId); PGPSecretKeyRing decryptionKeyRing = findDecryptionKeyRing(keyId); if (decryptionKeyRing != null) { PGPSecretKey secretKey = decryptionKeyRing.getSecretKey(keyId); - LOGGER.log(LEVEL, "Found respective secret key " + Long.toHexString(keyId)); + LOGGER.log(LEVEL, "Found respective secret key {}", Long.toHexString(keyId)); // Watch out! This assignment is possibly done multiple times. encryptedSessionKey = publicKeyEncryptedData; decryptionKey = UnlockSecretKey.unlockSecretKey(secretKey, options.getSecretKeyProtector(decryptionKeyRing)); @@ -290,7 +290,7 @@ public final class DecryptionStreamFactory { PublicKeyDataDecryptorFactory decryptorFactory = ImplementationFactory.getInstance().getPublicKeyDataDecryptorFactory(privateKey); try { publicKeyEncryptedData.getSymmetricAlgorithm(decryptorFactory); // will only succeed if we have the right secret key - LOGGER.log(LEVEL, "Found correct key " + Long.toHexString(key.getKeyID()) + " for hidden recipient decryption."); + LOGGER.log(LEVEL, "Found correct key {} for hidden recipient decryption.", Long.toHexString(key.getKeyID())); decryptionKey = privateKey; resultBuilder.setDecryptionKey(new SubkeyIdentifier(ring, decryptionKey.getKeyID())); encryptedSessionKey = publicKeyEncryptedData; @@ -321,7 +321,7 @@ public final class DecryptionStreamFactory { if (symmetricKeyAlgorithm == SymmetricKeyAlgorithm.NULL) { LOGGER.log(LEVEL, "Message is unencrypted"); } else { - LOGGER.log(LEVEL, "Message is encrypted using " + symmetricKeyAlgorithm); + LOGGER.log(LEVEL, "Message is encrypted using {}", symmetricKeyAlgorithm); } throwIfAlgorithmIsRejected(symmetricKeyAlgorithm); resultBuilder.setSymmetricKeyAlgorithm(symmetricKeyAlgorithm); @@ -359,12 +359,12 @@ public final class DecryptionStreamFactory { private void processOnePassSignature(PGPOnePassSignature signature) throws PGPException { final long keyId = signature.getKeyID(); - LOGGER.log(LEVEL, "Message contains OnePassSignature from " + Long.toHexString(keyId)); + LOGGER.log(LEVEL, "Message contains OnePassSignature from {}", Long.toHexString(keyId)); // Find public key PGPPublicKeyRing verificationKeyRing = findSignatureVerificationKeyRing(keyId); if (verificationKeyRing == null) { - LOGGER.log(LEVEL, "Missing verification key from " + Long.toHexString(keyId)); + LOGGER.log(LEVEL, "Missing verification key from {}", Long.toHexString(keyId)); return; } PGPPublicKey verificationKey = verificationKeyRing.getPublicKey(keyId); @@ -390,7 +390,7 @@ public final class DecryptionStreamFactory { for (PGPPublicKeyRing publicKeyRing : options.getCertificates()) { PGPPublicKey verificationKey = publicKeyRing.getPublicKey(keyId); if (verificationKey != null) { - LOGGER.log(LEVEL, "Found public key " + Long.toHexString(keyId) + " for signature verification"); + LOGGER.log(LEVEL, "Found public key {} for signature verification", Long.toHexString(keyId)); verificationKeyRing = publicKeyRing; break; } diff --git a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/SignatureVerifyingInputStream.java b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/SignatureVerifyingInputStream.java index ab2f22b5..3df518ab 100644 --- a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/SignatureVerifyingInputStream.java +++ b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/SignatureVerifyingInputStream.java @@ -126,7 +126,7 @@ public class SignatureVerifyingInputStream extends FilterInputStream { if (!onePassSignature.verify(signature)) { throw new SignatureException("Bad Signature of key " + signature.getKeyID()); } else { - LOGGER.log(LEVEL, "Verified signature of key " + Long.toHexString(signature.getKeyID())); + LOGGER.log(LEVEL, "Verified signature of key {}", Long.toHexString(signature.getKeyID())); } } diff --git a/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionStream.java b/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionStream.java index 87d2d0a5..fc32bff0 100644 --- a/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionStream.java +++ b/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionStream.java @@ -99,7 +99,7 @@ public final class EncryptionStream extends OutputStream { SymmetricKeyAlgorithm encryptionAlgorithm = EncryptionBuilder.negotiateSymmetricEncryptionAlgorithm(encryptionOptions); resultBuilder.setEncryptionAlgorithm(encryptionAlgorithm); - LOGGER.log(LEVEL, "Encrypt message using " + encryptionAlgorithm); + LOGGER.log(LEVEL, "Encrypt message using {}", encryptionAlgorithm); PGPDataEncryptorBuilder dataEncryptorBuilder = ImplementationFactory.getInstance().getPGPDataEncryptorBuilder(encryptionAlgorithm); dataEncryptorBuilder.setWithIntegrityPacket(true); @@ -127,7 +127,7 @@ public final class EncryptionStream extends OutputStream { return; } - LOGGER.log(LEVEL, "Compress using " + compressionAlgorithm); + LOGGER.log(LEVEL, "Compress using {}", compressionAlgorithm); basicCompressionStream = new BCPGOutputStream(compressedDataGenerator.open(outermostStream)); outermostStream = basicCompressionStream; } diff --git a/pgpainless-core/src/main/java/org/pgpainless/signature/SignatureChainValidator.java b/pgpainless-core/src/main/java/org/pgpainless/signature/SignatureChainValidator.java index 927726ce..5267adea 100644 --- a/pgpainless-core/src/main/java/org/pgpainless/signature/SignatureChainValidator.java +++ b/pgpainless-core/src/main/java/org/pgpainless/signature/SignatureChainValidator.java @@ -140,7 +140,7 @@ public final class SignatureChainValidator { if (!userIdSignatures.get(userId).isEmpty()) { PGPSignature current = userIdSignatures.get(userId).get(0); if (current.getSignatureType() == SignatureType.CERTIFICATION_REVOCATION.getCode()) { - LOGGER.log(Level.FINE, "User-ID '" + userId + "' is revoked."); + LOGGER.log(Level.FINE, "User-ID '{}' is revoked.", userId); } else { anyUserIdValid = true; }