From 7949b1a9d135263c0ffcdeae80131a83ca8cf63c Mon Sep 17 00:00:00 2001 From: Remigiusz Janeczek Date: Tue, 13 Jul 2021 15:52:23 +0200 Subject: [PATCH] [OOM-CERT-SERVICE] Fix sonar and checkstyle issues, code cleanup Issue-ID: OOM-2753 Signed-off-by: Remigiusz Janeczek Change-Id: Id88b6b2bceba7258745e4ce999dd375fb9ce438f --- .../certservice/api/CertificationController.java | 3 +-- .../CertificationResponseModelFactory.java | 8 +++---- .../conversion/OldCertificateModelFactory.java | 1 - .../exception/CertificateDecryptionException.java | 2 +- .../certification/model/CertificateData.java | 17 +++++++++------ .../model/CertificateUpdateModel.java | 25 +++++++++++++--------- .../cmpv2client/impl/CmpClientImpl.java | 4 ++-- .../validation/CmpCertificationValidator.java | 2 +- .../api/CertificationControllerTest.java | 4 ++-- .../certification/CertificationProviderTest.java | 6 +++--- .../CertificationResponseModelFactoryTest.java | 6 +++--- .../oom/certservice/certification/TestData.java | 2 +- .../certservice/cmpv2client/ClientTestData.java | 12 +++++------ .../certservice/cmpv2client/Cmpv2ClientTest.java | 16 +++++++------- 14 files changed, 56 insertions(+), 52 deletions(-) diff --git a/certService/src/main/java/org/onap/oom/certservice/api/CertificationController.java b/certService/src/main/java/org/onap/oom/certservice/api/CertificationController.java index 8e2a378e..a4389ec2 100644 --- a/certService/src/main/java/org/onap/oom/certservice/api/CertificationController.java +++ b/certService/src/main/java/org/onap/oom/certservice/api/CertificationController.java @@ -28,7 +28,6 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; import org.onap.oom.certservice.certification.CertificationResponseModelFactory; -import org.onap.oom.certservice.certification.exception.CertificateDecryptionException; import org.onap.oom.certservice.certification.exception.DecryptionException; import org.onap.oom.certservice.certification.exception.ErrorResponseModel; import org.onap.oom.certservice.certification.model.CertificateUpdateModel; @@ -112,7 +111,7 @@ public class CertificationController { @RequestHeader("PK") String encodedPrivateKey, @RequestHeader("OLD_CERT") String encodedOldCert, @RequestHeader("OLD_PK") String encodedOldPrivateKey - ) throws DecryptionException, CmpClientException, CertificateDecryptionException { + ) throws DecryptionException, CmpClientException { caName = replaceWhiteSpaceChars(caName); LOGGER.info("Received certificate update request for CA named: {}", caName); CertificateUpdateModel certificateUpdateModel = new CertificateUpdateModel.CertificateUpdateModelBuilder() diff --git a/certService/src/main/java/org/onap/oom/certservice/certification/CertificationResponseModelFactory.java b/certService/src/main/java/org/onap/oom/certservice/certification/CertificationResponseModelFactory.java index 0e793bb0..af90bf7e 100644 --- a/certService/src/main/java/org/onap/oom/certservice/certification/CertificationResponseModelFactory.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/CertificationResponseModelFactory.java @@ -25,7 +25,6 @@ import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server; import org.onap.oom.certservice.certification.conversion.CsrModelFactory; import org.onap.oom.certservice.certification.conversion.OldCertificateModelFactory; import org.onap.oom.certservice.certification.conversion.StringBase64; -import org.onap.oom.certservice.certification.exception.CertificateDecryptionException; import org.onap.oom.certservice.certification.exception.DecryptionException; import org.onap.oom.certservice.certification.model.CertificateUpdateModel; import org.onap.oom.certservice.certification.model.CertificationResponseModel; @@ -79,10 +78,9 @@ public class CertificationResponseModelFactory { } public CertificationResponseModel provideCertificationModelFromUpdateRequest(CertificateUpdateModel certificateUpdateModel) - throws DecryptionException, CmpClientException, CertificateDecryptionException { - LOGGER.info("CSR: " + certificateUpdateModel.getEncodedCsr() + - ", old cert: " + certificateUpdateModel.getEncodedOldCert() + - ", CA: " + certificateUpdateModel.getCaName()); + throws DecryptionException, CmpClientException { + LOGGER.info("CSR: {}, old cert: {}, CA: {}", certificateUpdateModel.getEncodedCsr(), + certificateUpdateModel.getEncodedOldCert(), certificateUpdateModel.getCaName()); final CsrModel csrModel = csrModelFactory.createCsrModel( new StringBase64(certificateUpdateModel.getEncodedCsr()), new StringBase64(certificateUpdateModel.getEncodedPrivateKey()) diff --git a/certService/src/main/java/org/onap/oom/certservice/certification/conversion/OldCertificateModelFactory.java b/certService/src/main/java/org/onap/oom/certservice/certification/conversion/OldCertificateModelFactory.java index f5c199f6..d88b6bb0 100644 --- a/certService/src/main/java/org/onap/oom/certservice/certification/conversion/OldCertificateModelFactory.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/conversion/OldCertificateModelFactory.java @@ -72,7 +72,6 @@ public class OldCertificateModelFactory { return new OldCertificateModel(certificate, subjectData, sans, oldPrivateKey); } catch (StringToCertificateConversionException e) { throw new CertificateDecryptionException("Cannot convert certificate", e); - } catch (CertificateParsingException e) { throw new CertificateDecryptionException("Cannot read Subject Alternative Names from certificate"); } catch (NoSuchAlgorithmException | KeyDecryptionException | CertificateEncodingException | InvalidKeySpecException e) { diff --git a/certService/src/main/java/org/onap/oom/certservice/certification/exception/CertificateDecryptionException.java b/certService/src/main/java/org/onap/oom/certservice/certification/exception/CertificateDecryptionException.java index 16fdb44b..20df03c9 100644 --- a/certService/src/main/java/org/onap/oom/certservice/certification/exception/CertificateDecryptionException.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/exception/CertificateDecryptionException.java @@ -20,7 +20,7 @@ package org.onap.oom.certservice.certification.exception; -public class CertificateDecryptionException extends Exception { +public class CertificateDecryptionException extends DecryptionException { public CertificateDecryptionException(String message, Throwable cause) { super(message, cause); diff --git a/certService/src/main/java/org/onap/oom/certservice/certification/model/CertificateData.java b/certService/src/main/java/org/onap/oom/certservice/certification/model/CertificateData.java index 3a00c915..bc701e08 100644 --- a/certService/src/main/java/org/onap/oom/certservice/certification/model/CertificateData.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/model/CertificateData.java @@ -20,15 +20,14 @@ package org.onap.oom.certservice.certification.model; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.asn1.x509.GeneralName; - import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; +import org.bouncycastle.asn1.x500.X500Name; +import org.bouncycastle.asn1.x509.GeneralName; public class CertificateData { @@ -49,10 +48,14 @@ public class CertificateData { } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - CertificateData that = (CertificateData) o; + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null || getClass() != obj.getClass()) { + return false; + } + CertificateData that = (CertificateData) obj; return Objects.equals(subject, that.subject) && Objects.equals(sortedSans, that.sortedSans); } diff --git a/certService/src/main/java/org/onap/oom/certservice/certification/model/CertificateUpdateModel.java b/certService/src/main/java/org/onap/oom/certservice/certification/model/CertificateUpdateModel.java index 699ffe71..770d8812 100644 --- a/certService/src/main/java/org/onap/oom/certservice/certification/model/CertificateUpdateModel.java +++ b/certService/src/main/java/org/onap/oom/certservice/certification/model/CertificateUpdateModel.java @@ -31,7 +31,7 @@ public final class CertificateUpdateModel { private final String caName; private CertificateUpdateModel(String encodedCsr, String encodedPrivateKey, String encodedOldCert, - String encodedOldPrivateKey, String caName) { + String encodedOldPrivateKey, String caName) { this.encodedCsr = encodedCsr; this.encodedPrivateKey = encodedPrivateKey; this.encodedOldCert = encodedOldCert; @@ -60,15 +60,19 @@ public final class CertificateUpdateModel { } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - CertificateUpdateModel that = (CertificateUpdateModel) o; + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null || getClass() != obj.getClass()) { + return false; + } + CertificateUpdateModel that = (CertificateUpdateModel) obj; return Objects.equals(encodedCsr, that.encodedCsr) - && Objects.equals(encodedPrivateKey, that.encodedPrivateKey) - && Objects.equals(encodedOldCert, that.encodedOldCert) - && Objects.equals(encodedOldPrivateKey, that.encodedOldPrivateKey) - && Objects.equals(caName, that.caName); + && Objects.equals(encodedPrivateKey, that.encodedPrivateKey) + && Objects.equals(encodedOldCert, that.encodedOldCert) + && Objects.equals(encodedOldPrivateKey, that.encodedOldPrivateKey) + && Objects.equals(caName, that.caName); } @Override @@ -110,7 +114,8 @@ public final class CertificateUpdateModel { } public CertificateUpdateModel build() { - return new CertificateUpdateModel(encodedCsr, encodedPrivateKey, encodedOldCert, encodedOldPrivateKey, caName); + return new CertificateUpdateModel(encodedCsr, encodedPrivateKey, encodedOldCert, encodedOldPrivateKey, + caName); } } } diff --git a/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpClientImpl.java b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpClientImpl.java index bbca91b6..fd2d7085 100644 --- a/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpClientImpl.java +++ b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpClientImpl.java @@ -100,7 +100,7 @@ public class CmpClientImpl implements CmpClient { final CreateCertRequest certRequest = getCmpMessageBuilderWithCommonRequestValues(csrModel, cmpv2Server) .with(CreateCertRequest::setCmpRequestType, PKIBody.TYPE_KEY_UPDATE_REQ) - .with(CreateCertRequest::setExtraCerts, getCMPCertificate(oldCertificateModel.getOldCertificate())) + .with(CreateCertRequest::setExtraCerts, getCmpCertificate(oldCertificateModel.getOldCertificate())) .with(CreateCertRequest::setProtection, pkiMessageProtection) .build(); @@ -154,7 +154,7 @@ public class CmpClientImpl implements CmpClient { return new SignatureProtection(oldCertificateModel.getOldPrivateKey()); } - private CMPCertificate[] getCMPCertificate(Certificate oldCertificate) { + private CMPCertificate[] getCmpCertificate(Certificate oldCertificate) { CMPCertificate cert = new CMPCertificate(oldCertificate); return new CMPCertificate[]{cert}; } diff --git a/certService/src/main/java/org/onap/oom/certservice/cmpv2client/validation/CmpCertificationValidator.java b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/validation/CmpCertificationValidator.java index 40a2a1d9..f2601b94 100644 --- a/certService/src/main/java/org/onap/oom/certservice/cmpv2client/validation/CmpCertificationValidator.java +++ b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/validation/CmpCertificationValidator.java @@ -52,7 +52,7 @@ public class CmpCertificationValidator { private static final ASN1ObjectIdentifier PASSWORD_BASED_MAC = new ASN1ObjectIdentifier("1.2.840.113533.7.66.13"); private static final Logger LOG = LoggerFactory.getLogger(CmpCertificationValidator.class); - public static void validate( + public void validate( final CsrModel csrModel, final Cmpv2Server server, final CloseableHttpClient httpClient, diff --git a/certService/src/test/java/org/onap/oom/certservice/api/CertificationControllerTest.java b/certService/src/test/java/org/onap/oom/certservice/api/CertificationControllerTest.java index 81c2d39a..d3738747 100644 --- a/certService/src/test/java/org/onap/oom/certservice/api/CertificationControllerTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/api/CertificationControllerTest.java @@ -162,7 +162,7 @@ class CertificationControllerTest { @Test void shouldUpdateEndpointReturnDataAboutCsrBaseOnEncodedParameters() - throws DecryptionException, CmpClientException, CertificateDecryptionException { + throws DecryptionException, CmpClientException { // Given CertificationResponseModel testCertificationResponseModel = new CertificationResponseModel( Arrays.asList("ENTITY_CERT", "INTERMEDIATE_CERT"), @@ -183,7 +183,7 @@ class CertificationControllerTest { @Test void shouldThrowCertificateDecryptionExceptionWhenCreatingPemModelFails() - throws DecryptionException, CertificateDecryptionException, CmpClientException { + throws DecryptionException, CmpClientException { // Given String expectedMessage = "Incorrect certificate, decryption failed"; when(certificationResponseModelFactory.provideCertificationModelFromUpdateRequest(TEST_CERTIFICATE_UPDATE_MODEL)) diff --git a/certService/src/test/java/org/onap/oom/certservice/certification/CertificationProviderTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/CertificationProviderTest.java index 192050dc..042b2aec 100644 --- a/certService/src/test/java/org/onap/oom/certservice/certification/CertificationProviderTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/CertificationProviderTest.java @@ -140,7 +140,7 @@ class CertificationProviderTest { // When when( cmpClient.executeKeyUpdateRequest(any(CsrModel.class), any(Cmpv2Server.class), any(OldCertificateModel.class)) - ).thenReturn(getCMPv2CertificationModel()); + ).thenReturn(getCmpv2CertificationModel()); CertificationResponseModel certificationModel = certificationProvider .executeKeyUpdateRequest(csrModel, server, oldCertificateModel); @@ -162,7 +162,7 @@ class CertificationProviderTest { when( cmpClient.executeInitializationRequest(any(CsrModel.class), any(Cmpv2Server.class)) - ).thenReturn(getCMPv2CertificationModel()); + ).thenReturn(getCmpv2CertificationModel()); CertificationResponseModel certificationModel = certificationProvider .executeInitializationRequest(csrModel, server); @@ -214,7 +214,7 @@ class CertificationProviderTest { return string.replace("\n", "").replace("\r", ""); } - private Cmpv2CertificationModel getCMPv2CertificationModel() throws IOException, CertificateException { + private Cmpv2CertificationModel getCmpv2CertificationModel() throws IOException, CertificateException { List certificateChain = getX509CertificateFromPem(TEST_CMPv2_KEYSTORE); List trustedCertificates = getX509CertificateFromPem(TEST_CMPv2_TRUSTSTORE); return new Cmpv2CertificationModel(certificateChain, trustedCertificates); diff --git a/certService/src/test/java/org/onap/oom/certservice/certification/CertificationResponseModelFactoryTest.java b/certService/src/test/java/org/onap/oom/certservice/certification/CertificationResponseModelFactoryTest.java index 205513f5..90dc2359 100644 --- a/certService/src/test/java/org/onap/oom/certservice/certification/CertificationResponseModelFactoryTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/CertificationResponseModelFactoryTest.java @@ -204,7 +204,7 @@ class CertificationResponseModelFactoryTest { @Test void shouldPerformKurWhenCsrAndOldCertDataMatch() - throws CertificateDecryptionException, DecryptionException, CmpClientException { + throws DecryptionException, CmpClientException { // Given CsrModel csrModel = mockCsrFactoryModelCreation(); Cmpv2Server testServer = mockCmpv2ProviderServerSelection(); @@ -229,7 +229,7 @@ class CertificationResponseModelFactoryTest { @Test void shouldThrowCmpClientExceptionWhenUpdateRequestFailed() - throws DecryptionException, CmpClientException, CertificateDecryptionException { + throws DecryptionException, CmpClientException { // Given String expectedMessage = "Exception occurred while send request to CMPv2 Server"; @@ -254,7 +254,7 @@ class CertificationResponseModelFactoryTest { @Test void shouldPerformCrWhenCsrAndOldCertDataDontMatch() - throws CertificateDecryptionException, DecryptionException, CmpClientException { + throws DecryptionException, CmpClientException { // Given CsrModel csrModel = mockCsrFactoryModelCreation(); Cmpv2Server testServer = mockCmpv2ProviderServerSelection(); diff --git a/certService/src/test/java/org/onap/oom/certservice/certification/TestData.java b/certService/src/test/java/org/onap/oom/certservice/certification/TestData.java index 3c47d866..8a4ba645 100644 --- a/certService/src/test/java/org/onap/oom/certservice/certification/TestData.java +++ b/certService/src/test/java/org/onap/oom/certservice/certification/TestData.java @@ -29,7 +29,7 @@ public final class TestData { public static final String EXPECTED_CERT_SUBJECT = "C=US,ST=California,L=San-Francisco,O=Linux-Foundation,OU=ONAP,CN=onap.org"; public static final String EXPECTED_CERT_SANS = - "SANs: [onap@onap.org, localhost, onap.org, test.onap.org, onap://cluster.local/, " + LOCALHOST_IP_IN_HEX +"]"; + "SANs: [onap@onap.org, localhost, onap.org, test.onap.org, onap://cluster.local/, " + LOCALHOST_IP_IN_HEX + "]"; public static final String TEST_CSR = "-----BEGIN CERTIFICATE REQUEST-----\n" diff --git a/certService/src/test/java/org/onap/oom/certservice/cmpv2client/ClientTestData.java b/certService/src/test/java/org/onap/oom/certservice/cmpv2client/ClientTestData.java index 845361ef..e3896acd 100644 --- a/certService/src/test/java/org/onap/oom/certservice/cmpv2client/ClientTestData.java +++ b/certService/src/test/java/org/onap/oom/certservice/cmpv2client/ClientTestData.java @@ -43,27 +43,27 @@ public final class ClientTestData { private static final OldCertificateModelFactory factory = new OldCertificateModelFactory(new PemStringToCertificateConverter(), new X509CertificateParser()); - static final OldCertificateModel createCorrectOldCertificateModel() throws CertificateDecryptionException { + static OldCertificateModel createCorrectOldCertificateModel() throws CertificateDecryptionException { return createOldCertificateModel(TEST_ENCODED_OLD_CERT, TEST_ENCODED_OLD_PRIVATE_KEY); } - static final OldCertificateModel createOldCertificateModelWithWrongCert() throws CertificateDecryptionException { + static OldCertificateModel createOldCertificateModelWithWrongCert() throws CertificateDecryptionException { return createOldCertificateModel(WRONG_OLD_CERT, TEST_ENCODED_OLD_PRIVATE_KEY); } - static final OldCertificateModel createOldCertificateModelWithWrongPrivateKey() throws CertificateDecryptionException { + static OldCertificateModel createOldCertificateModelWithWrongPrivateKey() throws CertificateDecryptionException { return createOldCertificateModel(TEST_ENCODED_OLD_CERT, WRONG_OLD_PRIVATE_KEY); } - static final OldCertificateModel createOldCertificateModelWithPrivateKeyInPKCS1() throws CertificateDecryptionException { + static OldCertificateModel createOldCertificateModelWithPrivateKeyInPkcs1() throws CertificateDecryptionException { return createOldCertificateModel(TEST_ENCODED_OLD_CERT, TEST_ENCODED_PRIVATE_KEY_IN_PKCS1); } - static final OldCertificateModel createOldCertificateModelWithPrivateKeyInPKCS8() throws CertificateDecryptionException { + static OldCertificateModel createOldCertificateModelWithPrivateKeyInPkcs8() throws CertificateDecryptionException { return createOldCertificateModel(TEST_ENCODED_OLD_CERT, TEST_ENCODED_PRIVATE_KEY_IN_PKCS8); } - private static final OldCertificateModel createOldCertificateModel(String certificate, String privateKey) throws CertificateDecryptionException { + private static OldCertificateModel createOldCertificateModel(String certificate, String privateKey) throws CertificateDecryptionException { StringBase64 base64EncodedCertificate = new StringBase64(certificate); return factory.createCertificateModel(base64EncodedCertificate, privateKey); } diff --git a/certService/src/test/java/org/onap/oom/certservice/cmpv2client/Cmpv2ClientTest.java b/certService/src/test/java/org/onap/oom/certservice/cmpv2client/Cmpv2ClientTest.java index 93dcbb77..23964ea3 100644 --- a/certService/src/test/java/org/onap/oom/certservice/cmpv2client/Cmpv2ClientTest.java +++ b/certService/src/test/java/org/onap/oom/certservice/cmpv2client/Cmpv2ClientTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import static org.onap.oom.certservice.cmpv2client.ClientTestData.createOldCertificateModelWithPrivateKeyInPKCS1; -import static org.onap.oom.certservice.cmpv2client.ClientTestData.createOldCertificateModelWithPrivateKeyInPKCS8; +import static org.onap.oom.certservice.cmpv2client.ClientTestData.createOldCertificateModelWithPrivateKeyInPkcs1; +import static org.onap.oom.certservice.cmpv2client.ClientTestData.createOldCertificateModelWithPrivateKeyInPkcs8; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -115,7 +115,7 @@ class Cmpv2ClientTest { private static KeyPair keyPair; - private final static Decoder BASE64_DECODER = Base64.getDecoder(); + private static final Decoder BASE64_DECODER = Base64.getDecoder(); @BeforeEach void setUp() @@ -233,7 +233,7 @@ class Cmpv2ClientTest { @Test - void shouldThrowCMPClientExceptionWhenCannotParseOldCertificate() { + void shouldThrowCmpClientExceptionWhenCannotParseOldCertificate() { setCsrModelAndServerTestDefaultValues(); CmpClientImpl cmpClient = new CmpClientImpl(httpClient); @@ -375,7 +375,7 @@ class Cmpv2ClientTest { try ( BufferedInputStream bis = new BufferedInputStream(new ByteArrayInputStream( - preparePKIMessageWithoutProtectionAlgorithm().getEncoded() + preparePkiMessageWithoutProtectionAlgorithm().getEncoded() ))) { byte[] ba = IOUtils.toByteArray(bis); @@ -473,7 +473,7 @@ class Cmpv2ClientTest { server.setIssuerDN(dn); } - private PKIMessage preparePKIMessageWithoutProtectionAlgorithm() { + private PKIMessage preparePkiMessageWithoutProtectionAlgorithm() { CertTemplateBuilder certTemplateBuilder = new CertTemplateBuilder(); X500Name issuerDN = getTestIssuerDN(); @@ -504,8 +504,8 @@ class Cmpv2ClientTest { private static Stream getTestUpdateModelWithSupportedPrivateKeys() throws CertificateDecryptionException { return Stream.of( - Arguments.of(createOldCertificateModelWithPrivateKeyInPKCS1()), - Arguments.of(createOldCertificateModelWithPrivateKeyInPKCS8()) + Arguments.of(createOldCertificateModelWithPrivateKeyInPkcs1()), + Arguments.of(createOldCertificateModelWithPrivateKeyInPkcs8()) ); } -- 2.16.6