Merge pull request #448 from wazuh/3.8-about-info

Added app info to settings about section
wazuh · Jan 9, 2019 · c5f5fb9 · c5f5fb9
2 parents dd6f86c + 80720fe
commit c5f5fb9
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 3 deletions.
diff --git a/SplunkAppForWazuh/appserver/controllers/manager.py b/SplunkAppForWazuh/appserver/controllers/manager.py
@@ -144,6 +144,30 @@ def extensions(self, **kwargs):
             return json.dumps({'error': str(e)})
         return data_temp
 
+    @expose_page(must_login=False, methods=['GET'])
+    def app_info(self, **kwargs):
+        """Obtain app information from file.
+
+        Parameters
+        ----------
+        kwargs : dict
+            The request's parameters
+
+        """
+        try:
+            stanza = cli.getConfStanza(
+                'package',
+                'app')
+            data_temp = stanza
+            stanza = cli.getConfStanza(
+                'package',
+                'splunk')
+            data_temp['splunk_version'] = stanza['version']
+            parsed_data = json.dumps(data_temp)
+        except Exception as e:
+            return json.dumps({'error': str(e)})
+        return parsed_data
+
     @expose_page(must_login=False, methods=['GET'])
     def get_api(self, **kwargs):
         """Obtain Wazuh API from DB.

diff --git a/SplunkAppForWazuh/appserver/static/js/config/routes/settings-states.js b/SplunkAppForWazuh/appserver/static/js/config/routes/settings-states.js
@@ -24,6 +24,23 @@ define(['../module'], function(module) {
             '/static/app/SplunkAppForWazuh/js/controllers/settings/about/about.html',
           onEnter: $navigationService => {
             $navigationService.storeRoute('settings.about')
+          },
+          controller: 'aboutCtrl',
+          resolve: {
+            appInfo: [
+              '$requestService',
+              async ($requestService, $state) => {
+                try {
+                  const result = await $requestService.httpReq(
+                    'GET',
+                    '/manager/app_info'
+                  )
+                  return result.data
+                } catch (error) {
+                  $state.go('settings.api')
+                }
+              }
+            ]
           }
         })
         // settings -> api

diff --git a/SplunkAppForWazuh/appserver/static/js/controllers/settings/about/about.html b/SplunkAppForWazuh/appserver/static/js/controllers/settings/about/about.html
@@ -1,9 +1,24 @@
 <!-- About card section -->
+<br><i class="fa fa-fw fa-info-circle wz-margin-left-5" aria-hidden="true"></i><span class="wz-headline-title">Welcome to the Splunk app for Wazuh</span>
+<div layout="row">
+  <md-card flex class="wz-metric-color wz-md-card">
+    <md-card-content layout="row" class="wz-padding-metric">
+      <div class="wz-text-truncatable" flex>App version:
+        <span class="wz-text-bold" ng-bind="appInfo.version"></span>
+      </div>
+      <div class="wz-text-truncatable" flex>App revision:
+        <span class="wz-text-bold" ng-bind="appInfo.revision"></span>
+      </div>
+      <div class="wz-text-truncatable" flex>Splunk version:
+        <span class="wz-text-bold" ng-bind="appInfo.splunk_version"></span>
+      </div>
+    </md-card-content>
+  </md-card>
+</div>
+
 <div layout="row" layout-align="start start">
   <md-card flex class="wz-md-card">
     <md-card-content>
-      <i class="fa fa-fw fa-info-circle" aria-hidden="true"></i>
-      <span class="wz-headline-title">Welcome to the Splunk app for Wazuh</span>
       <md-divider class="wz-margin-top-10"></md-divider>
       <div layout="column" class="wz-padding-top-10">
         <div layout-padding>

diff --git a/SplunkAppForWazuh/appserver/static/js/controllers/settings/about/aboutCtrl.js b/SplunkAppForWazuh/appserver/static/js/controllers/settings/about/aboutCtrl.js
@@ -0,0 +1,16 @@
+define(['../../module'], function (controllers) {
+  'use strict'
+
+  class About {
+    constructor($scope, appInfo) {
+      this.scope = $scope
+      this.appInfo = appInfo
+    }
+
+    $onInit() {
+      this.scope.appInfo = this.appInfo
+    }
+
+  }
+  controllers.controller('aboutCtrl', About)
+})
diff --git a/SplunkAppForWazuh/appserver/static/js/controllers/settings/index.js b/SplunkAppForWazuh/appserver/static/js/controllers/settings/index.js
@@ -3,5 +3,6 @@ define([
   './index/settingsIndexCtrl',
   './api/settingsApiCtrl',
   './extensions/extensionsCtrl',
-  './logs/logsCtrl'
+  './logs/logsCtrl',
+  './about/aboutCtrl'
 ], function() {})