Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

configure jwt secret #175

Merged
merged 1 commit into from Mar 15, 2019
Merged

configure jwt secret #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion cmd/serve/root.go
View file
Open in desktop
Expand Up @@ -29,6 +29,12 @@ var (
Name: "listen, l",
Usage: "Address the server listens to",
},
cli.StringFlag{
Name: "jwt-secret",
Usage: "JWT Secret fof session protection (Default: Randon each start)",
EnvVar: "SHIORI_JWT_SECRET",
Hidden: true,
},
cli.IntFlag{
Name: "port, p",
Value: 8080,
Expand All @@ -53,7 +59,7 @@ var (
}

dataDir := c.GlobalString("data-dir")
hdl, err := newWebHandler(db, dataDir)
hdl, err := newWebHandler(db, dataDir, c.String("jwt-secret"))
// Parse flags
listenAddress := c.String("listen")
port := c.Int("port")
Expand Down
6 changes: 4 additions & 2 deletions cmd/serve/web-handler.go
View file
Open in desktop
Expand Up @@ -21,14 +21,16 @@ type webHandler struct {
}

// newWebHandler returns new webHandler
func newWebHandler(db dt.Database, dataDir string) (*webHandler, error) {
func newWebHandler(db dt.Database, dataDir string, jwtSecret string) (*webHandler, error) {
// Create JWT key
// TODO: allow jwtKey to be configurable (Don't change every start)
jwtKey := make([]byte, 32)
_, err := rand.Read(jwtKey)
if err != nil {
return nil, err
}
if len(jwtSecret) != 0 {
jwtKey = []byte(jwtSecret)
}

// Create handler
handler := &webHandler{
Expand Down