Merge remote-tracking branch 'couchbase/unstable' into HEAD

http: //ci-eventing.northscale.in/eventing-11.11.2021-01.13.pass.html Change-Id: I5217cd52a75abe8f7f50b9adb868ded797880166
couchbase · Nov 11, 2021 · 913a484 · 913a484
2 parents d7edd12 + 2fc8a75
commit 913a484
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/rbac/rbac.go b/rbac/rbac.go
@@ -34,12 +34,14 @@ const (
 	EventingManagePermission = "cluster.eventing.functions!manage"
 	EventingPermissionStats  = "cluster.admin.internal.stats!read"
 	ClusterPermissionRead    = "cluster.admin.security!read"
+	EventingAnyPermission    = "cluster.collection[.:.:].eventing.function!manage"
 )
 
 var (
-	EventingPermissionManage = []string{EventingManagePermission}
-	EventingReadPermissions  = []string{EventingManagePermission, ClusterPermissionRead}
-	EventingStatsPermission  = []string{EventingPermissionStats}
+	EventingPermissionManage         = []string{EventingManagePermission}
+	EventingReadPermissions          = []string{EventingManagePermission, ClusterPermissionRead}
+	EventingStatsPermission          = []string{EventingPermissionStats}
+	EventingAnyManageReadPermissions = []string{EventingManagePermission, ClusterPermissionRead, EventingAnyPermission}
 )
 
 func GetPermissions(keySpace *common.Keyspace, perm Permission) (perms []string) {

diff --git a/service_manager/http_handlers.go b/service_manager/http_handlers.go
@@ -2683,7 +2683,7 @@ func (m *ServiceMgr) configHandler(w http.ResponseWriter, r *http.Request) {
 	logPrefix := "ServiceMgr::configHandler"
 
 	w.Header().Set("Content-Type", "application/json")
-	if !rbac.ValidateAuthForOp(w, r, rbac.EventingReadPermissions, rbac.EventingPermissionManage, false) {
+	if !rbac.ValidateAuthForOp(w, r, rbac.EventingAnyManageReadPermissions, rbac.EventingPermissionManage, false) {
 		return
 	}
 

diff --git a/ui/eventing-ui/ui-current/eventing.js b/ui/eventing-ui/ui-current/eventing.js
@@ -977,16 +977,21 @@ angular.module('eventing', [
       self.saveSettings = function(closeDialog) {
         ApplicationService.public.updateConfig({
           enable_debugger: self.enableDebugger
+        }).then(function(response) {
+          if ($stateParams.appName) {
+            let app = ApplicationService.local.getAppByName($stateParams
+              .appName);
+            $rootScope.debugDisable = !(app.settings.deployment_status && app
+              .settings.processing_status) || !self.enableDebugger;
+            closeDialog('ok');
+          } else {
+            closeDialog('ok');
+          }
+       }).catch(function(errResponse) {
+         ApplicationService.server.showErrorAlert("Error in storing config changes: " +
+             JSON.stringify(errResponse.data));
+         closeDialog('error');
         });
-        if ($stateParams.appName) {
-          let app = ApplicationService.local.getAppByName($stateParams
-            .appName);
-          $rootScope.debugDisable = !(app.settings.deployment_status && app
-            .settings.processing_status) || !self.enableDebugger;
-          closeDialog('ok');
-        } else {
-          closeDialog('ok');
-        }
       };
     }
   ])