From ca315932268e1c5da6a12201db4cfaef35df69bb Mon Sep 17 00:00:00 2001 From: PatrikBuhr Date: Thu, 11 Aug 2022 09:03:24 +0200 Subject: [PATCH] NONRTRIC PMS, updated certs Updated certificate (which was expired). Issue-ID: CCSDK-3683 Signed-off-by: PatrikBuhr Change-Id: I373bf34bc0a1bb0b5b5ff00f0f98da080ba794ff --- a1-policy-management/config/README | 6 ++++-- a1-policy-management/config/keystore.jks | Bin 4779 -> 5269 bytes a1-policy-management/config/truststore.jks | Bin 3587 -> 3869 bytes .../controllers/v2/ApplicationTest.java | 10 ++++++---- a1-policy-management/src/test/resources/keystore.jks | Bin 5019 -> 0 bytes .../src/test/resources/truststore.jks | Bin 3699 -> 0 bytes 6 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 a1-policy-management/src/test/resources/keystore.jks delete mode 100644 a1-policy-management/src/test/resources/truststore.jks diff --git a/a1-policy-management/config/README b/a1-policy-management/config/README index b54a6751..42e0b7bd 100644 --- a/a1-policy-management/config/README +++ b/a1-policy-management/config/README @@ -3,13 +3,15 @@ The keystore.jks and truststore.jks files are created by using the following com 1) Create a CA certificate and a private key: openssl genrsa -des3 -out CA-key.pem 2048 -openssl req -new -key CA-key.pem -x509 -days 1000 -out CA-cert.pem +openssl req -new -key CA-key.pem -x509 -days 3600 -out CA-cert.pem 2) Create a keystore with a private key entry that is signed by the CA: +Note: the "your name" must be "localhost" for the unittest to work. + keytool -genkeypair -alias policy_agent -keyalg RSA -keysize 2048 -keystore keystore.jks -validity 3650 -storepass policy_agent keytool -certreq -alias policy_agent -file request.csr -keystore keystore.jks -ext san=dns:your.domain.com -storepass policy_agent -openssl x509 -req -days 365 -in request.csr -CA CA-cert.pem -CAkey CA-key.pem -CAcreateserial -out ca_signed-cert.pem +openssl x509 -req -days 3650 -in request.csr -CA CA-cert.pem -CAkey CA-key.pem -CAcreateserial -out ca_signed-cert.pem keytool -importcert -alias ca_cert -file CA-cert.pem -keystore keystore.jks -trustcacerts -storepass policy_agent keytool -importcert -alias policy_agent -file ca_signed-cert.pem -keystore keystore.jks -trustcacerts -storepass policy_agent diff --git a/a1-policy-management/config/keystore.jks b/a1-policy-management/config/keystore.jks index 48c3b33c0dfb61f1679df3f0f3b3503321bbd21c..563c67b309780ca80622b2360e627b72887970ee 100644 GIT binary patch literal 5269 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 Jg$;}=`yXAMCD8x? delta 3565 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 diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java index b4fe10a9..04845244 100644 --- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java +++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java @@ -95,8 +95,8 @@ import reactor.util.annotation.Nullable; @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @TestPropertySource(properties = { // - "server.ssl.key-store=./src/test/resources/keystore.jks", // - "app.webclient.trust-store=./src/test/resources/truststore.jks", // + "server.ssl.key-store=./config/keystore.jks", // + "app.webclient.trust-store=./config/truststore.jks", // "app.webclient.trust-store-used=true", // "app.vardata-directory=./target/testdata", // "app.filepath=" // @@ -314,8 +314,10 @@ class ApplicationTest { @Test void testTrustValidation() { addRic("ric1"); + String rsp = restClient(true).get("/rics").block(); // restClient(true) enables trust validation assertThat(rsp).contains("ric1"); + } @Test @@ -929,8 +931,8 @@ class ApplicationTest { for (int i = 0; i < 10; ++i) { AsyncRestClient restClient = restClient(); - ConcurrencyTestRunnable test = - new ConcurrencyTestRunnable(restClient, supervision, a1ClientFactory, rics, policyTypes); + ConcurrencyTestRunnable test = new ConcurrencyTestRunnable(restClient, supervision, a1ClientFactory, rics, + policyTypes); Thread thread = new Thread(test, "TestThread_" + i); thread.start(); threads.add(thread); diff --git a/a1-policy-management/src/test/resources/keystore.jks b/a1-policy-management/src/test/resources/keystore.jks deleted file mode 100644 index 675785b465ecfe18399cf7adbf20e63e4377ab61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5019 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 K0v$atvG89x;ST-) -- 2.16.6