From 989f40665366b23937d06ebddc5d7c42b2e75f9f Mon Sep 17 00:00:00 2001
From: ChrisC <christophe.closset@intl.att.com>
Date: Fri, 5 Apr 2019 16:24:13 +0200
Subject: [PATCH] Update cadi to 2.1.10 and updated keystore

Updated cadi for Dublin

Issue-ID: CLAMP-337
Change-Id: I71e02369e8aa0a23250c94c68fcd9cf434de4414
Signed-off-by: ChrisC <christophe.closset@intl.att.com>
---
 README.md                                          |  12 ++---
 docs/index.rst                                     |   2 +-
 pom.xml                                            |   2 +-
 src/main/resources/application.properties          |  10 ++--
 src/main/resources/clds/aaf/org.onap.clamp.keyfile |  54 ++++++++++-----------
 src/main/resources/clds/aaf/org.onap.clamp.p12     | Bin 4107 -> 4107 bytes
 6 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index 318d2c87..1cbf0e3f 100644
--- a/README.md
+++ b/README.md
@@ -125,8 +125,8 @@ There is a section for SSL enablement and cadi configuration (for AAF) + one spr
 
 server.port=8443
 server.ssl.key-store=classpath:/clds/aaf/org.onap.clamp.p12
-server.ssl.key-store-password=34xqGdj]VnHothQ]5qCykV3X
-server.ssl.key-password=34xqGdj]VnHothQ]5qCykV3X
+server.ssl.key-store-password=China in the Spring
+server.ssl.key-password=China in the Spring
 server.ssl.key-store-type=PKCS12
 server.ssl.key-alias=clamp@clamp.onap.org
 server.ssl.client-auth=want
@@ -139,21 +139,21 @@ spring.profiles.active=clamp-default,clamp-aaf-authentication,clamp-sdc-controll
 ....
 clamp.config.cadi.keyFile=classpath:/clds/aaf/org.onap.clamp.keyfile
 clamp.config.cadi.cadiLoglevel=DEBUG
-clamp.config.cadi.cadiLatitude=37.78187
-clamp.config.cadi.cadiLongitude=-122.26147
+clamp.config.cadi.cadiLatitude=10
+clamp.config.cadi.cadiLongitude=10
 clamp.config.cadi.aafLocateUrl=https://aaf.api.simpledemo.onap.org:8095
 clamp.config.cadi.cadiKeystorePassword=enc:V_kq_EwDNb4itWp_lYfDGXIWJzemHGkhkZOxAQI9IHs
 clamp.config.cadi.cadiTruststorePassword=enc:Mj0YQqNCUKbKq2lPp1kTFQWeqLxaBXKNwd5F1yB1ukf
 clamp.config.cadi.aafEnv=DEV
 clamp.config.cadi.aafUrl=https://AAF_LOCATE_URL/AAF_NS.service:2.0
-clamp.config.cadi.cadiX509Issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US
+clamp.config.cadi.cadiX509Issuers=CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US
 
 In that case a certificate must be added in the browser and is required to login properly
 Please check that section to get the certificate
 https://wiki.onap.org/display/DW/Control+Loop+Flows+and+Models+for+Casablanca#ControlLoopFlowsandModelsforCasablanca-Configure
 
 Or it can be found in the Clamp source code folder src/main/resources/clds/aaf
-(Default Password: "34xqGdj]VnHothQ]5qCykV3X")
+(Default Password: "China in the Spring")
 
 2. Spring authentication
 It's possible to enable the spring authentication by disabling the "clamp-aaf-authentication" profile and enabling only the "clamp-default-user"
diff --git a/docs/index.rst b/docs/index.rst
index c3c6ee40..fc0118ac 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -184,7 +184,7 @@ For OOM, the URL is https://<host-ip>:30258/designer/index.html
      Default password : password
 
    - With AAF enabled, the certificate p12 must be added to the browser
-     ca path: src/main/resources/clds/aaf/org.onap.clamp.p12, password "34xqGdj]VnHothQ]5qCykV3X"
+     ca path: src/main/resources/clds/aaf/org.onap.clamp.p12, password "China in the Spring"
      Or get it from this page : https://wiki.onap.org/display/DW/Control+Loop+Flows+and+Models+for+Casablanca
 
 Human Interfaces
diff --git a/pom.xml b/pom.xml
index dbe87387..71c9f298 100644
--- a/pom.xml
+++ b/pom.xml
@@ -374,7 +374,7 @@
 				<dependency>
 					<groupId>org.onap.aaf.authz</groupId>
 					<artifactId>aaf-cadi-aaf</artifactId>
