idk/reseed-tools
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

prefer server ciphers

Browse Source
This commit is contained in:
Matt Drollette
2014-12-14 18:55:14 -06:00
parent 664764aeb4
commit aa33b176c8
3 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
cmd/reseeder.go
View File

@@ -21,10 +21,22 @@ func NewReseedCommand() cli.Command {
Name: "signer",
Usage: "Your su3 signing ID (ex. something@mail.i2p)",
},
cli.StringFlag{
Name: "key",
Usage: "Path to your su3 signing private key",
},
cli.StringFlag{
Name: "netdb",
Usage: "Path to NetDB directory containing routerInfos",
},
cli.StringFlag{
Name: "tlsCert",
Usage: "Path to a TLS certificate",
},
cli.StringFlag{
Name: "tlsKey",
Usage: "Path to a TLS private key",
},
cli.StringFlag{
Name: "ip",
Value: "0.0.0.0",
@@ -35,19 +47,6 @@ func NewReseedCommand() cli.Command {
Value: "8080",
Usage: "Port to listen on",
},
cli.StringFlag{
Name: "tlsCert",
Usage: "Path to TLS certificate",
},
cli.StringFlag{
Name: "tlsKey",
Usage: "Path to TLS private key",
},
cli.StringFlag{
Name: "keyFile",
Value: "reseed_private.pem",
Usage: "Path to your su3 signing private key",
},
cli.IntFlag{
Name: "numRi",
Value: 75,
@@ -55,7 +54,8 @@ func NewReseedCommand() cli.Command {
},
cli.IntFlag{
Name: "numSu3",
Usage: "Number of su3 files to build",
Value: 0,
Usage: "Number of su3 files to build (0 = automatic based on size of netdb)",
},
cli.StringFlag{
Name: "interval",
@@ -64,6 +64,7 @@ func NewReseedCommand() cli.Command {
},
cli.StringFlag{
Name: "prefix",
Value: "",
Usage: "Prefix path for the HTTP(S) server. (ex. /netdb)",
},
cli.BoolFlag{
@@ -88,18 +89,30 @@ func reseedAction(c *cli.Context) {
return
}
// @todo: prompt to generate a new key
signerKey := c.String("key")
if signerKey == "" {
fmt.Println("--key is required")
return
}
reloadIntvl, err := time.ParseDuration(c.String("interval"))
if nil != err {
log.Fatalf("'%s' is not a valid time interval.\n", reloadIntvl)
fmt.Printf("'%s' is not a valid time interval.\n", reloadIntvl)
return
}
// @todo: prompt to generate a new key
tlsKey := c.String("tlsKey")
tlsCert := c.String("tlsCert")
// use all cores
cpus := runtime.NumCPU()
runtime.GOMAXPROCS(cpus)
log.Printf("Using %d CPU cores.\n", cpus)
// load our signing privKey
privKey, err := loadPrivateKey(c.String("keyfile"))
privKey, err := loadPrivateKey(signerKey)
if nil != err {
log.Fatalln(err)
}
@@ -121,13 +134,11 @@ func reseedAction(c *cli.Context) {
server.Reseeder = reseeder
server.Addr = net.JoinHostPort(c.String("ip"), c.String("port"))
// @todo check if tls cert exists, prompt to generate a new one if not
log.Printf("Server listening on %s\n", server.Addr)
if c.String("tlsCert") != "" && c.String("tlsKey") != "" {
log.Fatalln(server.ListenAndServeTLS(c.String("tlscert"), c.String("tlskey")))
if tlsCert != "" && tlsKey != "" {
log.Printf("HTTPS server started on %s\n", server.Addr)
log.Fatalln(server.ListenAndServeTLS(tlsCert, tlsKey))
} else {
log.Printf("HTTP server started on %s\n", server.Addr)
log.Fatalln(server.ListenAndServe())
}
}