@@ -22,8 +22,9 @@ import (
2222 "encoding/json"
2323 "errors"
2424 "fmt"
25+ client "github.com/devtron-labs/devtron/api/helm-app"
2526 service2 "github.com/devtron-labs/devtron/api/helm-app/service"
26- "github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/common "
27+ "github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/EAMode "
2728 "net/http"
2829 "strconv"
2930 "strings"
@@ -59,35 +60,41 @@ type AppStoreDeploymentRestHandler interface {
5960}
6061
6162type AppStoreDeploymentRestHandlerImpl struct {
62- Logger * zap.SugaredLogger
63- userAuthService user.UserService
64- enforcer casbin.Enforcer
65- enforcerUtil rbac.EnforcerUtil
66- enforcerUtilHelm rbac.EnforcerUtilHelm
67- appStoreDeploymentService service.AppStoreDeploymentService
68- appStoreDeploymentServiceC appStoreDeploymentCommon.AppStoreDeploymentCommonService
69- validator * validator.Validate
70- helmAppService service2.HelmAppService
71- argoUserService argo.ArgoUserService
72- attributesService attributes.AttributesService
63+ Logger * zap.SugaredLogger
64+ userAuthService user.UserService
65+ enforcer casbin.Enforcer
66+ enforcerUtil rbac.EnforcerUtil
67+ enforcerUtilHelm rbac.EnforcerUtilHelm
68+ appStoreDeploymentService service.AppStoreDeploymentService
69+ appStoreDeploymentDBService service.AppStoreDeploymentDBService
70+ validator * validator.Validate
71+ helmAppService service2.HelmAppService
72+ helmAppRestHandler client.HelmAppRestHandler
73+ argoUserService argo.ArgoUserService
74+ attributesService attributes.AttributesService
75+ installAppService EAMode.InstalledAppDBService
7376}
7477
7578func NewAppStoreDeploymentRestHandlerImpl (Logger * zap.SugaredLogger , userAuthService user.UserService ,
76- enforcer casbin.Enforcer , enforcerUtil rbac.EnforcerUtil , enforcerUtilHelm rbac.EnforcerUtilHelm , appStoreDeploymentService service.AppStoreDeploymentService ,
77- validator * validator.Validate , helmAppService service2.HelmAppService , appStoreDeploymentServiceC appStoreDeploymentCommon.AppStoreDeploymentCommonService ,
78- argoUserService argo.ArgoUserService , attributesService attributes.AttributesService ) * AppStoreDeploymentRestHandlerImpl {
79+ enforcer casbin.Enforcer , enforcerUtil rbac.EnforcerUtil , enforcerUtilHelm rbac.EnforcerUtilHelm ,
80+ appStoreDeploymentService service.AppStoreDeploymentService ,
81+ appStoreDeploymentDBService service.AppStoreDeploymentDBService ,
82+ validator * validator.Validate , helmAppService service2.HelmAppService ,
83+ argoUserService argo.ArgoUserService , attributesService attributes.AttributesService ,
84+ installAppService EAMode.InstalledAppDBService ) * AppStoreDeploymentRestHandlerImpl {
7985 return & AppStoreDeploymentRestHandlerImpl {
80- Logger : Logger ,
81- userAuthService : userAuthService ,
82- enforcer : enforcer ,
83- enforcerUtil : enforcerUtil ,
84- enforcerUtilHelm : enforcerUtilHelm ,
85- appStoreDeploymentService : appStoreDeploymentService ,
86- validator : validator ,
87- helmAppService : helmAppService ,
88- appStoreDeploymentServiceC : appStoreDeploymentServiceC ,
89- argoUserService : argoUserService ,
90- attributesService : attributesService ,
86+ Logger : Logger ,
87+ userAuthService : userAuthService ,
88+ enforcer : enforcer ,
89+ enforcerUtil : enforcerUtil ,
90+ enforcerUtilHelm : enforcerUtilHelm ,
91+ appStoreDeploymentService : appStoreDeploymentService ,
92+ appStoreDeploymentDBService : appStoreDeploymentDBService ,
93+ validator : validator ,
94+ helmAppService : helmAppService ,
95+ argoUserService : argoUserService ,
96+ attributesService : attributesService ,
97+ installAppService : installAppService ,
9198 }
9299}
93100
@@ -139,7 +146,7 @@ func (handler AppStoreDeploymentRestHandlerImpl) InstallApp(w http.ResponseWrite
139146 }
140147 //rbac block ends here
141148
142- isChartRepoActive , err := handler .appStoreDeploymentService . IsChartRepoActive (request .AppStoreVersion )
149+ isChartRepoActive , err := handler .appStoreDeploymentDBService . IsChartProviderActive (request .AppStoreVersion )
143150 if err != nil {
144151 handler .Logger .Errorw ("service err, CreateInstalledApp" , "err" , err , "payload" , request )
145152 common .WriteJsonResp (w , err , nil , http .StatusInternalServerError )
@@ -203,7 +210,7 @@ func (handler AppStoreDeploymentRestHandlerImpl) GetInstalledAppsByAppStoreId(w
203210 }
204211 token := r .Header .Get ("token" )
205212 handler .Logger .Infow ("request payload, GetInstalledAppsByAppStoreId" , "appStoreId" , appStoreId )
206- res , err := handler .appStoreDeploymentService .GetAllInstalledAppsByAppStoreId (w , r , token , appStoreId )
213+ res , err := handler .appStoreDeploymentDBService .GetAllInstalledAppsByAppStoreId (appStoreId )
207214 if err != nil {
208215 handler .Logger .Errorw ("service err, GetInstalledAppsByAppStoreId" , "err" , err , "appStoreId" , appStoreId )
209216 common .WriteJsonResp (w , err , nil , http .StatusInternalServerError )
@@ -289,7 +296,7 @@ func (handler AppStoreDeploymentRestHandlerImpl) DeleteInstalledApp(w http.Respo
289296
290297 handler .Logger .Infow ("request payload, DeleteInstalledApp" , "installAppId" , installAppId )
291298 token := r .Header .Get ("token" )
292- installedApp , err := handler .appStoreDeploymentService .GetInstalledApp (installAppId )
299+ installedApp , err := handler .appStoreDeploymentDBService .GetInstalledApp (installAppId )
293300 if err != nil {
294301 handler .Logger .Error (err )
295302 if err == pg .ErrNoRows {
@@ -432,7 +439,7 @@ func (handler AppStoreDeploymentRestHandlerImpl) UpdateInstalledApp(w http.Respo
432439 }
433440 token := r .Header .Get ("token" )
434441 handler .Logger .Debugw ("request payload, UpdateInstalledApp" , "payload" , request )
435- installedApp , err := handler .appStoreDeploymentService .GetInstalledApp (request .InstalledAppId )
442+ installedApp , err := handler .appStoreDeploymentDBService .GetInstalledApp (request .InstalledAppId )
436443 if err != nil {
437444 handler .Logger .Errorw ("service err, UpdateInstalledApp" , "err" , err , "payload" , request )
438445 common .WriteJsonResp (w , err , nil , http .StatusInternalServerError )
@@ -520,7 +527,7 @@ func (handler AppStoreDeploymentRestHandlerImpl) GetInstalledAppVersion(w http.R
520527 }
521528 token := r .Header .Get ("token" )
522529 handler .Logger .Infow ("request payload, GetInstalledAppVersion" , "installedAppVersionId" , installedAppId )
523- dto , err := handler .appStoreDeploymentService .GetInstalledAppVersion (installedAppId , userId )
530+ dto , err := handler .installAppService .GetInstalledAppVersion (installedAppId , userId )
524531 if err != nil {
525532 handler .Logger .Errorw ("service err, GetInstalledAppVersion" , "err" , err , "installedAppVersionId" , installedAppId )
526533 common .WriteJsonResp (w , err , nil , http .StatusInternalServerError )
@@ -585,18 +592,29 @@ func (handler AppStoreDeploymentRestHandlerImpl) UpdateProjectHelmApp(w http.Res
585592 return
586593 }
587594 } else {
588- installedApp , err := handler .appStoreDeploymentService .GetInstalledApp (request .InstalledAppId )
595+ installedApp , err := handler .appStoreDeploymentDBService .GetInstalledApp (request .InstalledAppId )
589596 if err != nil {
590597 handler .Logger .Errorw ("service err, InstalledAppId" , "err" , err , "InstalledAppId" , request .InstalledAppId )
591598 common .WriteJsonResp (w , fmt .Errorf ("Unable to fetch installed app details" ), nil , http .StatusBadRequest )
592599 }
593- rbacObjectForCurrentProject , rbacObjectForCurrentProject2 := handler .enforcerUtilHelm .GetHelmObjectByClusterIdNamespaceAndAppName (installedApp .ClusterId , installedApp .Namespace , installedApp .AppName )
594- ok := handler .enforcer .Enforce (token , casbin .ResourceHelmApp , casbin .ActionUpdate , rbacObjectForCurrentProject ) || handler .enforcer .Enforce (token , casbin .ResourceHelmApp , casbin .ActionUpdate , rbacObjectForCurrentProject2 )
595- rbacObjectForRequestedProject := handler .enforcerUtilHelm .GetHelmObjectByTeamIdAndClusterId (request .TeamId , installedApp .ClusterId , installedApp .Namespace , installedApp .AppName )
596- ok = handler .enforcer .Enforce (token , casbin .ResourceHelmApp , casbin .ActionUpdate , rbacObjectForRequestedProject )
597- if ! ok {
598- common .WriteJsonResp (w , fmt .Errorf ("unauthorized user" ), nil , http .StatusForbidden )
599- return
600+ if installedApp .IsVirtualEnvironment {
601+ rbacObjectForCurrentProject , _ := handler .enforcerUtilHelm .GetAppRBACNameByInstalledAppId (request .InstalledAppId )
602+ ok := handler .enforcer .Enforce (token , casbin .ResourceHelmApp , casbin .ActionUpdate , rbacObjectForCurrentProject )
603+ rbacObjectForRequestedProject := handler .enforcerUtilHelm .GetAppRBACNameByInstalledAppIdAndTeamId (request .InstalledAppId , request .TeamId )
604+ ok = handler .enforcer .Enforce (token , casbin .ResourceHelmApp , casbin .ActionUpdate , rbacObjectForRequestedProject )
605+ if ! ok {
606+ common .WriteJsonResp (w , fmt .Errorf ("unauthorized user" ), nil , http .StatusForbidden )
607+ return
608+ }
609+ } else {
610+ rbacObjectForCurrentProject , rbacObjectForCurrentProject2 := handler .enforcerUtilHelm .GetHelmObjectByClusterIdNamespaceAndAppName (installedApp .ClusterId , installedApp .Namespace , installedApp .AppName )
611+ ok := handler .enforcer .Enforce (token , casbin .ResourceHelmApp , casbin .ActionUpdate , rbacObjectForCurrentProject ) || handler .enforcer .Enforce (token , casbin .ResourceHelmApp , casbin .ActionUpdate , rbacObjectForCurrentProject2 )
612+ rbacObjectForRequestedProject := handler .enforcerUtilHelm .GetHelmObjectByTeamIdAndClusterId (request .TeamId , installedApp .ClusterId , installedApp .Namespace , installedApp .AppName )
613+ ok = handler .enforcer .Enforce (token , casbin .ResourceHelmApp , casbin .ActionUpdate , rbacObjectForRequestedProject )
614+ if ! ok {
615+ common .WriteJsonResp (w , fmt .Errorf ("unauthorized user" ), nil , http .StatusForbidden )
616+ return
617+ }
600618 }
601619 }
602620 err = handler .appStoreDeploymentService .UpdateProjectHelmApp (& request )
0 commit comments