From 7df9111d9f24f12417cc4938c7e859d97b45680e Mon Sep 17 00:00:00 2001
From: KatolaZ <katolaz@freaknet.org>
Date: Tue, 18 Jul 2017 16:24:49 +0100
Subject: The pipeline "spooling -> routing -> file deletion" works

---
 commits.go | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

(limited to 'commits.go')

diff --git a/commits.go b/commits.go
index 46672cf..b81bf7a 100644
--- a/commits.go
+++ b/commits.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/KatolaZ/git2go"
 	"golang.org/x/crypto/openpgp"
+	"log"
 	"os"
 	"strings"
 	//	"log"
@@ -23,15 +24,15 @@ func CommitToString(commit *git.Commit) string {
 }
 
 // FIXME: RETURN THE ENTITY PROVIDED BY THE CHECK, OR nil
-func check_signature(commit *git.Commit, keys []*openpgp.KeyRing) (signature, signed string, err error) {
+func check_signature(commit *git.Commit, keys *map[string]openpgp.KeyRing) (signature, signed string, err error) {
 
 	signature, signed, err = commit.ExtractSignature()
 
 	if err == nil {
-		for _, keyring := range keys {
+		for _, keyring := range *keys {
 
 			_, err_sig :=
-				openpgp.CheckArmoredDetachedSignature(*keyring, strings.NewReader(signed),
+				openpgp.CheckArmoredDetachedSignature(keyring, strings.NewReader(signed),
 					strings.NewReader(signature))
 
 			if err_sig == nil {
@@ -45,6 +46,14 @@ func check_signature(commit *git.Commit, keys []*openpgp.KeyRing) (signature, si
 	return "", "", err
 }
 
+func find_scorsh_message(commit *git.Commit) (string, error) {
+
+	msg := commit.RawMessage()
+	debug.log("[find_scorsg_msg] found message:\n %s\n", msg)
+
+	return msg, nil
+}
+
 // traverse all the commits between two references, looking for scorsh
 // commands
 // fixme: we don't have just one keyring here....
@@ -91,12 +100,17 @@ func walk_commits(msg SCORSHmsg, w *SCORSHworker) error {
 			// check if it can be verified by any of the keyrings associated
 			// with the scorsh-tag
 
-			//signature, signed, err := check_signature(commit, &keyring)
+			// check if the commit contains a scorsh command
+
+			_, err = find_scorsh_message(commit)
+
+			//signature, signed, err := check_signature(commit, &w.Keys)
 			//_, _, err := check_signature(commit, w.keys)
-			//if err != nil {
-			//	log.Printf("%s\n", SCORSHerr(SCORSH_ERR_SIGNATURE))
-			//
-			//}
+			if err != nil {
+				log.Printf("[worker: %s] %s\n", w.Name, SCORSHerr(SCORSH_ERR_SIGNATURE))
+			} else {
+
+			}
 			cur_commit = commit.Parent(0)
 		} else {
 			fmt.Printf("Commit %x not found!\n", cur_commit.Id())
-- 
cgit v1.2.3