From e5543ea5a236426dd33e74e427e8485a030a2540 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Thu, 19 Dec 2013 16:43:50 +0100
Subject: [PATCH] fix apt-key net-update test to use the buildin webserver

---
 cmdline/apt-key.in                            |   2 +-
 .../exploid-keyring-with-dupe-keys.pub        | Bin 3986 -> 0 bytes
 .../exploid-keyring-with-dupe-subkeys.pub     | Bin 2016 -> 0 bytes
 .../keyrings/test-archive-keyring.pub         | Bin 0 -> 979 bytes
 .../keyrings/test-archive-keyring.sec         | Bin 0 -> 1355 bytes
 .../keyrings/test-master-keyring.pub          | Bin 0 -> 1199 bytes
 .../keyrings/test-master-keyring.sec          | Bin 0 -> 2501 bytes
 test/integration/test-apt-key-net-update      | 133 ++++--------------
 8 files changed, 25 insertions(+), 110 deletions(-)
 delete mode 100644 test/integration/exploid-keyring-with-dupe-keys.pub
 delete mode 100644 test/integration/exploid-keyring-with-dupe-subkeys.pub
 create mode 100644 test/integration/keyrings/test-archive-keyring.pub
 create mode 100644 test/integration/keyrings/test-archive-keyring.sec
 create mode 100644 test/integration/keyrings/test-master-keyring.pub
 create mode 100644 test/integration/keyrings/test-master-keyring.sec

diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index c7d3ce8b5..463e4b4b4 100644
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -130,7 +130,7 @@ net_update() {
     if [ ! -d ${APT_DIR}/var/lib/apt/keyrings ]; then
 	mkdir -p ${APT_DIR}/var/lib/apt/keyrings
     fi
-    keyring=${APT_DIR}/var/lib/apt/keyrings/$(basename $ARCHIVE_KEYRING)
+    keyring=${APT_DIR}/var/lib/apt/keyrings/$(basename $ARCHIVE_KEYRING_URI)
     old_mtime=0
     if [ -e $keyring ]; then
 	old_mtime=$(stat -c %Y $keyring)
diff --git a/test/integration/exploid-keyring-with-dupe-keys.pub b/test/integration/exploid-keyring-with-dupe-keys.pub
deleted file mode 100644
index 642952a403cb33ab2e1a07aa7e98dd1c944f5927..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3986
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
Y-J7Y@#%C|vJDLuwddNK6er3&n059<R_y7O^

diff --git a/test/integration/exploid-keyring-with-dupe-subkeys.pub b/test/integration/exploid-keyring-with-dupe-subkeys.pub
deleted file mode 100644
index 02d4e6ee8f6d5bf2af4f7bc37bcbe6b522bbe8de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2016
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
SxQ~d_46|@!mtD^e2>%1>f18E?

diff --git a/test/integration/keyrings/test-archive-keyring.pub b/test/integration/keyrings/test-archive-keyring.pub
new file mode 100644
index 0000000000000000000000000000000000000000..d8d9d472be204166e2790533c78d3645f6394e6c
GIT binary patch
literal 979
zcmV;^11$WQjRaD&4i^Cg0MLhnE=bm^cCa5^&o<=ilbNGC&%+mr6bJ9~uj%F%o6TkL
zz7lWgZ`rTaH97adWJx#p953@_74w<8{q`Y|`XG)69dO9asT^B4huj`kPKGe@8`IJ4
zH;gctwDq|oNScckvorvsjCigErv4k}WVPo}4&vTON_#bnIE`ljRR9qI00Fc*RAqB?
zAVGC>Z*5_8X=5Nka${&|c4Z(_X=iR}Zf77%WqBYxW^{0EVRLk4azJHxVQp}1WiDfH
zZ9a&%1QP)W03iheQnL;h0viJb3ke7Z0|gZd2?z@X76JnS00JHX0vCV)3JDPX(%Xgh
zjD@4SMg#v%Tu9Tj3(8;d@s$ov`C6ef&;3Fhky*Bqr`meD$LzY2(;2A`0k~Qt00%lD
zfBjk$&=m-W!OuAes#PDf_d8fG>eul^GvFxK=27CmbXv9<N6EWXU5a+vyE&6&DL?*>
zh+qm#Qah%+Ary0|Dd}Og$EOr2u87Ex>U#hQbkm}V0UQJn0SEvF1p-pD4^sdN2@o_D
zECO7CpPriA2mKh5-Cjvs>dPp5FeNY9w9PP(5;(uX01T8_tl7PfDrqkkhTKa<4Ae>S
zbISZy#{loMle3|Z4+}@^%=z$AapWB}UeiWuI=9X(VwbV1wx;H@c62vo`CkV6x<q2&
zc*#Msgx~H1MF1%i*Ja5G4Yfd(;&QsCW?d<OJxz;4<;>pSj<CnmE@+_qw!kZ)BL*f-
zWn@{?weiW8gS0Oiw0z{KBujyei0jRlsVtHmuecvjyaQ#B;lN{~h?@bt?(NQPV%_Fc
zD<VhDLnyb*s@htIM>iT=)qM3WF-sGl(kgv)li3ubkP)z3TR7%v0k|6Rr%AOTv)Sz@
z6~O`>n`yX>1X8mO7XbtSzR^E&daCW-$LhPSV41@NT*RWQF`Rwyp7*oCLT%WjII_Yg
z`VT5=Sk`9#q>x_dZm%8QF;wDfexHA#<k1EWN%sd}CgC_`qAT)2o%fSMEnEn!NHh4O
z*UW!x(RcM)G{YLma45ajLAm`_>)SBH@mMVXs_(aK@A-%nql9eT01*KI0f?Uj7y$?X
z2?YXDvkn&m8w>yn2@w6#+lBUwg`<g#1OUrWe0;sGc_{6J`@(VB_e)x9xkc<y+<DdQ
z39{->zJZF62^!FKZM_Q`p}n!$8ybY*j$9E>b}lpJBe$-=6=JvmJ_ZW^!8&~y!hArK
ze%a1B{io57Ir7E!ORyF(TJaHL2m6~zG_WWUaa+hpD=8`I7pC;wA<|@!C?fUrEd{!D
BzxV(E

literal 0
HcmV?d00001

diff --git a/test/integration/keyrings/test-archive-keyring.sec b/test/integration/keyrings/test-archive-keyring.sec
new file mode 100644
index 0000000000000000000000000000000000000000..aece750e804abd57de9dfdceaa2462e88b213b81
GIT binary patch
literal 1355
zcmV-R1+@B=0oVjmvkn&l1OU*7gDyzct9Gy-UC%b;>yw$IJI})xiWCR$^RMaV7Msmw
z@V*jn>2KMu)ipWyz+_1`_#7|uWfk+8y8ZSck@_Hx2OV(8&8Zw)IEUOGR!)X6@*C69
z?Kg}tn6&k|BS@Ny6|*z|ql|d21*ZNR=VZ0#Q4ZqXNJ@J(i#UyE0961H0RRC21N{+x
z1eJ-~q!)QFuw_*A00inH<h}`A{GqUh!r0SPk2&*^We@bI`I>#!znV_!2J`}^RKz@s
ze8b8j@2VvZ?AbXx`t0yu6aRx19HPOPY$9$f>aEy>_fkNoej_U}R@fv;Yhqi;-Xy3Q
z7X|R?R<mb~ek!cDl>njok)@}x)ZqdE-6O6AoasQ8FlUB0tMROOOmq9#RlCfSylnw=
zPn#t6pPU(Ao)-iOm6|_>Y=M<1Deed)-Xo~<@=-!YVE^LL0s!%5@bg+FwX*l9U1zt0
z6q5<-+<*laf;GmPE%i7EhDEv-FU1Lf@yi*)9UQvk_E~5FeqCgTA^vo5iK)d5enkQR
z;89Xq?q4b(<Of~gfC4a-qoD$%j7?|YXKr)Blc3eiR>6!m?P<96**Mx_T!c;nD=E2r
zU3bCdT6Oz*kMCchqY$(@RAqB?AVGC>Z*5_8X=5Nka${&|c4Z(_X=iR}Zf77%WqBYx
zW^{0EVRLk4azJHxVQp}1WiDfHZ9a&%1QP)W03iheQnL;h0viJb3ke7Z0|gZd2?z@X
z76JnS00JHX0vCV)3JDPX(%XghjD@4SMg#v%Tu9Tj3(8;d@s$ov`C6ef&;3Fhky*Bq
zr`meD$LzY2(;2A`0k~Qt00%lDfBjk$&=m-W!OuAes#PDf_d8fG>eul^GvFxK=27Cm
zbXv9<N6EWXU5a+vyE&6&DL?*>h+qm#Qah%+Ary0|Dd}Og$EOr2u87Ex>U#hQbkm}p
z0oMdlvkn&l1OUF#KXQ7i?cT@gyRBfE!vtK!qN_2Seej<5v%x}b*rYhJ!YBF<Dr;EQ
zX8xp*Ug&PG9o{ii;%k1Nf1%{j1`bL02Vf@QIAx+M@<E;VlR_<A2&_mm_@md%e{9ir
z^;$H;8pv=cz1Bgw{Z{MSFvIa!EdQ$Sw`}kEh!mrQY~2760RRC21N9o`hFLK_cJ7kR
zlA_cDUFX-YPSVo2Msygvqw7Fe?&>Avy5(4Ww}BG$FwfI<)WGt<SHWN*oX<IPC=Mg)
zqa}^}_4*+bJA-tNrWSnBR!t+pYi+y&C`h(efpAy@!Mx0~FWGS~uS65luPG!(1MFA`
z6lbSmQrSQWM)&@KaRLC`-rJiUS1O2D+vKS!VRQD8py3QKm0dgN3g`3=S!3p$I2|TS
zez4uP%lIc$Dy$~4_!Nsh5E^SlS@pFkQb`2@0NpCMquA=Xa^1CpZTLjA7de2g-{t`P
z-e>)oJ!TII*=Qk<)BnoP!u!Uyy=d}@Zd3&AF{fri5cXE7JgBaF`2qlz3v8|~!equM
z&K?<(rBP?Ejco6u>#J$q=!Hmas`VKo{}q9%%j1sO_x%mXZZI+7Ug;ucW;+8FxEbdS
zPYs@=QHY-e7y$?X2?YXDvkn&m8w>yn2@w6#+lBUwg`<g#1OUrWe0;sGc_{6J`@(VB
z_e)x9xkc<y+<DdQ39{->zJZF62^!FKZM_Q`p}n!$8ybY*j$9E>b}lpJBe$-=6=Jvm
zJ_ZW^!8&~y!hArKe%a1B{io57Ir7E!ORyF(TJaHL2m6~zG_WWUaa+hpD=8`I7pC;w
NA<|@!C?fUrEd|5}f?WUr

literal 0
HcmV?d00001

diff --git a/test/integration/keyrings/test-master-keyring.pub b/test/integration/keyrings/test-master-keyring.pub
new file mode 100644
index 0000000000000000000000000000000000000000..33aa16796cf259bb1ed686e5c2e989ff49c37a73
GIT binary patch
literal 1199
zcmV;g1W@~#0SyFFs}B(Y2ms}sU+fz$Y?#|_(|?Q>Pg^53fK9q6)F;LY74CRa8{>K{
zLVR@VSMQs;8qGCbi%N1(C~(Z+W!E!-z@DN%a;a_raiG@U-APphvsgT@H7%Exok^3P
z9!5IczNCDi&1Uw<f_-@VWkaP}nYH1a*jKd)zO7y(gv(G^ft;6_+MaH$EME-g=9f(w
zeneWWO%K;=mAHEfC#Uf%V-AI!KS4b`-!6I@U&Xvo(ndXMsrO6^xlXUHt%Ah4-Ljl`
z2^1T(EoQaqP{w8nk@<_ka(>JF2uPXKgIkYnY>VCp7;S)&T1vEWdFeY`>0ug-Q3T%y
z-;n4{M{q#V-`FMMdzSza0RRECF;r!9bRa=;V`yo1Wgtyqb97~LAWLO=AUt$sb960j
zVRLk4azJHxVQp}1WiDfHZ9a(sHv|&_2mm1k0#d6F5ds?n1q%rX2LlBa3JC}c1r`DW
z0RRFX0Rk6*0162ZG!-lYT!EjSM~MgiEDl=A&LT&m!j4y&u!%Hiu~-j$B75tF17ri6
zcLW~PuVU1k*`8iey3aJ`E7zi6ePwx}qJeiaN^I8IB&%;UXTyb1>brF;bW&=UQMjfb
zCxXZhZBc2d^<U<o`N)3ef4BbWc2EZ}TI(#sYaS1Ax2{Hq*2^r&?_=OOube@3^Mn%5
zxsIWNeH732;+(vpsRDpu@e@Ochnsx1CGmd55HppNYSoWD?c^@Pox{c2OYR2c%oO$3
z-d+}sWszLNRYLouu)lZ!R!N-0`oSqdrpg<V0k63`!<~RIziUCRuurzNON|hQ4xND|
z<4&CZRaby8K&AFSeu3D^G-hzUxd9CXQmYRU0SExgs6W+3|MV1YSBNR(FQOA<r9m{r
zVT^{EqkCiD$TIhaH8!h0t3n(C^KgcfqzP5;cs|#es>i`y*m?a*M%$dVi8so-_;oUi
zYZEZ#Y{NF+RgQJM5ZN=?B|OS)!HXKSmYiy_V@6#H7!`V>ry)ACaD$+gm?!!-r6=N#
zp-Mc_bqdrBM>0>Ixs*2M>JT6$R7@~U#6Gx<(<5Hs2$``@Ab$1K%f*nZr=icr`;MkF
z5Xu%f26i)bAB|qRBD0G!HjVJ0D<rS!H}k94$Q-}B|LS1dDX_^_#Y(zae2)$U1L6{M
z+A^(%glirZ3YW-Ko;!cx?0cZ)W(YVy6X=5g5di=Ji2)x37y$?X2?YXDs}B(Z8w>yn
z2@o_DECO7CpPpKu2mro2BQ0MoHF(zC|Ne}QQjoQAeVrcfJcLv$*^nhN@XA9b3~okG
zV!WHS2|0EaTmica3jUft6_S4{Q75cM5X!z6&UsKtPtKc9Ky#k+mK#DJ{^D`p%bn1q
zzeTubz>O?`Sy_g)y${=o1m`9Y6+5^YP77R!0J4(Wgs+)Bj!kwGdX*skY{~Bfe~YX@
z+4v1yFB66!dOhxG1Aci@&_71nO$aK74kFsviA@_%_aVG4x9C(&DO8sP<sVBmg~q?z
zdP^pH3<a?ga^7S-<Om-`*&5j<ZYv%E_U_2P3_OBLcHJI+SFZ1Vnf#0pa`*j%pg!BT
NCa@E%y0e65c*7Ch8Ych%

literal 0
HcmV?d00001

diff --git a/test/integration/keyrings/test-master-keyring.sec b/test/integration/keyrings/test-master-keyring.sec
new file mode 100644
index 0000000000000000000000000000000000000000..9cb33176c5c9be8b098a319b486063def6c5799f
GIT binary patch
literal 2501
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
P+qWjL6Rf(kglBleV#}QC

literal 0
HcmV?d00001

diff --git a/test/integration/test-apt-key-net-update b/test/integration/test-apt-key-net-update
index e0869402e..4b38cd9b5 100755
--- a/test/integration/test-apt-key-net-update
+++ b/test/integration/test-apt-key-net-update
@@ -9,120 +9,35 @@ configarchitecture "i386"
 changetowebserver
 
 # setup env
-mkdir -p aptarchive/ubuntu/project var/lib/apt/keyrings
-echo 'APT::Key::ArchiveKeyringURI "http://localhost:8080/ubuntu/project/ubuntu-archive-keyring.gpg";' >> ./aptconfig.conf
-echo 'APT::Key::Net-Update-Enabled "1";' >> ./aptconfig.conf
-
-# signed thing
-echo "meep" > aptarchive/ubuntu/project/ubuntu-archive-keyring.gpg
-
-# test against the "real" webserver
-aptkey --fakeroot net-update
-
-exit 1
-
-# mock
-requires_root() {
-    return 0
-}
-
-# extract net_update() and import it
-func=$( sed -n -e '/^add_keys_with_verify_against_master_keyring/,/^}/p' ${BUILDDIRECTORY}/apt-key )
-eval "$func"
-
-mkdir -p ./etc/apt
-TRUSTEDFILE=./etc/apt/trusted.gpg
-mkdir -p ./var/lib/apt/keyrings
-TMP_KEYRING=./var/lib/apt/keyrings/maybe-import-keyring.gpg
-GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring"
-
-# FIXME: instead of copying this use apt-key and the buildin apt webserver
-#        to do a real test
-
-# COPYIED from apt-key.in --------------
-
-# gpg needs a trustdb to function, but it can't be invalid (not even empty)
-# so we create a temporary directory to store our fresh readable trustdb in
-TRUSTDBDIR="$(mktemp -d)"
-CURRENTTRAP="${CURRENTTRAP} rm -rf '${TRUSTDBDIR}';"
-trap "${CURRENTTRAP}" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
-chmod 700 "$TRUSTDBDIR"
-# We also don't use a secret keyring, of course, but gpg panics and
-# implodes if there isn't one available - and writeable for imports
-SECRETKEYRING="${TRUSTDBDIR}/secring.gpg"
-touch $SECRETKEYRING
-GPG_CMD="$GPG_CMD --secret-keyring $SECRETKEYRING"
-GPG_CMD="$GPG_CMD --trustdb-name ${TRUSTDBDIR}/trustdb.gpg"
-#----------------------------------------- END COPY
+mkdir -p var/lib/apt/keyrings
+mkdir -p usr/share/keyrings
 
-GPG="$GPG_CMD --keyring $TRUSTEDFILE"
-MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg
-
-msgtest "add_keys_with_verify_against_master_keyring"
-if [ ! -e $MASTER_KEYRING ]; then
-    echo -n "No $MASTER_KEYRING found"
-    msgskip 
-    exit 0
-fi
-
-# test bad keyring and ensure its not added (LP: #857472)
-ADD_KEYRING=./keys/exploid-keyring-with-dupe-keys.pub
-if add_keys_with_verify_against_master_keyring $ADD_KEYRING $MASTER_KEYRING; then
-    msgfail
-else
-    msgpass
-fi
-
-# ensure the keyring is still empty
-gpg_out=$($GPG --list-keys)
-msgtest "Test if keyring is empty"
-if [ -n "" ]; then
-    msgfail
-else
-    msgpass
-fi
-
-
-# test another possible attack vector using subkeys (LP: #1013128)
-msgtest "add_keys_with_verify_against_master_keyring with subkey attack"
-ADD_KEYRING=./keys/exploid-keyring-with-dupe-subkeys.pub
-if add_keys_with_verify_against_master_keyring $ADD_KEYRING $MASTER_KEYRING; then
-    msgfail
-else
-    msgpass
-fi
-
-# ensure the keyring is still empty
-gpg_out=$($GPG --list-keys)
-msgtest "Test if keyring is empty"
-if [ -n "" ]; then
-    msgfail
-else
-    msgpass
-fi
+# install the fake master keyring
+install -m0644 keys/test-master-keyring.pub usr/share/keyrings
+echo "APT::Key::MasterKeyring \"${TMPWORKINGDIRECTORY}/usr/share/keyrings/test-master-keyring.pub\";" >> ./aptconfig.conf
 
+# setup archive-keyring 
+mkdir -p aptarchive/ubuntu/project
+install -m0644 keys/test-archive-keyring.pub aptarchive/ubuntu/project/
+echo 'APT::Key::ArchiveKeyringURI "http://localhost:8080/ubuntu/project/test-archive-keyring.pub";' >> ./aptconfig.conf
+echo 'APT::Key::Net-Update-Enabled "1";' >> ./aptconfig.conf
 
-# test good keyring and ensure we get no errors
-ADD_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
-if add_keys_with_verify_against_master_keyring $ADD_KEYRING $MASTER_KEYRING; then
-    msgpass
-else
-    msgfail
-fi
+# test against the "real" webserver
+testequal 'Checking for new archive signing keys now
+gpg: key F68C85A3: public key "Test Automatic Archive Signing Key <ftpmaster@example.com>" imported
+gpg: Total number processed: 1
+gpg:               imported: 1  (RSA: 1)' aptkey --fakeroot net-update
 
-testequal './etc/apt/trusted.gpg
----------------------
-pub   1024D/437D05B5 2004-09-12
-uid                  Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>
-sub   2048g/79164387 2004-09-12
 
-pub   1024D/FBB75451 2004-12-30
-uid                  Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>
+# now try a different one
+# setup archive-keyring 
+mkdir -p aptarchive/ubuntu/project
+install -m0644 keys/marvinparanoid.pub aptarchive/ubuntu/project/
+echo 'APT::Key::ArchiveKeyringURI "http://localhost:8080/ubuntu/project/marvinparanoid.pub";' >> ./aptconfig.conf
+echo 'APT::Key::Net-Update-Enabled "1";' >> ./aptconfig.conf
 
-pub   4096R/C0B21F32 2012-05-11
-uid                  Ubuntu Archive Automatic Signing Key (2012) <ftpmaster@ubuntu.com>
+# test against the "real" webserver
+testequal "Checking for new archive signing keys now
+Key 'E8525D47528144E2' not added. It is not signed with a master key" aptkey --fakeroot net-update
 
-pub   4096R/EFE21092 2012-05-11
-uid                  Ubuntu CD Image Automatic Signing Key (2012) <cdimage@ubuntu.com>
-' $GPG --list-keys
 
-- 
2.45.2