MiauRizius/MiauInv
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Login System

Browse Source
This commit is contained in:
miaurizius
2026-06-03 13:55:48 +02:00
parent bd7b77c196
commit ba87deb32b
2 changed files with 191 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

341
handlers/account.go
View File

@@ -9,6 +9,8 @@ import (
"encoding/json" "encoding/json"
"log" "log"
"net/http" "net/http"
"os"
"time"
) )
var cfg, _ = config.LoadConfig() var cfg, _ = config.LoadConfig()
@@ -37,99 +39,98 @@ func Register(w http.ResponseWriter, r *http.Request) {
user.ID = utils.GenerateUUID() user.ID = utils.GenerateUUID()
user.Role = models.RoleUser user.Role = models.RoleUser
//if err := storage.AddUser(&user); err != nil { if err := storage.AddUser(&user); err != nil {
// log.Println("POST [api/register] " + r.RemoteAddr + ": " + err.Error()) log.Println("POST [api/register] " + r.RemoteAddr + ": " + err.Error())
// http.Error(w, "user already exists", http.StatusBadRequest) http.Error(w, "user already exists", http.StatusBadRequest)
// return return
//} }
w.WriteHeader(http.StatusCreated) w.WriteHeader(http.StatusCreated)
log.Println("POST [api/register] " + r.RemoteAddr + ": Successfully created user") log.Println("POST [api/register] " + r.RemoteAddr + ": Successfully created user")
} }
func Login(w http.ResponseWriter, r *http.Request) { func Login(w http.ResponseWriter, r *http.Request) {
//var creds struct { var creds struct {
// Username string `json:"username"` Username string `json:"username"`
// Password string `json:"password"` Password string `json:"password"`
//} }
//if err := json.NewDecoder(r.Body).Decode(&creds); err != nil { if err := json.NewDecoder(r.Body).Decode(&creds); err != nil {
// log.Println("POST [api/login] " + r.RemoteAddr + ": " + err.Error()) log.Println("POST [api/login] " + r.RemoteAddr + ": " + err.Error())
// http.Error(w, "Invalid request", http.StatusBadRequest) http.Error(w, "Invalid request", http.StatusBadRequest)
// return return
//} }
//
//user, err := storage.GetUserByUsername(creds.Username) user, err := storage.GetUserByUsername(creds.Username)
//if err != nil { if err != nil {
// log.Println("POST [api/login] " + r.RemoteAddr + ": " + err.Error()) log.Println("POST [api/login] " + r.RemoteAddr + ": " + err.Error())
// http.Error(w, "Invalid credentials", http.StatusUnauthorized) http.Error(w, "Invalid credentials", http.StatusUnauthorized)
// return return
//} }
//
//if !auth.CheckPasswordHash(creds.Password, user.Password) { if !auth.CheckPasswordHash(creds.Password, user.Password) {
// log.Println("POST [api/login] " + r.RemoteAddr + ": Invalid credentials") log.Println("POST [api/login] " + r.RemoteAddr + ": Invalid credentials")
// http.Error(w, "Invalid credentials", http.StatusUnauthorized) http.Error(w, "Invalid credentials", http.StatusUnauthorized)
// return return
//} }
//
//secret := []byte(os.Getenv("SHAP_JWT_SECRET")) secret := []byte(os.Getenv("JWT_SECRET"))
//if len(secret) == 0 { if len(secret) == 0 {
// log.Println("POST [api/login] " + r.RemoteAddr + ": Server misconfiguration") log.Println("POST [api/login] " + r.RemoteAddr + ": Server misconfiguration")
// http.Error(w, "Server misconfiguration", http.StatusInternalServerError) http.Error(w, "Server misconfiguration", http.StatusInternalServerError)
// return return
//} }
//
//accessToken, err := auth.GenerateJWT(user.ID, user.Role, secret) accessToken, err := auth.GenerateJWT(user.ID, user.Role, secret)
//if err != nil { if err != nil {
// log.Println("POST [api/login] " + r.RemoteAddr + ": " + err.Error()) log.Println("POST [api/login] " + r.RemoteAddr + ": " + err.Error())
// http.Error(w, "Could not generate token", http.StatusInternalServerError) http.Error(w, "Could not generate token", http.StatusInternalServerError)
// return return
//} }
//
//refreshTokenPlain, err := utils.GenerateRefreshToken() refreshTokenPlain, err := utils.GenerateRefreshToken()
//if err != nil { if err != nil {
// log.Println("POST [api/login] " + r.RemoteAddr + ": " + err.Error()) log.Println("POST [api/login] " + r.RemoteAddr + ": " + err.Error())
// http.Error(w, "could not generate refresh token", http.StatusInternalServerError) http.Error(w, "could not generate refresh token", http.StatusInternalServerError)
// return return
//} }
//refreshHash := utils.HashToken(refreshTokenPlain) refreshHash := utils.HashToken(refreshTokenPlain)
//refreshID := utils.GenerateUUID() refreshID := utils.GenerateUUID()
//refreshExpires := time.Now().Add(7 * 24 * time.Hour).Unix() // expiry: 7 days refreshExpires := time.Now().Add(7 * 24 * time.Hour).Unix() // expiry: 7 days
//
//deviceInfo := r.Header.Get("User-Agent") deviceInfo := r.Header.Get("User-Agent")
//
//if err := storage.AddRefreshToken(&models.RefreshToken{ if err := storage.AddRefreshToken(&models.RefreshToken{
// ID: refreshID, ID: refreshID,
// UserID: user.ID, UserID: user.ID,
// Token: refreshHash, Token: refreshHash,
// ExpiresAt: refreshExpires, ExpiresAt: refreshExpires,
// DeviceInfo: deviceInfo, DeviceInfo: deviceInfo,
// CreatedAt: time.Now().Unix(), CreatedAt: time.Now().Unix(),
// Revoked: false, Revoked: false,
//}); err != nil { }); err != nil {
// log.Println("POST [api/login] " + r.RemoteAddr + ": " + err.Error()) log.Println("POST [api/login] " + r.RemoteAddr + ": " + err.Error())
// http.Error(w, "could not save refresh token", http.StatusInternalServerError) http.Error(w, "could not save refresh token", http.StatusInternalServerError)
// return return
//} }
//
//// Return access + refresh token (refresh in plain for client to store securely) // Return access + refresh token (refresh in plain for client to store securely)
//resp := map[string]interface{}{ resp := map[string]interface{}{
// "access_token": accessToken, "access_token": accessToken,
// "refresh_token": refreshTokenPlain, "refresh_token": refreshTokenPlain,
// "user": map[string]interface{}{ "user": map[string]interface{}{
// "id": user.ID, "id": user.ID,
// "username": user.Username, "username": user.Username,
// "role": user.Role, "role": user.Role,
// }, },
// "wgName": cfg.HouseholdName, }
//}
// w.Header().Set("Content-Type", "application/json")
//w.Header().Set("Content-Type", "application/json") err = json.NewEncoder(w).Encode(resp)
//err = json.NewEncoder(w).Encode(resp) if err != nil {
//if err != nil { log.Println("POST [api/login] " + r.RemoteAddr + ": " + err.Error())
// log.Println("POST [api/login] " + r.RemoteAddr + ": " + err.Error()) http.Error(w, "Something went wrong", http.StatusInternalServerError)
// http.Error(w, "Something went wrong", http.StatusInternalServerError) return
// return }
//} log.Println("POST [api/login] " + r.RemoteAddr + ": Successfully logged in")
//log.Println("POST [api/login] " + r.RemoteAddr + ": Successfully logged in")
} }
func Logout(w http.ResponseWriter, r *http.Request) { func Logout(w http.ResponseWriter, r *http.Request) {
claims := r.Context().Value(auth.UserContextKey).(*auth.Claims) claims := r.Context().Value(auth.UserContextKey).(*auth.Claims)
@@ -157,88 +158,88 @@ func TestHandler(w http.ResponseWriter, r *http.Request) {
log.Println("GET [api/login] " + r.RemoteAddr + ": Successfully tested connection") log.Println("GET [api/login] " + r.RemoteAddr + ": Successfully tested connection")
} }
func RefreshToken(w http.ResponseWriter, r *http.Request) { func RefreshToken(w http.ResponseWriter, r *http.Request) {
//var req struct { var req struct {
// RefreshToken string `json:"refresh_token"` RefreshToken string `json:"refresh_token"`
//} }
//if err := json.NewDecoder(r.Body).Decode(&req); err != nil { if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
// log.Println("POST [api/refresh] " + r.RemoteAddr + ": " + err.Error()) log.Println("POST [api/refresh] " + r.RemoteAddr + ": " + err.Error())
// http.Error(w, "Invalid request", http.StatusBadRequest) http.Error(w, "Invalid request", http.StatusBadRequest)
// return return
//} }
//
//hashed := utils.HashToken(req.RefreshToken) hashed := utils.HashToken(req.RefreshToken)
//
//tokenRow, err := storage.GetRefreshToken(hashed) tokenRow, err := storage.GetRefreshToken(hashed)
//if err != nil || tokenRow.Revoked || tokenRow.ExpiresAt < time.Now().Unix() { if err != nil || tokenRow.Revoked || tokenRow.ExpiresAt < time.Now().Unix() {
// log.Println("POST [api/refresh] " + r.RemoteAddr + ": Invalid refresh token") log.Println("POST [api/refresh] " + r.RemoteAddr + ": Invalid refresh token")
// http.Error(w, "Invalid refresh token", http.StatusUnauthorized) http.Error(w, "Invalid refresh token", http.StatusUnauthorized)
// return return
//} }
//
//if err := storage.RevokeRefreshToken(tokenRow.ID); err != nil { if err := storage.RevokeRefreshToken(tokenRow.ID); err != nil {
// log.Println(err) log.Println(err)
//} }
//
//newToken, _ := utils.GenerateRefreshToken() newToken, _ := utils.GenerateRefreshToken()
//newHash := utils.HashToken(newToken) newHash := utils.HashToken(newToken)
//newExpires := time.Now().Add(7 * 24 * time.Hour).Unix() //7 days newExpires := time.Now().Add(7 * 24 * time.Hour).Unix() //7 days
//newID := utils.GenerateUUID() newID := utils.GenerateUUID()
//deviceInfo := r.Header.Get("User-Agent") deviceInfo := r.Header.Get("User-Agent")
//if err = storage.AddRefreshToken(&models.RefreshToken{ if err = storage.AddRefreshToken(&models.RefreshToken{
// ID: newID, ID: newID,
// UserID: tokenRow.UserID, UserID: tokenRow.UserID,
// Token: newHash, Token: newHash,
// ExpiresAt: newExpires, ExpiresAt: newExpires,
// CreatedAt: time.Now().Unix(), CreatedAt: time.Now().Unix(),
// Revoked: false, Revoked: false,
// DeviceInfo: deviceInfo, DeviceInfo: deviceInfo,
//}); err != nil { }); err != nil {
// log.Println("POST [api/refresh] " + r.RemoteAddr + ": " + err.Error()) log.Println("POST [api/refresh] " + r.RemoteAddr + ": " + err.Error())
// http.Error(w, "Could not generate new refresh token", http.StatusInternalServerError) http.Error(w, "Could not generate new refresh token", http.StatusInternalServerError)
// return return
//} }
//
//user, err := storage.GetUserById(tokenRow.UserID) user, err := storage.GetUserById(tokenRow.UserID)
//if err != nil { if err != nil {
// log.Println("POST [api/refresh] " + r.RemoteAddr + ": " + err.Error()) log.Println("POST [api/refresh] " + r.RemoteAddr + ": " + err.Error())
// http.Error(w, "Internal server error", http.StatusInternalServerError) http.Error(w, "Internal server error", http.StatusInternalServerError)
// return return
//} }
//accessToken, _ := auth.GenerateJWT(tokenRow.UserID, user.Role, []byte(os.Getenv("SHAP_JWT_SECRET"))) accessToken, _ := auth.GenerateJWT(tokenRow.UserID, user.Role, []byte(os.Getenv("JWT_SECRET")))
//
//if err = json.NewEncoder(w).Encode(map[string]string{ if err = json.NewEncoder(w).Encode(map[string]string{
// "access_token": accessToken, "access_token": accessToken,
// "refresh_token": newToken, "refresh_token": newToken,
//}); err != nil { }); err != nil {
// log.Println("POST [api/refresh] " + r.RemoteAddr + ": " + err.Error()) log.Println("POST [api/refresh] " + r.RemoteAddr + ": " + err.Error())
// http.Error(w, "Internal server error", http.StatusInternalServerError) http.Error(w, "Internal server error", http.StatusInternalServerError)
// return return
//} }
//log.Println("POST [api/refresh] " + r.RemoteAddr + ": Successfully refreshed token") log.Println("POST [api/refresh] " + r.RemoteAddr + ": Successfully refreshed token")
} }
func UserInfo(w http.ResponseWriter, r *http.Request) { func UserInfo(w http.ResponseWriter, r *http.Request) {
//if r.Method != http.MethodGet { if r.Method != http.MethodGet {
// log.Println("GET [api/userinfo] " + r.RemoteAddr + ": Method " + r.Method + " not allowed") log.Println("GET [api/userinfo] " + r.RemoteAddr + ": Method " + r.Method + " not allowed")
// http.Error(w, "Method not allowed", http.StatusMethodNotAllowed) http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
// return return
//} }
//query := r.URL.Query() query := r.URL.Query()
//idParam := query.Get("id") idParam := query.Get("id")
//user, err := storage.GetUserById(idParam) user, err := storage.GetUserById(idParam)
//if err != nil { if err != nil {
// log.Println("GET [api/userinfo] " + r.RemoteAddr + ": User " + idParam + " not found") log.Println("GET [api/userinfo] " + r.RemoteAddr + ": User " + idParam + " not found")
// http.Error(w, "User not found", http.StatusNotFound) http.Error(w, "User not found", http.StatusNotFound)
// return return
//} }
//w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
//err = json.NewEncoder(w).Encode(map[string]interface{}{ err = json.NewEncoder(w).Encode(map[string]interface{}{
// "id": user.ID, "id": user.ID,
// "name": user.Username, "name": user.Username,
// "avatar_url": "", "avatar_url": "",
//}) })
//if err != nil { if err != nil {
// log.Println("GET [api/userinfo] " + r.RemoteAddr + ": " + err.Error()) log.Println("GET [api/userinfo] " + r.RemoteAddr + ": " + err.Error())
// return return
//} }
//log.Println("GET [api/userinfo] " + r.RemoteAddr + ": Successfully retrieved user info") log.Println("GET [api/userinfo] " + r.RemoteAddr + ": Successfully retrieved user info")
} }

21
storage/storage.go
View File

@@ -5,6 +5,7 @@ import (
"database/sql" "database/sql"
"errors" "errors"
"log" "log"
"strings"
_ "github.com/glebarez/go-sqlite" _ "github.com/glebarez/go-sqlite"
) )
@@ -22,7 +23,7 @@ func InitDB(filepath string) error {
schema := ` schema := `
PRAGMA foreign_keys = ON; PRAGMA foreign_keys = ON;
CREATE TABLE IF NOT EXISTS users ( CREATE TABLE IF NOT EXISTS users (
id TEXT PRIMARY KEY, id TEXT PRIMARY KEY,
username TEXT NOT NULL UNIQUE, username TEXT NOT NULL UNIQUE,
password TEXT NOT NULL, password TEXT NOT NULL,
@@ -74,6 +75,24 @@ func InitDB(filepath string) error {
return err return err
} }
// Users
func AddUser(user *models.User) error {
_, err := DB.Exec("INSERT INTO users(id, username, password, role) VALUES (?, ?, ?, ?)", user.ID, strings.ToLower(user.Username), user.Password, user.Role)
return err
}
func GetUserByUsername(username string) (models.User, error) {
row := DB.QueryRow("SELECT * FROM users WHERE username = ?", strings.ToLower(username))
var user models.User
err := row.Scan(&user.ID, &user.Username, &user.Password, &user.Role)
return user, err
}
func GetUserById(id string) (models.User, error) {
row := DB.QueryRow("SELECT * FROM users WHERE id = ?", id)
var user models.User
err := row.Scan(&user.ID, &user.Username, &user.Password, &user.Role)
return user, err
}
// Refresh Tokens // Refresh Tokens
func AddRefreshToken(token *models.RefreshToken) error { func AddRefreshToken(token *models.RefreshToken) error {
_, err := DB.Exec("INSERT INTO refresh_tokens(id, user_id, token_hash, expires_at, created_at, revoked, device_info) VALUES (?, ?, ?, ?, ?, ?, ?)", _, err := DB.Exec("INSERT INTO refresh_tokens(id, user_id, token_hash, expires_at, created_at, revoked, device_info) VALUES (?, ?, ?, ?, ?, ?, ?)",