From 2dfca3dc2f06f4e6319094bb006eff090178a8f1 Mon Sep 17 00:00:00 2001
From: efiacor <fiachra.corcoran@est.tech>
Date: Thu, 2 Apr 2020 18:02:04 +0100
Subject: [PATCH] New DR AAF certs for elalto branch

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I8459b64627eb79de37086dc061cf07e6dbac345f
Issue-ID: DMAAP-1421
---
 datarouter-node/aaf_certs/org.onap.dmaap-dr.jks    | Bin 3647 -> 3666 bytes
 .../aaf_certs/org.onap.dmaap-dr.keyfile            |  54 ++++++++++-----------
 .../aaf_certs/org.onap.dmaap-dr.trust.jks          | Bin 1413 -> 1413 bytes
 .../org/onap/dmaap/datarouter/node/NodeUtils.java  |  20 +++++---
 .../src/main/resources/drNodeCadi.properties       |   6 +--
 datarouter-node/src/main/resources/node.properties |   6 +--
 .../onap/dmaap/datarouter/node/NodeUtilsTest.java  |   2 +-
 .../src/test/resources/node_test.properties        |   6 +--
 .../test/resources/org.onap.dmaap-dr-test-cert.jks | Bin 3647 -> 0 bytes
 .../src/test/resources/org.onap.dmaap-dr.jks       | Bin 0 -> 3666 bytes
 datarouter-prov/aaf_certs/org.onap.dmaap-dr.jks    | Bin 3647 -> 3668 bytes
 .../aaf_certs/org.onap.dmaap-dr.keyfile            |  54 ++++++++++-----------
 .../aaf_certs/org.onap.dmaap-dr.trust.jks          | Bin 1413 -> 1413 bytes
 .../src/main/resources/drProvCadi.properties       |   6 +--
 .../src/main/resources/provserver.properties       |   6 +--
 .../src/test/resources/integration_test.properties |   4 +-
 pom.xml                                            |   2 +-
 version.properties                                 |   4 +-
 18 files changed, 87 insertions(+), 83 deletions(-)
 delete mode 100644 datarouter-node/src/test/resources/org.onap.dmaap-dr-test-cert.jks
 create mode 100644 datarouter-node/src/test/resources/org.onap.dmaap-dr.jks

diff --git a/datarouter-node/aaf_certs/org.onap.dmaap-dr.jks b/datarouter-node/aaf_certs/org.onap.dmaap-dr.jks
index 2320dc9fe6b64cfcf7e3a9476ef868ed6198f059..bcbbe999302195e99c4f1532ca7e93d7601c7de1 100644
GIT binary patch
delta 2053
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

delta 2005
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

