From 1e8b38324fc1a9f73285ce2b07b6945db528d208 Mon Sep 17 00:00:00 2001 From: "r.bogacki" Date: Mon, 19 Aug 2019 10:43:05 +0200 Subject: [PATCH] HTTPS calls for webseal-simulator Implemented HTTPS calls into webseal-simulator -Added p12 keystore certificate. -Updated application configuration. Issue-ID: SDC-2517 Signed-off-by: Robert Bogacki Change-Id: Ieb5f9ec5a0e409eb4bad36f708b2eec424ecf70b --- .../cookbooks/sdc-simulator/files/default/keystore | Bin 1416 -> 0 bytes .../sdc-simulator/files/default/org.onap.sdc.p12 | Bin 0 -> 4051 bytes .../recipes/SDC_Simulator_4_locate_keystore.rb | 6 +++--- .../recipes/SDC_Simulator_5_create_jetty_modules.rb | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/keystore create mode 100644 utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/org.onap.sdc.p12 diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/keystore b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/keystore deleted file mode 100644 index 08f6cda8a7b0104236c37f3c06b4cda1d8fc58e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1416 zcmezO_TO6u1_mY|W&~r_tkjZ{N+3_R)UekNZbhDKH`EXUR-=hO7hY&y{H-e(+TowuJ*{`? zwVfT`ns@KmCLd9_H?QZ%#(VNFq-*~l&ib%)(Y!;gI{W`RJIFow^~EB{E~hHzXm8Qd z$+I3OFWL4l%D`0pEH}^DdFqAf_3vNy-07jRmW@8^t|?HpH{w+9zJZ0HTQ{GwgE`KsL0)*BinM>ExK{8V|s z_c83?=Ue&W%>UG?wT~>g^C-D5b6Kid$utMyOUY~8&RQ2O5Kv$6WA72RZCZOI`%XW7 zWGv*iET~D-A?Uf$)PkAXC#^&coOKW1)_jbSp1ybc*-Pg z*1AKX?hJ-g?<}Z|$~fj~%&Q)8GVXHmuY_w7iL*9Li<#ba=>(4shvkf&zalFllPfRmB({Gr>G+(AG{|j5^yi-$J^G%gy&!3%F`Y=?Z zqHag3(zm<4?6(-6S8caBa7ykAzsvLfb>|ds{`&FW?ULoW&INs`nHskiv_4^yUS(;u zwJG}=M=euvt`d*!{pAW3tsAR0lWEH+#d4(r%9_{jEh_BIde_H z2F(udYbrB!9Sz@xPFu0!#>2SI`Ssat!p3^(;?40Uy|?vOtS!3O8Zd1|F}L60tKCOm znylYEA@-w}ri%BqU%N_+XGl&zI@4*vv5nXG(`N27=6zy$WG5s+N9dUvSOODr2QVSG z7&I}yWn%FZKK#XimyJ`a&7GmI50%m z5h5xEN+4Za!qUF^MI{POiIob@`FX{qIVG8S=?VcQl?py3DTaIoJRnuv!mM7P3}z^0 zAOYet3k!lXoL(+aZ&G5VUVc%!ft)z6frX)=fw_T+k%h5YlsK=knSrs9DU>^yoZ2`a zIUIo{19M|9Ff2Qn8XFm!A3o&OeJrUOYjfQ^)giy{^|QK1CEP2QH%vD1Nc3MB^xmW4 z2fxzex2hhF*O)r=%WpirQ+H{vy7qk+o=56U7bdiMykRRo{_oVH)zDhW2yL+!vyn`wiA33|lR42Pgou}g~dvauF+U45K+=Wccj0}v( z&I3j>GtgZkrPhJg=H9<%l_$GC*-}{lrfI>Hv$DOvyPj6+9TS$eJZ37ao71_#A!EVD zCY$?z=d9ULtT&}=o8QIxpMTDAp0ptI@ccyM2W9WgVozM<*}KLmGg5O$WNJ zyVS~6#D7};!ib^4U#WeU%`4Hj5}6$f=N+nWnZl~&!Rl~+N3ew@4f%rb3QN(^LGj$B@Dy-jEWZW#Nf#hBaj-1!!U<| zFw8-JZ9f;0mhC zLM<9%<lgLxQXe=QV0!_&R&z33`_m_^sWb4}Sm9I2Id91Qu3*>bUySGPn04NO8rAO2 zYS&^d7)Vl2jpViwl)TU5SHt9}<^F`;EJEU1_8tG2X3`m~j9#m49&kL(<4tU%NYAk3 z_U$ocxM@7u9P$gBS4lw(@f4vZQU`jT=}U!ts59npst8MxFhr1UDe2mMXu(*59%6v8 z0I-PQLoy#HH@xyk+XwZoFuKQKl;Z808qPdOUvlCX*Q6cOtcYW3ftOh2Ab+D1OVSCi5ZLGx!gC<(TY07|jlg@PZVs zhP^U79;+d|{^WATLUh0WGpU1h*@7bC2aosLy#`Jia!+Fy;N?Sxy)GH|AC#jbP1WMG zFc!Gjfa|FnY*#pz`=3fkgY!kBN`hkk{BsKdJuN#9X5(VuvZWh^_I9Kh1dYzd)0|}m zjd|L{9O(&td2qL4!Nvjj^Il}=49ixAki;S9U0CR&k%5J&F7e9i<4T&->wILnk2%Qm zz0F!BHlvaQah+4r6sBi3y5epqHeSJm3MNW|iMHHz2VURQE>$*~1IHR`q@ zdv9IttqUYo4Y_`(xpUXK& zyzUN}ywHugc@``D>Mz+^)?M~?Ly{G#PH#|k#OwsIe(X$LT1w53nG@7!x?~Z`lAcL& zQ?7uRU{d^+Q|6cb67i8+UY4!Cm%ry;DRR7A`g61q@gSzUbm%!$WQ^0$K*^C+HaHaG zmQ`}YKSyLEOQ6L?b8IOb^eX5Z1zp5bVQ-ajO4#<8i2yJ7Tu0ka^3p+}Q8PJi6-r2K zs~dgwGlA!{7qiV75Rz-4IV`d%Q@`Q7%rmz*xzF%rr_R(}mmd_>QW?eYmdZ(}bE@Cl zBxD=6`p2)D2QJ(0d&o_%RkUPdc9`XMh{NbI%d?@sUxp(ZKVM56Myg24QyGPFyXabP zC~Id;Hmb%;4qFEem%Jk-J-PBo`NHky*8H0BaP zYibtEYrZE=9?2$cNp4MsbuzhVJ$n(< zyyosvstr=*?=A1ST|dP0W-alhXZEL__tZ-~^0^OE#d5_^`=1_Tj0sEP>Dvr78aE>! zi6TH~#Hpi=#cD?>q zgUFo8MCK15+l+pt+&pRY4gxm|nzMef4DHgApf1qK|GsNb6jfKlFpUy$>S zGocH^4g876CiLQj<;BRqo+8$SF)!Xa-9u;B0 zs|zFJgaM-T%5P*no0HzC>#cDO;oDqsn(N!xo<8e%8F0U?o!C(O)+)0_X7J;&y+CuE z)v+LY5=e8(nrK{H{y_wHHV3e8d%HT&Y}I1bfoY8`k2Cok(MoGhve-Arm#;@*$Yw;Z zV=H>R_??U>=w48Ei}Ipje}xOMktE*lw5!*z4LN-?68TTt+Ej~`-NBjGd5KoUbQH!$ zNVAI5+<=$3+z_P`!p#+4i?|!fFPR_n;ho3b%MPu`iQYN7Dp}j53lulIYs=lFX4Ms@ z;+T(e&PF$t2HhUVd25;;yZU?Ad&hIS+#Yf9kHw%ucje*-xf*`gTgjZ-;kUj{G!R3> zV_jN#4j5vDf|;Ssit-;+tJ|T;hL<+1(^*1N36c%$^TPy;Mu`a^{YfrIOOwk-$OgH`f4T z!VUCPV}!iLJRXB^QRu4JoB1w#?0S-g`ui3kv1F7XNw(0CxksB{REjpJGH*frzI2+%#3vVKLOmHTJkLJqz*=;-H6F?kwx@df~v?#ngIEsGQc<{P*8J z;{qf4nRtI{i`u0QRwUey(@;y!(wW&w=vzKN%h?@$^%B?8wqJAIrbDn+onK1lRf;=~ z9PM+YN-o1T6!JKT8IN$Ogjpz?W&UpKGZXC^tdTiPH>(Fa*WKCcCLPF{RUE7{BA9+H zO;ptiZ^OA$!xW--7FrDFRQkWWt?oSZ=kdxI3;76R&pcwXWwG}N(kyABoH#&Kj1ro- zW)358^Iw8KDWC|$;-)?)-HN=<^kHW>$qndDSOBA;Zt2fzisR%Yv}>gcg{7vj=%R5G zr3=MJE^L-??c^?iy+z(r&;Pw{UwQdZ$qvX?9B!kC)tA(=i_zw0Um#Fs4sgwQD4&Q?ChA^;5Hry1g1u$|;I*I4_vGA0rR2}R5;wdZ=|0vb`p4GN# z1lpZ)gA9l2ia{UJyv9x`H*zXyWJspgL=)ZhzQV5;opyG|AQGn&Y&JP%sSctR3DH?j z^Wf#bFU6rY>F?tv=R;ShWggUv;pD9l)~4Z7XQL=N+xD!m+!*H`{h~(~?=0&HCYY;o z?YAUg7zwC4uY!B-?zDnLQTeV#XEHGsRX5~i? zNEKlvXxr%{QLSo0ik(Wrd}8*Ls?{QkOLad8g~;v=`sF109=uw=kdYrKmye%qR*wrKYs~=ZqH&JmYI{%ULz| z5Y!54EkygtWR=1_Fx?A2@x4pMf)dx~_%>1N%I;8~^jvyXB^!2!vvTgW_o-= zSzVW2<*Sg6!a^j&$XjE+PsY9SaJCHhZzC4P!ozrst*7>_#`*Q0*n5XN^6|l(#jD)D z$j3hgnaO0Xh_n$ufA(4h1N{QcDVqrvawm=a4n#(uhJ6w_gNkd2`KNGfN$FV(T#Fa% ziMh(wgEfT^G?&I4k6jkM6zw~PdhW;U89h|G`*+vY<-kK_6|U zL}YU09V?lM=Sn$-I}334w&_{vtW^LQj2(DSw0=7$_E539aC|UX=vAAcWw$sH_=H)f zX@?Jr5OWN>Vzzmeh4!G_E#5Fq{ZFC=cV6~4BTk90m3yh`Ee|U_>37N+`?c#`AcdAy zom_s*M7K9Gg;`<&71u*T%BuzJ3jj*ddRk65(g(a#NT&nznkf2xN?W)&RxiB~a9 z^~(CM>6l}``85G_Dh+#?)=gYrJ7M3_*Ur9RgEEaT2XZzHWXFt!gdn^c!lysP3)HG> zpbKr8ka$KcPnY7<^^@1r_sog$PmLDUR7qDsKc z@)4k}@JxwHL_@O_VaqCRA~LChQXlWpG-Rd1MN?loF}KrJ)}b-$z3abUR*H_;3ENfr z#%kb=&?Pe20h%;S)b|>qpaed_{SSa9qB{Tp literal 0 HcmV?d00001 diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_4_locate_keystore.rb b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_4_locate_keystore.rb index 3bb482d89a..8358e28339 100644 --- a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_4_locate_keystore.rb +++ b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_4_locate_keystore.rb @@ -8,9 +8,9 @@ directory "Jetty_etcdir_creation" do action :create end -cookbook_file "/#{jetty_base}/etc/keystore" do - source "keystore" +cookbook_file "/#{jetty_base}/etc/org.onap.sdc.trust.jks" do + source "org.onap.sdc.trust.jks" owner "jetty" group "jetty" mode 0755 -end \ No newline at end of file +end diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb index 8a0f6a79c2..4f7e710d63 100644 --- a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb +++ b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb @@ -18,8 +18,8 @@ template "ssl-ini" do mode "0755" variables({ :https_port => "8443", - :jetty_keystore_pwd => "OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4", - :jetty_keymanager_pwd => "OBF:1u2u1wml1z7s1z7a1wnl1u2g" + :jetty_keystore_pwd => "rTIS;B4kM]2GHcNK2c3B4&Ng", + :jetty_keymanager_pwd => "rTIS;B4kM]2GHcNK2c3B4&Ng" }) end -- 2.16.6