7 Commits

Author SHA1 Message Date
Adrian Zürcher
51d20dba37 increase member permission to 31 for import export 2025-11-12 17:15:18 +01:00
Adrian Zürcher
2a400f4ee4 add domain env to test 2025-11-12 14:23:07 +01:00
Adrian Zürcher
d50691776b move env vars to login and add domain 2025-11-12 14:21:57 +01:00
Adrian Zürcher
14968bfd4c replace static secrets with enviroment variables 2025-11-12 11:05:04 +01:00
Adrian Zürcher
f8e7b01a28 change member efault permission to 15 for import export permission 2025-11-12 09:02:27 +01:00
Adrian Zürcher
332a84aa57 add appName to user settings 2025-11-12 09:01:54 +01:00
Adrian Zürcher
e9fdea664f read role every refresh 2025-11-08 12:00:09 +01:00
4 changed files with 18 additions and 8 deletions

View File

@@ -16,6 +16,11 @@ import (
) )
func TestDatabase(t *testing.T) { func TestDatabase(t *testing.T) {
// set enviroment variables
os.Setenv("ACCESS_SECRET", "12345678910111213141516171819202")
os.Setenv("REFRESH_SECRET", "9998979695949392919089888786858")
os.Setenv("DOMAIN", "localhost")
dbName := "user.db" dbName := "user.db"
if _, err := os.Stat(dbName); err == nil { if _, err := os.Stat(dbName); err == nil {
t.Log("remove user.db to start test with empty database") t.Log("remove user.db to start test with empty database")
@@ -154,6 +159,10 @@ func TestDatabase(t *testing.T) {
} }
func TestLoginAndAuthorization(t *testing.T) { func TestLoginAndAuthorization(t *testing.T) {
os.Setenv("ACCESS_SECRET", "12345678910111213141516171819202")
os.Setenv("REFRESH_SECRET", "9998979695949392919089888786858")
os.Setenv("DOMAIN", "localhost")
gin.SetMode(gin.TestMode) gin.SetMode(gin.TestMode)
// Setup your AccessHandler and router // Setup your AccessHandler and router

View File

@@ -3,6 +3,7 @@ package handlers
import ( import (
"fmt" "fmt"
"net/http" "net/http"
"os"
"time" "time"
"gitea.tecamino.com/paadi/access-handler/internal/utils" "gitea.tecamino.com/paadi/access-handler/internal/utils"
@@ -16,12 +17,12 @@ import (
// 🔐 AUTHENTICATION CONSTANTS // 🔐 AUTHENTICATION CONSTANTS
// ----------------------------- // -----------------------------
// JWT secrets (replace "*" with strong random values in production!) // JWT secrets
var ACCESS_SECRET = []byte("ShFRprALcXjlosJ2hFCnGYGG3Ce2uRx6") var ACCESS_SECRET = []byte(os.Getenv("ACCESS_SECRET"))
var REFRESH_SECRET = []byte("pQIjuX6g6Tzf0FEfdScxttT3hlL9NFaa") var REFRESH_SECRET = []byte(os.Getenv("REFRESH_SECRET"))
// DOMAIN defines where cookies are valid. Change this in production. // DOMAIN defines where cookies are valid. Change this in production.
var DOMAIN = "localhost" var DOMAIN = os.Getenv("DOMAIN")
// ACCESS_TOKEN_TIME defines how long access tokens are valid. // ACCESS_TOKEN_TIME defines how long access tokens are valid.
var ACCESS_TOKEN_TIME = 15 * time.Minute var ACCESS_TOKEN_TIME = 15 * time.Minute
@@ -164,9 +165,8 @@ func (aH *AccessHandler) Refresh(c *gin.Context) {
username := claims["username"].(string) username := claims["username"].(string)
id := int(claims["id"].(float64)) id := int(claims["id"].(float64))
role := claims["role"].(string)
_, hasError := aH.getUserFromDB(c, username) user, hasError := aH.getUserFromDB(c, username)
if hasError { if hasError {
return return
} }
@@ -177,7 +177,7 @@ func (aH *AccessHandler) Refresh(c *gin.Context) {
newAccess := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{ newAccess := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
"id": id, "id": id,
"username": username, "username": username,
"role": role, "role": user.Role,
"exp": accessExp.Unix(), "exp": accessExp.Unix(),
}) })
accessString, _ := newAccess.SignedString(ACCESS_SECRET) accessString, _ := newAccess.SignedString(ACCESS_SECRET)

View File

@@ -12,7 +12,7 @@ func (r *Permissions) DefaultPermissions() {
*r = append(*r, *r = append(*r,
Permission{Name: "settings", Permission: 7}, Permission{Name: "settings", Permission: 7},
Permission{Name: "userSettings", Permission: 7}, Permission{Name: "userSettings", Permission: 7},
Permission{Name: "members", Permission: 7}, Permission{Name: "members", Permission: 31},
Permission{Name: "events", Permission: 7}, Permission{Name: "events", Permission: 7},
Permission{Name: "responsible", Permission: 7}, Permission{Name: "responsible", Permission: 7},
) )

View File

@@ -12,6 +12,7 @@ type Settings struct {
SecondaryColor string `json:"secondaryColor,omitempty"` SecondaryColor string `json:"secondaryColor,omitempty"`
SecondaryColorText string `json:"secondaryColorText,omitempty"` SecondaryColorText string `json:"secondaryColorText,omitempty"`
Icon string `json:"icon,omitempty"` Icon string `json:"icon,omitempty"`
AppName string `json:"appName,omitempty"`
DatabaseName string `json:"databaseName,omitempty"` DatabaseName string `json:"databaseName,omitempty"`
DatabaseToken string `json:"databaseToken,omitempty"` DatabaseToken string `json:"databaseToken,omitempty"`
} }