Merge branch 'develop' into misc/prValidator

Author: SATYAsasini

api/restHandler/BulkUpdateRestHandler.go

@@ -19,11 +19,13 @@ package restHandler
 import (
 "encoding/json"
 "fmt"
+bean4 "github.com/devtron-labs/devtron/pkg/auth/user/bean"
 "github.com/devtron-labs/devtron/pkg/build/git/gitMaterial/repository"
 "github.com/devtron-labs/devtron/pkg/build/git/gitProvider"
 "github.com/devtron-labs/devtron/pkg/bulkAction/bean"
 "github.com/devtron-labs/devtron/pkg/bulkAction/service"
 "github.com/devtron-labs/devtron/pkg/cluster/environment"
+"github.com/devtron-labs/devtron/util"
 "net/http"
 "strconv"
 "strings"
@@ -216,9 +218,14 @@ func (handler BulkUpdateRestHandlerImpl) CheckAuthForBulkUpdate(AppId int, EnvId
 
 }
 func (handler BulkUpdateRestHandlerImpl) BulkUpdate(w http.ResponseWriter, r *http.Request) {
+userId, err := handler.userAuthService.GetLoggedInUser(r)
+if userId == 0 || err != nil {
+common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
+return
+}
 decoder := json.NewDecoder(r.Body)
 var script bean.BulkUpdateScript
-err := decoder.Decode(&script)
+err = decoder.Decode(&script)
 if err != nil {
 common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
 return
@@ -257,8 +264,14 @@ func (handler BulkUpdateRestHandlerImpl) BulkUpdate(w http.ResponseWriter, r *ht
 return
 }
 }
-
-response := handler.bulkUpdateService.BulkUpdate(script.Spec)
+isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
+userEmail := util.GetEmailFromContext(r.Context())
+userMetadata := &bean4.UserMetadata{
+UserEmailId: userEmail,
+IsUserSuperAdmin: isSuperAdmin,
+UserId: userId,
+}
+response := handler.bulkUpdateService.BulkUpdate(script.Spec, userMetadata)
 common.WriteJsonResp(w, nil, response, http.StatusOK)
 }
 
@@ -268,7 +281,15 @@ func (handler BulkUpdateRestHandlerImpl) BulkHibernate(w http.ResponseWriter, r
 return // response already written by the helper on error.
 }
 token := r.Header.Get("token")
-response, err := handler.bulkUpdateService.BulkHibernate(request, r.Context(), w, token, handler.checkAuthForBulkHibernateAndUnhibernate)
+isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
+userEmail := util.GetEmailFromContext(r.Context())
+userMetadata := &bean4.UserMetadata{
+UserEmailId: userEmail,
+IsUserSuperAdmin: isSuperAdmin,
+UserId: request.UserId,
+}
+
+response, err := handler.bulkUpdateService.BulkHibernate(r.Context(), request, handler.checkAuthForBulkHibernateAndUnhibernate, userMetadata)
 if err != nil {
 common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 return
@@ -305,7 +326,14 @@ func (handler BulkUpdateRestHandlerImpl) BulkUnHibernate(w http.ResponseWriter,
 return // response already written by the helper on error.
 }
 token := r.Header.Get("token")
-response, err := handler.bulkUpdateService.BulkUnHibernate(request, r.Context(), w, token, handler.checkAuthForBulkHibernateAndUnhibernate)
+isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
+userEmail := util.GetEmailFromContext(r.Context())
+userMetadata := &bean4.UserMetadata{
+UserEmailId: userEmail,
+IsUserSuperAdmin: isSuperAdmin,
+UserId: request.UserId,
+}
+response, err := handler.bulkUpdateService.BulkUnHibernate(r.Context(), request, handler.checkAuthForBulkHibernateAndUnhibernate, userMetadata)
 if err != nil {
 common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 return
@@ -333,7 +361,14 @@ func (handler BulkUpdateRestHandlerImpl) BulkDeploy(w http.ResponseWriter, r *ht
 common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
 return
 }
-response, err := handler.bulkUpdateService.BulkDeploy(&request, token, handler.checkAuthBatch)
+isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
+userEmail := util.GetEmailFromContext(r.Context())
+userMetadata := &bean4.UserMetadata{
+UserEmailId: userEmail,
+IsUserSuperAdmin: isSuperAdmin,
+UserId: userId,
+}
+response, err := handler.bulkUpdateService.BulkDeploy(&request, token, handler.checkAuthBatch, userMetadata)
 if err != nil {
 common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 return

api/restHandler/ConfigMapRestHandler.go

@@ -19,6 +19,7 @@ package restHandler
 import (
 "encoding/json"
 "fmt"
+"github.com/devtron-labs/devtron/pkg/auth/user/util"
 "github.com/devtron-labs/devtron/pkg/pipeline/draftAwareConfigService"
 "net/http"
 "strconv"
@@ -125,12 +126,8 @@ func (handler ConfigMapRestHandlerImpl) CMGlobalAddUpdate(w http.ResponseWriter,
 //RBAC END
 ctx := r.Context()
 isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-userEmail, err := handler.userAuthService.GetActiveEmailById(userId)
-if err != nil {
-common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-return
-}
-res, err := handler.draftAwareResourceService.CMGlobalAddUpdate(ctx, &configMapRequest, isSuperAdmin, userEmail)
+userMetadata := util.GetUserMetadata(r.Context(), userId, isSuperAdmin)
+res, err := handler.draftAwareResourceService.CMGlobalAddUpdate(ctx, &configMapRequest, userMetadata)
 if err != nil {
 handler.Logger.Errorw("service err, CMGlobalAddUpdate", "err", err, "payload", configMapRequest)
 common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
@@ -175,12 +172,8 @@ func (handler ConfigMapRestHandlerImpl) CMEnvironmentAddUpdate(w http.ResponseWr
 //RBAC END
 ctx := r.Context()
 isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-userEmail, err := handler.userAuthService.GetActiveEmailById(userId)
-if err != nil {
-common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-return
-}
-res, err := handler.draftAwareResourceService.CMEnvironmentAddUpdate(ctx, &configMapRequest, isSuperAdmin, userEmail)
+userMetadata := util.GetUserMetadata(r.Context(), userId, isSuperAdmin)
+res, err := handler.draftAwareResourceService.CMEnvironmentAddUpdate(ctx, &configMapRequest, userMetadata)
 if err != nil {
 handler.Logger.Errorw("service err, CMEnvironmentAddUpdate", "err", err, "payload", configMapRequest)
 common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
@@ -378,12 +371,8 @@ func (handler ConfigMapRestHandlerImpl) CSGlobalAddUpdate(w http.ResponseWriter,
 //RBAC END
 ctx := r.Context()
 isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-userEmail, err := handler.userAuthService.GetActiveEmailById(userId)
-if err != nil {
-common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-return
-}
-res, err := handler.draftAwareResourceService.CSGlobalAddUpdate(ctx, &configMapRequest, isSuperAdmin, userEmail)
+userMetadata := util.GetUserMetadata(r.Context(), userId, isSuperAdmin)
+res, err := handler.draftAwareResourceService.CSGlobalAddUpdate(ctx, &configMapRequest, userMetadata)
 if err != nil {
 handler.Logger.Errorw("service err, CSGlobalAddUpdate", "err", err, "payload", configMapRequest)
 common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
@@ -429,12 +418,8 @@ func (handler ConfigMapRestHandlerImpl) CSEnvironmentAddUpdate(w http.ResponseWr
 //RBAC END
 ctx := r.Context()
 isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-userEmail, err := handler.userAuthService.GetActiveEmailById(userId)
-if err != nil {
-common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-return
-}
-res, err := handler.draftAwareResourceService.CSEnvironmentAddUpdate(ctx, &configMapRequest, isSuperAdmin, userEmail)
+userMetadata := util.GetUserMetadata(r.Context(), userId, isSuperAdmin)
+res, err := handler.draftAwareResourceService.CSEnvironmentAddUpdate(ctx, &configMapRequest, userMetadata)
 if err != nil {
 handler.Logger.Errorw("service err, CSEnvironmentAddUpdate", "err", err, "payload", configMapRequest)
 common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
@@ -548,17 +533,13 @@ func (handler ConfigMapRestHandlerImpl) CMGlobalDelete(w http.ResponseWriter, r
 //RBAC END
 ctx := r.Context()
 isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-userEmail, err := handler.userAuthService.GetActiveEmailById(userId)
-if err != nil {
-common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-return
-}
+userMetadata := util.GetUserMetadata(r.Context(), userId, isSuperAdmin)
 deleteReq := &bean.ConfigDataRequest{
 Id: id,
 AppId: appId,
 UserId: userId,
 }
-res, err := handler.draftAwareResourceService.CMGlobalDelete(ctx, name, deleteReq, isSuperAdmin, userEmail)
+res, err := handler.draftAwareResourceService.CMGlobalDelete(ctx, name, deleteReq, userMetadata)
 if err != nil {
 handler.Logger.Errorw("service err, CMGlobalDelete", "err", err, "appId", appId, "id", id, "name", name)
 common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
@@ -614,17 +595,13 @@ func (handler ConfigMapRestHandlerImpl) CMEnvironmentDelete(w http.ResponseWrite
 //RBAC END
 ctx := r.Context()
 isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-userEmail, err := handler.userAuthService.GetActiveEmailById(userId)
-if err != nil {
-common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-return
-}
+userMetadata := util.GetUserMetadata(r.Context(), userId, isSuperAdmin)
 deleteReq := &bean.ConfigDataRequest{
 Id: id,
 AppId: appId,
 UserId: userId,
 }
-res, err := handler.draftAwareResourceService.CMEnvironmentDelete(ctx, name, deleteReq, isSuperAdmin, userEmail)
+res, err := handler.draftAwareResourceService.CMEnvironmentDelete(ctx, name, deleteReq, userMetadata)
 if err != nil {
 handler.Logger.Errorw("service err, CMEnvironmentDelete", "err", err, "appId", appId, "envId", envId, "id", id)
 common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
@@ -666,17 +643,13 @@ func (handler ConfigMapRestHandlerImpl) CSGlobalDelete(w http.ResponseWriter, r
 //RBAC END
 ctx := r.Context()
 isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-userEmail, err := handler.userAuthService.GetActiveEmailById(userId)
-if err != nil {
-common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-return
-}
+userMetadata := util.GetUserMetadata(r.Context(), userId, isSuperAdmin)
 deleteReq := &bean.ConfigDataRequest{
 Id: id,
 AppId: appId,
 UserId: userId,
 }
-res, err := handler.draftAwareResourceService.CSGlobalDelete(ctx, name, deleteReq, isSuperAdmin, userEmail)
+res, err := handler.draftAwareResourceService.CSGlobalDelete(ctx, name, deleteReq, userMetadata)
 if err != nil {
 handler.Logger.Errorw("service err, CSGlobalDelete", "err", err, "appId", appId, "id", id, "name", name)
 common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
@@ -732,17 +705,13 @@ func (handler ConfigMapRestHandlerImpl) CSEnvironmentDelete(w http.ResponseWrite
 //RBAC END
 ctx := r.Context()
 isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-userEmail, err := handler.userAuthService.GetActiveEmailById(userId)
-if err != nil {
-common.WriteJsonResp(w, fmt.Errorf("userEmail not found by userId"), "userEmail not found by userId", http.StatusNotFound)
-return
-}
+userMetadata := util.GetUserMetadata(r.Context(), userId, isSuperAdmin)
 deleteReq := &bean.ConfigDataRequest{
 Id: id,
 AppId: appId,
 UserId: userId,
 }
-res, err := handler.draftAwareResourceService.CSEnvironmentDelete(ctx, name, deleteReq, isSuperAdmin, userEmail)
+res, err := handler.draftAwareResourceService.CSEnvironmentDelete(ctx, name, deleteReq, userMetadata)
 if err != nil {
 handler.Logger.Errorw("service err, CSEnvironmentDelete", "err", err, "appId", appId, "envId", envId, "id", id)
 common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)

api/restHandler/app/appList/AppListingRestHandler.go

@@ -38,6 +38,7 @@ import (
 util4 "github.com/devtron-labs/devtron/pkg/appStore/util"
 "github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
 "github.com/devtron-labs/devtron/pkg/auth/user"
+"github.com/devtron-labs/devtron/pkg/auth/user/bean"
 bean5 "github.com/devtron-labs/devtron/pkg/cluster/bean"
 bean2 "github.com/devtron-labs/devtron/pkg/cluster/environment/bean"
 common2 "github.com/devtron-labs/devtron/pkg/deployment/common"
@@ -49,6 +50,7 @@ import (
 k8sApplication "github.com/devtron-labs/devtron/pkg/k8s/application"
 "github.com/devtron-labs/devtron/pkg/pipeline"
 bean6 "github.com/devtron-labs/devtron/pkg/team/bean"
+util2 "github.com/devtron-labs/devtron/util"
 "github.com/devtron-labs/devtron/util/rbac"
 "github.com/go-pg/pg"
 "github.com/gorilla/mux"
@@ -471,6 +473,11 @@ func (handler AppListingRestHandlerImpl) FetchOverviewAppsByEnvironment(w http.R
 }
 
 func (handler AppListingRestHandlerImpl) FetchAppDetailsV2(w http.ResponseWriter, r *http.Request) {
+userId, err := handler.userService.GetLoggedInUser(r)
+if userId == 0 || err != nil {
+common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
+return
+}
 vars := mux.Vars(r)
 token := r.Header.Get("token")
 appId, err := strconv.Atoi(vars["app-id"])
@@ -488,14 +495,21 @@ func (handler AppListingRestHandlerImpl) FetchAppDetailsV2(w http.ResponseWriter
 common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), nil, http.StatusForbidden)
 return
 }
+isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
+userEmail := util2.GetEmailFromContext(r.Context())
+userMetadata := &bean.UserMetadata{
+UserEmailId: userEmail,
+IsUserSuperAdmin: isSuperAdmin,
+UserId: userId,
+}
 appDetail, err := handler.appListingService.FetchAppDetails(r.Context(), appId, envId)
 if err != nil {
 handler.logger.Errorw("service err, FetchAppDetailsV2", "err", err, "appId", appId, "envId", envId)
 common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 return
 }
 
-appDetail, err = handler.updateApprovalConfigDataInAppDetailResp(appDetail, appId, envId)
+appDetail, err = handler.updateApprovalConfigDataInAppDetailResp(r.Context(), appDetail, appId, envId, userMetadata)
 if err != nil {
 common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 return

api/restHandler/app/appList/AppListingRestHandler_ent.go

@@ -1,7 +1,9 @@
 package appList
 
 import (
+"context"
 "github.com/devtron-labs/devtron/api/bean/AppView"
+userBean "github.com/devtron-labs/devtron/pkg/auth/user/bean"
 "net/http"
 )
 
@@ -14,6 +16,6 @@ func (handler AppListingRestHandlerImpl) FetchAutocompleteJobCiPipelines(w http.
 func (handler AppListingRestHandlerImpl) GetAllAppEnvsFromResourceNames(w http.ResponseWriter, r *http.Request) {
 }
 
-func (handler AppListingRestHandlerImpl) updateApprovalConfigDataInAppDetailResp(appDetail AppView.AppDetailContainer, appId, envId int) (AppView.AppDetailContainer, error) {
+func (handler AppListingRestHandlerImpl) updateApprovalConfigDataInAppDetailResp(ctx context.Context, appDetail AppView.AppDetailContainer, appId, envId int, userMetadata *userBean.UserMetadata) (AppView.AppDetailContainer, error) {
 return appDetail, nil
 }