beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Config: Refresh expired sessions on startup

Browse source 
Signed-off-by: Michael Mayer <michael@lastzero.net>
This commit is contained in:
Michael Mayer 2020-10-07 12:47:12 +02:00
parent 13383ac701
commit 95e51a9754
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
internal/pro/config.go
View file

@ -8,6 +8,7 @@ import (
"crypto/sha256"
"encoding/hex"
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"net/http"
@ -197,6 +198,12 @@ func (c *Config) Load() error {
c.Sanitize()
c.Propagate()
if sess, err := c.DecodeSession(); err != nil {
return err
} else if sess.Expired() {
return errors.New("session expired")
}
return nil
}

14
internal/pro/pro_test.go
View file

@ -124,23 +124,15 @@ func TestConfig_DecodeSession(t *testing.T) {
t.Run("pro3.yml", func(t *testing.T) {
c := NewConfig("develop", "testdata/pro3.yml")
if err := c.Load(); err != nil {
t.Fatal(err)
}
err := c.Load()
assert.EqualError(t, err, "session expired")
assert.Equal(t, "8dd8b115d052f91ac74b1c2475e305009366c487", c.Key)
assert.Equal(t, "ddf4ce46afbf6c16a6bd8555ab1e4efb", c.Secret)
assert.Equal(t, "7607796238c26b2d95007957b05c72d63f504346576bc2aa064a6dc54344de47d2ab38422bd1d061c067a16ef517e6054d8b7f5336c120431935518277fed45e49472aaf740cac1bc33ab2e362c767007a59e953e9973709", c.Session)
assert.Equal(t, "unregistered", c.Status)
assert.Equal(t, "develop", c.Version)
if sess, err := c.DecodeSession(); err != nil {
t.Fatal(err)
} else if sess.Expired() {
t.Logf("expired session: %+v", sess)
} else {
t.Errorf("session should be expired: %+v", sess)
}
})
}