-					<version>2.1.1</version>
+					<version>2.1.10</version>
 					<exclusions>
 						<exclusion>
 							<groupId>javax.servlet</groupId>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b8c63356..02acf184 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -58,8 +58,8 @@ server.port=8443
 ## Config part for Server certificates
 # Can be a classpath parameter instead of file:/
 server.ssl.key-store=classpath:/clds/aaf/org.onap.clamp.p12
-server.ssl.key-store-password=34xqGdj]VnHothQ]5qCykV3X
-server.ssl.key-password=34xqGdj]VnHothQ]5qCykV3X
+server.ssl.key-store-password=China in the Spring
+server.ssl.key-password=China in the Spring
 server.ssl.key-store-type=PKCS12
 server.ssl.key-alias=clamp@clamp.onap.org
 
@@ -236,8 +236,8 @@ clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Princ
 #AAF related parameters
 clamp.config.cadi.keyFile=classpath:/clds/aaf/org.onap.clamp.keyfile
 clamp.config.cadi.cadiLoglevel=DEBUG
-clamp.config.cadi.cadiLatitude=37.78187
-clamp.config.cadi.cadiLongitude=-122.26147
+clamp.config.cadi.cadiLatitude=10
+clamp.config.cadi.cadiLongitude=10
 clamp.config.cadi.aafLocateUrl=https://aaf.api.simpledemo.onap.org:8095
 clamp.config.cadi.cadiKeystorePassword=enc:V_kq_EwDNb4itWp_lYfDGXIWJzemHGkhkZOxAQI9IHs
 clamp.config.cadi.cadiTruststorePassword=enc:Mj0YQqNCUKbKq2lPp1kTFQWeqLxaBXKNwd5F1yB1ukf
@@ -245,4 +245,4 @@ clamp.config.cadi.cadiTruststorePassword=enc:Mj0YQqNCUKbKq2lPp1kTFQWeqLxaBXKNwd5
 #clamp.config.cadi.oauthIntrospectUrll=https://AAF_LOCATE_URL/AAF_NS.introspect:2.0/introspect
 clamp.config.cadi.aafEnv=DEV
 clamp.config.cadi.aafUrl=https://AAF_LOCATE_URL/AAF_NS.service:2.0
