Better checking for admin mode (#737)

wazuh · Jun 11, 2019 · becb0bc · becb0bc
1 parent da8a8a5
commit becb0bc
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 58 deletions.
diff --git a/SplunkAppForWazuh/appserver/static/js/config/routes/management-states.js b/SplunkAppForWazuh/appserver/static/js/config/routes/management-states.js
@@ -1,10 +1,18 @@
-define(['../module'], function(module) {
+define(['../module'], function (module) {
   'use strict'
 
+  const checkAdmin = async $currentDataService => {
+    try {
+      return await $currentDataService.isAdmin()
+    } catch (error) {
+      return false
+    }
+  }
+
   module.config([
     '$stateProvider',
     'BASE_URL',
-    function($stateProvider, BASE_URL) {
+    function ($stateProvider, BASE_URL) {
       $stateProvider
         // Manager
         .state('manager', {
@@ -84,13 +92,7 @@ define(['../module'], function(module) {
           resolve: {
             isAdmin: [
               '$currentDataService',
-              async $currentDataService => {
-                try {
-                  return await $currentDataService.isAdmin()
-                } catch (error) {
-                  return false
-                }
-              }
+              async $currentDataService => { return await checkAdmin($currentDataService) }
             ]
           }
         })
@@ -129,6 +131,10 @@ define(['../module'], function(module) {
                   return false
                 }
               }
+            ],
+            isAdmin: [
+              '$currentDataService',
+              async $currentDataService => { return await checkAdmin($currentDataService) }
             ]
           }
         })
@@ -145,13 +151,7 @@ define(['../module'], function(module) {
           resolve: {
             isAdmin: [
               '$currentDataService',
-              async $currentDataService => {
-                try {
-                  return await $currentDataService.isAdmin()
-                } catch (error) {
-                  return false
-                }
-              }
+              async $currentDataService => { return await checkAdmin($currentDataService) }
             ]
           }
         })
@@ -190,6 +190,10 @@ define(['../module'], function(module) {
                   return false
                 }
               }
+            ],
+            isAdmin: [
+              '$currentDataService',
+              async $currentDataService => { return await checkAdmin($currentDataService) }
             ]
           }
         })
@@ -207,13 +211,7 @@ define(['../module'], function(module) {
           resolve: {
             isAdmin: [
               '$currentDataService',
-              async $currentDataService => {
-                try {
-                  return await $currentDataService.isAdmin()
-                } catch (error) {
-                  return false
-                }
-              }
+              async $currentDataService => { return await checkAdmin($currentDataService) }
             ]
           }
         })
@@ -231,13 +229,7 @@ define(['../module'], function(module) {
           resolve: {
             isAdmin: [
               '$currentDataService',
-              async $currentDataService => {
-                try {
-                  return await $currentDataService.isAdmin()
-                } catch (error) {
-                  return false
-                }
-              }
+              async $currentDataService => { return await checkAdmin($currentDataService) }
             ],
             cdbInfo: [
               '$cdbEditor',
@@ -282,6 +274,10 @@ define(['../module'], function(module) {
                   return false
                 }
               }
+            ],
+            isAdmin: [
+              '$currentDataService',
+              async $currentDataService => { return await checkAdmin($currentDataService) }
             ]
           }
         })
@@ -298,13 +294,7 @@ define(['../module'], function(module) {
           resolve: {
             isAdmin: [
               '$currentDataService',
-              async $currentDataService => {
-                try {
-                  return await $currentDataService.isAdmin()
-                } catch (error) {
-                  return false
-                }
-              }
+              async $currentDataService => { return await checkAdmin($currentDataService) }
             ],
             clusterInfo: [
               '$requestService',
@@ -350,13 +340,7 @@ define(['../module'], function(module) {
           resolve: {
             isAdmin: [
               '$currentDataService',
-              async $currentDataService => {
-                try {
-                  return await $currentDataService.isAdmin()
-                } catch (error) {
-                  return false
-                }
-              }
+              async $currentDataService => { return await checkAdmin($currentDataService) }
             ],
             clusterInfo: [
               '$requestService',
@@ -402,13 +386,7 @@ define(['../module'], function(module) {
           resolve: {
             isAdmin: [
               '$currentDataService',
-              async $currentDataService => {
-                try {
-                  return await $currentDataService.isAdmin()
-                } catch (error) {
-                  return false
-                }
-              }
+              async $currentDataService => { return await checkAdmin($currentDataService) }
             ],
             statusData: [
               '$requestService',

diff --git a/...kAppForWazuh/appserver/static/js/controllers/management/decoders/managerDecodersIdCtrl.js b/...kAppForWazuh/appserver/static/js/controllers/management/decoders/managerDecodersIdCtrl.js
@@ -25,7 +25,8 @@ define(['../../module', '../rules/ruleset'], function(controllers, Ruleset) {
       extensions,
       $fileEditor,
       $restartService,
-      $requestService
+      $requestService,
+      isAdmin
     ) {
       super(
         $scope,
@@ -43,6 +44,7 @@ define(['../../module', '../rules/ruleset'], function(controllers, Ruleset) {
       this.restartService = $restartService
       this.requestService = $requestService
       this.currentDecoder = currentDecoder
+      this.scope.adminMode = isAdmin
     }
 
     /**
@@ -59,7 +61,6 @@ define(['../../module', '../rules/ruleset'], function(controllers, Ruleset) {
         this.scope.downloadCsv = (path, name) => this.downloadCsv(path, name)
         this.scope.addDetailFilter = (name, value) =>
           this.addDetailFilter(name, value)
-        this.scope.adminMode = this.extensions['admin'] === 'true'
         this.scope.isLocal = this.scope.currentDecoder.path === 'etc/decoders'
         this.scope.saveDecoderConfig = fileName =>
           this.saveDecoderConfig(fileName)

diff --git a/SplunkAppForWazuh/appserver/static/js/controllers/management/groups/groupsCtrl.js b/SplunkAppForWazuh/appserver/static/js/controllers/management/groups/groupsCtrl.js
@@ -24,7 +24,8 @@ define(['../../module', 'FileSaver'], function(controllers) {
       $beautifierJson,
       $notificationService,
       $groupHandler,
-      extensions
+      extensions,
+      isAdmin
     ) {
       this.scope = $scope
       this.state = $state
@@ -60,6 +61,7 @@ define(['../../module', 'FileSaver'], function(controllers) {
         }
       })
       this.extensions = extensions
+      this.scope.adminMode = isAdmin
       this.scope.addingGroup = false
       this.scope.addingAgents = false
       this.scope.$on('groupsIsReloaded', () => {
@@ -230,8 +232,6 @@ define(['../../module', 'FileSaver'], function(controllers) {
         this.scope.saveGroupAgentConfig = content =>
           this.saveGroupAgentConfig(content)
 
-        this.scope.adminMode = this.extensions['admin'] === 'true'
-
         this.scope.$applyAsync()
       } catch (err) {
         console.error('err ', err)

diff --git a/SplunkAppForWazuh/appserver/static/js/controllers/management/rules/managerRulesetIdCtrl.js b/SplunkAppForWazuh/appserver/static/js/controllers/management/rules/managerRulesetIdCtrl.js
@@ -26,7 +26,8 @@ define(['../../module', './ruleset'], function(controllers, Ruleset) {
       extensions,
       $fileEditor,
       $restartService,
-      $requestService
+      $requestService, 
+      isAdmin
     ) {
       super(
         $scope,
@@ -43,6 +44,7 @@ define(['../../module', './ruleset'], function(controllers, Ruleset) {
       this.fileEditor = $fileEditor
       this.restartService = $restartService
       this.requestService = $requestService
+      this.scope.adminMode = isAdmin
       try {
         this.filters = JSON.parse(window.localStorage.ruleset) || []
       } catch (err) {
@@ -72,7 +74,6 @@ define(['../../module', './ruleset'], function(controllers, Ruleset) {
       this.scope.downloadCsv = (path, name) => this.downloadCsv(path, name)
       this.scope.addDetailFilter = (name, value) =>
         this.addDetailFilter(name, value)
-      this.scope.adminMode = this.extensions['admin'] === 'true'
       this.scope.isLocal = this.scope.ruleInfo.path === 'etc/rules'
       this.scope.saveRuleConfig = fileName => this.saveRuleConfig(fileName)
       this.scope.closeEditingFile = () => this.closeEditingFile()