Merge pull request hoisie#207 from hoisie/key-cleanup

hoisie · web-flow · commit a498c022b2c0 · 2016-08-09T07:13:53.000-07:00
Move encKey and signKey from ServerConfig to Server
diff --git a/secure_cookie.go b/secure_cookie.go
@@ -25,18 +25,18 @@ var (
 )
 
 func (ctx *Context) SetSecureCookie(name string, val string, age int64) error {
-	serverConfig := ctx.Server.Config
-	if len(serverConfig.CookieSecret) == 0 {
+	server := ctx.Server
+	if len(server.Config.CookieSecret) == 0 {
 		return ErrMissingCookieSecret
 	}
-	if len(serverConfig.encKey) == 0 || len(serverConfig.signKey) == 0 {
+	if len(server.encKey) == 0 || len(server.signKey) == 0 {
 		return ErrInvalidKey
 	}
-	ciphertext, err := encrypt([]byte(val), serverConfig.encKey)
+	ciphertext, err := encrypt([]byte(val), server.encKey)
 	if err != nil {
 		return err
 	}
-	sig := sign(ciphertext, serverConfig.signKey)
+	sig := sign(ciphertext, server.signKey)
 	data := base64.StdEncoding.EncodeToString(ciphertext) + "|" + base64.StdEncoding.EncodeToString(sig)
 	ctx.SetCookie(NewCookie(name, data, age))
 	return nil
@@ -59,11 +59,11 @@ func (ctx *Context) GetSecureCookie(name string) (string, bool) {
 		if err != nil {
 			return "", false
 		}
-		expectedSig := sign([]byte(ciphertext), ctx.Server.Config.signKey)
+		expectedSig := sign([]byte(ciphertext), ctx.Server.signKey)
 		if !bytes.Equal(expectedSig, sig) {
 			return "", false
 		}
-		plaintext, err := decrypt(ciphertext, ctx.Server.Config.encKey)
+		plaintext, err := decrypt(ciphertext, ctx.Server.encKey)
 		if err != nil {
 			return "", false
 		}
diff --git a/server.go b/server.go
@@ -28,8 +28,6 @@ type ServerConfig struct {
 	RecoverPanic bool
 	Profiler     bool
 	ColorOutput  bool
-	encKey       []byte
-	signKey      []byte
 }
 
 // Server represents a web.go server.
@@ -39,7 +37,9 @@ type Server struct {
 	Logger *log.Logger
 	Env    map[string]interface{}
 	//save the listener so it can be closed
-	l net.Listener
+	l       net.Listener
+	encKey  []byte
+	signKey []byte
 }
 
 func NewServer() *Server {
@@ -61,8 +61,8 @@ func (s *Server) initServer() {
 
 	if len(s.Config.CookieSecret) > 0 {
 		s.Logger.Println("Generating cookie encryption keys")
-		s.Config.encKey = genKey(s.Config.CookieSecret, "encryption key salt")
-		s.Config.signKey = genKey(s.Config.CookieSecret, "signature key salt")
+		s.encKey = genKey(s.Config.CookieSecret, "encryption key salt")
+		s.signKey = genKey(s.Config.CookieSecret, "signature key salt")
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -25,18 +25,18 @@ var (`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`func (ctx *Context) SetSecureCookie(name string, val string, age int64) error {`
`28`		`- serverConfig := ctx.Server.Config`
`29`		`- if len(serverConfig.CookieSecret) == 0 {`
	`28`	`+ server := ctx.Server`
	`29`	`+ if len(server.Config.CookieSecret) == 0 {`
`30`	`30`	`return ErrMissingCookieSecret`
`31`	`31`	`}`
`32`		`- if len(serverConfig.encKey) == 0 \|\| len(serverConfig.signKey) == 0 {`
	`32`	`+ if len(server.encKey) == 0 \|\| len(server.signKey) == 0 {`
`33`	`33`	`return ErrInvalidKey`
`34`	`34`	`}`
`35`		`- ciphertext, err := encrypt([]byte(val), serverConfig.encKey)`
	`35`	`+ ciphertext, err := encrypt([]byte(val), server.encKey)`
`36`	`36`	`if err != nil {`
`37`	`37`	`return err`
`38`	`38`	`}`
`39`		`- sig := sign(ciphertext, serverConfig.signKey)`
	`39`	`+ sig := sign(ciphertext, server.signKey)`
`40`	`40`	`data := base64.StdEncoding.EncodeToString(ciphertext) + "\|" + base64.StdEncoding.EncodeToString(sig)`
`41`	`41`	`ctx.SetCookie(NewCookie(name, data, age))`
`42`	`42`	`return nil`
`@@ -59,11 +59,11 @@ func (ctx *Context) GetSecureCookie(name string) (string, bool) {`
`59`	`59`	`if err != nil {`
`60`	`60`	`return "", false`
`61`	`61`	`}`
`62`		`- expectedSig := sign([]byte(ciphertext), ctx.Server.Config.signKey)`
	`62`	`+ expectedSig := sign([]byte(ciphertext), ctx.Server.signKey)`
`63`	`63`	`if !bytes.Equal(expectedSig, sig) {`
`64`	`64`	`return "", false`
`65`	`65`	`}`
`66`		`- plaintext, err := decrypt(ciphertext, ctx.Server.Config.encKey)`
	`66`	`+ plaintext, err := decrypt(ciphertext, ctx.Server.encKey)`
`67`	`67`	`if err != nil {`
`68`	`68`	`return "", false`
`69`	`69`	`}`