use original mtime of routerInfo and simplify Reseeder interface

cmd/su3tools.go

@@ -1,75 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-
-	"github.com/MDrollette/i2p-tools/reseed"
-	"github.com/codegangsta/cli"
-)
-
-func NewSu3Command() cli.Command {
-	return cli.Command{
-		Name:        "su3",
-		Usage:       "Do SU3 things",
-		Description: "Do SU3 things",
-		Action:      su3Action,
-		Flags: []cli.Flag{
-			cli.StringFlag{
-				Name:  "signer",
-				Usage: "Your SU3 signing ID (your email address)",
-			},
-			cli.StringFlag{
-				Name:  "netdb",
-				Usage: "Path to NetDB directory containing routerInfos",
-			},
-			cli.StringFlag{
-				Name:  "keyfile",
-				Value: "reseed_private.pem",
-				Usage: "Path to your su3 signing private key",
-			},
-		},
-	}
-}
-
-func su3Action(c *cli.Context) {
-	netdbDir := c.String("netdb")
-	if netdbDir == "" {
-		fmt.Println("--netdb is required")
-		return
-	}
-
-	signerId := c.String("signer")
-	if signerId == "" {
-		fmt.Println("--signer is required")
-		return
-	}
-
-	// load our signing privKey
-	privKey, err := loadPrivateKey(c.String("keyfile"))
-	if nil != err {
-		log.Fatalln(err)
-	}
-
-	netdb := reseed.NewLocalNetDb(netdbDir)
-	reseeder := reseed.NewReseeder(netdb)
-	reseeder.SignerId = []byte(signerId)
-	reseeder.SigningKey = privKey
-
-	// make a fake peer
-	seeds, err := reseeder.Seeds(reseed.Peer("127.0.0.1"))
-	if nil != err {
-		log.Fatalln(err)
-	}
-
-	// create an SU3 from the seed
-	su3File, err := reseeder.CreateSu3(seeds)
-
-	//write the file to disk
-	data, err := su3File.MarshalBinary()
-	if nil != err {
-		log.Fatalln(err)
-	}
-	ioutil.WriteFile("i2pseeds.su3", data, 0777)
-}

cmd/verify.go

