updated file browser url logic

auth/auth.go

@@ -11,6 +11,7 @@ import (
 
 	"git.acooldomain.co/server-manager/backend/dbhandler"
 	"git.acooldomain.co/server-manager/backend/factories"
+	"git.acooldomain.co/server-manager/backend/instancemanager"
 	"git.acooldomain.co/server-manager/backend/models"
 	"github.com/gin-gonic/gin"
 	"github.com/golang-jwt/jwt"
@@ -23,6 +24,7 @@ type AuthApi struct {
 	userAuthDbHandler   dbhandler.UserPassAuthanticationDbHandler
 	serverAuthDbHandler dbhandler.ServersAuthorizationDbHandler
 	OidcAuthDbHandler   dbhandler.OidcAuthenticationDbHandler
+	instanceManager     instancemanager.InstanceManager
 }
 
 type Claims struct {
@@ -171,12 +173,18 @@ func (con AuthApi) Verify(ctx *gin.Context) {
 
 	pathSegments := strings.Split(forwardedUri, "/")
 
-	serverId, service := pathSegments[2], pathSegments[1]
+	service := pathSegments[1]
 
 	switch service {
 	case "browsers":
-		fmt.Printf("%#v %s", claims, serverId)
+		serverId, err := con.instanceManager.GetServerIdFromFileBrowserUrl(ctx, forwardedUri)
+		if err != nil {
+			ctx.AbortWithError(500, err)
+			return
+		}
+
 		serverPermissions, err := con.serverAuthDbHandler.GetPermissions(ctx, claims.Username, serverId)
+		fmt.Printf("User: %s | GlobalPermissions: %d | ServerId: %s | ServerPermissions: %d\n", claims.Username, claims.Permissions, serverId, serverPermissions)
 		if err != nil {
 			ctx.AbortWithError(500, err)
 			return
@@ -215,10 +223,16 @@ func LoadGroup(group *gin.RouterGroup, config models.GlobalConfig) gin.HandlerFu
 		panic(err)
 	}
 
+	instanceManager, err := factories.GetInstanceManager(config.InstanceManager, config.Domain)
+	if err != nil {
+		panic(err)
+	}
+
 	connection := AuthApi{
 		userAuthDbHandler:   userAuthHandler,
 		serverAuthDbHandler: serverAuthDbHandler,
 		tokenHandler:        inviteHandler,
+		instanceManager:     instanceManager,
 		config:              config,
 	}
 

dbhandler/mongo/servers_authorization.go

@@ -52,8 +52,7 @@ func (self *ServersAuthorizationDbHandler) AddPermissions(ctx context.Context, u
 			"server_id": serverId,
 		},
 	).Decode(&serverPermissions)
-
+	if err != nil && err != mongo.ErrNoDocuments {
-	if err != nil {
 		return err
 	}
 
@@ -65,11 +64,12 @@ func (self *ServersAuthorizationDbHandler) AddPermissions(ctx context.Context, u
 			"username":  username,
 			"server_id": serverId,
 		},
-		bson.M{"$set": bson.M{
+		bson.M{
-			"username":    username,
+			"$set": bson.M{
-			"server_id":   serverId,
+				"username":    username,
-			"permissions": newPermissions,
+				"server_id":   serverId,
-		},
+				"permissions": newPermissions,
+			},
 		},
 		options.Update().SetUpsert(true),
 	)
@@ -86,7 +86,6 @@ func (self *ServersAuthorizationDbHandler) RemovePermissions(ctx context.Context
 			"server_id": serverId,
 		},
 	).Decode(&serverPermissions)
-
 	if err != nil {
 		return err
 	}
@@ -99,9 +98,10 @@ func (self *ServersAuthorizationDbHandler) RemovePermissions(ctx context.Context
 			"username":  username,
 			"server_id": serverId,
 		},
-		bson.M{"$set": bson.M{
+		bson.M{
-			"permissions": newPermissions,
+			"$set": bson.M{
-		},
+				"permissions": newPermissions,
+			},
 		},
 	)
 
@@ -115,10 +115,12 @@ func (self *ServersAuthorizationDbHandler) SetPermissions(ctx context.Context, u
 			"username":  username,
 			"server_id": serverId,
 		},
-		bson.M{"$set": bson.M{
+		bson.M{
-			"permissions": permissions,
+			"$set": bson.M{
-		},
+				"permissions": permissions,
+			},
 		},
+		options.Update().SetUpsert(true),
 	)
 
 	return err
@@ -134,8 +136,11 @@ func (self *ServersAuthorizationDbHandler) GetPermissions(ctx context.Context, u
 			"server_id": serverId,
 		},
 	).Decode(&serverPermissions)
-
 	if err != nil {
+		if err == mongo.ErrNoDocuments {
+			return 0, nil
+		}
+
 		return 0, err
 	}
 

instancemanager/docker/instance_manager.go

@@ -3,6 +3,7 @@ package docker
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"log"
 	"maps"
@@ -656,6 +657,14 @@ func (im *InstanceManager) StopFileBrowser(ctx context.Context, serverId string)
 	return nil
 }
 
+func (im *InstanceManager) GetServerIdFromFileBrowserUrl(ctx context.Context, url string) (string, error) {
+	pathSegments := strings.Split(url, "/")
+	if len(pathSegments) < 3 {
+		return "", errors.New("invalid url")
+	}
+	return pathSegments[2], nil
+}
+
 func NewInstanceManager(config models.DockerInstanceManagerConfig, siteDomain string) (*InstanceManager, error) {
 	apiClient, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
 	if err != nil {

instancemanager/instance_manager.go

@@ -60,6 +60,7 @@ type InstanceManager interface {
 	// Read Only
 	GetFileBrowser(ctx context.Context, serverId string) (*models.FileBrowser, error)
 	ListFileBrowsers(ctx context.Context) ([]models.FileBrowser, error)
+	GetServerIdFromFileBrowserUrl(ctx context.Context, serverId string) (string, error)
 
 	// Status Changing
 	StartFileBrowser(ctx context.Context, serverId string) (*models.FileBrowser, error)

instancemanager/kubernetes/instance_manager.go

@@ -8,6 +8,8 @@ import (
 	"strings"
 	"time"
 
+	gerrors "errors"
+
 	"git.acooldomain.co/server-manager/backend/instancemanager"
 	"git.acooldomain.co/server-manager/backend/models"
 	servermanagerv1 "git.acooldomain.co/server-manager/kubernetes-operator/api/v1alpha1"
@@ -355,6 +357,14 @@ func (i *InstanceManager) StopFileBrowser(ctx context.Context, serverId string)
 	return nil
 }
 
+func (im *InstanceManager) GetServerIdFromFileBrowserUrl(ctx context.Context, url string) (string, error) {
+	pathSegments := strings.Split(url, "/")
+	if len(pathSegments) < 4 {
+		return "", gerrors.New("invalid url")
+	}
+	return pathSegments[3], nil
+}
+
 func NewInstanceManager(config models.KubernetesInstanceManagerConfig) (*InstanceManager, error) {
 	c, err := rest.InClusterConfig()
 	if err != nil {