third-party-mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-06-09 20:02:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removed unnecessary code

Browse Source
This commit is contained in:
Deluan 2021-05-11 18:55:58 -04:00
parent fa9083ddec
commit 22ce5b6282
3 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/auth/auth.go
View File

@ -17,11 +17,11 @@ var (
once sync.Once once sync.Once
Secret []byte Secret []byte
TokenAuth *jwtauth.JWTAuth TokenAuth *jwtauth.JWTAuth
sessionTimeOut time.Duration
) )
func InitTokenAuth(ds model.DataStore) { func Init(ds model.DataStore) {
once.Do(func() { once.Do(func() {
log.Info("Setting Session Timeout", "value", conf.Server.SessionTimeout)
secret, err := ds.Property(context.TODO()).DefaultGet(consts.JWTSecretKey, "not so secret") secret, err := ds.Property(context.TODO()).DefaultGet(consts.JWTSecretKey, "not so secret")
if err != nil { if err != nil {
log.Error("No JWT secret found in DB. Setting a temp one, but please report this error", err) log.Error("No JWT secret found in DB. Setting a temp one, but please report this error", err)
@ -46,22 +46,13 @@ func CreateToken(u *model.User) (string, error) {
return TouchToken(token) return TouchToken(token)
} }
func getSessionTimeOut() time.Duration {
if sessionTimeOut == 0 {
sessionTimeOut = conf.Server.SessionTimeout
log.Info("Setting Session Timeout", "value", sessionTimeOut)
}
return sessionTimeOut
}
func TouchToken(token jwt.Token) (string, error) { func TouchToken(token jwt.Token) (string, error) {
claims, err := token.AsMap(context.Background()) claims, err := token.AsMap(context.Background())
if err != nil { if err != nil {
return "", err return "", err
} }
timeout := getSessionTimeOut() claims[jwt.ExpirationKey] = time.Now().UTC().Add(conf.Server.SessionTimeout).Unix()
claims[jwt.ExpirationKey] = time.Now().UTC().Add(timeout).Unix()
_, newToken, err := TokenAuth.Encode(claims) _, newToken, err := TokenAuth.Encode(claims)
return newToken, err return newToken, err

6
server/app/auth.go
View File

@ -26,7 +26,7 @@ var (
) )
func Login(ds model.DataStore) func(w http.ResponseWriter, r *http.Request) { func Login(ds model.DataStore) func(w http.ResponseWriter, r *http.Request) {
auth.InitTokenAuth(ds) auth.Init(ds)
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
username, password, err := getCredentialsFromBody(r) username, password, err := getCredentialsFromBody(r)
@ -85,7 +85,7 @@ func getCredentialsFromBody(r *http.Request) (username string, password string,
} }
func CreateAdmin(ds model.DataStore) func(w http.ResponseWriter, r *http.Request) { func CreateAdmin(ds model.DataStore) func(w http.ResponseWriter, r *http.Request) {
auth.InitTokenAuth(ds) auth.Init(ds)
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
username, password, err := getCredentialsFromBody(r) username, password, err := getCredentialsFromBody(r)
@ -190,7 +190,7 @@ func verifier() func(http.Handler) http.Handler {
} }
func authenticator(ds model.DataStore) func(next http.Handler) http.Handler { func authenticator(ds model.DataStore) func(next http.Handler) http.Handler {
auth.InitTokenAuth(ds) auth.Init(ds)
return func(next http.Handler) http.Handler { return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

2
server/subsonic/middlewares_test.go
View File

@ -270,8 +270,8 @@ var _ = Describe("Middlewares", func() {
Context("JWT based authentication", func() { Context("JWT based authentication", func() {
var validToken string var validToken string
BeforeEach(func() { BeforeEach(func() {
auth.InitTokenAuth(ds)
conf.Server.SessionTimeout = time.Minute conf.Server.SessionTimeout = time.Minute
auth.Init(ds)
u := &model.User{UserName: "admin"} u := &model.User{UserName: "admin"}
var err error var err error