From c570b9e936d4cdb80ebb34847d0784a0863a57b3 Mon Sep 17 00:00:00 2001 From: catttam Date: Tue, 23 Jan 2024 12:44:46 +0100 Subject: [PATCH] Added prints to debug --- pkg/handlers/create.go | 10 ++++++++-- pkg/utils/auth/oidc.go | 6 ++++++ pkg/utils/minio.go | 17 ++++++++++++----- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/pkg/handlers/create.go b/pkg/handlers/create.go index 121cf7c4..8bbdcf0e 100644 --- a/pkg/handlers/create.go +++ b/pkg/handlers/create.go @@ -234,8 +234,14 @@ func createBuckets(service *types.Service, cfg *types.Config, allowed_users []st // TODO error control minIOAdminClient, _ := utils.MakeMinIOAdminClient(cfg) - minIOAdminClient.CreateServiceGroup(splitPath[0]) - minIOAdminClient.AddUserToGroup(allowed_users, splitPath[0]) + err = minIOAdminClient.CreateServiceGroup(splitPath[0]) + if err != nil { + return fmt.Errorf("error creating service group for bucket %s: %v", splitPath[0], err) + } + err = minIOAdminClient.AddUserToGroup(allowed_users, splitPath[0]) + if err != nil { + return err + } // Create folder(s) if len(splitPath) == 2 { diff --git a/pkg/utils/auth/oidc.go b/pkg/utils/auth/oidc.go index 686f5a98..dcf1ee92 100644 --- a/pkg/utils/auth/oidc.go +++ b/pkg/utils/auth/oidc.go @@ -18,6 +18,8 @@ package auth import ( "context" + "log" + "os" "crypto/rand" "encoding/base64" @@ -37,6 +39,8 @@ const ( SecretKeyLength = 10 ) +var oidcLogger = log.New(os.Stdout, "[OIDC-AUTH] ", log.Flags()) + // oidcManager struct to represent a OIDC manager, including a cache of tokens type oidcManager struct { provider *oidc.Provider @@ -100,6 +104,7 @@ func getOIDCMiddleware(kubeClientset *kubernetes.Clientset, minIOAdminClient *ut ui, _ := oidcManager.getUserInfo(rawToken) uid := ui.subject + oidcLogger.Println("Request user: ", uid) // Check if exist MinIO user in cached users list exists := mc.UserExists(uid) @@ -180,6 +185,7 @@ func (om *oidcManager) UserHasVO(rawToken string, vo string) (bool, error) { func (om *oidcManager) GetUID(rawToken string) (string, error) { ui, err := om.getUserInfo(rawToken) + oidcLogger.Println("received uid: ", ui.subject) if err != nil { return ui.subject, nil } diff --git a/pkg/utils/minio.go b/pkg/utils/minio.go index 60a1551b..20ec9147 100644 --- a/pkg/utils/minio.go +++ b/pkg/utils/minio.go @@ -103,11 +103,18 @@ func (minIOAdminClient *MinIOAdminClient) CreateAllUsersGroup() { } } -func (minIOAdminClient *MinIOAdminClient) CreateServiceGroup(bucketName string) { +func (minIOAdminClient *MinIOAdminClient) CreateServiceGroup(bucketName string) error { err := createGroup(minIOAdminClient.adminClient, bucketName) if err != nil { - //TODO manage error + return err + } + + err = createPolicy(minIOAdminClient.adminClient, bucketName) + if err != nil { + return err } + + return nil } func (minIOAdminClient *MinIOAdminClient) AddUserToGroup(users []string, groupName string) error { @@ -185,9 +192,9 @@ func createPolicy(adminClient *madmin.AdminClient, groupName string) error { return fmt.Errorf("error creating MinIO policy for group %s: %v", groupName, err) } - err2 := adminClient.SetPolicy(context.TODO(), groupName, groupName, true) - if err2 != nil { - return fmt.Errorf("error setting MinIO policy for group %s: %v", groupName, err2) + err = adminClient.SetPolicy(context.TODO(), groupName, groupName, true) + if err != nil { + return fmt.Errorf("error setting MinIO policy for group %s: %v", groupName, err) } return nil }