mirror of
https://github.com/m1k1o/neko.git
synced 2024-07-24 14:40:50 +12:00
OnHostChanged event and add tokens to session.
This commit is contained in:
parent
453a6905f7
commit
3fcca6ab52
@ -68,7 +68,7 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) {
|
||||
// TODO: Refactor.
|
||||
// data.ID
|
||||
|
||||
session, err := h.sessions.Create(*data.MemberProfile)
|
||||
session, _, err := h.sessions.Create(*data.MemberProfile)
|
||||
if err != nil {
|
||||
utils.HttpInternalServerError(w, err)
|
||||
return
|
||||
|
@ -31,7 +31,7 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
// TODO: Proper login.
|
||||
session, err := api.sessions.Create(types.MemberProfile{
|
||||
session, token, err := api.sessions.Create(types.MemberProfile{
|
||||
Name: data.ID,
|
||||
IsAdmin: true,
|
||||
CanLogin: true,
|
||||
@ -53,7 +53,7 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
http.SetCookie(w, &http.Cookie{
|
||||
Name: "NEKO_SESSION",
|
||||
Value: session.ID(),
|
||||
Value: token,
|
||||
Expires: CookieExpirationDate,
|
||||
Secure: !UnsecureCookies,
|
||||
SameSite: sameSite,
|
||||
|
@ -14,7 +14,7 @@ func (manager *SessionManagerCtx) Authenticate(r *http.Request) (types.Session,
|
||||
return nil, fmt.Errorf("no authentication provided")
|
||||
}
|
||||
|
||||
session, ok := manager.Get(token)
|
||||
session, ok := manager.GetByToken(token)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("session not found")
|
||||
}
|
||||
|
@ -19,6 +19,7 @@ func New(config *config.Session) *SessionManagerCtx {
|
||||
config: config,
|
||||
host: nil,
|
||||
hostMu: sync.Mutex{},
|
||||
tokens: make(map[string]string),
|
||||
sessions: make(map[string]*SessionCtx),
|
||||
sessionsMu: sync.Mutex{},
|
||||
emmiter: events.New(),
|
||||
@ -30,36 +31,48 @@ type SessionManagerCtx struct {
|
||||
config *config.Session
|
||||
host types.Session
|
||||
hostMu sync.Mutex
|
||||
tokens map[string]string
|
||||
sessions map[string]*SessionCtx
|
||||
sessionsMu sync.Mutex
|
||||
emmiter events.EventEmmiter
|
||||
}
|
||||
|
||||
func (manager *SessionManagerCtx) Create(profile types.MemberProfile) (types.Session, error) {
|
||||
func (manager *SessionManagerCtx) Create(profile types.MemberProfile) (types.Session, string, error) {
|
||||
id, err := utils.NewUID(32)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return nil, "", err
|
||||
}
|
||||
|
||||
token, err := utils.NewUID(64)
|
||||
if err != nil {
|
||||
return nil, "", err
|
||||
}
|
||||
|
||||
manager.sessionsMu.Lock()
|
||||
_, ok := manager.sessions[id]
|
||||
if ok {
|
||||
if _, ok := manager.sessions[id]; ok {
|
||||
manager.sessionsMu.Unlock()
|
||||
return nil, fmt.Errorf("Session id already exists.")
|
||||
return nil, "", fmt.Errorf("Session id already exists.")
|
||||
}
|
||||
|
||||
if _, ok := manager.tokens[token]; ok {
|
||||
manager.sessionsMu.Unlock()
|
||||
return nil, "", fmt.Errorf("Session token already exists.")
|
||||
}
|
||||
|
||||
session := &SessionCtx{
|
||||
id: id,
|
||||
token: token,
|
||||
manager: manager,
|
||||
logger: manager.logger.With().Str("id", id).Logger(),
|
||||
profile: profile,
|
||||
}
|
||||
|
||||
manager.tokens[token] = id
|
||||
manager.sessions[id] = session
|
||||
manager.sessionsMu.Unlock()
|
||||
|
||||
manager.emmiter.Emit("created", session)
|
||||
return session, nil
|
||||
return session, token, nil
|
||||
}
|
||||
|
||||
func (manager *SessionManagerCtx) Update(id string, profile types.MemberProfile) error {
|
||||
@ -87,6 +100,10 @@ func (manager *SessionManagerCtx) Delete(id string) error {
|
||||
return fmt.Errorf("Session id not found.")
|
||||
}
|
||||
|
||||
if _, ok := manager.tokens[session.token]; ok {
|
||||
delete(manager.tokens, session.token)
|
||||
}
|
||||
|
||||
delete(manager.sessions, id)
|
||||
manager.sessionsMu.Unlock()
|
||||
|
||||
@ -107,6 +124,18 @@ func (manager *SessionManagerCtx) Get(id string) (types.Session, bool) {
|
||||
return session, ok
|
||||
}
|
||||
|
||||
func (manager *SessionManagerCtx) GetByToken(token string) (types.Session, bool) {
|
||||
manager.sessionsMu.Lock()
|
||||
id, ok := manager.tokens[token]
|
||||
manager.sessionsMu.Unlock()
|
||||
|
||||
if !ok {
|
||||
return nil, false
|
||||
}
|
||||
|
||||
return manager.Get(id)
|
||||
}
|
||||
|
||||
func (manager *SessionManagerCtx) List() []types.Session {
|
||||
manager.sessionsMu.Lock()
|
||||
defer manager.sessionsMu.Unlock()
|
||||
|
@ -10,6 +10,7 @@ import (
|
||||
|
||||
type SessionCtx struct {
|
||||
id string
|
||||
token string
|
||||
logger zerolog.Logger
|
||||
manager *SessionManagerCtx
|
||||
profile types.MemberProfile
|
||||
|
@ -59,10 +59,11 @@ type Session interface {
|
||||
}
|
||||
|
||||
type SessionManager interface {
|
||||
Create(profile MemberProfile) (Session, error)
|
||||
Create(profile MemberProfile) (Session, string, error)
|
||||
Update(id string, profile MemberProfile) error
|
||||
Get(id string) (Session, bool)
|
||||
Delete(id string) error
|
||||
Get(id string) (Session, bool)
|
||||
GetByToken(token string) (Session, bool)
|
||||
List() []Session
|
||||
|
||||
SetHost(host Session)
|
||||
|
Loading…
Reference in New Issue
Block a user