Fixed mistake on update

grycap · Jan 25, 2024 · 0ea1c4d · 0ea1c4d
1 parent 2d998cd
commit 0ea1c4d
Showing 1 changed file with 36 additions and 3 deletions.
diff --git a/pkg/handlers/update.go b/pkg/handlers/update.go
@@ -25,6 +25,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/grycap/oscar/v2/pkg/types"
 	"github.com/grycap/oscar/v2/pkg/utils"
+	"github.com/grycap/oscar/v2/pkg/utils/auth"
 	"k8s.io/apimachinery/pkg/api/errors"
 )
 
@@ -39,6 +40,38 @@ func MakeUpdateHandler(cfg *types.Config, back types.ServerlessBackend) gin.Hand
 			return
 		}
 
+		mcUntyped, mcExists := c.Get("mc")
+		uidOrigin, uidExists := c.Get("uid_origin")
+
+		if !mcExists {
+			c.String(http.StatusInternalServerError, fmt.Sprintf("Missing multitenancy config"))
+		}
+		if !uidExists {
+			c.String(http.StatusInternalServerError, fmt.Sprintf("Missing EGI user uid"))
+		}
+
+		mc, mcParsed := mcUntyped.(*auth.MultitenancyConfig)
+		uid, uidParsed := uidOrigin.(string)
+
+		if !mcParsed {
+			c.String(http.StatusInternalServerError, fmt.Sprintf("Error parsing multitenancy config: %v", mcParsed))
+		}
+
+		if !uidParsed {
+			c.String(http.StatusInternalServerError, fmt.Sprintf("Error parsing uid origin: %v", uidParsed))
+		}
+
+		// Check if users in allowed_users have a MinIO associated user
+		minIOAdminClient, _ := utils.MakeMinIOAdminClient(cfg)
+		uids := mc.CheckUsersInCache(newService.AllowedUsers)
+		if len(uids) == 0 {
+			for _, uid := range uids {
+				sk, _ := auth.GenerateRandomKey(8)
+				minIOAdminClient.CreateMinIOUser(uid, sk)
+				mc.CreateSecretForOIDC(uid, sk)
+			}
+		}
+
 		// Check service values and set defaults
 		checkValues(&newService, cfg)
 
@@ -91,7 +124,7 @@ func MakeUpdateHandler(cfg *types.Config, back types.ServerlessBackend) gin.Hand
 				}
 
 				// Update buckets
-				if err := updateBuckets(&newService, oldService, cfg); err != nil {
+				if err := updateBuckets(&newService, oldService, minIOAdminClient, cfg); err != nil {
 					if err == errInput {
 						c.String(http.StatusBadRequest, err.Error())
 					} else {
@@ -115,13 +148,13 @@ func MakeUpdateHandler(cfg *types.Config, back types.ServerlessBackend) gin.Hand
 	}
 }
 
-func updateBuckets(newService, oldService *types.Service, cfg *types.Config) error {
+func updateBuckets(newService, oldService *types.Service, minIOAdminClient *utils.MinIOAdminClient, cfg *types.Config) error {
 	// Disable notifications from oldService.Input
 	if err := disableInputNotifications(oldService.GetMinIOWebhookARN(), oldService.Input, oldService.StorageProviders.MinIO[types.DefaultProvider]); err != nil {
 		return fmt.Errorf("error disabling MinIO input notifications: %v", err)
 	}
 
 	// Create the input and output buckets/folders from newService
 	// TODO fix
-	return createBuckets(newService, cfg, newService.AllowedUsers)
+	return createBuckets(newService, cfg, minIOAdminClient, newService.AllowedUsers)
 }