From 231fe480a3a52ad228d9a7d3cda0a2fe1663a284 Mon Sep 17 00:00:00 2001
From: Ben Burwell <ben@benburwell.com>
Date: Mon, 9 Sep 2019 14:18:35 -0400
Subject: vendor sumdb

---
 main.go | 114 +++++++++++++++++-----------------------------------------------
 1 file changed, 29 insertions(+), 85 deletions(-)

(limited to 'main.go')

diff --git a/main.go b/main.go
index d08cdbd..9a62ac3 100644
--- a/main.go
+++ b/main.go
@@ -1,96 +1,40 @@
 package main
 
 import (
-	"bytes"
-	"fmt"
-	"io"
 	"log"
-	"net/http"
-	"strconv"
-	"strings"
+	"time"
 
-	"golang.org/x/mod/sumdb/note"
+	"git.sr.ht/~benburwell/gosumdbaudit/sumdb"
 )
 
 func main() {
-	dbs := []*db{
-		&db{host: "sum.golang.org", key: "sum.golang.org+033de0ae+Ac4zctda0e5eza+HJyk9SxEdh+s3Ux18htTTAD8OuAn8"},
-		//&db{host: "sum.golang.org", key: "sum.golang.org+033de0ae+BADBADBADBADBADBADBADBADBADBADBADBADBADBADBA"},
-	}
-	for _, d := range dbs {
-		if err := audit(d); err != nil {
-			log.Printf("AUDIT FAIL (%s): %s", d.host, err.Error())
+	dbs := []*database{
+		&database{
+			host: "sum.golang.org",
+
+			key: "sum.golang.org+033de0ae+Ac4zctda0e5eza+HJyk9SxEdh+s3Ux18htTTAD8OuAn8",
+			// key: "sum.golang.org+033de0ae+BADBADBADBADBADBADBADBADBADBADBADBADBADBADBA",
+
+			pollInterval: 10 * time.Second,
+		},
+	}
+	for _, db := range dbs {
+		client := sumdb.NewClient(db)
+		// lines, err := client.Lookup("golang.org/x/text", "v0.3.0")
+		lines, err := client.Lookup("github.com/influxdata/influxdb", "v0.0.0-20190908081120-80e3efa37a3a")
+		if err != nil {
+			log.Printf("could not lookup: %v", err)
+		} else {
+			for _, line := range lines {
+				log.Printf("got: %s", line)
+			}
 		}
+		// log.Printf("config: %s", string(db.config["sum.golang.org/latest"]))
+		// if err := d.monitor(); err != nil {
+		// 	log.Printf("AUDIT FAIL (%s): %s", d.host, err.Error())
+		// }
+		// if err := audit(d); err != nil {
+		// 	log.Printf("AUDIT FAIL (%s): %s", d.host, err.Error())
+		// }
 	}
 }
-
-func audit(d *db) error {
-	log.Printf("starting audit of %s...", d.host)
-	size, hash, err := d.getLatest()
-	if err != nil {
-		return err
-	}
-	log.Printf("db size %d", size)
-	log.Printf("db hash %s", hash)
-	return nil
-}
-
-type db struct {
-	host string
-	key  string
-}
-
-// httpGet makes a GET request to the specified path of the database and
-// returns a byte slice of the response body.
-func (d *db) httpGet(path string) ([]byte, error) {
-	client := &http.Client{}
-	resp, err := client.Get("https://" + d.host + path)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	var body bytes.Buffer
-	if _, err := io.Copy(&body, resp.Body); err != nil {
-		return nil, fmt.Errorf("could not read response body: %w", err)
-	}
-	return body.Bytes(), nil
-}
-
-// verifyNote takes a signed byte slice, verifies the signature against the
-// db's public key. If successful, the note content is returned, otherwise, an
-// error.
-func (d *db) verifyNote(b []byte) (string, error) {
-	verifier, err := note.NewVerifier(d.key)
-	if err != nil {
-		return "", err
-	}
-	verifiers := note.VerifierList(verifier)
-	msg, err := note.Open(b, verifiers)
-	if err != nil {
-		return "", err
-	}
-	return msg.Text, nil
-}
-
-// getLatest fetches and verifies the latest signed tree head hash and database
-// size.
-func (d *db) getLatest() (int, string, error) {
-	body, err := d.httpGet("/latest")
-	if err != nil {
-		return 0, "", fmt.Errorf("could not fetch latest: %w", err)
-	}
-	msg, err := d.verifyNote(body)
-	if err != nil {
-		return 0, "", fmt.Errorf("could not verify note: %w", err)
-	}
-	parts := strings.Split(msg, "\n")
-	if len(parts) != 4 {
-		return 0, "", fmt.Errorf("could not parse latest: expected %d lines but got %d", 4, len(parts))
-	}
-	size, err := strconv.Atoi(parts[1])
-	if err != nil {
-		return 0, "", fmt.Errorf("could not parse tree size: %w", err)
-	}
-	hash := parts[2]
-	return size, hash, nil
-}
-- 
cgit v1.2.3