fully convert redis over to custom key value store type

This commit is contained in:
Gregory Wells
2026-06-08 18:24:59 -04:00
parent f6016bbdb1
commit 09e0683ae0
5 changed files with 94 additions and 85 deletions
+76 -76
View File
@@ -1,90 +1,90 @@
package session
import (
"sync"
"time"
// import (
// "sync"
// "time"
"astraltech.xyz/accountmanager/src/logging"
"astraltech.xyz/accountmanager/src/worker"
)
// "astraltech.xyz/accountmanager/src/logging"
// "astraltech.xyz/accountmanager/src/worker"
// )
type MemoryStore struct {
sessions map[string]*SessionData
lock sync.RWMutex
}
// type MemoryStore struct {
// sessions map[string]*SessionData
// lock sync.RWMutex
// }
func NewMemoryStore() *MemoryStore {
logging.Debug("Creating new in memory session store")
store := &MemoryStore{
sessions: make(map[string]*SessionData),
}
worker.CreateWorker(time.Minute*5, store.cleanup)
return store
}
// func NewMemoryStore() *MemoryStore {
// logging.Debug("Creating new in memory session store")
// store := &MemoryStore{
// sessions: make(map[string]*SessionData),
// }
// worker.CreateWorker(time.Minute*5, store.cleanup)
// return store
// }
func (m *MemoryStore) Create(sessionID string, session *SessionData) (err error) {
hashedSession := hashSession(sessionID)
// func (m *MemoryStore) Create(sessionID string, session *SessionData) (err error) {
// hashedSession := hashSession(sessionID)
m.lock.Lock()
defer m.lock.Unlock()
_, exist := m.sessions[hashedSession]
if exist {
return ErrSessionAlreadyExists
}
// m.lock.Lock()
// defer m.lock.Unlock()
// _, exist := m.sessions[hashedSession]
// if exist {
// return ErrSessionAlreadyExists
// }
m.sessions[hashedSession] = session
return nil
}
func (m *MemoryStore) Get(sessionID string) (*SessionData, error) {
m.lock.RLock()
hashed := hashSession(sessionID)
data, exists := m.sessions[hashed]
m.lock.RUnlock()
if exists == false {
return nil, ErrSessionNotFound
}
copy := *data
return &copy, nil
}
func (m *MemoryStore) Update(sessionID string, session *SessionData) error {
hashedSession := hashSession(sessionID)
// m.sessions[hashedSession] = session
// return nil
// }
// func (m *MemoryStore) Get(sessionID string) (*SessionData, error) {
// m.lock.RLock()
// hashed := hashSession(sessionID)
// data, exists := m.sessions[hashed]
// m.lock.RUnlock()
// if exists == false {
// return nil, ErrSessionNotFound
// }
// copy := *data
// return &copy, nil
// }
// func (m *MemoryStore) Update(sessionID string, session *SessionData) error {
// hashedSession := hashSession(sessionID)
m.lock.Lock()
defer m.lock.Unlock()
_, exist := m.sessions[hashedSession]
if !exist {
return ErrSessionNotFound
}
m.sessions[hashedSession] = session
return nil
}
// m.lock.Lock()
// defer m.lock.Unlock()
// _, exist := m.sessions[hashedSession]
// if !exist {
// return ErrSessionNotFound
// }
// m.sessions[hashedSession] = session
// return nil
// }
func (m *MemoryStore) cleanup() {
logging.Debug("Cleaning up memory store sessions")
now := time.Now()
// func (m *MemoryStore) cleanup() {
// logging.Debug("Cleaning up memory store sessions")
// now := time.Now()
m.lock.Lock()
defer m.lock.Unlock()
// m.lock.Lock()
// defer m.lock.Unlock()
deleted := 0
for id, session := range m.sessions {
if now.After(session.ExpiresAt) {
delete(m.sessions, id)
deleted = deleted + 1
}
}
logging.Infof("Cleaned up %d stale sessions", deleted)
}
// deleted := 0
// for id, session := range m.sessions {
// if now.After(session.ExpiresAt) {
// delete(m.sessions, id)
// deleted = deleted + 1
// }
// }
// logging.Infof("Cleaned up %d stale sessions", deleted)
// }
func (m *MemoryStore) Delete(sessionID string) error {
hashedSession := hashSession(sessionID)
// func (m *MemoryStore) Delete(sessionID string) error {
// hashedSession := hashSession(sessionID)
m.lock.Lock()
defer m.lock.Unlock()
_, exist := m.sessions[hashedSession]
if !exist {
return ErrSessionNotFound
}
delete(m.sessions, hashedSession)
return nil
}
// m.lock.Lock()
// defer m.lock.Unlock()
// _, exist := m.sessions[hashedSession]
// if !exist {
// return ErrSessionNotFound
// }
// delete(m.sessions, hashedSession)
// return nil
// }
+6 -6
View File
@@ -12,7 +12,7 @@ import (
const SessionCookieName = "session_token"
type SessionManager struct {
store store.Store[string, *SessionData]
store store.KeyValueStore[*SessionData]
}
var instance *SessionManager
@@ -37,12 +37,12 @@ func (manager *SessionManager) SetStoreType(storeType StoreType) {
switch storeType {
case InMemory:
{
manager.store = NewMemoryStore()
// manager.store = NewMemoryStore()
break
}
case Redis:
{
manager.store = NewRedisStore()
manager.store = store.NewRedisStore[*SessionData]()
break
}
}
@@ -72,10 +72,10 @@ func (manager *SessionManager) CreateSession(userID string) (cookie *http.Cookie
Name: SessionCookieName,
Value: token,
Path: "/",
HttpOnly: true, // Essential: prevents JS access
Secure: true, // Set to TRUE in production (HTTPS)
HttpOnly: true,
Secure: true,
SameSite: http.SameSiteLaxMode,
MaxAge: 3600, // 1 hour
MaxAge: 3600,
}
return newCookie, nil
}
+9 -1
View File
@@ -1,6 +1,14 @@
package session
import "time"
import (
"errors"
"time"
)
var ErrSessionNotFound = errors.New("Session not found")
var ErrSessionAlreadyExists = errors.New("Session already exists")
var ErrSessionExpired = errors.New("Session expired")
var ErrSessionBackend = errors.New("Session backend")
type SessionData struct {
UserID string `json:"userid"`
+1 -1
View File
@@ -2,7 +2,7 @@ package store
// A simple key value store that can either just be single instance in memory or a redis server (for now)
type Store[Value any] interface {
type KeyValueStore[Value any] interface {
Create(key string, value Value) error
Get(key string) (Value, error)
Update(key string, session Value) error
+2 -1
View File
@@ -42,6 +42,7 @@ func NewRedisStore[Value any]() *RedisStore[Value] {
store := &RedisStore[Value]{
client: rdb,
ctx: ctx,
prefix: "random_string_1",
}
return store
}
@@ -77,7 +78,7 @@ func (m *RedisStore[Value]) Get(sessionID string) (Value, error) {
return session_data, ErrKeyBackend
}
if err := json.Unmarshal(data, session_data); err != nil {
if err := json.Unmarshal(data, &session_data); err != nil {
logging.Error(err.Error())
return session_data, ErrKeyBackend
}