Fix key loading on Windows + move paths into vars
This uses filepath.Join() to make sure they always load correctly
This commit is contained in:
parent
561568343a
commit
96c197453d
17
keys.go
17
keys.go
|
@ -2,6 +2,17 @@ package writefreely
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
|
"path/filepath"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
keysDir = "keys"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
emailKeyPath = filepath.Join(keysDir, "email.aes256")
|
||||||
|
cookieAuthKeyPath = filepath.Join(keysDir, "cookies_auth.aes256")
|
||||||
|
cookieKeyPath = filepath.Join(keysDir, "cookies_enc.aes256")
|
||||||
)
|
)
|
||||||
|
|
||||||
type keychain struct {
|
type keychain struct {
|
||||||
|
@ -12,17 +23,17 @@ func initKeys(app *app) error {
|
||||||
var err error
|
var err error
|
||||||
app.keys = &keychain{}
|
app.keys = &keychain{}
|
||||||
|
|
||||||
app.keys.emailKey, err = ioutil.ReadFile("keys/email.aes256")
|
app.keys.emailKey, err = ioutil.ReadFile(emailKeyPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
app.keys.cookieAuthKey, err = ioutil.ReadFile("keys/cookies_auth.aes256")
|
app.keys.cookieAuthKey, err = ioutil.ReadFile(cookieAuthKeyPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
app.keys.cookieKey, err = ioutil.ReadFile("keys/cookies_enc.aes256")
|
app.keys.cookieKey, err = ioutil.ReadFile(cookieKeyPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue