Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-10-31 02:25:53 +01:00
Code Issues Packages Projects Releases Activity

fix review findings and code smells

Browse Source
This commit is contained in:
Konstantin Schaper
2020-08-12 12:00:57 +02:00
parent a4d0ff2b24
commit 82f752a7fc
16 changed files with 134 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scm-webapp/src/main/java/sonia/scm/security/gpg/DefaultPrivateKey.java
View File

@@ -37,22 +37,26 @@ import org.bouncycastle.openpgp.PGPSignatureGenerator;
import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
import sonia.scm.security.PrivateKey;
import javax.validation.constraints.NotNull;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Optional;
class DefaultPrivateKey implements PrivateKey {
final Optional<PGPPrivateKey> privateKey;
static DefaultPrivateKey parseRaw(String rawPrivateKey) {
return new DefaultPrivateKey(KeysExtractor.extractPrivateKey(rawPrivateKey));
}
DefaultPrivateKey(String rawPrivateKey) {
privateKey = KeysExtractor.extractPrivateKey(rawPrivateKey);
private final PGPPrivateKey privateKey;
private DefaultPrivateKey(@NotNull PGPPrivateKey privateKey) {
this.privateKey = privateKey;
}
@Override
public String getId() {
return privateKey.map(Keys::createId).orElse(null);
return Keys.createId(privateKey);
}
@Override
@@ -64,14 +68,10 @@ class DefaultPrivateKey implements PrivateKey {
HashAlgorithmTags.SHA1).setProvider(BouncyCastleProvider.PROVIDER_NAME)
);
if (privateKey.isPresent()) {
try {
signatureGenerator.init(PGPSignature.BINARY_DOCUMENT, privateKey.get());
} catch (PGPException e) {
throw new GPGException("Could not initialize signature generator", e);
}
} else {
throw new GPGException("Missing private key");
try {
signatureGenerator.init(PGPSignature.BINARY_DOCUMENT, privateKey);
} catch (PGPException e) {
throw new GPGException("Could not initialize signature generator", e);
}
ByteArrayOutputStream buffer = new ByteArrayOutputStream();