missed some files

cmd/su3tools.go

@@ -0,0 +1,60 @@
+package cmd
+
+import (
+	"io/ioutil"
+	"log"
+
+	"github.com/MDrollette/go-i2p/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:  "netdb",
+				Usage: "Path to NetDB directory containing routerInfos",
+			},
+			cli.StringFlag{
+				Name:  "signer",
+				Usage: "Your email address or su3 signing ID",
+			},
+			cli.StringFlag{
+				Name:  "keyfile",
+				Value: "reseed_private.pem",
+				Usage: "Path to your su3 signing private key",
+			},
+		},
+	}
+}
+
+func su3Action(c *cli.Context) {
+	// load our signing privKey
+	privKey, err := loadPrivateKey(c.String("keyfile"))
+	if nil != err {
+		log.Fatalln(err)
+	}
+
+	netdb := reseed.NewLocalNetDb(c.String("netdb"))
+	reseeder := reseed.NewReseeder(netdb)
+	reseeder.SignerId = []byte(c.String("signer"))
+	reseeder.SigningKey = privKey
+
+	// make a fake peer
+	peer := reseed.Peer("127.0.0.1")
+	seeds, err := reseeder.Seeds(peer)
+	if nil != err {
+		log.Fatalln(err)
+		return
+	}
+
+	// create an SU3 from the seed
+	su3File, err := reseeder.CreateSu3(seeds)
+
+	//write the file to disk
+	ioutil.WriteFile("i2pseeds.su3", su3File.Bytes(), 0777)
+}

cmd/utils.go

@@ -0,0 +1,22 @@
+package cmd
+
+import (
+	"crypto/rsa"
+	"crypto/x509"
+	"encoding/pem"
+	"io/ioutil"
+)
+
+func loadPrivateKey(path string) (*rsa.PrivateKey, error) {
+	privPem, err := ioutil.ReadFile(path)
+	if nil != err {
+		return nil, err
+	}
+	privDer, _ := pem.Decode(privPem)
+	privKey, err := x509.ParsePKCS1PrivateKey(privDer.Bytes)
+	if nil != err {
+		return nil, err
+	}
+
+	return privKey, nil
+}

reseed/service.go

@@ -0,0 +1,123 @@
+package reseed
+
+import (
+	"crypto/rsa"
+	"io/ioutil"
+	"log"
+	"math/rand"
+	"net"
+	"net/http"
+	"os"
+	"path/filepath"
+	"regexp"
+
+	"github.com/MDrollette/go-i2p/su3"
+)
+
+type routerInfo struct {
+	Name string
+	Data []byte
+}
+
+type Peer string
+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)
+}
+
+type ReseederImpl struct {
+	netdb      NetDbProvider
+	SigningKey *rsa.PrivateKey
+	SignerId   []byte
+}
+
+func NewReseeder(netdb NetDbProvider) *ReseederImpl {
+	return &ReseederImpl{
+		netdb: netdb,
+	}
+}
+
+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 {
+	ip, _, _ := net.SplitHostPort(r.RemoteAddr)
+	return Peer(ip)
+}
+
+func (rs *ReseederImpl) CreateSu3(seeds Seeds) (*su3.Su3File, error) {
+	su3File := su3.NewSu3File()
+	su3File.FileType = su3.FILE_TYPE_ZIP
+	su3File.ContentType = su3.CONTENT_TYPE_RESEED
+
+	zipped, err := zipSeeds(seeds)
+	if nil != err {
+		return nil, err
+	}
+	su3File.Content = zipped
+
+	su3File.SignerId = rs.SignerId
+	su3File.Sign(rs.SigningKey)
+
+	return su3File, nil
+}
+
+type NetDbProvider interface {
+	// Get all router infos
+	RouterInfos() ([]routerInfo, error)
+}
+
+type LocalNetDbImpl struct {
+	Path string
+}
+
+func NewLocalNetDb(path string) *LocalNetDbImpl {
+	return &LocalNetDbImpl{
+		Path: path,
+	}
+}
+
+func (db *LocalNetDbImpl) RouterInfos() (routerInfos []routerInfo, err error) {
+	var src []os.FileInfo
+	if src, err = ioutil.ReadDir(db.Path); nil != err {
+		return
+	}
+
+	// randomize the file order
+	files := make([]os.FileInfo, len(src))
+	perm := rand.Perm(len(src))
+	for i, v := range perm {
+		files[v] = src[i]
+	}
+
+	r, _ := regexp.Compile("^routerInfo-[A-Za-z0-9-=~]+.dat$")
+
+	for _, file := range files {
+		if r.MatchString(file.Name()) {
+			riBytes, err := ioutil.ReadFile(filepath.Join(db.Path, file.Name()))
+			if nil != err {
+				log.Println(err)
+				continue
+			}
+
+			routerInfos = append(routerInfos, routerInfo{
+				Name: file.Name(),
+				Data: riBytes,
+			})
+		}
+	}
+
+	return
+}