From 09af9fc40b695a22cb6a3f59d61b3c23aed6fa79 Mon Sep 17 00:00:00 2001
From: syl20bnr <sylvain.benner@gmail.com>
Date: Sat, 24 Aug 2019 22:49:48 -0400
Subject: [PATCH] [core] Add "unit" and functional tests for archvie
 verification

---
 tests/core/core-configuration-layer-ftest.el  |  45 +++++++++++++++++-
 tests/core/core-configuration-layer-utest.el  |  41 ++++++++++++++++
 .../core/data/signed-test-stable-elpa.tar.gz  | Bin 0 -> 2248 bytes
 .../data/signed-test-stable-elpa.tar.gz.sig   | Bin 0 -> 336 bytes
 tests/core/data/test-stable-elpa.tar.gz       | Bin 0 -> 712 bytes
 5 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 tests/core/data/signed-test-stable-elpa.tar.gz
 create mode 100644 tests/core/data/signed-test-stable-elpa.tar.gz.sig
 create mode 100644 tests/core/data/test-stable-elpa.tar.gz

diff --git a/tests/core/core-configuration-layer-ftest.el b/tests/core/core-configuration-layer-ftest.el
index 752a99167..be460860f 100644
--- a/tests/core/core-configuration-layer-ftest.el
+++ b/tests/core/core-configuration-layer-ftest.el
@@ -46,5 +46,48 @@
     (should (eq 'spacemacs-base (third configuration-layer--used-layers)))))
 
 ;; ---------------------------------------------------------------------------
-;; Lazy installation of layers
+;; configuration-layer//stable-elpa-verify-archive
 ;; ---------------------------------------------------------------------------
+
+(ert-deftest test-stable-elpa-verify-archive--verification-ok ()
+  (cl-letf (((symbol-function 'configuration-layer//stable-elpa-tarball-local-file)
+             (lambda ()
+               (concat spacemacs-test-directory
+                       "core/data/signed-test-stable-elpa.tar.gz")))
+            ((symbol-function 'configuration-layer//stable-elpa-tarball-local-sign-file)
+             (lambda ()
+               (concat spacemacs-test-directory
+                       "core/data/signed-test-stable-elpa.tar.gz.sig")))
+            ((symbol-function 'configuration-layer//stable-elpa-ask-to-continue)
+             (lambda (x)
+               (message "Verification Error: %s" x)
+               nil))
+            ((symbol-function 'configuration-layer//error)
+             (lambda (x)
+               (message "Fatal Error: %s" x)
+               nil))
+            ((symbol-function 'message) 'ignore))
+    (should (equal t (configuration-layer//stable-elpa-verify-archive)))))
+
+(ert-deftest test-stable-elpa-verify-archive--verification-failed ()
+  (let (verification-error)
+    (cl-letf (((symbol-function 'configuration-layer//stable-elpa-tarball-local-file)
+               (lambda ()
+                 (concat spacemacs-test-directory
+                         "core/data/test-stable-elpa.tar.gz")))
+              ((symbol-function 'configuration-layer//stable-elpa-tarball-local-sign-file)
+               (lambda ()
+                 (concat spacemacs-test-directory
+                         "core/data/signed-test-stable-elpa.tar.gz.sig")))
+              ((symbol-function 'configuration-layer//stable-elpa-ask-to-continue)
+               (lambda (x)
+                 (setq verification-error x)
+                 nil))
+              ((symbol-function 'configuration-layer//error)
+               (lambda (x)
+                 (message "Fatal Error: %s" x)
+                 nil))
+              ((symbol-function 'message) 'ignore))
+      (should (and (null (configuration-layer//stable-elpa-verify-archive))
+                   (string-match-p "^Verification failed!.*"
+                                   verification-error))))))
diff --git a/tests/core/core-configuration-layer-utest.el b/tests/core/core-configuration-layer-utest.el
index 0d300142b..df8a94fda 100644
--- a/tests/core/core-configuration-layer-utest.el
+++ b/tests/core/core-configuration-layer-utest.el
@@ -3016,3 +3016,44 @@
                                   :reqs '((foo 7)))))
     (let ((patched-pkg (configuration-layer//package-install-org 'identity pkg)))
       (should (equal pkg patched-pkg)))))
+
+;; ---------------------------------------------------------------------------
+;; configuration-layer//stable-elpa-verify-archive
+;; ---------------------------------------------------------------------------
+
+(ert-deftest test-stable-elpa-verify-archive--archive-not-found-is-fatal-error ()
+  (mocker-let
+   ((configuration-layer//stable-elpa-tarball-local-file
+     nil ((:record-cls 'mocker-stub-record
+                       :output
+                       (concat spacemacs-test-directory
+                               "core/data/not-found.tar.gz")
+                       :occur 1)))
+    (configuration-layer//stable-elpa-tarball-local-sign-file
+     nil ((:record-cls 'mocker-stub-record
+                       :output
+                       (concat spacemacs-test-directory
+                               "core/data/stable-elpa.sig")
+                       :occur 1)))
+    (configuration-layer//error
+     (msg &rest args) ((:record-cls 'mocker-stub-record :occur 1))))
+   (should (null (configuration-layer//stable-elpa-verify-archive)))))
+
+
+(ert-deftest test-stable-elpa-verify-archive--signature-not-found-is-fatal-error ()
+  (mocker-let
+   ((configuration-layer//stable-elpa-tarball-local-file
+     nil ((:record-cls 'mocker-stub-record
+                       :output
+                       (concat spacemacs-test-directory
+                               "core/data/signed-stable-elpa.tar.gz")
+                       :occur 1)))
+    (configuration-layer//stable-elpa-tarball-local-sign-file
+     nil ((:record-cls 'mocker-stub-record
+                       :output
+                       (concat spacemacs-test-directory
+                               "core/data/not-found.sig")
+                       :occur 1)))
+    (configuration-layer//error
+     (msg &rest args) ((:record-cls 'mocker-stub-record :occur 1))))
+   (should (null (configuration-layer//stable-elpa-verify-archive)))))
diff --git a/tests/core/data/signed-test-stable-elpa.tar.gz b/tests/core/data/signed-test-stable-elpa.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..f08c7c8e1540f7980cc893790b70de475ae7ac06
GIT binary patch
literal 2248
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
W%$PA_#*7&=4E_Odi#*%_Pyhf;lUq>$

literal 0
HcmV?d00001

diff --git a/tests/core/data/signed-test-stable-elpa.tar.gz.sig b/tests/core/data/signed-test-stable-elpa.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..d4e50736853e940bce5cfbb63138232ec2cb713d
GIT binary patch
literal 336
zcmV-W0k8gv0Zjw|0SEv$79j*&jb}OM!44I8u3u<FuUb59&1q@{0$pM3&lwzZd2DuJ
zX>KlJWo~X|azJNoVQFkGV{dH$3JDNHuUb59&1q`w76<(v*aS>Db5&bQ5@l&cl_WUO
zPrj%{SGBnD;I)*-f1vq%(E|xO=}*!e8J+y)U8R}kXp-j2X+UDFnbs><GL6_W-3S&*
zE<N?v60b?(|9UrEp?<4-eCSwiKd$70x6edp4hjksnp6flTL6J$$f1i~+OESZ_Rp8Y
zti_9FO2VPI%A1ol3m4x<lSdCZ##-qFHSQRAr_oRG8tfsB+F!OW)*SVngrR>HS=@up
z3+RS0y7EFl5*7D;^zNpuhWnJORuU;9uHU}?2!PhZVr3p%UF0r)wW64nLs4cm@k3^p
i1Obcd8=ECxUE2;Rv@NU{BnbMaDTI5%84(Jk=9S-KKbar^

literal 0
HcmV?d00001

diff --git a/tests/core/data/test-stable-elpa.tar.gz b/tests/core/data/test-stable-elpa.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..7609213fbc2aba8c14e9e8d5b47b32af33684c7c
GIT binary patch
literal 712
zcmV;(0yq61iwFR!>|tF11MOE`Z`v>v?Q?#`RUd+lmN=A;PL=YsXWsf!$-<;GjBHRU
z5+*7|{_V4!lG-HUqeI#{e6Z|m`}oEV=O#B<oMv8{MUV5?i{~$qpKY?MGb0FsL9Yk0
zy&d#b8{8CqiQ8VU1D$Ta8*~SQP7pxQ=?`v#D+tcLkvgo!;a6fS>FfMglsq@`1Z_Iq
z<EJ<al<g;h2jAAKWSJ(}EBs96^Y{s}SqzgXgF6p94(MpB`pa-Q{OY={Z%mm?g`p%$
zrt8YCU!`aa*LAdOl+)#`Tf2JSbW59W)oiaI$jRyva>^JZxi*4TjSL6I9T5KB=^<4O
z3H9sZFbua2^otQyQ~mNq?d(tt65URTAx7w1VY2hytrkale=A5HDBn{IwzvoQcs61u
z`94$x`^We6XtovZ8$t}DhY_GqchD?cDXUQ-suDPCe^|FUsGqJ|HNbL0i@#LqQb?A7
z-1(8h1<Fp4;xXd-SJ)RNTv@TIdTUk+P+G5Qv1oTmuKG2ymL`rMf|k#G?^?hUH<i@O
zJ*4+6EY@&Us6ixK#{%Q)F)e6fn49sFYqhetS|$cKsfiSQ%ba+k;dRkd`pe~rI0BGy
zHK0ftJ_xa#ii%uxK>g?O)DTKU+4_T8&t{a((J|SKvUy=QWj0voA2ozY;~S$~3HsVH
z>nUwsn*m9i7xP4m0W%w7oK-WU=4=S#L(0>#Awmx6RLh1CI!V<OpE(9DC<uh|NzMvW
zMgZN_rKdC`p0YwZ^iW<T#19V;-ZPMau=CCc+i0xJF*a5Di2}e#@KH_rzUSkC(nH~5
zykKxe)q5n3$e#uPz;v}-z%0vN(mO)dX}t0`izH2x<+DFoE(nhoQ8IsAZb+0)l7xv5
u;MAXG3+Hctpj%j2SXfwCSXfwCSXfwCSXfwCSXfwm0KWm>-6A#sC;$Mx>Qx~C

literal 0
HcmV?d00001