From 45bea5f11e5db90f54525425099d649fe939e1df Mon Sep 17 00:00:00 2001 From: ChrisC Date: Fri, 29 Mar 2019 10:50:49 +0100 Subject: [PATCH] Update cadi for Casablanca Updated cadi params and uplift aaf to casablanca release official Issue-ID: CLAMP-335 Change-Id: Ib83fdf9f6f1a8d4dee6f5a0996c170ee63f5ab58 Signed-off-by: ChrisC --- pom.xml | 2 +- src/main/resources/application.properties | 6 +++--- src/main/resources/clds/aaf/truststoreONAPall.jks | Bin 114865 -> 117990 bytes 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d2f45218..dca319ad 100644 --- a/pom.xml +++ b/pom.xml @@ -347,7 +347,7 @@ org.onap.aaf.authz aaf-cadi-aaf - 2.1.1 + 2.1.8 javax.servlet diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 66ea64fa..72847635 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -235,8 +235,8 @@ clamp.config.security.permission.instance=dev #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 @@ -244,4 +244,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 diff --git a/src/main/resources/clds/aaf/truststoreONAPall.jks b/src/main/resources/clds/aaf/truststoreONAPall.jks index 2da1dcc4b470e1d4a8a52898573aa24cb59e060a..ff844b109d97cf4c452c1a275c50ca5e8acd59af 100644 GIT binary patch delta 2876 zcmdUvdpOg5AIG=ZX49NT7Q(2sMf$Cpa7PR!hfK&>rp+v7b1G8SD4{TxQ*=V)u!K-z zIg~q+$tglYq+4;*$*~^QbKmzL_jCXET+ekqe|)d&{r!C2*XMd)-|zK#m2t%`AG;z`ak?zZa@QJ`Kb1mZFaknoK_C#= zd)WIoRS?WshY09{K(Im}3U&jC5=*!y1_47LNYJIS+0FuFnlFDX9LrBsMo>_Y1C|6i zKo&0M2o*<3kZ4pUBOrKn7y%8)d@o9%khW}EfVruy4fzk_8k9sZgUR-%QE5yT!2ro>un}JPmUi1_7L%>R3Zet57)gRI zfv{a~JAtrsyRIuna#awv@A~%@;0pMsl@&Puh1^>J+|S(V|0y@to)&bB7KAl5!8#NE z7XKgf^Lc1>PR;x+tya=&s@L-c4XK?GF25xe8)&PrPB&%v7d&gwb2@CL$RfR~YJuDKSiC~b zn}$0$|4IydbB;A(W_Wjte?5Q63;Fzw6V+v8`Knm=^_!fn!-v|_JD1^(XP1f_|gjVJ1=n&Zxh_Q_=f?A0Go z!9p1T9iYLXs}clw0B&%E790$Ni9;ZOt&+`tA8a@)6dMv08XSTR@nr;KkI;g?D_Q{d zI1TGdIYz@$u--uoDxJ1krG)&jGZ}Q>5Ue*1`(rg|!69%Obye%|$?N1fxi+avXYbm! za6L@aG$p!}(C(2+)Ne}~-1m}BXa-NpVC2BT+O>qeAIvaWOkr}K`_>gsg0>^P_18%E z&PVS9#zkmBhP~6(=t5m%&n}$J%+$19}l3Mm`u%3&5Sa(i#? zNxHwA;|AI7VK&`nCi4=;LATf)c0b|zB$VOp-5*;LYRE@N z+Qg}J?Y>-@_V|__KACg5y2b3(**hOg@>AAcTW+6}zLSthoZY*E&`O3)&a~p&mc+A9 zDp|><#3EF;)`G}dB3+OB?ZUjN=`MC(&of7j+BG}%m_0J$Ugs+nI9_Vi9Rr525ji-U^wIKLu$|6k4xAKLeo`FH z%f3}Ud?+I`v}Pp{ky4k=OVJoj3rjfqpx)S`=o;~b+=>R*v&74roRvE{kJXzkmAP&< zb7f-T)J3Vs#E*Uf9OuSli{Y&b!Usp|Dyh5X&E%Vqor2AyF)I8dv)ARqtl5rtwJoHO z(U@+vIKu{vzWiBSPmlG!v7(f{b5Bq3$hbhi<5ndHI&GMRckoLQhe)t0YsT}=3dJ_n z1Vy>Su8Pi=1Qn{V*RdLk1NqFT;U~meXzkF~LkA~CA3YW{pn|mOfr^!-hgrH3KlvHN zVuk#~XP(=i_=KASQE(F=3X1;&pWQht_c1b~`u{KZB!0)|cbe+{z$eia;MRS|=l=-% z_`h-UpRmtYXQ*?Ya67t?sSC~aFpVTZqLHaa2M{ntmJ7BHTF*hEb&fzu&=IMw4JF|I ze#oS!_uZN0-Fo%8!9hzFsWHQ`OK=yr*$E?IGncDfi!fl%wHb1!{Gw`~7>-qdYPJ*_ z#fs{IflssHGO@HZZ@^DAC9-ZW#48XojSJ2Vp2NyCe$F*6M5neIngFrtzxp*q?A z*5w)Zu3zNYXil8!B<$M;)va;v#=ANy`#AjWdj3Eu=BbkAmu%mn$9SG+C9CF@X}gd2 zskFE}j%-e>Z({T14KvU7=x3_&zc~&@3_p2*u6VXkgZTzhk1w;V%O1LSf4opswgZfO zpr@P#zfA(ZE$6e!dx5K_*VxBRea0G#HO*eO;MGo)qjisx>GU94$XfU2VkYJVS1LUu z+d$T(scEz0Q=t_kKYuV4li2V$sjRe5KfOMS!*+VJ8K>6%NLhM0^>#Y8F3+y~d0B68 z8DMl{qQ}$&^>op$2rT`J`rs~vP%08SCh%Iwp|hd@!?=gAi8~uWnIK}OmcsjL{@tMR zr7{%+EL$)MoicqmEO|q@W#QSGbe4H$UkvYHJtZd1=l%^x>wUQM=@+678klaVdcGA0 z#eG&V~hqkeGP#<&#DCOGboupcXMIJF?P_!bd- zjw|^|mQ-#<3jB%}XO0^^qijbjZv5&=&1rb`2qEmh5pEluF@80nVLi9_fzO&h_C@|orpzw-^A!myhY?~hf>{lp2)^n^=dB?djS45 z`ZehDP}7Cv4Y;~~Xc}N_8CM2ry$JOq_i^fGdlexaakCW)qxSmEb;31O;=hxZNE)vU zE?7Nwe^E&Uh(rI8J;Hlv?Jhc>#eO^R4B93^Hq)Z&~-0jm=Apr+I2B9W$_(5W;lC` zhLYZ{Ni3L=ax?I2fm}6RVDLA04dv;L)^BR$)qgR`o3`^fG<0b`qkQZ)s1>Uu`?SHk z!tlPSIg@3v)mO3nEMO%n-svNQpfN&TT?is~+PvRv*-s(erWf}sf4piJVMq1#0ZC7E zn%H4VgE77nIi5JO&oFY#O=6nv1dX1fZmX_M2an+7-`HMjQ(8)XTJuJnhyf{~ F{soaOxr_h+ delta 79 zcmV-V0I>h&nFq0f2Mqr0{_Ow&00IC20BMtPo)fVjQK+*EtYrnWaHyLDlXjjEvw*RJ lO1IAe0l%BK_M-vZC=`V;gbc(F8qX@fXw}SanDRJrzhyzdBQpR1 -- 2.16.6