-clamp.config.cadi.cadiX509Issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US
+clamp.config.cadi.cadiX509Issuers=CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US
diff --git a/src/main/resources/clds/aaf/org.onap.clamp.keyfile b/src/main/resources/clds/aaf/org.onap.clamp.keyfile
index 4908ca7e..45cdcb60 100644
--- a/src/main/resources/clds/aaf/org.onap.clamp.keyfile
+++ b/src/main/resources/clds/aaf/org.onap.clamp.keyfile
@@ -1,27 +1,27 @@
-dK4TahfDgZ9dafmSF971Olx2sfGYPTm7JZnfbtjWxJOWSoRXzyLnJ2C1JwfucH99_9QTF2HQc_Av
-LiBCbDt1UJz8K63igFpZhKHR1RpsF-jjGWcrkSWu5z9yz52DJYru4uJ-GY0simVUvlVOn_QR2SHV
-D2qknw7FzUKO8NzQd0xJSbxP2lbTEOw5bD74d3gXaVnMEA1yUrV2f5LV5F6O6zPC7s94l9G1Prxa
-LS2VE1ZUY2Y2VD9bigQxw_OdtfbMk9DrDAfvYmhUZwd4MMqurHYdqwn5iuMVBT3cz4saFVGhoFNv
-d_NwEmsaeGujnZWRQUwhnv5SPXslQY_QXOnTbucvItDwpIA07W8fxZk1os3D5q2XFkHjqDzhWqnq
-4Snv1Bz9gw7WIHBjVIgPDHfheQfvm7gO5E5LlmSiVouBdyEp1Yc4mhdR1zs8Kt1AvUEkXVzlbR7a
-rMBcASvn1lGvjcU4NqM_u8hIFg-O-w2ooMJK9UUOOVlYRI_wblAGF173Z67CfVRtWdepKb2Fv4pb
-3N9w95knLUsh6xea05W4FnNYdoGwHRofRVkH3Kotd0KUoXwe4p6UpfFw33jj-8pWMaRpkkDu9-Ol
-Q_B006lHZ6HnXMWnQyrpqYxPRWc0TvoYvlSPqcXVQWIOVP3K-pp6lnREFfJSJ4MPm9AgE9v5GywH
-YC9Tq0fWxzKuEbNZCU9xJyXP8rrQi9O8CVwBT0oAzJ012Ztt4mEXvjByKOJsCAPVbEqB3THcL-X5
-UNnyiM7aDFiemQGFbRQgNu9fkk3CgvgU_G4MvXneFmsbJdthvqVDMDe26miUmjOsQl6tZgqKg5sN
-pExhOpoApRi7YL_1J79zkeziLHLU5NC9ryRrUfQgpwivnj9nqJr0COsEYLg9381NWMM100LBm2z0
-K8BTcmp9vKKXbfTm8a3qHexjThxWw8Og-x3Qsv4YP4TpNUAaDcLn78WPc23Mpx0Ir2Z8ALRwhmpH
-W_F0phywuCPH_VO0rDulT8bTIs0Ldu5CnGCswL8hGhyw5mM0ZheOymFGn6Sd7mLOyKKFIF5HcR3n
-_xfv11UweRzp0M-5VoLcCD6rXxJTZK245ureyZsXtkOLvQ81yko1FkQRbaN_86ECtYrMpGbhLY9O
-GUyhXLG1Ac3M6ZsgwDn6iMUckCbANKIR77GY_BEIza5aw-3GHhhCsmtU5NtoUlpFuIC_JqqxoNYH
-_iAB2bqN3Py6dXvTtT0WX6gciDsyYuXchECFub3i4vw_RZe0UEfrpJM3kEjcp3AFsOrosffvS2BT
-ITDQr12f9Y0-ydAlCqzB9EpSchKwW4Hn7sUA_BEbSkO3e-ujNDrvzPPXWdESiJSzkJc6WHgossJx
-q8UnYkCd4XJYavt1a7XnrCxJcJ-TVyM1EVWuHZxziX3p0FCeu0Ett600WXVCYvJ2UsLYpvAJWgYx
-BQnMoJyJ6Xkk7-IaedqCZLlkITul99arptcxCKrfWY12V6C2cwmbJgxjvHPoM--4iads_Kj24c_q
-LTLOuyqvqHL1UIVXW5i_1ddsgYJmCUK0WjsWvI151UNlKB7N0MFNhFZlGqN9JCog2HoAtyb2bRj7
-2-0VmLeiWAysfrfxEhL_ipHB3A5iVmVC6Eq_w2G8pcTk7Ii_oqiDVIbT90sgaUZavXyb3kkGKsko
-ELxkKw7wytSXLgBY6E2IqLjnWdssQIYlolA1Hmg5JWNMr2vjcQWGQiXe1R5s6j2Kfp_vID4bn3qT
-Reptwp9nEJ1xVGwWu6rGPdHIwqp-KwzajjNffJQPAgv0IoDSknF_uQ3fYfY2N_CfyI8p_fCsn5xx
-zYXHR8enH6e1Q3olkWgdZtl5mhIF6B4RwMB7L7h5NDLoab-OlYVqDqKBZqcoE3iQXvEUGilj1S1O
-cPN8A8KB8IXUsdSy38TqAEv8j4fY6TpMnhq-dmN0RhWekDJ2v9B2Jhmdu4Wnq3UetiEW455iwd8S
-nNDAVyE0JlPq9Mgt10bUUwF5fL2JfpZWehSMVIbU2E0VMTcTxggVK9nMI3wMc2n8CRWgc7kM
\ No newline at end of file
+HTQLJHUg5Du0VM7wHY5cBMTgupk6ujhSoAgx5BTHp9wt9CoWvD72ScIciyldEH9R2QZIL9ZvpVo0
+h2o-hSQueaVjPcIFUhVIl4HWmNC6I2YAlNkwy3VMl1g9otKaOTgo3ChsFUVq7ACIrcr2977wo4B_
+FeHa0lInuaLoEjHMP1fszTWYBBx9oY3K9s-9MQQyCo6bFV-4L733sPeE60j20FWoygUwvIqxp3Pc
+Bmnm1AtcrhGH0elqDg9qNjmnmC3gxZaGpGiclaEds_lVu57RIXwtTHgYyMbJzfP-Ziq3T7i8d-h3
+JZThj1l9JvDLYm2z0BEXuQ3Owvn4m98cWB9P5esJOKYEvsfIGK_Fd6uT04fzkeDT1wNV4-Swuorr
+ymZQxnvHbUAp91NJEa3EtWTuBxNeoqV0cw97WkAYn95pgjH4ZVhBdczclS-EStFJyYOHtTRAs1A_
+8i36GiuUPHn3KolkRF2GvtZfwNj5AYfcUKhqULJ-T_is2KKYnGwQ2iaItX2852o4zlzkMXFMkt5C
+qbsDmrU7F5zxn4HG6yShW5sIXgAcS9cyIs8IFgHtkYauDJlKZWynhzqibh3-bzPyfFmreTHxQ-Av
+Lgp5sAtf1B9_1feVyE78bmQ3IMtxE-YkV8RYPDJzKw0nIdjce7j89azNq_as5JMfCCHSlYcKRs8O
+Nrh8gXYun28iUL_kwEUWK0WohPgwQBb46_Hkc6a0aSYbuFA_7qgprPB9wmAlHtuqnCAb2vk8GT-h
+07DB6yPGgzE-OgXUzLIWHXVzPO6SjOg3ifYpCRigOsNqkV1paBBOzje7dn2RnpgaRJS3zupTMnqF
+g5N9qCgubxRlII626-Dc_i5X1OAWPzJK8UZPuxRAg3YVJNHluB3O0Q2Uo14RkO3a2Tn_Ce9XoTUJ
+Jqi_qZWytIB9sHMNM7KvcRxGedLqd_230O3zV7rTa4Up0BFoMyHmnf2SZu96x_Yz_n_AWhiaALvE
+ON_nTxPEOHfEfrNzo7pCwIaI5gM6eu_S24aZTf4L-5tekqH7l1PEbKr2QP4XfTZBN4FgNExgGpzG
+the3zv4k7hJeWe7GbtMmnZXIQUJkZVTHBwqvHkqtN9cBWpihCNVmI3zKq6Bsy6Us0SDZ686kpeVS
+s9eyrzj6uLPE65mQxCpoMt6G4HSjzMqA3HOX_7ixBBhtdVi5-X7NeTigr-uaZg67yP3cSikfFf9w
+dyFuMjg29jtlaTNzOov8HFrcLq01N3fpwDkSU_2TmLndU-FMat78CMCLW5QuS1KF3hC9T8wzKWS_
+WHK2oMA3SqWyqnj_cE_T4Ql_VKL3nkvf_bzTvLso_BWodUw2A-eO-1qjtCHp3nnTdSVH06E3_eRH
+BuKWEt0MLyNpm88OD0tgOC3fn7casioynQLoFatta5nlQfj4nsAXj2bD6CrohtDhjOKXqHxDU6s7
+adtNoBGyEK5FKy3HtHMC7KXsK_6wbYUluz93nCNMok696HIHojNUydGFqfr2HluQTi0S3uHnD_pS
+-QM8DbsFi8oIztn6Er4CFFJQ-tUuDyX6ahfY5gWLqCgRM7RzrkoHY7b4vkHxZTBLZlPGWfRtG0vc
+GTSqIRNI2Z_Zte5-wW7T9vfFVBsArF0SJWOrlUqf7fGN1_2H9B9aIpLEMaHF7EEp1OP6_SNnfuhB
+K31EFy0VW0eGnLezpd3HT540kznub7h_m6phZaqeZJxsle9jHEOS7qDc3T6s1hZ7DLK2Ej5RFuq8
+5LA9Cj5VrdejKMZKZJwmyWylLe224RyY4gDa0MB_lDAeC-YFdY2ClymYRJmclFFSWf7X1j5beQve
+xGbsXJaWZcJpahpFu4RR-kOOyZBLPsdiyOZ7PGXz83l35NiXabmRapgjve1t7NFSuRluafihc0Lg
+GKoz_-3YAFJmh4Z3bcCsz1WhCUYqzWyDsnZiD7sMQT7Oyje7RqzoxBZs5Ke1_0jtpgFrc7BcqHG7
+WpwJr6hg53o3BpWcUEopBomhbdxiDSLxZmDrePy9LDC7YNk_7-gVKIc7dZDMgw6kSRR330p0
\ No newline at end of file
diff --git a/src/main/resources/clds/aaf/org.onap.clamp.p12 b/src/main/resources/clds/aaf/org.onap.clamp.p12
index 7003136b9989ecba83c1294aeb493ad22e5bcf78..b3c69efea51e75a1ed3e713f725b3c379b7c9bac 100644
GIT binary patch
delta 3922
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

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

-- 
2.16.6