From aefb4b6b82b81fc68103628ae7ed86da9153d1bb Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 25 Feb 2016 15:22:25 +0100
Subject: [PATCH] Add make-test-bundles.sh

---
 .gitignore                     |   6 ++++++
 tests/hello.xdgapp             | Bin 1332 -> 0 bytes
 tests/make-test-bundles.sh     |  26 ++++++++++++++++++++++++++
 tests/test-keyring/README      |   3 +++
 tests/test-keyring/pubring.gpg | Bin 0 -> 1166 bytes
 tests/test-keyring/secring.gpg | Bin 0 -> 2468 bytes
 6 files changed, 35 insertions(+)
 delete mode 100644 tests/hello.xdgapp
 create mode 100755 tests/make-test-bundles.sh
 create mode 100644 tests/test-keyring/README
 create mode 100644 tests/test-keyring/pubring.gpg
 create mode 100644 tests/test-keyring/secring.gpg

diff --git a/.gitignore b/.gitignore
index 66db326b..d4f5810f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,9 @@ XdgApp-1.0.*
 /test-doc-portal.trs
 /testdb.log
 /testdb.trs
+/tests/test-keyring/.gpg-v21-migrated
+/tests/test-keyring/private-keys-v1.d/
+/tests/test-keyring/trustdb.gpg
+/tests/hello*.xdgapp
+/tests/platform*.xdgapp
+/tests/repo
diff --git a/tests/hello.xdgapp b/tests/hello.xdgapp
deleted file mode 100644
index 843e8ad5839ac3c7474a34b3f2cde28acc3a8cc8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1332
zcmb<ON!Lv*C}3b@=zPjh%E3^Sn#KSEKr#LNqIA8I)Z!97kJOx;eEkXwvv@NT{oKUj
zlGGvwhGG_wy4=)~#FWI6L=YPUq8$qgax#+>OEUBGV!84Xb5m_mjo~UP%`3@-3a97g
z=ceif<Rq4)<rn3m+Q5~ZpPQSQmtva%vR$t@g9~UUXG&^LNn)|SYo&f(SdgV(SdMv=
zWoAl_sY#?^Nm!V6l~-kAs=r%cMtq`0V3LuOc1D4Tz5&o(6@SgEBBB@=Se{+m;>N_F
z$S4IAJTt-g<pU-*#wD=~4B7LR34Q6AH$ndHvFiCOs=E)Y_KrWq|F2IqxsB`pwjG<7
zw%hIf+NAc+AzoZgUwK~KguJR_(~n8rnV}wL{xEUXb+5Lx^ZQ%!moK&Xw0qwFO}@+C
z|FC|tLV2S_P>9!##$fSt*<1EIs?L@<;GO^a=Fy6K)^0q>`gKbTm%dX!(8a=#So7@0
zs(5w5WbM?s!gmVZC#)=bS!eerdv{>_^ocIN-(B#1zEb!=)J5<0(x+!x?JZuV;3^*!
z@RxrYL#p4cy`0;%uN@8iKj-!1(}MbUrmH0{sq*md*?HiF-0cgUsWVNVAHO0R_WG9U
z&Gyn2L9^z~;5}>X%igHbcW1)pg16^*`R>K4x_Zx^P`RM#dQH_U_DTIlJ#!|pU9X!}
zB39JtDEhEq*|aI!L|ILFzey-%zni}`;=o>E+nX8>CNa2weKYazQ|*?^x9)6<%9y@U
zUgOL>r>EIID}2f>6~9k)(~)}Vw{7j!;Az<f2J;?g)vpW4k(v2Tv%^8^=f$f&hb-zA
zsm$Z^?OF5j_=fmd5BYoc=_E&d$(OpT#kNPuFVZyN_3FI4&KiGBm5hP$B^uVVy2LV)
zoq_QHb2~8kJ)bt~(Z(a`znOq?3@njR3>uY*m6~P@{0ue>8yK#Fg@H0*XE&M(YhHD~
z96EhlZRgF(hrPL>@tf7v=2?U&{#`GSpHSB}FTc2?C^c2DII}9X7-X8xpW~&05veYX
z@y`!^<}f}wrQ+h{V#Aa<6BZuwyRK-vF;MrD<j*6wHr_Qnxw-nrw&%f3s~_=L-xdwz
zh>R0odtuh*b>%TiE)0o@mAuie6$SZ4B?_qdfWZ%#H>}VExg3j<GprOKIgQJyC@~Mj
zh2=PqyFei9xY_Y9YI2dxrJ^D8rGuP5F~3=Rw9138Dlu*=2M5#I+N`}YE?ImZrE3nR
zf8NIYwDtJAciT#TEfKo<rWhFXueozVIxZ|OiiwGVnD^Mkva-j^ByU6fL)K$gTGCWx
zc~4C9xx9sKV^N9d^Poo{RZkfqYEMFGraTkwIsZ3T&6u;)<=O5EE}e=Avi6(JEy`L2
z7qf}4Um(jw$c0P?Ircm2HWmq1+6i?WEb#M`lndN{){XC5-uqjTg?kT+F!3Jqdaw5D
zmBMwYu9;5-RhK5DM@ofUKe;~p-i6=qyY}p4Cge#*LUF`MD4JD(B?Z{y%B=sG|1ong
JzhJt{1OVJfF311?

diff --git a/tests/make-test-bundles.sh b/tests/make-test-bundles.sh
new file mode 100755
index 00000000..3bdc5ce9
--- /dev/null
+++ b/tests/make-test-bundles.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+./make-test-runtime.sh
+./make-test-app.sh
+
+URL=file://`pwd`/repo
+
+REF=`(cd repo/refs/heads; echo app/org.test.Hello/*/master)`
+
+xdg-app build-bundle repo hello.xdgapp org.test.Hello
+xdg-app build-bundle repo hello-key.xdgapp --gpg-keys=test-keyring/pubring.gpg org.test.Hello
+xdg-app build-bundle repo --repo-url=${URL} hello-origin.xdgapp org.test.Hello
+xdg-app build-bundle repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg hello-key-origin.xdgapp org.test.Hello
+
+ostree gpg-sign --repo=repo --gpg-homedir=test-keyring ${REF} 7B0961FD
+
+xdg-app build-bundle repo hello-signed.xdgapp org.test.Hello
+xdg-app build-bundle repo hello-key-signed.xdgapp --gpg-keys=test-keyring/pubring.gpg org.test.Hello
+xdg-app build-bundle repo --repo-url=${URL} hello-origin-signed.xdgapp org.test.Hello
+xdg-app build-bundle repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg hello-key-origin-signed.xdgapp org.test.Hello
+
+REF=`(cd repo/refs/heads; echo runtime/org.test.Platform/*/master)`
+ostree gpg-sign --repo=repo --gpg-homedir=test-keyring ${REF} 7B0961FD
+xdg-app build-bundle --runtime repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg platform.xdgapp org.test.Platform
diff --git a/tests/test-keyring/README b/tests/test-keyring/README
new file mode 100644
index 00000000..7586ed3e
--- /dev/null
+++ b/tests/test-keyring/README
@@ -0,0 +1,3 @@
+These are completely random keys, which include the secret key.
+Use these for testing gpg signing, do *NOT* ever use these for any
+real application.
diff --git a/tests/test-keyring/pubring.gpg b/tests/test-keyring/pubring.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..787919139942f0b0f89a1cb972d8077dcec45d0e
GIT binary patch
literal 1166
zcmV;91abSB0SyFJ&j$Jd2msb^K2G_3?#SPr3`|P%T3n0h2+R{!2kz3a-2{SyX{4wy
z1SS3j-h@T(SkFnxY><DpHnT>a%$|A=o*tiGct~t;JL|8+axA#8zE|>Ast#qQMBu6k
z?)^cL|HG@;OsfN$g3zxIUMUmxicqf*BSvvoVIwEg4pVDW|L)6`IEQ1^Q$2qIUptoe
ziJrLm<89{TY1jIyL>tMbre`qcX>VN9?hD>>lPOO?n8?v-&bg%A$24J^mxn$|ibLto
zAuqb>EHy}1Xl;wKd;8%2u;R*}F3AZY>{XYaG4aoWe4_WPp0JGWl8E6^2MTt0{>b*f
z(KnY&36`dDEj0^iUF84~0RREC4_IVpEn#qQAarGObZKs9i2*nS69EDMA_W3g&j$Je
z8v_Ol2?z%R0tOWb0tpHW1Qr4V0RkQY0vCV)3JDMsi!tDP31R(%hzI)x4;r0K!hwoO
zj^nniKO;c%w2WjzHKX!r;2Z}Z2#i@Hf5%!V!@>gIph7AHq%RJHIH2>OW#*WeI3COF
zl!51Ypi-~{C3s*9_eSE%0=K`^;{~_S%N||XS4irI7z$gIU)v(i0pCM`85e<%aNJmm
zvTu(Dt)z;S`C1B@85bmt5C;ZOCxWTA@`DhN0M85#uSJ1WWafoy6ZybWZm3DY0fxt@
z2fu=7c9BkE=zH{mvrP5?p4yaw^-BI1-eec0`v4)upWU0bF`S(j^=^mD(=ijUJ&R6M
zOGd?;#01^p=I1=|(bALMyqT)3qMuXhfiN?T<^-UQyI36n>^L~N0SyFJ&j$Jd2mr_R
z?h&LfbdAZ`h9)>pkz+{7WpdiNaro)NQR1%jno!=q^QvH^(k@y!t4@RBjKae-*nV1R
z4XHblXx1>@w&VM?l8S{o(R=8-Ae0A-X$i1-X_wLG8$P_nVWs!dMvwxeJz7l<MeROn
zv~yTBpHltmUwpN7=L%A=LbyP>TJ=@JiWal%*U`lROTdvj7PC$}*Axu*>S#*R?}6Q5
zft0V4+R_g?GUJtqGhhU8`F{T=pmz(ue6L~f|0U`OHwrGgyIExc-+3?HyRI8yx-CYg
za@RxfixUSJzMP1_y#f;!s<?3W+gt)hXbILD;?8x{J$vz?2;w*<Iw?kZ<2wKm0RRDs
z0Urby0RjLC1p-#j2KoXU3;+rV5EF|r;Cl&S{Y)<h{0^wC;IVol{0#G!H*Zd94r~(+
z!-KZxEhbC5#*q>X9||E-ze(<x-~o<*#`D%WGoxY=aam>+8u=y80JwoIOug{$IF~AY
zhEx5hX4XakSHbRYI08gQt7uaMd2c8w0}f4djJLtpPYa93?&?YL`&9km1+@1_(ZZ{&
z216CtR~DVo#n6K3@cP>Z=zL8kqfr{xAos?lVcOo~ePeY-6BXZ2A+&Txl1Y|uM%%o4
zu7d*lb!J4p35#MbzwXpB15%wEfEkj&PyE1Q-rb?L6ly~qZ|7ogbS9ZL;w`vGxvgd4
ge)<N)`YK_YePsCOYpjWV$H~C<%ziU)Ut-bXo-kk~y8r+H

literal 0
HcmV?d00001

diff --git a/tests/test-keyring/secring.gpg b/tests/test-keyring/secring.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..03bc3fa6db8eaa0be3e12f64f57af47288bc6bfd
GIT binary patch
literal 2468
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

literal 0
HcmV?d00001