ston1th/gowiki
0
0
Fork 0
Code Issues 2 Releases Activity

minor bugfixes and cleanup

Browse source
This commit is contained in:
ston1th 2018-09-19 00:10:16 +02:00
commit 97d914bce4
26 changed files with 198 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

29
pkg/server/server.go
View file

@ -1,3 +1,5 @@
// Copyright (C) 2018 Marius Schellenberger
package server
import (
@ -9,6 +11,7 @@ import (
"net/http"
"time"
"git.giftfish.de/ston1th/gowiki/pkg/core"
"git.giftfish.de/ston1th/gowiki/pkg/db"
"git.giftfish.de/ston1th/gowiki/pkg/log"
"git.giftfish.de/ston1th/jwt"
@ -19,10 +22,13 @@ const (
)
type HTTPServer struct {
Version string
indexPath string
listener net.Listener
srv *http.Server
Version string
Secure bool
Secret string
DataDir string
listener net.Listener
srv *http.Server
DB *db.DB
JWT *jwt.JWT
@ -31,9 +37,12 @@ type HTTPServer struct {
res map[string][]byte
}
func NewHTTPServer(l net.Listener, version, indexPath string, secCookie bool) (srv *HTTPServer) {
func NewHTTPServer(l net.Listener, conf core.Config) (srv *HTTPServer) {
srv = &HTTPServer{
Version: version,
Version: conf.Version,
Secure: conf.SecureCookie,
Secret: conf.Secret,
DataDir: conf.DataDir,
listener: l,
}
srv.loadTemplates()
@ -44,13 +53,15 @@ func NewHTTPServer(l net.Listener, version, indexPath string, secCookie bool) (s
}
func (s *HTTPServer) Start() (err error) {
//TODO make secret configurable
buf := bytes.NewBufferString("be688838ca8686e5c90689bf2ab585cef1137c999b48c70b92f67a5c34dc15697b5d11c982ed6d71be1e1e7f7b4e0733884aa97c3f7a339a8ed03577cf74be09")
var buf *bytes.Buffer
if s.Secret != "" {
buf = bytes.NewBufferString(s.Secret)
}
s.JWT, err = jwt.New(jwt.DefaultExpiry, jwt.NewMemBlacklist(), buf)
if err != nil {
return
}
s.DB, err = db.New(s.indexPath)
s.DB, err = db.New(s.DataDir)
if err != nil {
return
}