added git hooks and refactored some internals

Author: tionis

git-skm/cli.janet

@@ -1,4 +1,5 @@
 #!/bin/env janet
+(import spork/sh)
 (use ./init)
 
 (def zero-commit "0000000000000000000000000000000000000000")
@@ -19,30 +20,52 @@
     (verify-commit (first args))
     (verify-commit "HEAD")))
 
-(defn cli/hooks/pre-receive [args]
+(defn cli/hooks/update [refname oldrev newrev]
   (def excludeExisting ["--not" "--all"])
+  (printf "%s %s %s" oldrev newrev refname)
+  (when (not= newrev zero-commit)
+    (def span
+      (if (= oldrev zero-commit)
+        (string/split "\n" (sh/exec-slurp "git" "rev-list" newrev ;excludeExisting))
+        (string/split "\n" (sh/exec-slurp "git" "rev-list" (string oldrev ".." newrev) ;excludeExisting))))
+    (setdyn :repo-path (os/cwd))
+    (verify-commit newrev)
+    (each commit span
+      (try
+        (os/execute ["git" "verify-commit" commit] :px) # TODO this does not update allowed_signers yet
+        ([err] (error (string "could not verify signature of commit "
+                              commit " due to: " err
+                              "\nrejecting push")))))))
+
+(defn cli/hooks/update-simple [refname oldrev newrev]
+  (def excludeExisting ["--not" "--all"])
+  (printf "%s %s %s" oldrev newrev refname)
+  (when (not= newrev zero-commit)
+    (setdyn :repo-path (os/cwd))
+    (verify-commit newrev)))
+
+(defn cli/hooks/pre-receive []
   (forever
-    (def input (string/trimr (file/read :line stdin)))
+    (def input (string/trimr (file/read stdin :line)))
     (if (= input "") (break))
     (def [oldrev newrev refname] (string/split " " input))
     (printf "%s %s %s" oldrev newrev refname)
-    (when (not= newrev zero-commit)
-      (def span "")
-      (if (= oldrev zero-commit)
-        (set span (string/split "\n" (sh/exec-slurp "git" "rev-list" newrev ;excludeExisting)))
-        (set span (string/split "\n" (sh/exec-slurp "git" "rev-list" (string oldrev ".." newrev) ;excludeExisting))))
-      (each commit span
-        (try
-          (os/execute ["git" "verify-commit" commit] :px) # TODO this does not update allowed_signers yet
-          ([err] (error (string "could not verify signature of commit "
-                                commit " due to: " err
-                                "\nrejecting push"))))))))
+    (cli/hooks/update refname oldrev newrev)))
+
+(def cli/hooks/help-message
+  `Available hooks:
+    - update - check each commit of each pushed rev against a newly generated allowed_signers file
+    - update-simple - like update but only check the last commit
+    - pre-receive - simple hook that works like the update hook but checks all ref at the same time`)
 
 (defn cli/hooks [args]
   (def hook-type (first args))
   (case hook-type
-    "pre-receive" (cli/hooks/pre-receive (slice args 1 -1))
-    (error "unknown hook-type")))
+    "help" (print cli/hooks/help-message)
+    "pre-receive" (cli/hooks/pre-receive)
+    "update" (cli/hooks/update ;(slice args 1 -1))
+    "update-simple" (cli/hooks/update-simple ;(slice args 1 -1))
+    (do (print "unknown hook-type, showing help:\n" cli/hooks/help-message))))
 
 (defn cli/help []
   (print `simple key management
@@ -58,6 +81,6 @@
     "help" (cli/help)
     "verify-commit" (cli/verify-commit (slice args 1 -1))
     "generate" (cli/generate-allowed-signers (slice args 1 -1))
-    "hook" (cli/hook (slice args 1 -1))
+    "hook" (cli/hooks (slice args 1 -1))
     "trust" (cli/trust (slice args 1 -1))
     (cli/help)))

git-skm/init.janet

@@ -7,9 +7,6 @@
 (defn git/slurp [& args] (sh/exec-slurp "git" "-C" (dyn :repo-path) ;args))
 (defn git/slurp-all [& args] (sh/exec-slurp-all "git" "-C" (dyn :repo-path) ;args))
 
-# TODO
-# pre-receive hook
-
 (defn is-in-dir [child parent]
   (not (deep= (first (path/parts (path/relpath parent child))) "..")))
 
@@ -41,46 +38,22 @@
 
 (defn git-dir [&opt repo]
   (default repo (dyn :repo-path))
-  (def opts @[])
-  (if repo (array/concat opts ["-C" repo]))
   (if (dyn :git-dir)
     (dyn :git-dir)
-    (let [git-dir (path/join repo (sh/exec-slurp "git" ;opts "rev-parse" "--git-dir"))]
+    (let [git-dir (path/join repo (sh/exec-slurp "git" "-C" repo "rev-parse" "--git-dir"))]
       (setdyn :git-dir git-dir)
       git-dir)))
 
-(defn repo-top-level [&opt repo]
-  (default repo (dyn :repo-path))
-  (def opts @[])
-  (if repo (array/concat opts ["-C" repo]))
-  (if (dyn :repo-top-level)
-    (dyn :repo-top-level)
-    (let [repo-top-level (sh/exec-slurp "git" ;opts "rev-parse" "--show-toplevel")]
-      (setdyn :repo-top-level repo-top-level)
-      repo-top-level)))
-
-(defn allowed-signers-absolute-path [&opt repo]
-  (default repo (dyn :repo-path))
-  (def opts @[])
-  (if repo (array/concat opts ["-C" repo]))
-  (if (dyn :allowed-signers-absolute-path)
-    (dyn :allowed-signers-absolute-path)
-    (try
-      (let [allowed-signers-absolute-path (sh/exec-slurp "git" ;opts "config" "--local" "skm.allowedSignersFile")]
-        (let [stat (os/stat allowed-signers-absolute-path)]
-          (if (or (not stat) (not= (stat :mode) :file))
-            (error "allowedSignersFile does not exist or is not a file")))
-        (setdyn :allowed-signers-absolute-path allowed-signers-absolute-path))
-      ([err]
-       (do
-          (setdyn :allowed-signers-absolute-path (path/join (repo-top-level) ".allowed_signers"))
-          (sh/exec-slurp "git" ;opts "config" "--local" "skm.allowedSignersFile" (dyn :allowed-signers-absolute-path)))))))
-
 (defn allowed-signers-relative-path [&opt repo]
   (default repo (dyn :repo-path))
   (if (dyn :allowed-signers-relative-path)
     (dyn :allowed-signers-relative-path)
-    (path/relpath (repo-top-level repo) (allowed-signers-absolute-path repo))))
+    (let [result (sh/exec-slurp-all "git" "-C" repo "config" "--local" "skm.allowedSignersFile")]
+      (if (and (= (result :status) 0)
+               (result :out)
+               (not= (result :out) ""))
+        (setdyn :allowed-signers-relative-path (result :out))
+        (setdyn :allowed-signers-relative-path ".allowed_signers")))))
 
 (defn trust
   "set trust anchor"
@@ -141,10 +114,12 @@
   "generate the allowed_signers file using a previously set trust anchor"
   [commit]
   (check-allowed-signers)
-  (def allowed-signers-absolute-path (allowed-signers-absolute-path))
-  (var last-verified-commit (git/slurp "config" "skm.last-verified-commit"))
+  (var last-verified-commit "")
+  (try
+    (set last-verified-commit (git/slurp "config" "skm.last-verified-commit"))
+    ([err] (error (string "could not get trust anchor: " err))))
   (if (or (not last-verified-commit) (= last-verified-commit "")) (error "No last verified commit set"))
-  (def all_commits (string/split "\n" (git/slurp "log" "--pretty=format:%H" (allowed-signers-relative-path))))
+  (def all_commits (string/split "\n" (git/slurp "rev-list" commit "--" (allowed-signers-relative-path))))
   (def commits-to-verify @[])
   (var found_commit false)
   (each commit all_commits
@@ -158,13 +133,11 @@
     (set last-verified-commit commit))
   (trust last-verified-commit)
   (def allowed-signers-cache-file (path/join (git-dir) "allowed_signers"))
-  (sh/copy-file allowed-signers-absolute-path allowed-signers-cache-file)
+  (spit allowed-signers-cache-file (git/slurp "show" (string commit ":" (allowed-signers-relative-path))))
   (git/fail "config" "gpg.ssh.allowedSignersFile" allowed-signers-cache-file)
   (print "allowed_signers was verified and copied into git_dir"))
 
 (defn verify-commit
   [commit]
-  (def allowed-signers-cache-file (path/join (git-dir) "allowed_signers"))
-  (unless (deep= (slurp allowed-signers-cache-file) (slurp (allowed-signers-absolute-path)))
-    (generate-allowed-signers (git/slurp "rev-parse" commit)))
+  (generate-allowed-signers (git/slurp "rev-parse" commit))
   (git/loud "verify-commit" commit))