@@ -41,7 +41,8 @@ func su3VerifyAction(c *cli.Context) {
 	ks := reseed.KeyStore{Path: "./certificates"}
 	cert, err := ks.ReseederCertificate(su3File.SignerId)
 	if nil != err {
-		panic(err)
+		fmt.Println(err)
+		return
 	}
 
 	if err := su3File.VerifySignature(cert); nil != err {

main.go

@@ -21,9 +21,8 @@ func main() {
 	app.Flags = []cli.Flag{}
 	app.Commands = []cli.Command{
 		cmd.NewReseedCommand(),
-		// cmd.NewSu3VerifyCommand(),
+		cmd.NewSu3VerifyCommand(),
 		cmd.NewKeygenCommand(),
-		// cmd.NewSu3Command(),
 		// cmd.NewSu3VerifyPublicCommand(),
 	}
 

reseed/server.go

@@ -66,9 +66,9 @@ func NewServer(prefix string, trustProxy bool) *Server {
 }
 
 func (s *Server) reseedHandler(w http.ResponseWriter, r *http.Request) {
-	peer := s.Reseeder.Peer(r)
+	peer := Peer(r.RemoteAddr)
 
-	su3, err := s.Reseeder.PeerSu3Bytes(peer)
+	su3Bytes, err := s.Reseeder.PeerSu3Bytes(peer)
 	if nil != err {
 		http.Error(w, "500 Unable to get SU3", http.StatusInternalServerError)
 		return
@@ -76,9 +76,9 @@ func (s *Server) reseedHandler(w http.ResponseWriter, r *http.Request) {
 
 	w.Header().Set("Content-Disposition", "attachment; filename=i2pseeds.su3")
 	w.Header().Set("Content-Type", "application/octet-stream")
-	w.Header().Set("Content-Length", strconv.FormatInt(int64(len(su3)), 10))
+	w.Header().Set("Content-Length", strconv.FormatInt(int64(len(su3Bytes)), 10))
 
-	io.Copy(w, bytes.NewReader(su3))
+	io.Copy(w, bytes.NewReader(su3Bytes))
 }
 
 func loggingMiddleware(next http.Handler) http.Handler {

reseed/service.go

@@ -8,7 +8,6 @@ import (
 	"io/ioutil"
 	"log"
 	"math/rand"
-	"net/http"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -19,8 +18,9 @@ import (
 )
 
 type routerInfo struct {
-	Name string
-	Data []byte
+	Name    string
+	ModTime time.Time
+	Data    []byte
 }
 
 type Peer string
@@ -32,16 +32,8 @@ func (p Peer) Hash() int {
 	return int(crc32.ChecksumIEEE(c))
 }
 
-type Seeds []routerInfo
-
 type Reseeder interface {
-	// seed a peer with routerinfos
-	Seeds(p Peer) (Seeds, error)
-	// get a peer from a given request
-	Peer(r *http.Request) Peer
-	// create an Su3 file from the given seeds
-	CreateSu3(seeds Seeds) (*su3.Su3File, error)
-	// get signed su3 bytes for a peer
+	// get an su3 file (bytes) for a peer
 	PeerSu3Bytes(peer Peer) ([]byte, error)
 }
 
@@ -144,7 +136,7 @@ func (rs *ReseederImpl) rebuild() error {
 	return nil
 }
 
-func (rs *ReseederImpl) seedsProducer(ris []routerInfo) <-chan Seeds {
+func (rs *ReseederImpl) seedsProducer(ris []routerInfo) <-chan []routerInfo {
 	lenRis := len(ris)
 
 	// if NumSu3 is not specified, then we determine the "best" number based on the number of RIs
@@ -168,11 +160,11 @@ func (rs *ReseederImpl) seedsProducer(ris []routerInfo) <-chan Seeds {
 
 	log.Printf("Building %d su3 files each containing %d out of %d routerInfos.\n", numSu3s, rs.NumRi, lenRis)
 
-	out := make(chan Seeds)
+	out := make(chan []routerInfo)
 
 	go func() {
 		for i := 0; i < numSu3s; i++ {
-			var seeds Seeds
+			var seeds []routerInfo
 			unsorted := rand.Perm(lenRis)
 			for z := 0; z < rs.NumRi; z++ {
 				seeds = append(seeds, ris[unsorted[z]])
@@ -186,11 +178,11 @@ func (rs *ReseederImpl) seedsProducer(ris []routerInfo) <-chan Seeds {
 	return out
 }
 
-func (rs *ReseederImpl) su3Builder(in <-chan Seeds) <-chan *su3.Su3File {
+func (rs *ReseederImpl) su3Builder(in <-chan []routerInfo) <-chan *su3.Su3File {
 	out := make(chan *su3.Su3File)
 	go func() {
 		for seeds := range in {
-			gs, err := rs.CreateSu3(seeds)
+			gs, err := rs.createSu3(seeds)
 			if nil != err {
 				log.Println(err)
 				continue
@@ -210,20 +202,7 @@ func (rs *ReseederImpl) PeerSu3Bytes(peer Peer) ([]byte, error) {
 	return m[peer.Hash()%len(m)], nil
 }
 
-func (rs *ReseederImpl) Seeds(p Peer) (Seeds, error) {
-	all, err := rs.netdb.RouterInfos()
-	if nil != err {
-		return nil, err
-	}
-
-	return Seeds(all), nil
-}
-
-func (rs *ReseederImpl) Peer(r *http.Request) Peer {
-	return Peer(r.RemoteAddr)
-}
-
-func (rs *ReseederImpl) CreateSu3(seeds Seeds) (*su3.Su3File, error) {
+func (rs *ReseederImpl) createSu3(seeds []routerInfo) (*su3.Su3File, error) {
 	su3File := su3.NewSu3File()
 	su3File.FileType = su3.FILE_TYPE_ZIP
 	su3File.ContentType = su3.CONTENT_TYPE_RESEED
@@ -276,8 +255,9 @@ func (db *LocalNetDbImpl) RouterInfos() (routerInfos []routerInfo, err error) {
 		}
 
 		routerInfos = append(routerInfos, routerInfo{
-			Name: file.Name(),
-			Data: riBytes,
+			Name:    file.Name(),
+			ModTime: file.ModTime(),
+			Data:    riBytes,
 		})
 	}
 

reseed/zip.go

@@ -4,10 +4,9 @@ import (
 	"archive/zip"
 	"bytes"
 	"io/ioutil"
-	"time"
 )
 
-func zipSeeds(seeds Seeds) ([]byte, error) {
+func zipSeeds(seeds []routerInfo) ([]byte, error) {
 	// Create a buffer to write our archive to.
 	buf := new(bytes.Buffer)
 
@@ -17,7 +16,7 @@ func zipSeeds(seeds Seeds) ([]byte, error) {
 	// Add some files to the archive.
 	for _, file := range seeds {
 		fileHeader := &zip.FileHeader{Name: file.Name, Method: zip.Deflate}
-		fileHeader.SetModTime(time.Now().UTC())
+		fileHeader.SetModTime(file.ModTime)
 		zipFile, err := zipWriter.CreateHeader(fileHeader)
 		if err != nil {
 			return nil, err
@@ -36,14 +35,14 @@ func zipSeeds(seeds Seeds) ([]byte, error) {
 	return buf.Bytes(), nil
 }
 
-func uzipSeeds(c []byte) (Seeds, error) {
+func uzipSeeds(c []byte) ([]routerInfo, error) {
 	input := bytes.NewReader(c)
 	zipReader, err := zip.NewReader(input, int64(len(c)))
 	if nil != err {
 		return nil, err
 	}
 
-	var seeds Seeds
+	var seeds []routerInfo
 	for _, f := range zipReader.File {
 		rc, err := f.Open()
 		if err != nil {