diff --git a/datarouter-node/aaf_certs/org.onap.dmaap-dr.keyfile b/datarouter-node/aaf_certs/org.onap.dmaap-dr.keyfile
index 0d187ccf..fc9bdf31 100644
--- a/datarouter-node/aaf_certs/org.onap.dmaap-dr.keyfile
+++ b/datarouter-node/aaf_certs/org.onap.dmaap-dr.keyfile
@@ -1,27 +1,27 @@
-6-tNRI8kimOFIXwcTbENGrkJzim1NFAcA4iRrbWVSteGmgX0-RzgwYEy4wnNju7jlOUfRVKqJSYL
-0qcHP1Z9AbX_K5zqJ2CATFO_0tlvNbocvoh6IecTlvL6V00hlVzP1JjCedUN0cO13TSnc4_NpWWj
-nVZ9EaFQTmFL0NiYj-TPqRolhnQCIMDruBI6ImOIrnWxIcOEpH_6zmivzHhzRVbKVRNFEDq_F5J9
-fp2P3PXrYWU7rglKQtWcJpo3kMyC65zoPNVc-gMr4pfnpTTqzim5vVQyv-9w0QSwzvpKaydWPkm8
-E-kTotAQJ7r843U67U16-JTVb4n-7NummoNwshHo60BUb2xZd418VnIURD79QWt1zzOVFIs5f_LB
-pebds0dtdL_cPGzuY23Z4SBWU2LTihziJDzYCIo-6PIL5-XeWqkwBrLRcy9-JffHYbaNVCf9g0Ml
-cbnteUjuET-ea2-M-d1PwOIIr_ziU3UpMClQJ1GRZEuy4Aco9qJgMUqoJVJfEI_4CdLNVMTRwg1-
-T81PoIf0nN_cje8pQlu3LX_B0oozdJd5yfGqsM021jsXPs0uJ5KuLPHP8NvY_uDqaqANXRUEG2ke
-d57X6nF2CXcXXFKO0cf8-L35UrzbYgaZt5XsPP_sDl4WkKqJxKjREvrzjE4DXHfwrGqCMg7E767O
-y9-uPF5SpfgUer8jtQcFlREAl050CwMzv90TBb2UqM3Ydi6qq80miKBqXVbKMgqdBs7qIVxXLm43
-TR-krMmMnimWBI6SVxEFREXnzHePItLazefHwZTqn7_0Tu_WPqZltLIKo_waKV57nrnH3EJtd7lu
-GI5vIp46XQ6k-5LHOkfibKmImEKl19pFUvJehEjgVE6C3_2RnEmpG3T779_KJZKEy1sMqrud2QPX
-2rZPnfEJEaEkYW8jibKwZtNQ0HpRarg1sc0p4mrl6dGGqLbdPBSsxLdAkm9gLRKkMPsS_gtfjjWZ
-oPmUydEHu2fhUOjqsADpa76QSlPsun2-aL1CEiUAwzow9e68gxmnMQz02rc_cXElhskH2dDPod2w
-h2c6PfVkji5rvk-nDFJQ0MwMbpl1ctSI4_gZU4j_OD6nSh4RbXgC4wwzfqAGe_A-9UNq2bkmC1BA
-CDzjZXZRtZTCjgyaAH9yt6bsGTNxCfqD_OiRv7rQrO0yy-o4kGTidlW9Xwk_THgVn9-hF76JiDc-
-bw9DxTzJwQxHxrg7JNicFbpXP071rdaXRrXWxUQ7X7ZRWrZuCJ87qhOqfd3iE2VylI3vwEaqrDGD
-AULLczDd50X594-_pN8bCW_Nya5vjvRWNZmv1Uh0_YtbmotCj4Fz9vlTs5bIbfnyUp5sCk7jZZrv
-RGGFTU3mwa7jq-0uzY-jYdosDyU2PXMI0WZsSiSF08g_K7y0nnoSEa9kPtOWPTcotEXsTeZ5cgpj
-Bufi_U1SoW-kKG5-eyNDbputpvEFy00zrcSj3U8A6m2YkCxRQ7m_s9wnISiwVdVKuSCQ08MvyOrs
-10a3HHPB7T1BDA6sPVpDrGBjq7piVDQZvEgA9CGIrcyHrRR8_96DGKbMboUaY9vNG2NBJc7zcBRw
-AHs6cc-LKxB1mMUPNJZHxDNQOCk_nnbzGSG2AWppZHEmTpmB0tg0ZM03aqDrGgOK07xREZSZaAMY
-TmVNJSgEIOA2mEDoP2qOHdT5eQmn7xK34HSWJBKR6l1N30K626oomF70DVgqRSqkSZ0rhDBZzNzy
-VlZ4hG_ZZCJOcm_AUShWOsS6JJ11s23uJKkZQeaTZCWc0KVqhtWbKTE8CVyRzm1XcyRONdJVnvXN
-P4ANxGMzsaRZDC31gJYbSirZoTobLQ5OZxgNaNY9cBsEuK6r3sznPORG98d9y33x4Xa5HUedrHju
-HxAAADMCZwK0ITdWPPsk9lsag-tNor16nfLXj20y2JdLaZfx2PnluQjCitwskuZhTcWmHRZ0Ry7t
-ZxfxCSh5IOnAowFu1G2t0RiooKh4v26wOLTCzFiV0ZSmw1VSflkabxsIY9K2rh4-24QwQaAt
\ No newline at end of file
+6_5dED7IASSWN0rg5BJESs9Gt1hnaAmDl-6zKnCSARoF1nqf8yblyPHB739Iyq_gc_8z7wOHM730
+fhFaXVKNpqQBghl-wC-gRmtFBQYZA30qvz0tk2Z13bBXa5w7yrjFC4m3sAYi2x6INZ_K3PVhDALY
+Uzh3t3WwHd-_reZJvQaYlwhlTZ9A6KB6Emryj2AJzu-FcZl-qQkXZ2Yc3yVjkKspYLUfjl7g6odn
+XGrfrlXFxhv_b3cq7KQOKFf7UedTsVVMZAEdXRc5TlV5Zahy_j7Ra6TyTQJSIAhhAS2hQAfBUt0V
+aJTlNkx9U7XNOSZVo4-rlHgmkKyyGJi-out1mSZZSstCK4zroY523GOI_B_FDVUnFuLNuQgMRiob
+lw3X8NF4KDERbv1RGtsBWj94GeP2t9Qm9n8sBa0jprD48kz0e2wfUIH9AcDxbYhaMiYdu5VNRNLQ
+090Sd0VNZ4-R73-CnQHaCVHtIFbLA5rs-1fVpwK3Bk947o4pVdZyqkO2pyiFDZksUzrrq9E6TkeT
+Oyn_5QRGtjlZ7r-324WYhSrvYXO-p9_LdujC-L4c-FRK7B_xAoiEN95gq6XbCRzEOjov1hl09VIO
+rnFaXZs0BBhfieDyYMCthe4pbmm1ri_c7JUrxUo7f3lYSKjMaytGJRFx704Mb0D4eF0-TP07czuj
+N3G6UxFcHlLA_5RTLCiiwvktruy9q9hl2Aqe_Bf-0NT7LBX5WDvbsb0A-4ZSBp-iiQbCSZ0WfATF
+nrosqjLGM76AsPIi7eG6X9CapI9hjJpE5ZX9B3drpXXslXaNDZBwdwiirkm1M3TyTb1vt9xbXLlD
+Ubz5fKBWSsW3-4GvDiDKZNAiBijaou5vvZ0CV-dVcAPtD_U8csL3K8DmrIrjckgjgI8bToO1okiS
+Sjz61qa3EZtH8WYC9CIZgxmnw0Z6ruY7728hxRpFI4an5fupQJpEBfp3qeZHn9VgWmFoBR4-B18a
+cp0xD0SkMVJnTv31Qgm1HbMmKU7FtolZ1Lcc5CBJMByqlVR30OWL0NYwFgb_WN-szoPll-DwgZNk
+POeMUOW5hORHiSmYUfqZfZ57IIdDabi5uOECozX9NU3S327QxHnc5IMYgYDkCMLnvghatRUlPgBQ
+Wnj2mZUwE2g6UIuNiFM1c-t_LemRFD9s5JV3rcNI9GNP_CsxWSCh2tIm7Y-3YOuFB8l7QUnK4n8r
+AlCcwJWxuSXljbQxv3NqjvWm_t9ADE_OMSKSX_5NetNX-sQtz7IvX2scJ6yL3Wzm1FvYGOb7cL8b
+qTPQ5bbovMMxGXYl6zKyZuQV0xGk6c3loX_7CLB8o89mtO50Vs0bPbps07dt9OIMcuPBxPPnSc01
+7lMa0kf_kiW0sCjRCJK9685ZJWK1YVdXuHAbiWtkpmNK81Ks0G1-H25wCgBSJUlqq1-8F1aazs3s
+lcOzAj1qXLfpbp0QZ916pzUU6P2USt7oF1vrUuNEslCk5oMymYMLX-miz0MNG3gUboCMAXKvBJPF
+FIg29T9v_tPsvoyGy_Tsqhg0CXq7BVvh-AQ-UFxbmZw78EWLwC7y0cUlaVjKo7Ubog3cKmS7K7O6
+OJs6ZdJGjOHcqZNxtoi08ZiP8y21pOyROhcgYtWi4zOA1ZgYKKNBO8xa2DSXSH0p-zxlS1uuEBLj
+G1Y1CxHYmuTXIE45ZEse7waa8SOA8rbUkeFFAvNy1_xYFYLfNjiF5t_sEOMVkSeushDmK39X3nGN
+YJr-_SkLAq7NdRKxGQhQqjy9QkdbLLm8go_8wcpH4kQEAhKF99mciEAnKht8a_paF1gVGxMetK4_
+3zJZ6roaflVDLrCs8BqbS5_4l3WxR02mVjT2seQjDoxIYeF8Lfg0IVoThCPryRphc0jMidXzx-40
+QhryIOMNx569-5BSFAQz2xdNtuqKI_PnGN-S23YRfDM-3vcpjhOyfShKK3nk68PNEzIgjrYBWqrj
+x8cLP7_BxbIq27iQXzavpB2bRMYETZ8ZTucEYWLAGZLX3roaxz8xLiHFf_TO6lEhCE7_ISs4
\ No newline at end of file
diff --git a/datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks b/datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks
index 808c1b92945bb1394787a2506ce70c11ab184cfd..0e384957f3e41c9e478c4b7af155a4aec1c80030 100644
GIT binary patch
delta 37
tcmZqWZsndJ&su2palwj>D!!~D3$}~D3rpkwHqW6cqr0@<?avR+cmNm%5DEYQ

