From 2cb29d2db15503cf7fc1ee932c53eedd300850e0 Mon Sep 17 00:00:00 2001 From: freyssin Date: Thu, 10 Dec 2020 17:49:54 +0100 Subject: [PATCH] Test the use of client authentication configuration (JORAM-368). --- tests/src/joram/ssl/Test.java | 21 +++++++++++++++++++-- tests/src/joram/ssl/keystore_ca.jks | Bin 0 -> 733 bytes tests/src/joram/ssl/keystore_clt.jks | Bin 0 -> 1347 bytes tests/src/joram/ssl/keystore_clt_ca.jks | Bin 0 -> 2048 bytes tests/src/joram/ssl/keystore_srv.jks | Bin 0 -> 1348 bytes tests/src/joram/ssl/keystore_srv_ca.jks | Bin 0 -> 2049 bytes 6 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 tests/src/joram/ssl/keystore_ca.jks create mode 100644 tests/src/joram/ssl/keystore_clt.jks create mode 100644 tests/src/joram/ssl/keystore_clt_ca.jks create mode 100644 tests/src/joram/ssl/keystore_srv.jks create mode 100644 tests/src/joram/ssl/keystore_srv_ca.jks diff --git a/tests/src/joram/ssl/Test.java b/tests/src/joram/ssl/Test.java index ae1c33569..86bf29f42 100644 --- a/tests/src/joram/ssl/Test.java +++ b/tests/src/joram/ssl/Test.java @@ -52,10 +52,27 @@ public class Test extends TestCase { public void run() { try { System.out.println("server start"); - startAgentServer((short) 0); + String serverks = System.getProperty("server.ks", "joram_ks"); + String serverpass = System.getProperty("server.pass", "jorampass"); + String clientauth = System.getProperty("client.auth", "NEED"); + startAgentServer((short) 0, + new String[] {"-Dorg.objectweb.joram.clientAuth=" + clientauth, + "-Dorg.objectweb.joram.keystore=" + serverks, + "-Dorg.objectweb.joram.keystorepass=" + serverpass}); Thread.sleep(1000); + // Joram client and server use the same property names, so we have to overload these + // properties prior to create the Connection. + String clientks = System.getProperty("client.ks"); + if (clientks != null) + System.setProperty("org.objectweb.joram.keystore", clientks); + String clientpass = System.getProperty("client.pass"); + if (clientpass != null) + System.setProperty("org.objectweb.joram.keystorepass", clientpass); + + System.out.println("ks=" + clientks + ", pass=" + clientpass); + admin(); System.out.println("admin config ok"); @@ -99,7 +116,7 @@ public class Test extends TestCase { public void admin() throws Exception { - AdminModule.connect("root", "root", 60, "org.objectweb.joram.client.jms.tcp.ReliableSSLTcpClient"); + AdminModule.connect("root", "root", 30, "org.objectweb.joram.client.jms.tcp.ReliableSSLTcpClient"); Queue queue = Queue.create("queue"); Topic topic = Topic.create("topic"); diff --git a/tests/src/joram/ssl/keystore_ca.jks b/tests/src/joram/ssl/keystore_ca.jks new file mode 100644 index 0000000000000000000000000000000000000000..913a81927eb352e809f93d208b27e9f7bd5a86cb GIT binary patch literal 733 zcmezO_TO6u1_mY|W(3nb#fd2;@g=FnCGp9LK*6GyKlQU2SR?dI4J?7`W*9UvO)+R< z{JVgeiIItkli}>Vd+Yio{#6_BvTyhvU5lEJC4c6smO{s$AfYbTyi zOP#-V*nnJ;iK-$ood))Jqay?%(ldVrFDuTpVEFXCMm< zK3P5%F&2@uy*0l}c)A@9M(=YIkoRaY6?|7`APqx<1~sig(;J}-Qr zbZ~OCbG6%2g_HMY72Hcdz31KT!!ZTSyDpW#+!?3gwK(w=>xwYl{U&8%ta~aF4jJC9 zd7}9^&oT0qR=3yT&0QLi*BM%D))*JgC=Hk$*?)6UvHZ#{&n6tn+A>AqeQ0|)vwDq| Lw2Pej#fdWj47a_>$D(lKAAD5};_&EAGYiKoz?TnwYj3@Ud}evoW$T zYB32iGO{wTG%+no`tawW-GV(QoX^fO{j*BSxM=5Jcde})|0e4QuRY?LlvIAA!+qH$ zh6?@U{3%}&{&RCxoShJM=3}dN>cZ7YzFSX;{*K!o^6i*H=zMNLcCRbnGByiOZuC%h zJriW1c)zpg>DOODEVmbR*cWZe>7T}OAn4`N$={Bq%vmDrbyDWLztqp|DSCyGCUH9_ zG(1(g`?Aep!=?K5)A%jdv2K(yaABUKl;9A1_U^u(Ju6=PUwc4Tt||V6!A~paCc%CA zJ>9{)J`U?jmMnA*Oz^rEygqud_qv$}_vy2kTds@?y|(djoC!Z;&n(g&j$V2!~=IPKG2@ibB*(t(<%Lg^5~%X5wXS$qSJRrZ&MUzmVEK{`uboltw=Bb z>fYs#eOUs3JvWwiPHMbpXd1Xsr{$9R-M+|&cV5IW)@(WAt7bK^T5MORiTnP;v;2Pf z^xXcS%_)E1aoM&jH?)39=Q>!Ai$@*?xXyHLdvtHPvfS@2ZC`%xNc$$? z|E-O~w?aqf*i7bxta)qZO(-(d;9n7YH92ARj2Dh?4?pKyey;G(stwCH_T?`6|JOdc zbzzB^{xPGSwU14WbUaEnEn?dEIqIg~rhHq^2Ms^2H#|P|<;~u9RX2~Dw|%wDx94=fOy1wRs^d`M z8K!st(r=^|yj~<)*0t(cOrOTwkb|>!f8yX?$DJq3Tq9;Lanr*_b^n_U;VzHg>y!s8 zXDzsJm)CsVoAgI~SN2%nm6*GDW7?|-?&TUYf^Rt7jLPfN__Hm&`Jef}TQb!z7SvaL zl>PNxiPd~3&*zn5pQkO~xayIr(SIwYC*B$QG5(r&0`DD*S^u_Qdda_{=^7uw37a)S z&(y#Yn2@c33EAABiE#lFC&T=!8=FhzGkpzs**LY@JlekVGBR?rG8iNoiW&&BF^94+ z^Y8>ax`Zf%xCVzPI6K0Gxq!mSi8+qxsd*&|E+K{jz>EP@&CSCORv7MX$Zfz05@8c& zatksPHV_1H*m<~IlQS}l@^f-hiwzXSd5sJV%#2J8OifJ;O`;_DjSN8o28K`pgBU}8 zpu@nfU`x))1lmPS`y1yY`x=;;nHzf<3>rI`8XFm=?Y`I(A#_u+vG2zJFphUeU3BGk zY&x~|P{g8#N%g;v<{8eFKJwXhYxB0Vx(mx$eH(U*-8E}l?_hW4dhpz$OH-zNJ{38$ zGEdI2As~%wrRAG|tPL;vWF`x|7Jh1E$@!~i_N(-tQNpd0euxQbe75+trL?wh4wv6P zrT>pD5*GKKJnhNE%*eoq>^xwkFazD?a(FK-z-skr&?YHx*>0jHt@-_fYASx9A literal 0 HcmV?d00001 diff --git a/tests/src/joram/ssl/keystore_clt_ca.jks b/tests/src/joram/ssl/keystore_clt_ca.jks new file mode 100644 index 0000000000000000000000000000000000000000..b05311443d8cf40c575c7dee5a93ec8ed7fc6f59 GIT binary patch literal 2048 zcmezO_TO6u1_mZ5W@O+kPE09@FG(#fiBHZcVPIe^dd0oi9;jlMK@-z913oq`Z8k<0 zMlB{mMn+Z!mL{e}Ngw_^v|F&}g!9>1rhisR85iyR>#ntxlD(j;!@ zgodXocVD(SY`9dvej2~!I@XO+1}@BVloA|b&)(hFvuDMN|7#EE$~DEGF!*WZ+$6X! zzo$Ex*T-R9$&!W6feBvMg4ahc_Fgyh;68m8bIX-+q1QG(jx*tB40>U)^Uv|MGwXDX zK3(8+{n?-&n|R>v#RuARdaiN)ayq4-P#zsLKO)wcL3H}==xvI^%#ttOUSA)~r4{Mr zU){U>u`f&Dujj_n&Pk0I4NU_V>a<)^zuOo2@Xm`E#+ofheATQbR*UWGG;!a5c$VKU zpPt(vv^nMPJ1*OH<%ZTT>0F1)r%GFQL0N0t$ZIA9PSC;#|rR~e_9ckYr z{J*tv_*UrX9Gl6UkTq}3ya`2y8vH9_uO=s~p7Fx*?cwKq%g+`5S+!vq$G+S}|Nq)Y zw=OIZ(?4dkv-Yv6k&Z{nrbSE}KS$lv+mvtX`Jmy)^@hi%zP#DnuIeZ2aLs*5h|41J zB@dI6twI=j*!99frpcY=6Vu=MIrH+0TcPP!**Z>n_xlt+{kE@``SzUdm&yBES9KgJ zJj3+vU;2&Ig4c^g%eq!Qi|Nyt8**^g?oS-t>$vk|nQO%CC2o4ysP2EWA>8Hhd!6!N z<*Wr4?(&+idz1c%@5&zQyApF3Z%lg?!M$8#M(_=Xn^Adv8h^H>H~%yLcT1-F#e({( zkFvkME3umI|J(-vp85ohB2aFVEpu1eIw(Xc4!ph)TAGgOoSliS0v_Qsn%@QVC ziT1a%bXPO{T*6nG*>j+9%ImH}pI`W#k``8x5}u(WuJzt7@Pkr?W1)!Dv>n{h>6>-i z+#(`n`-SXk3QtUHS}l4dS+xGq`7iQ0H&2;+-riJq&|YNKJu%sWHy!oN5#51{x+kzO zEIQf*E+%=9ipWH82^r?hi%4HHfaz-rFn#@9z|6$R1WaUS=iOV^FY&J$%|G-`WJVSy zsEG_LKo?iwOKJzt+|hK^+Vs!B_g$ty^F!~+4eXj7l>(Rgp0K`~6&tJn{pc#uCmXF7 zUvyX}(7i%ZQEjtpA+N?yYxUW7w>~DXpU%-dAzV)}`tTxk-Ae|i!rJA%i~Ao;=&qf3 zLM?RyXHZM^hJW@u-Yc)0=54$rGJ8whclH#s2_o+sjZ-g4e7S$e8=TY@2N?Jn$O5yP zEFX&)i%8nun%^Zn-3|w%_qhqkd$gDezN<5k2T3clNEnDUU{}BcQXtI2YQW6M_#Z8@ zL5a6TQa%6GUca-?i_h;6Y+A>puJOcnug;;0pHKVs{ynMM^~Gkg)Y5`^pBFw*IygDn zx!P^1!pVEH3ht$!-t%tv;g|yEU6;yV?u^s$TAcWbbw!x&ev>jW);$#ohYau5Jkfld z=NS1)tJ~}F<}QuM>kKV6Ym5tLlm^U>?7z9FSbpV}XA@qn%ztobj+C~nc-rN8+m2r| IFb|Oe08}3jsQ>@~ literal 0 HcmV?d00001 diff --git a/tests/src/joram/ssl/keystore_srv.jks b/tests/src/joram/ssl/keystore_srv.jks new file mode 100644 index 0000000000000000000000000000000000000000..be650d523063884774c9c5c7b5f3df7a03a03c90 GIT binary patch literal 1348 zcmezO_TO6u1_mY|W&~s2;>47a_>$D(lKA4HGN5SDD-LE=po-lFO-$Pj_}I9#*%(anlZ(n- zpZy8hUwI@lEa&>AlFI#2w!1Dqu9@2Xx^(f)2lqa)Cv;cE&JL57WLTBfD$ixSXPw-$ z&kx%KUq+`cDN}d-9Z@aa{Uo7(L*2{DR!^NMbxy^%b#3k%mAf;wOBEhj$4cEy<}A#7 zvOl(XV^V5FxBaW?ge7%%SGT3xS@ccw+c zXCHo0`$cX0h4wljsmrg<$S|&dKR3UpXt(j!un*H_zTP@JKdPnIah8Do(Xxx(SESVg z-8ot}CQ5Z5)ag+2Vb*e+!Mfr>^mLpR;ccIgYxd|h`o zzuT41g;%LCm#^G$a!;G^t;%?@Z`N;B4n#kDch^|UWl@ts_UYj8cMm-7l{wvMsogn& z!!yMxmg|ehjfBjbYhOg&-Mlg2OIPt4ukbyQ;so zyu54VYa1DszTYi9dZBpyWKS7|BX#S7_rLt3zxIq|mP*N%lYOF(%({QB<+|9r)7#^7 z*I)am*PmW^b!N_$z~}077e(p!cT}&ols_S4zxYu>%MI;%ANI^Wrzb{88uMv9*i^qL z+{bexm(7FXSuN(53ayQ9Uwb3-^UvS?^Bc5McYm)F6wLR3W2mIKRj7b}_VlEOOw8XI zs@=*qBv@X$YO{%nyG)El`}EF9H*LFLtX{R}d%V%x^0!P8`#){ZzAW~cXLUpF_Lg0t z&zu5Omg#yisi*$9xv#rH{A9}wqin@g*2UZ<=?=48r)Fn=jEiLt_e+fZ4^G*v5qhQu zmcW#34NS@A22G3$m^c~cU)|VTDxc|Nz{|#|)#lOmotKf3o0Y*J$xzfln2kAsCPEO2mOi#@#QE&+{6aeN7plWU&cCf;5cSCLiPLK$jFq2!5 zp|F71?3K+x~@&g?P zb_H8;YEfBg5jE{^oR92lU~Xn^>}4=$>||Vn998X}j>WhYE?O24sFHe}Ae*k;9l=l>|y8;*zr&!Kkw9w>=P}eC5_uMOiSHB-RI7uw9RkY*D zoG#-fEH~wpT&2Goe*4pzr2j6?utL${kY|BuXynb?Vh?_A{@z=)eV5SDnm;#xznQUk z>6Uv9x#yL%-@Un2|I{J8L2kBW-1DsqcE*2_VgCO;V%qB&-530AMO8LGwTtS^uj%4* Z+p+#wqKTJ5SCEdYllcl(iy-cX8UO^!B{%>8 literal 0 HcmV?d00001 diff --git a/tests/src/joram/ssl/keystore_srv_ca.jks b/tests/src/joram/ssl/keystore_srv_ca.jks new file mode 100644 index 0000000000000000000000000000000000000000..dd1ecbc829eb86ccc4c7fc08350896dd527aab92 GIT binary patch literal 2049 zcmezO_TO6u1_mZL<|$50DTyyhEiQ>qPGn$UEPCa)jE8|WLeJE|5~yy5K@-yygC@qm z3z(T0nV2{k&d$5Hu3zF`wE-_1r&gOs+jm|@Ms8LHgCs*y17SAiP!?t$o?u6p5QPxe z;1C68N0=}dP&hd;$1y!MuSCHm#8AM152Tu#haIdi+})7dfDfU+ZaZdPop{`aG+M4xQ5UVPDE zoj~^rNkz5Iu7$iBKdseg+uiz@ynZ@I^Mr6c#puI})O9ZzoC<4~_b%>#FrmA4;t93X z37kPK)f@iV?|84gZko68lE~~Wao^cf%qEDuZ!}K5B=P0`9d9OPMh3>k0S0~svcTYz zmJJ~sh*j}}wGcXbBxAZcY52?MbP>zLFvp4jfyIaKlUX}{jTCsn(?*i4pMS}^bP!UswR zCr3M1yDe2Xd2d$1z4X(2-t9gdQ^36IQu)iBaT;EW6JN2e2-DqfQYOZ_ry}8y;oX`i znve4wBVTECdmY}~r4f0Zp~Ys6ap8>8fZ37#Hy0JluiWx%0x$tHGVmf2Z*fr>IQ4Qc zs{)hlZeX(A4oqQO+H8z0j9N^BjKFweX<}NeT+JvZcj%n6Z|t|8c&+nqPR!YJ=V~AO zI&aQ?X{AlpE=ESPPcABVefB40f8~+Lu$=3cN-Fn9+3vddxMphi>(a$HAKd%Ip3q$t zJ3CBTl3`U^t2~$So^^81K0j;|d>Ng(q)grQcSN;x_mhPF4RtRoTRnB6)HxO3*0s57 zRPN5yE>(DB9V>M+nX@qS$^O{ljY+8y-S)4l6PDE7UEP*$XVEv!Z{y6h+-pBIn?1N{ z`k_{kQ~q7oT}PWs3UA&loPGE~?H9G}7uxHDq%OZYBg44<{oMSXqTR+@!#+%#`FiW@ z{HT^*$5{gUN6RjDUy)W1bmwT@m?+hKP^Ux5hgr*Q2J4CkkvpEII=X2qC_jmKs>$dn zB0uZM4&8J&+odl&^L5?X{BBo17ha{pT)uM0$vthtw<_bszFEIjIS~Eq-CbiXmqkqm z*{6fU-#zfSSLSr5rFQ284$l;)SgtP~Hxe>$u6+@8ck{-8ldF?WCuSXKA(P=UU_5E9Q!wOJrdvbhG=||&kEkXzUxo- zR_FE*g}$kGtTN?z?yCOU^75{cuWe*l`hK_c=!N3(lRae=j?}FS-v9EC{@OE=St=!4 zPWFjDGVA`img{2gPH&ITU4QMLUVnPw)tNb00-vkTT@@9{=&%il6Z z?Ekbq`?A<)p4APx+go;pK646CS*Gj7q@McY=DzL*@slk#jItF|Sr>Dcq&v)VotmBf zF)o%p+%GZqKR9K>3t($tN;U@;zzcw7@BFJ9n@i<0ebBNaT}nNqve(4Yz!;_M1q&F& z81e%h2Cf0vic^cqQj4fr_TwvcH_C*3l3Vioy#C4x#^NnP{5wlT=Q;UL^Tm7+OGSc(;#Q6sbGr-qW@i>G-_fER>=~B2Aab9E$R%^x z3Dca?Z|sx}nX@mpS@GZbf5|h~`L)jfn3x=QaC1fYAGZtLLhjOsm@h;Y-e0P=Y~4k0 zsf!jVpfWOmA#sZ3{6z~*t_XFVl5o$x5_t9dp@Wme0$W8pp3LboUcz!yPRUjJyWzJ# zok{xd;tVSk9S(UGn1)8)ye;i*N}T&N&DTKTlG&J z!W-mfOU6Clx?pGgCmH7d-y^2Ip3!~5-&Ry*^HaO1&itA#KDYBKh5Dff|1A_gsk!~I LuUPph6>|*$M5qj6 literal 0 HcmV?d00001 -- GitLab