Renamed all server routes

init.js

@@ -17,6 +17,7 @@ import { WazuhApiElasticRoutes } from './server/routes/wazuh-api-elastic';
 import { Monitoring } from './server/monitoring';
 import { WazuhApiRoutes } from './server/routes/wazuh-api';
 import { WazuhReportingRoutes } from './server/routes/wazuh-reporting';
+import { WazuhUtilsRoutes } from './server/routes/wazuh-utils';
 
 export function initApp(server) {
   Initialize(server);
@@ -25,4 +26,5 @@ export function initApp(server) {
   Monitoring(server, false);
   WazuhApiRoutes(server);
   WazuhReportingRoutes(server);
+  WazuhUtilsRoutes(server);
 }

public/controllers/agent/agents-preview.js

@@ -127,12 +127,12 @@ class AgentsPreviewController {
       const data = await Promise.all([
         this.genericReq.request(
           'GET',
-          '/api/wazuh-api/agents-unique/' + api,
+          '/api/agents-unique/' + api,
           {}
         ),
         this.genericReq.request(
           'GET',
-          `/api/wazuh-elastic/top/${firstUrlParam}/${secondUrlParam}/agent.name/${pattern}`
+          `/elastic/top/${firstUrlParam}/${secondUrlParam}/agent.name/${pattern}`
         )
       ]);
       const [agentsUnique, agentsTop] = data;
@@ -158,7 +158,7 @@ class AgentsPreviewController {
         this.$scope.mostActiveAgent.name = agentsTop.data.data;
         const info = await this.genericReq.request(
           'GET',
-          `/api/wazuh-elastic/top/${firstUrlParam}/${secondUrlParam}/agent.id/${pattern}`
+          `/elastic/top/${firstUrlParam}/${secondUrlParam}/agent.id/${pattern}`
         );
         if (info.data.data === '' && this.$scope.mostActiveAgent.name !== '') {
           this.$scope.mostActiveAgent.id = '000';

public/controllers/management/monitoring.js

@@ -248,7 +248,7 @@ app.controller('clusterController', function(
 
       const visData = await genericReq.request(
         'POST',
-        `/api/wazuh-elastic/create-vis/cluster-monitoring/${appState.getCurrentPattern()}`,
+        `/elastic/visualizations/cluster-monitoring/${appState.getCurrentPattern()}`,
         { nodes }
       );
 

public/controllers/misc/health-check.js

@@ -74,7 +74,7 @@ class HealthCheck {
         const i = this.$scope.results.map(item => item.id).indexOf(2);
         const patternData = await this.genericReq.request(
           'GET',
-          `/api/wazuh-elastic/pattern/${patternTitle}`
+          `/elastic/index-patterns/${patternTitle}`
         );
         if (!patternData.data.status) {
           this.$scope.errors.push('The selected index-pattern is not present.');
@@ -89,7 +89,7 @@ class HealthCheck {
         const i = this.$scope.results.map(item => item.id).indexOf(3);
         const templateData = await this.genericReq.request(
           'GET',
-          `/api/wazuh-elastic/template/${patternTitle}`
+          `/elastic/template/${patternTitle}`
         );
         if (!templateData.data.status) {
           this.$scope.errors.push(
@@ -136,7 +136,7 @@ class HealthCheck {
             const apiVersion = versionData.data.data;
             const setupData = await this.genericReq.request(
               'GET',
-              '/api/wazuh-elastic/setup'
+              '/elastic/setup'
             );
             if (!setupData.data.data['app-version'] || !apiVersion) {
               this.errorHandler.handle(

public/controllers/misc/reporting.js

@@ -49,7 +49,7 @@ class ReportingController {
       this.$scope.loading = true;
       await this.genericReq.request(
         'DELETE',
-        '/api/wazuh-reporting/report/' + name,
+        '/reports/' + name,
         {}
       );
       await this.load();
@@ -110,7 +110,7 @@ class ReportingController {
       this.$scope.loading = true;
       const data = await this.genericReq.request(
         'GET',
-        '/api/wazuh-reporting/reports',
+        '/reports',
         {}
       );
       this.items = data.data.list;

public/controllers/settings/index.js

@@ -82,7 +82,7 @@ app.controller('settingsController', function(
       }
       await genericReq.request(
         'DELETE',
-        `/api/wazuh-api/apiEntries/${$scope.apiEntries[index]._id}`
+        `/elastic/apis/${$scope.apiEntries[index]._id}`
       );
       $scope.showEditForm[$scope.apiEntries[index]._id] = false;
       $scope.apiEntries.splice(index, 1);
@@ -166,7 +166,7 @@ app.controller('settingsController', function(
   // Get settings function
   const getSettings = async () => {
     try {
-      const patternList = await genericReq.request('GET', '/get-list', {});
+      const patternList = await genericReq.request('GET', '/elastic/index-patterns', {});
       $scope.indexPatterns = patternList.data.data;
 
       if (!patternList.data.data.length) {
@@ -175,7 +175,7 @@ app.controller('settingsController', function(
         $location.path('/blank-screen');
         return;
       }
-      const data = await genericReq.request('GET', '/api/wazuh-api/apiEntries');
+      const data = await genericReq.request('GET', '/elastic/apis');
       for (const entry of data.data) $scope.showEditForm[entry._id] = false;
 
       $scope.apiEntries = data.data.length > 0 ? data.data : [];
@@ -297,7 +297,7 @@ app.controller('settingsController', function(
       // Insert new API entry
       const data = await genericReq.request(
         'PUT',
-        '/api/wazuh-api/settings',
+        '/elastic/api',
         tmpData
       );
       appState.setExtensions(data.data.response._id, tmpData.extensions);
@@ -350,7 +350,7 @@ app.controller('settingsController', function(
       }
 
       try {
-        await genericReq.request('GET', '/api/wazuh-api/fetchAgents');
+        await genericReq.request('GET', '/api/monitoring');
       } catch (error) {
         if (error && error.status && error.status === -1) {
           errorHandler.handle(
@@ -412,7 +412,7 @@ app.controller('settingsController', function(
       tmpData.cluster_info = data.data;
       await genericReq.request(
         'PUT',
-        '/api/wazuh-api/update-settings',
+        '/elastic/api-settings',
         tmpData
       );
       $scope.apiEntries[index]._source.cluster_info = tmpData.cluster_info;
@@ -461,7 +461,7 @@ app.controller('settingsController', function(
       const data = await testAPI.check(tmpData);
       tmpData.cluster_info = data.data;
 
-      const tmpUrl = `/api/wazuh-api/updateApiHostname/${
+      const tmpUrl = `/elastic/api-hostname/${
         $scope.apiEntries[index]._id
       }`;
       await genericReq.request('PUT', tmpUrl, {
@@ -501,7 +501,7 @@ app.controller('settingsController', function(
   $scope.changeIndexPattern = async newIndexPattern => {
     try {
       appState.setCurrentPattern(newIndexPattern);
-      await genericReq.request('GET', `/refresh-fields/${newIndexPattern}`, {});
+      await genericReq.request('GET', `/elastic/known-fields/${newIndexPattern}`, {});
       $scope.$emit('updatePattern', {});
       errorHandler.info(
         'Successfully changed the default index-pattern',
@@ -528,7 +528,7 @@ app.controller('settingsController', function(
   const getAppLogs = async () => {
     try {
       $scope.loadingLogs = true;
-      const logs = await genericReq.request('GET', '/api/wazuh-api/logs', {});
+      const logs = await genericReq.request('GET', '/utils/logs', {});
       $scope.logs = logs.data.lastLogs.map(item => JSON.parse(item));
       $scope.loadingLogs = false;
       if (!$scope.$$phase) $scope.$digest();
@@ -545,7 +545,7 @@ app.controller('settingsController', function(
 
   const getAppInfo = async () => {
     try {
-      const data = await genericReq.request('GET', '/api/wazuh-elastic/setup');
+      const data = await genericReq.request('GET', '/elastic/setup');
       $scope.appInfo = {};
       $scope.appInfo['app-version'] = data.data.data['app-version'];
       $scope.appInfo['installationDate'] = data.data.data['installationDate'];

public/directives/wz-menu/wz-menu.js

@@ -62,7 +62,7 @@ class WzMenu {
         let filtered = false;
         // If there is no current pattern, fetch it
         if (!appState.getCurrentPattern()) {
-          const currentPattern = await genericReq.request('GET', '/get-list');
+          const currentPattern = await genericReq.request('GET', '/elastic/index-patterns');
           if (!currentPattern.data.data.length) {
             wzMisc.setBlankScr('Sorry but no valid index patterns were found');
             $location.search('tab', null);
@@ -72,7 +72,7 @@ class WzMenu {
           appState.setCurrentPattern(currentPattern.data.data[0].id);
         } else {
           // If there is current pattern, check if there is some pattern
-          const patternList = await genericReq.request('GET', '/get-list');
+          const patternList = await genericReq.request('GET', '/elastic/index-patterns');
 
           if (!patternList.data.data.length) {
             wzMisc.setBlankScr('Sorry but no valid index patterns were found');

public/services/api-request.js

@@ -31,7 +31,7 @@ export class ApiRequest {
 
       const data = await this.genericReq.request(
         'POST',
-        '/api/wazuh-api/request',
+        '/api/request',
         requestData
       );
 

public/services/api-tester.js

@@ -45,7 +45,7 @@ export class ApiTester {
         /** End of checks for outdated cookies */
       } else {
         const result = await this.$http.post(
-          chrome.addBasePath('/api/wazuh-api/checkStoredAPI'),
+          chrome.addBasePath('/api/check-stored-api'),
           data,
           headers
         );
@@ -74,7 +74,7 @@ export class ApiTester {
         timeout: timeout || 8000
       };
 
-      const url = chrome.addBasePath('/api/wazuh-api/checkAPI');
+      const url = chrome.addBasePath('/api/check-api');
       const response = await this.$http.post(url, data, headers);
 
       if (response.error) {

public/services/common-data.js

@@ -145,7 +145,7 @@ export class CommonData {
       const gdprTabs = [];
       const data = await this.genericReq.request(
         'GET',
-        '/api/wazuh-api/gdpr/all'
+        '/api/gdpr/all'
       );
       if (!data.data) return [];
       for (const key in data.data) {
@@ -162,7 +162,7 @@ export class CommonData {
       const pciTabs = [];
       const data = await this.genericReq.request(
         'GET',
-        '/api/wazuh-api/pci/all'
+        '/api/pci/all'
       );
       if (!data.data) return [];
       for (const key in data.data) {

public/services/csv-request.js

@@ -19,7 +19,7 @@ export class CSVRequest {
   }
 
   /**
-   * It fetchs data from /api/wazuh-api/csv route using the below parameters.
+   * It fetchs data from /api/csv route using the below parameters.
    * @param {string} path Wazuh API route
    * @param {number|string} id Elasticsearch document ID
    * @param {*} filters Array of Wazuh API filters. Optional
@@ -28,7 +28,7 @@ export class CSVRequest {
     try {
       const output = await this.genericReq.request(
         'POST',
-        '/api/wazuh-api/csv',
+        '/api/csv',
         { path, id, filters }
       );
       return output.data;

public/services/pattern-handler.js

@@ -20,7 +20,7 @@ export class PatternHandler {
 
   async getPatternList() {
     try {
-      const patternList = await this.genericReq.request('GET', '/get-list', {});
+      const patternList = await this.genericReq.request('GET', '/elastic/index-patterns', {});
 
       if (!patternList.data.data.length) {
         this.wzMisc.setBlankScr('Sorry but no valid index patterns were found');
@@ -49,7 +49,7 @@ export class PatternHandler {
       this.appState.setCurrentPattern(selectedPattern);
       await this.genericReq.request(
         'GET',
-        `/refresh-fields/${selectedPattern}`,
+        `/elastic/known-fields/${selectedPattern}`,
         {}
       );
       return this.appState.getCurrentPattern();

public/services/reporting.js

@@ -72,7 +72,7 @@ export class ReportingService {
 
       await this.genericReq.request(
         'POST',
-        '/api/wazuh-reporting/report',
+        '/reports',
         data
       );
 

public/services/resolves/check-ram.js

@@ -11,7 +11,7 @@
  */
 export async function totalRAM(genericReq, errorHandler) {
   try {
-    const data = await genericReq.request('GET', '/api/wazuh-api/ram');
+    const data = await genericReq.request('GET', '/utils/memory');
     const totalRAM = data.data.ram;
     if (totalRAM < 3072 && totalRAM > 2048) {
       errorHandler.handle(

public/services/resolves/check-timestamp.js

@@ -13,7 +13,7 @@ export async function checkTimestamp(appState, genericReq, $location, wzMisc) {
   try {
     const data = await genericReq.request(
       'GET',
-      '/api/wazuh-elastic/timestamp'
+      '/elastic/timestamp'
     );
     const current = appState.getCreatedAt();
     if (data && data.data) {

public/services/resolves/get-config.js

@@ -41,7 +41,7 @@ export async function getWzConfig($q, genericReq, errorHandler, wazuhConfig) {
   try {
     const config = await genericReq.request(
       'GET',
-      '/api/wazuh-api/configuration',
+      '/utils/configuration',
       {}
     );
 

public/services/resolves/get-ip.js

@@ -39,7 +39,7 @@ export function getIp(
 
       const { savedObjects } = savedObjectsData;
 
-      const data = await genericReq.request('GET', '/get-list');
+      const data = await genericReq.request('GET', '/elastic/index-patterns');
 
       let currentPattern = '';
 

public/services/resolves/settings-wizard.js

@@ -183,7 +183,7 @@ export function settingsWizard(
       // There's no cookie for current API
       if (!appState.getCurrentAPI()) {
         genericReq
-          .request('GET', '/api/wazuh-api/apiEntries')
+          .request('GET', '/elastic/apis')
           .then(data => {
             if (data.data.length > 0) {
               const apiEntries = data.data;

public/services/vis-factory-handler.js

@@ -48,7 +48,7 @@ export class VisFactoryService {
     try {
       const data = await this.genericReq.request(
         'GET',
-        `/api/wazuh-elastic/create-vis/overview-${tab}/${this.appState.getCurrentPattern()}`
+        `/elastic/visualizations/overview-${tab}/${this.appState.getCurrentPattern()}`
       );
       this.rawVisualizations.assignItems(data.data.raw);
       this.commonData.assignFilters(filterHandler, tab, localChange);
@@ -64,7 +64,7 @@ export class VisFactoryService {
     try {
       const data = await this.genericReq.request(
         'GET',
-        `/api/wazuh-elastic/create-vis/agents-${tab}/${this.appState.getCurrentPattern()}`
+        `/elastic/visualizations/agents-${tab}/${this.appState.getCurrentPattern()}`
       );
       this.rawVisualizations.assignItems(data.data.raw);
       this.commonData.assignFilters(filterHandler, tab, localChange, id);

public/templates/management/reporting.html

@@ -47,7 +47,7 @@
                                 <td>{{item.size / 1024 | number: 2}}KB</td>
                                 <td>{{item.date.split('T')[0]}} {{item.date.split('T')[1].split('.')[0]}}</td>
                                 <td>
-                                    <a ng-href="/api/wazuh-reporting/report/{{item.name}}" flex class="wz-text-right" target="_blank">
+                                    <a ng-href="/reports/{{item.name}}" flex class="wz-text-right" target="_blank">
                                         <i class="fa fa-fw fa-download"></i>
                                     </a>
                                     <a flex class="wz-text-right cursor-pointer" ng-click="deleteReport(item.name)">

server/controllers/index.js

@@ -13,10 +13,12 @@ import { WazuhElasticCtrl } from './wazuh-elastic';
 import { WazuhApiElasticCtrl } from './wazuh-api-elastic';
 import { WazuhApiCtrl } from './wazuh-api';
 import { WazuhReportingCtrl } from './wazuh-reporting';
+import { WazuhUtilsCtrl } from './wazuh-utils';
 
 export {
   WazuhElasticCtrl,
   WazuhApiElasticCtrl,
   WazuhApiCtrl,
-  WazuhReportingCtrl
+  WazuhReportingCtrl,
+  WazuhUtilsCtrl
 };