delta 37
vcmV+=0NVeB3xx}i9|dXHHlI?lBuxbrkxf&d^@`SbH?5Rb<jA+`1)sbf7lRP3

diff --git a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java
index d4fc7dbe..37e5db60 100644
--- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java
@@ -47,6 +47,9 @@ import java.util.Enumeration;
 import java.util.TimeZone;
 import java.util.UUID;
 import java.util.zip.GZIPInputStream;
+import javax.naming.InvalidNameException;
+import javax.naming.ldap.LdapName;
+import javax.naming.ldap.Rdn;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.codec.binary.Base64;
@@ -315,15 +318,16 @@ public class NodeUtils {
             X509Certificate cert = (X509Certificate) ks.getCertificate(alias);
             if (cert != null) {
                 String subject = cert.getSubjectX500Principal().getName();
-                String[] parts = subject.split(",");
-                if (parts.length < 1) {
-                    return null;
+                try {
+                    LdapName ln = new LdapName(subject);
+                    for (Rdn rdn : ln.getRdns()) {
+                        if (rdn.getType().equalsIgnoreCase("CN")) {
+                            return rdn.getValue().toString();
+                        }
+                    }
+                } catch (InvalidNameException e) {
+                    eelfLogger.error("No valid CN not found for dr-node cert", e);
                 }
-                subject = parts[5].trim();
-                if (!subject.startsWith("CN=")) {
-                    return null;
-                }
-                return subject.substring(3);
             }
         }
         return null;
diff --git a/datarouter-node/src/main/resources/drNodeCadi.properties b/datarouter-node/src/main/resources/drNodeCadi.properties
index 8dfcab1c..b94f6cfa 100644
--- a/datarouter-node/src/main/resources/drNodeCadi.properties
+++ b/datarouter-node/src/main/resources/drNodeCadi.properties
@@ -1,11 +1,11 @@
 cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US
 cadi_keyfile=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.keyfile
 cadi_keystore=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks
-cadi_keystore_password=]3V)($O&.Mv]W{f8^]6SxGNL
-cadi_key_password=]3V)($O&.Mv]W{f8^]6SxGNL
+cadi_keystore_password=[V7pj(U*?Jzpsl0aZP?3hS;?
+cadi_key_password=[V7pj(U*?Jzpsl0aZP?3hS;?
 cadi_alias=dmaap-dr-node@dmaap-dr.onap.org
 cadi_truststore=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks
-cadi_truststore_password=(Rd,&{]%ePdp}4JZjqoJ2G+g
+cadi_truststore_password=jH+{FIhNOX+tl:I7:dnJT($3
 
 aaf_env=DEV
 aaf_locate_url=https://aaf-onap-test.osaaf.org:8095
diff --git a/datarouter-node/src/main/resources/node.properties b/datarouter-node/src/main/resources/node.properties
index 7c076359..5a669eca 100644
--- a/datarouter-node/src/main/resources/node.properties
+++ b/datarouter-node/src/main/resources/node.properties
@@ -63,10 +63,10 @@ KeyStoreType = jks
 KeyStoreFile = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks
 #
 #    The password for the https keystore
-KeyStorePassword=WGxd2P6MDo*Bi4+UdzWs{?$8
+KeyStorePassword=[V7pj(U*?Jzpsl0aZP?3hS;?
 #
 #    The password for the private key in the https keystore
-KeyPassword=WGxd2P6MDo*Bi4+UdzWs{?$8
+KeyPassword=[V7pj(U*?Jzpsl0aZP?3hS;?
 #
 #    The type of truststore for https
 TrustStoreType = jks
@@ -75,7 +75,7 @@ TrustStoreType = jks
 TrustStoreFile = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks
 #
 #    The password for the https truststore
-TrustStorePassword=)OBvCd{e{aWq.^mJJdX:S:1&
+TrustStorePassword=jH+{FIhNOX+tl:I7:dnJT($3
 #
 #    The path to the file used to trigger an orderly shutdown
 QuiesceFile = etc/SHUTDOWN
diff --git a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeUtilsTest.java b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeUtilsTest.java
index 2d87b8b9..2b64c013 100644
--- a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeUtilsTest.java
+++ b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeUtilsTest.java
@@ -79,7 +79,7 @@ public class NodeUtilsTest {
 
     @Test
     public void Given_Get_CanonicalName_Called_Valid_CN_Returned() {
-        String canonicalName = NodeUtils.getCanonicalName("jks", "src/test/resources/org.onap.dmaap-dr-test-cert.jks", "WGxd2P6MDo*Bi4+UdzWs{?$8");
+        String canonicalName = NodeUtils.getCanonicalName("jks", "src/test/resources/org.onap.dmaap-dr.jks", "[V7pj(U*?Jzpsl0aZP?3hS;?");
         Assert.assertEquals("dmaap-dr-node", canonicalName);
     }
 }
diff --git a/datarouter-node/src/test/resources/node_test.properties b/datarouter-node/src/test/resources/node_test.properties
index 9e0cd994..a4f1cbd2 100644
--- a/datarouter-node/src/test/resources/node_test.properties
+++ b/datarouter-node/src/test/resources/node_test.properties
@@ -63,10 +63,10 @@ KeyStoreType = jks
 KeyStoreFile = aaf_certs/org.onap.dmaap-dr.jks
 #
 #    The password for the https keystore
-KeyStorePassword=WGxd2P6MDo*Bi4+UdzWs{?$8
+KeyStorePassword=[V7pj(U*?Jzpsl0aZP?3hS;?
 #
 #    The password for the private key in the https keystore
-KeyPassword=WGxd2P6MDo*Bi4+UdzWs{?$8
+KeyPassword=[V7pj(U*?Jzpsl0aZP?3hS;?
 #
 #    The type of truststore for https
 TrustStoreType = jks
@@ -75,7 +75,7 @@ TrustStoreType = jks
 TrustStoreFile = aaf_certs/org.onap.dmaap-dr.trust.jks
 #
 #    The password for the https truststore
-TrustStorePassword=)OBvCd{e{aWq.^mJJdX:S:1&
+TrustStorePassword=jH+{FIhNOX+tl:I7:dnJT($3
 #
 #    The path to the file used to trigger an orderly shutdown
 QuiesceFile = etc/SHUTDOWN
diff --git a/datarouter-node/src/test/resources/org.onap.dmaap-dr-test-cert.jks b/datarouter-node/src/test/resources/org.onap.dmaap-dr-test-cert.jks
deleted file mode 100644
index 2320dc9fe6b64cfcf7e3a9476ef868ed6198f059..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3647
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

diff --git a/datarouter-node/src/test/resources/org.onap.dmaap-dr.jks b/datarouter-node/src/test/resources/org.onap.dmaap-dr.jks
new file mode 100644
index 0000000000000000000000000000000000000000..bcbbe999302195e99c4f1532ca7e93d7601c7de1
GIT binary patch
literal 3666
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
ZZfyEbugom0scM-Rx{gKY>xNnR{tLN(`9=T$

literal 0
HcmV?d00001

diff --git a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.jks b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.jks
index 17027970e4560d4ab6fe9c59439eb2aa7bbd9831..a3c2fa3aa8716de7fb744a644e3d4feed9c5a675 100644
GIT binary patch
delta 2055
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

delta 2005
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

diff --git a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.keyfile b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.keyfile
index 59f161f9..d46a8757 100644
--- a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.keyfile
+++ b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.keyfile
@@ -1,27 +1,27 @@
-XzAbZ4lSt3j0vgqonk1lGgt_2IvBzet-MDbt7nlxdj5vrQbUBET9eqIfjRBMlen0E815nYm6nRBi
-RR2fUKzqO8JIn2s19e3fmYrp9wTbIkY9GXOzsnuSeyRxVxxW-82VrAD-gSBmqUEJvPjqjVWinadL
-LVy1h9lE35EErQkBpK_GmqVp2RajjXv8N_5LcKkkc4vYJQ8WclOHwN_BnQpNS1NLBWJVXSPeVwjM
-zIkQ10Q6GGEGCurBPLef9UiXD73oVnQsVyZY3E87X7RbDfCiVbfmHN1hyVkR3DX6gDfrfjTnqkqE
-Hv7kw43qXx9-aRCHrqnmaGYBTscU5JgxTNpqe5hvxLJHnDwLTtHDx-vES0PljekcofQVT5pWJvRK
-ltZtPQwuGlapONa_rDuMq3sSDx8gXKE01rjK0bNDurIPvFzyef0RoDYIc3m4M-KdsBMlnE7oyBAz
-OXCPt42HLJX55F9boRIWwSy-8o3AsPXwQTwEKoD7ZUL4pZ2Zf45npfQLlhhs5x_ERcPTrOXrF7Uu
-40HxQnMbwO_Ofz7CrlKe78UImSJbsQp0heyBbr6irHrMq6_E1DqbjWafs_a4kKNbtfN4fHHvxkA0
-9J_plrqVOoBqFaeUc9MJt_6WBYq2vDFbHSvBf9QZKnaVZ3aKU2MzV2Y5xjw7V6rgDQHwmXXeAmfV
--Z3JT5ocQhyG4SqyKhSrzh4nGOMt51yy68hPPHMrYnpW8VF99qTLqSmQfLAeNqog413Efj75oQDW
-JLw1BR56ABvCPdcR5wZruo2Egwak1UyiRL0Mjd8txrjc4uojiiqddqalEQrORvn4BgP0OKQOOdUx
-dArQ4HqjBGwvurQUM0XjBvyqki1h1pxhSNeuyOY3mofVB2NNi-ZvSHHUpwqIgQ4kVLombpsKw2W9
-AW-3h4cLYl3LgP_LRH5mS8Mo_BEKZqivM9v9YYVZCgB2Djqyn3MQXpcFSxaB1AK9wG4TmMneFP7W
-_dHqJnx26njAtff1y2ud8cmW_UGgzMb33QGIjIrYo3AVX8_G8iEQ-838fDpGE7BdqLSam-BMoeo3
-WPht7-O8gx7utuYx1ceCetunKRmh3Tfga_0srBNDWMyzuiPvbLX3oUJO_F5p5734Qwm5CeqCAaJv
-sU_yfzTgUPqS6jC9cuKi54h3HrzV-k7DcSdGrpsAgzYZdHwi7XFfAzFOhkpBeNUNzDCX8B7yTHjU
-dKdGDezdgs7lMWbJwnSNFDyTwbZdk4XTnSrtdhmOZp4oVizEQgha0Un0ISKQ519kajTFj1rZV6ue
-h8SzN4QXOw6BHYB5rsy8YEvWbkfyneQ74HeyeWRRq3p4UdBTTUn2JbGM0neErRrxnYvmKIdFlSsU
-NlEgNf7dh_kqdWUBkXfud32ftazttjmiO4zkqBupsJTlxj9Tjam9aZqNhunPNI9znf4luKAiRa3v
-26giSwRUX8mjlK5FvBNUbLeFM-G3Pk2jQej13q1lZ3PZMesLjUwvvMIdlu9qmDx_TCYSy72-6O2A
-qmPlUeYCKgI8eVaZV79aM6YtomaopHiPCcyJGWl114Ke4j8H3-Lg3EkjfVROwQw_fKn2z4Eci7io
-LetFQnibRw2ow-Z0F-Db3kuEuRTgmb6U0pMUO3njou6Sq7oa_gaND0XYHy6MKGu1uJ9aKVLZ9uy4
-m9KRxZvq71LRJkD84y9bMv14lxzUsosuzbXV7Q_uz8kceWSq_1BLXQXam9j5rxN6SKEk_Rn0jgnX
-h4A4e7q6loMXUq4nPSVII9K6pHAqfi1sDLhVZ239XcLBwKY9R5f0jgYy76AI1dN-_oEMdXJf_L6w
-KuRJ4jy0XSfyV_QvS6at77san2UIOkdY_tuI03Ps3fTzSaztsy5yX22t-6TnkFSoYxGkuMw9R-Rn
-ZwJIanS3v_wQbgNdUB6JIlE_9kkHYCokheldHkKndV8eEc6Z6bgasNWKB3PreI1m6UrfZI3agd-n
-zhsQppGFk8j7Tkq4S_9SP1OFVCgCT3-mU0UhPhDhCFPM1bladfj8RptCbPKO66evW1c_ooU2
\ No newline at end of file
+bxVb25V71S7Mc0br6UCv__tc5dIqGYSVJ3ocHHFBu55M2zVnOa53_9jWS-CHpVT1BRZx8EbShdtq
+rfCwuzEoHb95jxrLVBZ6jAyYUtL2-rYE301pGrw9QiTfy9kyBYUkl02VIJX5vNj6aak19AbbwMvN
+CK_rc0w0v99Ladt3DeSRZyEF6O3-GsXAMlSJireBJc_u8fcUCVeHmqhlHr2PbqkJ8-xFUdgxKAGF
+wggbb89k9tnIWuom_XrNAuDx6s6W2L3Ftc_Klag2d7qR7oMmtGZ1vPiohCLgn6SN2r6pbNOT8ytb
+uidOlZtiwleV-FJxPCoNBaAhtH9_bXqR-sNstVkJSfpyUTApUCUuz8nZa0YDO04XeRGm8nODQplu
+ePrp6mMnXWYAw7yoMoi8FI9q4xHtFUAWfAbpc9tmyRWkSOvU930qermoypRHKultHjBXQguH5pP7
+p4V83Qffmp-32LW_pTdwb_0YgcnVBsBcCK40xQi1rYz2MSOzJ3Eh9zn-cenM8FkIpPueupcQZRhr
+iIISIDfr7C3n6vsQO7Sfcprcrl6m5eKuX_2M9-dHlwbxiL_UR4Ywy6ybDTXKRb1pRUirYAfiKMP9
+LBmng-HgP_0o5ZUFA5pJynyWPsWXwkxBH3mIhyik-ZamN8MvYTNzC89aOS3K8DRaUXaM0avL-Sh3
+izSjbNSD7CIJnGu2yEQc1oeROB57fngJiCNX5UT3s3Imep07Zn3hcCLnO73pP3G8bECiDpiWMnRU
+gx0Tpnz-GaZNiIRBolD7X0lsrwWePuwyeEQ30K6qwFlJ0aJf1n7I8lQJOhpNLoV09tyrage5dw5r
+GuTfaUHkcmNKxWSCTddWKtV3oXtHRMcx--FY-VsnpP8CE4rXHP-XYWNgRd6EkWYlJRQlgY5gBwHc
+pFdmWbsMNJK7Ucn6-8gl-SBbC-nKTcmClDoN-Fyf-kKDzPySkh1gLrgvXCoZV7yWeFsVIMWpVxg8
+_Gt1TJ3WQJ4Z89-5aiCC6IPThUC0Q9X54ez4YoaIk80YlR-R2d4f8igpdZxaDmdrwxmF1a1VELKu
+IMSuyulmWXR01_9cxPM65SKG_ye6PL1LUoG8bJ8Wes5fu3kkmpt6_4b-NzbhJ3MRQGU1iIfwNiha
+zJ0uXQdfreek61i2OUKoh7zPcr7hYkSK0ViHirHXb9TCbnAI363oaieIvOhvBxnbFmyVcMzxYdBM
+PszMntzpwd0Xcc8s3o3_zmnHOSP_B2fvXI511C7I4ixHec0y_3I8magBXQJO42hH9FsfEHKtJ1ip
+hs8mZr0XNu3uEzqQ1M4ryurvMaFaXj6nYvJWxmMoHMVp1QbsITrqzwD0qHDaNEVz_enHLoDB9X9G
+1dXAF455EATw23nQ9LXybNnjxsPG2Iowrhpf1xQhTQaDrUtm95XHtxFEAcNEerOP93dV0i7PRkL8
+_703_pQPrRBmJUS_N8JkepGjxmXYXUujqAw6x5S5AZV9NhIhSOzynFOMPZvjx6kKy4biLfoNeB9y
+vcy2nAhLaV1ULYEAlNdMuYb4Mqd0QkVHOo-nyB6yChqybWIaDIjLUH0C-tH0DQIE_V7fncOiSnn-
+lRKZRiCgMLGSXPOQy9UYoPMl6uWFPVe5FRSadC8ufIWDJeo_rPrAMdqygO_Dkf53fUzL89ZWI3oA
+zq-adA5w2MilymddeS3TVURyk_-50L5JqbaYJknkAbVQksFtrpweN3yRV30581h5B7QTAYD7jUKN
+-oiZzLpKhKLSuBvZI6Edost16ZrKv0viSXBrCGHgzUd5bPz8N4Y31Epy_aNhSWax2ZeQUYrEdtCi
+uxEm_UIt41RmrkBKO5AMbpUb3GOIPid0fO1tlswBobIadi-a1m50V8G1Wpg2or2YGGA1EmF_uep8
+dI2e78-VCYnN2T9e_F0Cq2SxhrHq4nuA3i7HH_4e5cjEubpgMa_KbsDGFIFmsgJiDbfNKQ7LfFex
+fFqLknleEHpOQpC15yvqVmm9SzjNq05DAn1cVf-4XBTe8W85Bt3aCrDVeXjzmmOpA4CIwmw6
\ No newline at end of file
diff --git a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.trust.jks b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.trust.jks
index 2fe06cd216fb21c2882dde477f0c1fc327beefc3..d814490fade63d412346f20799539e497f6d6785 100644
GIT binary patch
delta 37
tcmZqWZsndJ&su2p;d1Xr6<=17tBWHhmc0<)*Uh!ePCM4*r0%;jkpLQV58VI&

delta 37
vcmV+=0NVeB3xx}i9|dXHP28WcBuxbrceo_aTJJ}~@#g6l)z>)=G`rvlEO`+x

diff --git a/datarouter-prov/src/main/resources/drProvCadi.properties b/datarouter-prov/src/main/resources/drProvCadi.properties
index 56f2e5c0..f2de9218 100644
--- a/datarouter-prov/src/main/resources/drProvCadi.properties
+++ b/datarouter-prov/src/main/resources/drProvCadi.properties
@@ -1,11 +1,11 @@
 cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US
 cadi_keyfile=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.keyfile
 cadi_keystore=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks
-cadi_keystore_password=AT{];bvaDiytVD&oWhMZj0N5
-cadi_key_password=AT{];bvaDiytVD&oWhMZj0N5
+cadi_keystore_password=)OC(*mtYL!1ZJk{sLl3bk?@h
+cadi_key_password=)OC(*mtYL!1ZJk{sLl3bk?@h
 cadi_alias=dmaap-dr-prov@dmaap-dr.onap.org
 cadi_truststore=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks
-cadi_truststore_password=ljlS@Y}0]{UO(TnwvEWkgJ%]
+cadi_truststore_password=vn$sH1Y8X$so:&9u0zYsz{7c
 
 aaf_env=DEV
 aaf_locate_url=https://aaf-onap-test.osaaf.org:8095
diff --git a/datarouter-prov/src/main/resources/provserver.properties b/datarouter-prov/src/main/resources/provserver.properties
index 59b791dc..75857a8f 100755
--- a/datarouter-prov/src/main/resources/provserver.properties
+++ b/datarouter-prov/src/main/resources/provserver.properties
@@ -27,11 +27,11 @@ org.onap.dmaap.datarouter.provserver.https.port          = 8443
 org.onap.dmaap.datarouter.provserver.https.relaxation    = true
 
 org.onap.dmaap.datarouter.provserver.keystore.type       = jks
-org.onap.dmaap.datarouter.provserver.keymanager.password = FZNkU,B%NJzcT1v7;^v]M#ZX
+org.onap.dmaap.datarouter.provserver.keymanager.password = )OC(*mtYL!1ZJk{sLl3bk?@h
 org.onap.dmaap.datarouter.provserver.keystore.path       = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks
-org.onap.dmaap.datarouter.provserver.keystore.password   = FZNkU,B%NJzcT1v7;^v]M#ZX
+org.onap.dmaap.datarouter.provserver.keystore.password   = )OC(*mtYL!1ZJk{sLl3bk?@h
 org.onap.dmaap.datarouter.provserver.truststore.path     = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks
-org.onap.dmaap.datarouter.provserver.truststore.password = +mzf@J.D^;3!![*Xr.z$c#?b
+org.onap.dmaap.datarouter.provserver.truststore.password = vn$sH1Y8X$so:&9u0zYsz{7c
 
 org.onap.dmaap.datarouter.provserver.accesslog.dir       = /opt/app/datartr/logs
 org.onap.dmaap.datarouter.provserver.spooldir            = /opt/app/datartr/spool
diff --git a/datarouter-prov/src/test/resources/integration_test.properties b/datarouter-prov/src/test/resources/integration_test.properties
index 9ac1850a..98373246 100644
--- a/datarouter-prov/src/test/resources/integration_test.properties
+++ b/datarouter-prov/src/test/resources/integration_test.properties
@@ -1,5 +1,5 @@
 test.keystore=aaf_certs/org.onap.dmaap-dr.jks
-test.kspassword=Qgw77oaQcdP*F8Pwa[&.,.Ab
+test.kspassword=)OC(*mtYL!1ZJk{sLl3bk?@h
 test.truststore=aaf_certs/org.onap.dmaap-dr.trust.jks
-test.tspassword=9M?)?:KAj1z6gpLhNrVUG@0T
+test.tspassword=vn$sH1Y8X$so:&9u0zYsz{7c
 test.host=https://dmaap-dr-prov:8443
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0e24a373..8cc5cf3e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
     </parent>
     <properties>
         <!--revision must also be set in the version.properties file at project root-->
-        <revision>2.1.2-SNAPSHOT</revision>
+        <revision>2.2.0-SNAPSHOT</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
diff --git a/version.properties b/version.properties
index 44a1614c..2a39d41b 100644
--- a/version.properties
+++ b/version.properties
@@ -26,8 +26,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=2
-minor=1
-patch=2
+minor=2
+patch=0
 
 base_version=${major}.${minor}.${patch}
 
-- 
2.16.6