From 442258e3178361e71867030bac8d4794db326262 Mon Sep 17 00:00:00 2001 From: Denys Date: Mon, 27 May 2024 03:36:28 +0300 Subject: [PATCH] Fix tests --- src/tests/cli_tests.py | 24 +++++++++++++----------- src/tests/data/keyrings/7/pubring.gpg | Bin 621 -> 1251 bytes src/tests/data/keyrings/7/secring.gpg | Bin 1272 -> 2553 bytes 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/tests/cli_tests.py b/src/tests/cli_tests.py index 107e9dd820..74b7b80ee5 100755 --- a/src/tests/cli_tests.py +++ b/src/tests/cli_tests.py @@ -102,7 +102,7 @@ def escape_regex(str): KEYRING_DIR_1 = 'keyrings/1' KEYRING_DIR_2 = 'keyrings/2' KEYRING_DIR_3 = 'keyrings/3' -KEYRING_DIR_7 = 'keyrings/7' +PUBRING_7 = 'keyrings/7/pubring.gpg' SECRING_G10 = 'test_stream_key_load/g10' KEY_ALICE_PUB = 'test_key_validity/alice-pub.asc' KEY_ALICE_SUB_PUB = 'test_key_validity/alice-sub-pub.pgp' @@ -4068,29 +4068,31 @@ def test_allow_weak_hash(self): shutil.rmtree(RNP2, ignore_errors=True) def test_allow_sha1_key_sigs(self): - RNP7 = RNPDIR + '7' - kring = shutil.copytree(data_path(KEYRING_DIR_7), RNP7) - src, sig = reg_workfiles('cleartext', '.txt', '.sig') random_text(src, 120) - # rnpkeys, force weak hashes for key generation - ret, _, err = run_proc(RNP, ['--homedir', kring, '--password=', '--sign', src, '--output', sig]) + ret, out, _ = run_proc(RNPK, ['--keyfile', data_path(PUBRING_7), '--notty', '--list-keys']) + self.assertEqual(ret, 0) + self.assertRegex(out, r'(?s)^.*\[INVALID\].*$') + ret, out, _ = run_proc(RNPK, ['--keyfile', data_path(PUBRING_7), '--notty', '--list-keys', '--allow-sha1-key-sigs']) + self.assertEqual(ret, 0) + self.assertRegex(out, r'(?s)^.*pub.*2024-05-27.*EXPIRES 2026.*sub.*2024-05-27.*EXPIRES 2026.*$') + + ret, _, err = run_proc(RNP, ['--keyfile', data_path(PUBRING_7), '--notty', '--password=', '-e', src, '--output', sig]) self.assertNotEqual(ret, 0) - self.assertRegex(err, r'(?s)^.*Failed to add signature.*') - ret, _, err = run_proc(RNP, ['--homedir', kring, '--password=', '--sign', src, '--output', sig, '--allow-sha1-key-sigs']) + self.assertRegex(err, r'(?s)^.*Failed to add recipient.*') + ret, _, err = run_proc(RNP, ['--keyfile', data_path(PUBRING_7), '--notty', '--password=', '-e', src, '--output', sig, '--allow-sha1-key-sigs']) self.assertEqual(ret, 0) remove_files(sig) - ret, _, err = run_proc(RNP, ['--homedir', kring, '--password=', '--sign', src, '--output', sig, '--hash', 'SHA1']) + ret, _, err = run_proc(RNP, ['--keyfile', data_path(PUBRING_7), '--notty', '--password=', '-e', src, '--output', sig, '--hash', 'SHA1']) self.assertNotEqual(ret, 0) self.assertRegex(err, r'(?s)^.*Hash algorithm \'SHA1\' is cryptographically weak!.*Weak hash algorithm detected. Pass --allow-weak-hash option if you really want to use it\..*') - ret, _, err = run_proc(RNP, ['--homedir', kring, '--password=', '--sign', src, '--output', sig, '--hash', 'SHA1', '--allow-sha1-key-sigs']) + ret, _, err = run_proc(RNP, ['--keyfile', data_path(PUBRING_7), '--notty', '--password=', '-e', src, '--output', sig, '--hash', 'SHA1', '--allow-sha1-key-sigs']) self.assertEqual(ret, 0) remove_files(sig) clear_workfiles() - shutil.rmtree(RNP7, ignore_errors=True) def test_armored_detection_on_cleartext(self): ret, out, err = run_proc(RNP, ['--keyfile', data_path(SECRING_1), '--password', PASSWORD, '--clearsign'], 'Hello\n') diff --git a/src/tests/data/keyrings/7/pubring.gpg b/src/tests/data/keyrings/7/pubring.gpg index 50f86ba6ee3156f7c1850c08d19fec9ca4b2dafa..931b28977baa0769f4bb3ca013d5b656ceb4b6be 100644 GIT binary patch literal 1251 zcmX?hz?UU0_`)Pc4u*X)x1Lm)ZPCa`$H8t1#`B@ zIH~^n!uBCz^%Bp(!z@u>9<5o+@KQEp>fA^1dmrzxSz>cKv~SU)Jx%iNS2Qi#mJ5bR z9@pR7muT=ks!6$9e#`QwGHpkflucjBCDhkuTl{MOiyc0j_0QCQ<)l^=a26Z$B@!^PV_cK|^&WgCHXV<5{DiU`GWF*SzGS%7PMw{33 z1tS9!3*Ds55{2y4N(Gyg#5{+b{N%)(jQrvfyF&+hS%evx7|g{KSvdH2g>HF%e}h5s z52jzPJDJ44H)pakfkK#-llf3O1Cul}3pXbRJF6%MCl@!X7!xxi0|OVQ08Fh?FZ+MD z|Ce&M@*QbE?k#@e?d@yRZ}$f{znA{kziy-by$GA1e#T#R+?v(6^kB=*cPA7Bi$7GF zaHnT^e?2ni_6(MUrRJ{+Z+}ct=*qJzw-h6v#^YzSyKe^{6C8ZyA zXj;jT{)t^S!tYG3PRN;^+;gTRBrBwFTiu$pVejVS7jHY)@6vpBl_l9y@j8o^&^}SN zhO*$Rp%%g%%RU}{77*!H@V##Gk_&dP#Y!Z#KOK-TR$CrqEh5Yl>Ay-e>2rJAiY+QC z3k~F?+1n$I=A}jY?OxeZG11_8ar*4l5u3{6y%&X@)w+AR;sLjD(C#_b=Y^IWV)>NV zs=)D&;s3o@&2xw}xy@H5<#H*zQ)P|L#FgEm(5aVw=|+dDwissQc370?a`(&0shr&S?qr!G@6y}u?q}~guTS!r z_L^JN!oWIxX~`mknBoTphHXsQf%UeQOEcc9?c1Ew|KNw-!HTPPS|{eLUzWZzb(6%k zyRSLV=VV80mXBuJ7p*D1W9ID%ob0b77y?=^{y7!n0Zr72#TRT;YH<<5n3=hW`mr+H@5?ayz*tUkuK{y!`&3e49 zC8q|zTvq?XGgb5-?vN~YYMJoo;!ALvJanLjMFN<<)QC!7JjltZxrqILhTCj0*NFRH z(|0oWdGlBLKDky{2n(Qx0g=klKJhq=*W$S zf0C}=RQ=HNSG=90hWDY>+#=TN0of~)9F=`mKh$$BW?g$Wa&P#-FRv>cCz>bs&-g4D z@#hWO?6-5xkEh=~RWwaNPjKl<7LEVQpZ_>|Wzxe7Q(e~l`59jN+3d?oriE=YYx-}Q HY_$depCCz0 delta 605 zcmV-j0;2un3GD=b#=uPkW<>T$0SExQ=Ok?#(A03aT!vyDR7*t_=kbeq+n$hNdn)m? zlmEBK&?(Kr-5g7}o}ZWX*_#r7fvWXhl0Ilg-<|a(sb zMj|0^e={;|ewb(?3)jfP(`!=VG3$C;@#kS+JMZI#Gw4-+4ERd)o!8<`AgT!8mJhSV z3#=mFmZ+zIUDO1_n|VIvVF0vsL7N7WnXc#h`1K3i>94=6nC+qwi*^?*$meO zX16)OQqpQISYT9vx!G$(cs@eJ-i->yr(s$B@Hqa)^6!K!UR+gEcbBQf+X9B^gvnoas00GSlb7)~PbY*jNYh`)Dz>NeG0RjLw79j*E zg0YZg%>BFD8rd&vfKB7MCi2_`0%k<^Nt0>;9)D|qP2;&H^4xRg2mp&9=GMjbuuaYa zTumnV4-;U-E+Zr`s@Six16%nmty$Awiq@iF*^qlf6{iW;BI~)h&&gE>2oXgDdtUb!ToPS}yc9lIH5r zP;6_AHLL%qFNdd;o)c0oRds+4$HPQD;{W4nwjCNZKFNYMq$f^ZR%Yqd44KOhkH%TF rX}@_fnO_4^f^0)Vhmu&ZKE%SfqYkB3a}Mk3=eXt%B*ROS8TPA);JPmZ diff --git a/src/tests/data/keyrings/7/secring.gpg b/src/tests/data/keyrings/7/secring.gpg index 5b5dd2528d23a84f6be6a00e8cf40d3279681e8e..7d7c6bb15a68b8e20d6d6239810c15affab87118 100644 GIT binary patch literal 2553 zcma*nX*?4S1Hkc_VKcW}5p#w#W9}BeSo{g64@pR0^7lUDPgF&*u~j$7aewJuC1CxMZDzrebKAE@tzxZDb}2C4jgGZO(>nRV@Jc}5 zQVKU^zF^x)6*mwgGRY2h`ek1B?dnmZD?4dsZImxM!ya+(iEt`8xW(Jw<{%}MJ48*x ziLM17pqm@o*YaQ%gQR9n3D8!9b#A5Q!K5W~0GxCHIsnr#UBB)gzg2%}LgKd~_8}sl zQSSN2U?IkU^T!cw3H2W6sz?_1S$Rwt3ZxzVoxWD`a%zp!%v@jw3RgeZ`5LSC#~NP} z#K|GtLuJ`xaqtUfZ&IW$pvgPPFyVxyle;!g8Btw&zd)0oAuLbgUv}kObmP}%3a|$3pSDNAD{etSOz=&jU=TTL_ljC0C zqoA-Z4gR$H2&=8Qits=C$ITr@drz7_$+4S5I*~SA7te*InwxheWRQ%?pQlkOdl@5> zlJ;mJ4$XB#Yh07SaF|r#p&h2oYV7$l3Nv*~N3zx^{41_U?fj#{CkLu9IWvc_H1Mf-`u7OOglXfdI)MO6%b8>|wO$Z0Ow@0HzRw+?#pY0p6}C8`_uX*=#xEcMea6uDKpeAjnOKuGV* z7P*d!d36jebaV6S)r~F(cLYWWx%GnM!LGv?Q&@gwX#%%igwmQlv%^Hn8OJX`k=8Bwn!{Yh zWYDf_91MI0IG?{GL-{X{AIyZ@$Ag*l31M<+ITIzP;{#`HtgL#$PA*tO8D(FC$5F&3 zhXfPK_@6%2=v2#oC9Z+>6fZ^c1CoNbZ=zbzRVYzdSfan?M}LSOYYFYfjiGsiYPXwN zn@}D#gr-+XP!ZxbZULbX55!tUYO9xcZ%eh;`4AV5;9dAh9ofG8>Nj3Z9<}^aUp67b zK3G(ph!bPGlZ;?v4lNbJw21;(#*Lm1+}XOb7>O4!j%n+RNTyhfwY)S9AGLG~`VEli zhkssa_Y@t=CD^sDH@zyz4{vRk8BC|`{cW$Y;~aP1EhwblsIC7ClQgCuW$w#h(VZh9 zzt|{%(~nI(9bNx7k0+o8dg@6lzwj}=`{laDaUO+rLGk3w1$e^D!zbO&JkGagZaKSH zc;cJ$mPkDlq+0p#=i95n2je1C3(au_k5)8cj;+;kMlJhW05I{xL;yGzouZTdN2-V~ z-*~AlB(r}Vx8DgTAPVa%%vVg(crOXQwVSuR6c)$U7;BX9k|z(?Halrh5YLZO*5i9Q zA_~74%Yz8(9U5B^07Z*sV_|OUW!jAGhj_!D465~R(GK9ta-09_IWYVlK24Y>4@;yJA`I^pFDsM~lq=BI2M{HOEet7UGx745U_1 zKS}2yr81Dt9lw=^E`)OUno8+^Fe*@=T4o_5;$wkFKUI3hjLMdPDi)-am2Q|J8cWx> zxsaI~A656`1^t=m*X29tCfV$mq73j1UsmJ01LBmz)A*^hNil-qM=B&Khrt+af?H)= z>9QB(3vMC4zUwRQ{QfOK3VLHWw;{3N0yv~nSHqGq*v{*zp1^x(ttVhD3Uy8H+M@Q< zH;l%`#2P?{u>HdlWX~X$svF)m-4L1L69$G9jK54h{$rxnOYRH<@&A)LssD>Qmj9J4 zCXnge+bECM5cT!ItBF447CXUgc`6{H<)PvljAhUxd5-<}urYk4DD>X@CpG0-=6w6~z58LteA2c8g{$lzRMQfTvS9d&9SiYPIQz{Ry@udSW}y?~ zqMqr+Q@6<($)8XD@Fjr5SQj-40vV{5*m5^Lanp)LxB-r#a>$|Wude+~yk43rn)rN= z6LtDGW8PMQD#h!|KwuUJoU^1HBz<1Gdel3SzBrP3{oU#DU%`7S`{lq_@i}3{S*3c- Fe*pX&zheLZ literal 1272 zcmVo zGcs*{m}nvk*T}-tYf|Dd>v~)9=V4$w@8g9t=v55(O7xxA;!Pl`2;Y_uv&9RnBHxy% zr+{751jCzoKILHmv~@w729lYs=lb~d3*70izpR+;q99>tTza+|7G>EC*9B&`IlxlV zYAsk`RDrqKYeaZHLd4#U3dN^kS^e-h{>Jj}ge+cMRa1ADsm0p@hUtXKXBoKB`^Kl^ zagOs{bBIWkZ^YZuu6Y0v0RRC22mKYEK0cpVqgZ5}pon2Vb$NMDx+aC%lAod1ebred zJ>qjDAL}4wH~}s=al94y_cCRn5q>deIquz9l;6X7eeWjl#gRg{_)&w+k)qfS(&Kiw z9_}I8%$6Lg*Y*Px!MejwccqPpn8NoN8M($xp9tC}Vz7o$dag1G$ZCH(kkOUv22h8W zk?j*jRG=&pJQ`g`wPXEcVe_LUBlbM!Y)F@L{gD&t8Q#@Gexia9fi7a4e^JXOT}67s6jsA%=6S63yLgFu?{)*?_4B)w%}nlC99 z(>`kbr9=CVDRi!Nf>6>aYEc9L&2v^j9jQkn%4B|{-k{DYl99`BS_JXvbx9M>6&9=I`aemGZ>-JSJ~#Ni`u%+)sa)Uo`7__+#!IcN(zVkyAd2X zY!|2ypAUAu92=hbivE#qocs?putpWe@t$YrMTRd40$qRWM)zdjeuu^7x0h>%TzJvf zG|qTW{{v#1Am{WjWC56B*?Eu#I5a36wlyHgFkrUm=P&pXGZ20Y1C)cZKLyPTb7)~P zbY*jNYh`)Dz>NeG0RjLw79j*Eg0YZg%>BFD8rd&vfKB7MCi2_`0%k<^Nd*Z5!e;;i z8v_Ij2?z%T6$l9m3k4Pe0|5X43JDNvfKB7MCi2{K<_G|bAm-M^_OMOP0$fcd`41Cd z#4aNwFsj(EvIATBEv;JGCz+O@M!=z+lTr0L`Pm@YjVq(3fvuCbqU?T}ricJmbIBrJ z@twIrAh7CIHfkveyi9cE^w+C-#bktvBlgF&<%#JU)uG~eaxJ--IH$Awiq@iF*^qlf6{iW;BI~)h&&gE>2oXgDdtUb!ToPS}yc9lIH5rP;6_AHLL%q zFNdd;o)c0oRds+4$HPQD;{W4nwjCNZKFNYMq$f^ZR%Yqd44KOhkH%TFX}@_fnO_4^ if^0)Vhmu&ZKE%SfqYkB3bL;BoxaJQe!%LGH_N$1@@oS_2