Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-07-04 10:18:48 +02: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

11
scm-webapp/src/test/java/sonia/scm/security/gpg/DefaultGPGTest.java
View File

@@ -144,8 +144,8 @@ class DefaultGPGTest {
void shouldImportExportedGeneratedPrivateKey() throws NoSuchProviderException, NoSuchAlgorithmException, PGPException, IOException {
final PGPKeyRingGenerator keyRingGenerator = GPGKeyPairGenerator.generateKeyPair();
final String exportedPrivateKey = GPGKeyExporter.exportKeyRing(keyRingGenerator.generateSecretKeyRing());
final Optional<PGPPrivateKey> privateKey = KeysExtractor.extractPrivateKey(exportedPrivateKey);
assertThat(privateKey).isPresent();
final PGPPrivateKey privateKey = KeysExtractor.extractPrivateKey(exportedPrivateKey);
assertThat(privateKey).isNotNull();
}
@Test
@@ -155,12 +155,13 @@ class DefaultGPGTest {
ThreadContext.bind(subjectUnderTest);
String raw = GPGTestHelper.readResourceAsString("private-key.asc");
final DefaultPrivateKey privateKey = new DefaultPrivateKey(raw);
final DefaultPrivateKey privateKey = DefaultPrivateKey.parseRaw(raw);
final byte[] signature = privateKey.sign("This is a test commit".getBytes());
final String signatureString = new String(signature);
assertThat(signature).isNotEmpty();
assertThat(signatureString).startsWith("-----BEGIN PGP SIGNATURE-----");
assertThat(signatureString).contains("-----END PGP SIGNATURE-----");
assertThat(signatureString)
.startsWith("-----BEGIN PGP SIGNATURE-----")
.contains("-----END PGP SIGNATURE-----");
}
@Test

14
scm-webapp/src/test/java/sonia/scm/security/gpg/GPGKeyExporterTest.java
View File

@@ -70,14 +70,16 @@ class GPGKeyExporterTest {
final PGPKeyRingGenerator keyRingGenerator = GPGKeyPairGenerator.generateKeyPair();
final String exportedPublicKey = GPGKeyExporter.exportKeyRing(keyRingGenerator.generatePublicKeyRing());
assertThat(exportedPublicKey).isNotBlank();
assertThat(exportedPublicKey).startsWith("-----BEGIN PGP PUBLIC KEY BLOCK-----");
assertThat(exportedPublicKey).contains("-----END PGP PUBLIC KEY BLOCK-----");
assertThat(exportedPublicKey)
.isNotBlank()
.startsWith("-----BEGIN PGP PUBLIC KEY BLOCK-----")
.contains("-----END PGP PUBLIC KEY BLOCK-----");
final String exportedPrivateKey = GPGKeyExporter.exportKeyRing(keyRingGenerator.generateSecretKeyRing());
assertThat(exportedPrivateKey).isNotBlank();
assertThat(exportedPrivateKey).startsWith("-----BEGIN PGP PRIVATE KEY BLOCK-----");
assertThat(exportedPrivateKey).contains("-----END PGP PRIVATE KEY BLOCK-----");
assertThat(exportedPrivateKey)
.isNotBlank()
.startsWith("-----BEGIN PGP PRIVATE KEY BLOCK-----")
.contains("-----END PGP PRIVATE KEY BLOCK-----");
}
}

11
scm-webapp/src/test/java/sonia/scm/security/gpg/KeysExtractorTest.java
View File

@@ -29,7 +29,6 @@ import org.bouncycastle.openpgp.PGPPublicKey;
import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Optional;
import static org.assertj.core.api.Assertions.assertThat;
@@ -39,17 +38,17 @@ class KeysExtractorTest {
void shouldExtractPublicKeyFromRawKey() throws IOException {
String raw = GPGTestHelper.readResourceAsString("single.asc");
Optional<PGPPublicKey> publicKey = KeysExtractor.extractPublicKey(raw);
PGPPublicKey publicKey = KeysExtractor.extractPublicKey(raw);
assertThat(publicKey).isPresent();
assertThat(Long.toHexString(publicKey.get().getKeyID())).isEqualTo("975922f193b07d6e");
assertThat(publicKey).isNotNull();
assertThat(Long.toHexString(publicKey.getKeyID())).isEqualTo("975922f193b07d6e");
}
@Test
void shouldExtractPrivateKeyFromRawKey() throws IOException {
String raw = GPGTestHelper.readResourceAsString("private-key.asc");
final Optional<PGPPrivateKey> privateKey = KeysExtractor.extractPrivateKey(raw);
assertThat(privateKey).isPresent();
final PGPPrivateKey privateKey = KeysExtractor.extractPrivateKey(raw);
assertThat(privateKey).isNotNull();
}
}

6
scm-webapp/src/test/java/sonia/scm/security/gpg/PrivateKeyStoreTest.java
View File

@@ -24,11 +24,9 @@
package sonia.scm.security.gpg;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
import sonia.scm.store.DataStoreFactory;
import sonia.scm.store.InMemoryDataStoreFactory;
@@ -36,7 +34,6 @@ import sonia.scm.store.InMemoryDataStoreFactory;
import java.util.Optional;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;
@ExtendWith(MockitoExtension.class)
class PrivateKeyStoreTest {
@@ -61,7 +58,6 @@ class PrivateKeyStoreTest {
void setForUserId() {
keyStore.setForUserId("testId", "Test Key");
final Optional<String> rawKey = keyStore.getForUserId("testId");
assertThat(rawKey).isNotEmpty();
assertThat(rawKey.get()).isEqualTo("Test Key");
assertThat(rawKey).contains("Test Key");
}
}