mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-16 14:40:12 +01:00
* chore(publish-auth): Add TODO for cookie-based auth in publish proxy A TODO comment was added to indicate future implementation of authentication using cookies in the PublishServiceTransport RoundTrip method. * 🎨 Add session-based authentication for publish proxy Introduces session management using cookies for the publish reverse proxy server. Adds session ID generation, storage, and validation in kernel/model/auth.go, and updates the proxy transport to check for valid sessions before falling back to basic authentication. Sets a session cookie upon successful basic auth login. * 🐛 Fixed the issue of repeatedly setting cookies * 🎨 Dynamically remove invalid session IDs * ♻️ Revert changes in pnpm-lock.yaml
161 lines
3.6 KiB
Go
161 lines
3.6 KiB
Go
// SiYuan - Refactor your thinking
|
|
// Copyright (c) 2020-present, b3log.org
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
package model
|
|
|
|
import (
|
|
"crypto/rand"
|
|
"net/http"
|
|
"sync"
|
|
|
|
"github.com/golang-jwt/jwt/v5"
|
|
"github.com/google/uuid"
|
|
"github.com/siyuan-note/logging"
|
|
)
|
|
|
|
type Account struct {
|
|
Username string
|
|
Password string
|
|
Token string
|
|
}
|
|
type AccountsMap map[string]*Account // username -> account
|
|
type SessionsMap map[string]string // sessionID -> username
|
|
type ClaimsKeyType string
|
|
|
|
const (
|
|
XAuthTokenKey = "X-Auth-Token"
|
|
|
|
SessionIdCookieName = "publish-visitor-session-id"
|
|
|
|
ClaimsContextKey = "claims"
|
|
|
|
iss = "siyuan-publish-reverse-proxy-server"
|
|
sub = "publish"
|
|
aud = "siyuan-kernel"
|
|
|
|
ClaimsKeyRole string = "role"
|
|
)
|
|
|
|
var (
|
|
accountsMap = AccountsMap{}
|
|
sessionsMap = SessionsMap{}
|
|
sessionLock = sync.Mutex{}
|
|
|
|
jwtKey = make([]byte, 32)
|
|
)
|
|
|
|
func GetBasicAuthAccount(username string) *Account {
|
|
return accountsMap[username]
|
|
}
|
|
|
|
func GetBasicAuthUsernameBySessionID(sessionID string) string {
|
|
return sessionsMap[sessionID]
|
|
}
|
|
|
|
func GetNewSessionID() string {
|
|
sessionID := uuid.New().String()
|
|
return sessionID
|
|
}
|
|
|
|
func AddSession(sessionID, username string) {
|
|
sessionLock.Lock()
|
|
defer sessionLock.Unlock()
|
|
sessionsMap[sessionID] = username
|
|
}
|
|
|
|
func DeleteSession(sessionID string) {
|
|
sessionLock.Lock()
|
|
defer sessionLock.Unlock()
|
|
delete(sessionsMap, sessionID)
|
|
}
|
|
|
|
func InitAccounts() {
|
|
accountsMap = AccountsMap{
|
|
"": &Account{}, // 匿名用户
|
|
}
|
|
for _, account := range Conf.Publish.Auth.Accounts {
|
|
accountsMap[account.Username] = &Account{
|
|
Username: account.Username,
|
|
Password: account.Password,
|
|
}
|
|
}
|
|
|
|
InitJWT()
|
|
}
|
|
|
|
func InitJWT() {
|
|
if _, err := rand.Read(jwtKey); err != nil {
|
|
logging.LogErrorf("generate JWT signing key failed: %s", err)
|
|
return
|
|
}
|
|
|
|
for username, account := range accountsMap {
|
|
// REF: https://golang-jwt.github.io/jwt/usage/create/
|
|
t := jwt.NewWithClaims(
|
|
jwt.SigningMethodHS256,
|
|
jwt.MapClaims{
|
|
"iss": iss,
|
|
"sub": sub,
|
|
"aud": aud,
|
|
"jti": username,
|
|
|
|
ClaimsKeyRole: RoleReader,
|
|
},
|
|
)
|
|
if token, err := t.SignedString(jwtKey); err != nil {
|
|
logging.LogErrorf("JWT signature failed: %s", err)
|
|
return
|
|
} else {
|
|
account.Token = token
|
|
}
|
|
}
|
|
}
|
|
|
|
func ParseJWT(tokenString string) (*jwt.Token, error) {
|
|
// REF: https://golang-jwt.github.io/jwt/usage/parse/
|
|
return jwt.Parse(
|
|
tokenString,
|
|
func(token *jwt.Token) (interface{}, error) {
|
|
return jwtKey, nil
|
|
},
|
|
jwt.WithIssuer(iss),
|
|
jwt.WithSubject(sub),
|
|
jwt.WithAudience(aud),
|
|
)
|
|
}
|
|
|
|
func ParseXAuthToken(r *http.Request) *jwt.Token {
|
|
tokenString := r.Header.Get(XAuthTokenKey)
|
|
if tokenString != "" {
|
|
if token, err := ParseJWT(tokenString); err != nil {
|
|
logging.LogErrorf("JWT parse failed: %s", err)
|
|
} else {
|
|
return token
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func GetTokenClaims(token *jwt.Token) jwt.MapClaims {
|
|
return token.Claims.(jwt.MapClaims)
|
|
}
|
|
|
|
func GetClaimRole(claims jwt.MapClaims) Role {
|
|
if role := claims[ClaimsKeyRole]; role != nil {
|
|
return Role(role.(float64))
|
|
}
|
|
return RoleVisitor
|
|
}
|