Merge pull request #2781 from wazuh/4.0-7.10-organize-backend

4.0-7.10 Backend organization
wazuh · Jan 14, 2021 · b218bce · b218bce
2 parents 8527fc6 + 05e70b2
commit b218bce
Show file tree

Hide file tree

Showing 192 changed files with 4,973 additions and 13,212 deletions.
diff --git a/.kibana-plugin-helpers.bak.json b/.kibana-plugin-helpers.bak.json
@@ -7,6 +7,6 @@
       "init.js",
       "server/**/*",
       "public/**/*",
-      "util/**/*"
+      "common/**/*"
     ]
 }
diff --git a/...er/integration-files/gdpr-requirements.js → ...pliance-requirements/gdpr-requirements.ts b/...er/integration-files/gdpr-requirements.js → ...pliance-requirements/gdpr-requirements.ts
diff --git a/...r/integration-files/hipaa-requirements.js → ...liance-requirements/hipaa-requirements.ts b/...r/integration-files/hipaa-requirements.js → ...liance-requirements/hipaa-requirements.ts
diff --git a/...er/integration-files/nist-requirements.js → ...pliance-requirements/nist-requirements.ts b/...er/integration-files/nist-requirements.js → ...pliance-requirements/nist-requirements.ts
diff --git a/server/integration-files/pci-requirements.js → ...mpliance-requirements/pci-requirements.ts b/server/integration-files/pci-requirements.js → ...mpliance-requirements/pci-requirements.ts
diff --git a/server/integration-files/tsc-requirements.js → ...mpliance-requirements/tsc-requirements.ts b/server/integration-files/tsc-requirements.js → ...mpliance-requirements/tsc-requirements.ts
diff --git a/util/constants.ts → common/constants.ts b/util/constants.ts → common/constants.ts
diff --git a/util/csv-key-equivalence.ts → common/csv-key-equivalence.ts b/util/csv-key-equivalence.ts → common/csv-key-equivalence.ts
diff --git a/server/reporting/tab-description.old.js → common/wazuh-modules.ts b/server/reporting/tab-description.old.js → common/wazuh-modules.ts
@@ -9,7 +9,7 @@
  *
  * Find more information about this on the LICENSE file.
  */
-export const TabDescription = {
+export const WAZUH_MODULES = {
   general: {
     title: 'Security events',
     description:

diff --git a/public/components/add-modules-data/WzSampleDataWrapper.js b/public/components/add-modules-data/WzSampleDataWrapper.js
@@ -27,7 +27,7 @@ import WzReduxProvider from '../../redux/wz-redux-provider';
 import { withUserAuthorizationPrompt } from '../../components/common/hocs/withUserAuthorization';
 import store from '../../redux/store';
 import { updateSelectedSettingsSection } from '../../redux/actions/appStateActions';
-import { WAZUH_ROLE_ADMINISTRATOR_NAME } from '../../../util/constants';
+import { WAZUH_ROLE_ADMINISTRATOR_NAME } from '../../../common/constants';
 
 export class WzSampleDataProvider extends Component {
   constructor(props) {

diff --git a/public/components/add-modules-data/add-modules-data-main.tsx b/public/components/add-modules-data/add-modules-data-main.tsx
@@ -31,7 +31,7 @@ import WzModuleGuide from './module-guide';
 import WzSampleData from './sample-data';
 import modeGuides from './guides';
 
-import { TabDescription } from '../../../server/reporting/tab-description';
+import { WAZUH_MODULES } from '../../../common/wazuh-modules';
 import { updateGlobalBreadcrumb } from '../../redux/actions/globalBreadcrumbActions';
 import store from '../../redux/store';
 
@@ -70,7 +70,7 @@ export default class WzAddModulesData extends Component<IPropsWzAddModulesData,
 		// 								layout='horizontal'
 		// 								icon={(<EuiIcon size='xl' type={extension.icon} />) }
 		// 								title={extension.name}
-		// 								description={(TabDescription[extension.id] && TabDescription[extension.id].description) || extension.description}
+		// 								description={(WAZUH_MODULES[extension.id] && WAZUH_MODULES[extension.id].description) || extension.description}
 		// 								onClick={() => this.changeGuide(extension.id) }
 		// 							/>
 		// 						</EuiFlexItem>

diff --git a/public/components/add-modules-data/sample-data.tsx b/public/components/add-modules-data/sample-data.tsx
@@ -29,7 +29,7 @@ import {
 import { getToasts } from '../../kibana-services';
 import { WzRequest } from '../../react-services/wz-request';
 import { AppState } from '../../react-services/app-state';
-import { WAZUH_ROLE_ADMINISTRATOR_NAME } from '../../../util/constants';
+import { WAZUH_ROLE_ADMINISTRATOR_NAME } from '../../../common/constants';
 
 export default class WzSampleData extends Component {
   categories: { title: string, description: string, image: string, categorySampleAlertsIndex: string }[]

diff --git a/public/components/agents/syscollector/components/syscollector-table.tsx b/public/components/agents/syscollector/components/syscollector-table.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { EuiPanel, EuiFlexGroup, EuiButtonEmpty, EuiFlexItem, EuiText, EuiLoadingSpinner, EuiFieldSearch, EuiHorizontalRule, EuiIcon, EuiBasicTable } from "@elastic/eui";
 import { useApiRequest } from '../../../common/hooks/useApiRequest';
-import { KeyEquivalence } from '../../../../../util/csv-key-equivalence';
+import { KeyEquivalence } from '../../../../../common/csv-key-equivalence';
 import { AppState } from '../../../../react-services/app-state';
 
 

diff --git a/public/components/common/modules/agents-current-section.tsx b/public/components/common/modules/agents-current-section.tsx
@@ -18,7 +18,7 @@ import { updateGlobalBreadcrumb } from '../../../redux/actions/globalBreadcrumbA
 import { updateCurrentTab } from '../../../redux/actions/appStateActions';
 import store from '../../../redux/store';
 import { connect } from 'react-redux';
-import { TabDescription } from '../../../../server/reporting/tab-description';
+import { WAZUH_MODULES } from '../../../../common/wazuh-modules';
 import { getAngularModule } from '../../../kibana-services';
 
 class WzCurrentAgentsSection extends Component {
@@ -29,7 +29,7 @@ class WzCurrentAgentsSection extends Component {
   }
 
   setGlobalBreadcrumb() {
-    if (TabDescription[this.props.currentTab]) {
+    if (WAZUH_MODULES[this.props.currentTab]) {
       const breadcrumb = [
         { text: '' },
         {
@@ -45,7 +45,7 @@ class WzCurrentAgentsSection extends Component {
           className: 'wz-global-breadcrumb-btn euiBreadcrumb--truncate',
           truncate: false,
         },
-        { text: TabDescription[this.props.currentTab].title },
+        { text: WAZUH_MODULES[this.props.currentTab].title },
       ];
       store.dispatch(updateGlobalBreadcrumb(breadcrumb));
     }
@@ -74,10 +74,10 @@ class WzCurrentAgentsSection extends Component {
   render() {
     return (
       <span>
-        {this.props.currentTab && TabDescription[this.props.currentTab] && TabDescription[this.props.currentTab].title && (
+        {this.props.currentTab && WAZUH_MODULES[this.props.currentTab] && WAZUH_MODULES[this.props.currentTab].title && (
           <EuiTitle size='s'>
             <h2>
-              {TabDescription[this.props.currentTab].title}
+              {WAZUH_MODULES[this.props.currentTab].title}
             </h2>
           </EuiTitle>)}
       </span>

diff --git a/public/components/common/modules/discover/discover.tsx b/public/components/common/modules/discover/discover.tsx
@@ -347,7 +347,7 @@ export const Discover = compose(
 
         const alerts = await GenericRequest.request(
           'POST',
-          `/elastic/esAlerts`,
+          `/elastic/alerts`,
           {
             index: AppState.getCurrentPattern(),
             body: newFilters

diff --git a/public/components/common/modules/discover/row-details.tsx b/public/components/common/modules/discover/row-details.tsx
@@ -368,6 +368,32 @@ export class RowDetails extends Component {
     );
   }
 
+  getValueAsString(value) {
+    if (value && typeof value === 'object' && value.constructor === Object) {
+      let list: any[] = [];
+      Object.keys(value).forEach((key, idx) => {
+        list.push(
+          <span key={key}>
+            {key}:&nbsp;
+            {value[key]}
+            {idx < Object.keys(value).length - 1 && ', '}
+            <br />
+          </span>
+        );
+      });
+      return (
+        <ul>
+          <li>
+            {list}
+          </li>
+        </ul>
+      );
+    } else {
+
+      return value.toString();
+    }
+  }
+
   getFormattedDetails(value) {
 
     if (Array.isArray(value) && value[0].type) {
@@ -382,9 +408,10 @@ export class RowDetails extends Component {
       })
       return <span>{name}: {link}</span>
     } else {
+      const _value = typeof value === 'string' ? value : this.getValueAsString(value);
       return (
         <WzTextWithTooltipTruncated position='top'>
-          {value}
+          {_value}
         </WzTextWithTooltipTruncated>
       );
     }

diff --git a/public/components/common/modules/main-agent.tsx b/public/components/common/modules/main-agent.tsx
@@ -30,7 +30,7 @@ import store from '../../../redux/store';
 import { FilterHandler } from '../../../utils/filter-handler';
 import { AppState } from '../../../react-services/app-state';
 import { ReportingService } from '../../../react-services/reporting';
-import { TabDescription } from '../../../../server/reporting/tab-description';
+import { WAZUH_MODULES } from '../../../../common/wazuh-modules';
 import { Events, Dashboard, Loader, Settings } from '../../common/modules';
 import WzReduxProvider from '../../../redux/wz-redux-provider';
 import { AgentInfo } from '../../common/welcome/agents-info';
@@ -90,7 +90,7 @@ export class MainModuleAgent extends Component {
         },
         { agent: this.props.agent },
         {
-          text: TabDescription[this.props.section].title,
+          text: WAZUH_MODULES[this.props.section].title,
           className: 'wz-global-breadcrumb-popover'
         },
       ];

diff --git a/public/components/common/modules/main-overview.tsx b/public/components/common/modules/main-overview.tsx
@@ -26,7 +26,7 @@ import { updateGlobalBreadcrumb } from '../../../redux/actions/globalBreadcrumbA
 import store from '../../../redux/store';
 import { ReportingService } from '../../../react-services/reporting';
 import { AppNavigate } from '../../../react-services/app-navigate';
-import { TabDescription } from '../../../../server/reporting/tab-description';
+import { WAZUH_MODULES } from '../../../../common/wazuh-modules';
 import { Events, Dashboard, Loader, Settings } from '../../common/modules';
 import OverviewActions from '../../../controllers/overview/components/overview-actions/overview-actions';
 import { MainFim } from '../../agents/fim';
@@ -55,7 +55,7 @@ export class MainModuleOverview extends Component {
 
   setGlobalBreadcrumb() {
     const currentAgent = store.getState().appStateReducers.currentAgentData;
-    if (TabDescription[this.props.currentTab]) {
+    if (WAZUH_MODULES[this.props.currentTab]) {
       let breadcrumb = [
         {
           text: '',
@@ -70,7 +70,7 @@ export class MainModuleOverview extends Component {
           href: "#/overview"
         },
         {
-          text: TabDescription[this.props.section].title
+          text: WAZUH_MODULES[this.props.section].title
         },
       ];
       store.dispatch(updateGlobalBreadcrumb(breadcrumb));
@@ -104,7 +104,7 @@ export class MainModuleOverview extends Component {
               <span style={{ display: 'inline-flex' }}>
                 <EuiTitle size="s">
                   <h1>
-                    <span>&nbsp;{TabDescription[this.props.section].title}&nbsp;&nbsp;</span>
+                    <span>&nbsp;{WAZUH_MODULES[this.props.section].title}&nbsp;&nbsp;</span>
                   </h1>
                 </EuiTitle>
                 <EuiPopover
@@ -122,7 +122,7 @@ export class MainModuleOverview extends Component {
                   closePopover={() => { this.setState({ isDescPopoverOpen: false }) }}>
                   <EuiPopoverTitle>Module description</EuiPopoverTitle>
                   <div style={{ width: '400px' }}>
-                    {TabDescription[this.props.section].description}
+                    {WAZUH_MODULES[this.props.section].description}
                   </div>
                 </EuiPopover>
               </span>

diff --git a/public/components/common/modules/overview-current-section.tsx b/public/components/common/modules/overview-current-section.tsx
@@ -20,7 +20,7 @@ import { updateGlobalBreadcrumb } from '../../../redux/actions/globalBreadcrumbA
 import { updateCurrentTab } from '../../../redux/actions/appStateActions';
 import store from '../../../redux/store';
 import { connect } from 'react-redux';
-import { TabDescription } from '../../../../server/reporting/tab-description';
+import { WAZUH_MODULES } from '../../../../common/wazuh-modules';
 import { AppNavigate } from '../../../react-services/app-navigate'
 
 class WzCurrentOverviewSection extends Component {
@@ -40,19 +40,19 @@ class WzCurrentOverviewSection extends Component {
   setGlobalBreadcrumb() {
     const currentAgent = store.getState().appStateReducers.currentAgentData;
 
-    if(TabDescription[this.props.currentTab]){
+    if(WAZUH_MODULES[this.props.currentTab]){
       const breadcrumb = currentAgent.id ? [
         { text: '' },
         { text: 'Modules', href: '/app/wazuh#/overview' },
         { agent: currentAgent },
-        { text: TabDescription[this.props.currentTab].title},
+        { text: WAZUH_MODULES[this.props.currentTab].title},
       ] :
       [
         { text: '' },
         { text: 'Modules', href: '/app/wazuh#/overview' },
 
 
-        { text: TabDescription[this.props.currentTab].title},
+        { text: WAZUH_MODULES[this.props.currentTab].title},
       ];
       store.dispatch(updateGlobalBreadcrumb(breadcrumb));
       $('#breadcrumbNoTitle').attr("title","");
@@ -80,10 +80,10 @@ class WzCurrentOverviewSection extends Component {
   render() {
     return (
       <span>
-      {/*this.props.currentTab && TabDescription[this.props.currentTab] && TabDescription[this.props.currentTab].title && (
+      {/*this.props.currentTab && WAZUH_MODULES[this.props.currentTab] && WAZUH_MODULES[this.props.currentTab].title && (
       <EuiTitle size='s'>
         <h2>
-          {TabDescription[this.props.currentTab].title}
+          {WAZUH_MODULES[this.props.currentTab].title}
        </h2>
       </EuiTitle>)*/}
         </span>

diff --git a/public/components/common/welcome/agents-welcome.js b/public/components/common/welcome/agents-welcome.js
@@ -37,7 +37,7 @@ import {
 } from '@elastic/eui';
 import { FimEventsTable, ScaScan, MitreTopTactics, RequirementVis } from './components';
 import { AgentInfo } from './agents-info';
-import { TabDescription } from '../../../../server/reporting/tab-description';
+import { WAZUH_MODULES } from '../../../../common/wazuh-modules';
 import store from '../../../redux/store';
 import { updateGlobalBreadcrumb } from '../../../redux/actions/globalBreadcrumbActions';
 import { ActionAgents } from '../../../react-services/action-agents';
@@ -346,9 +346,9 @@ export class AgentsWelcome extends Component {
           layout="horizontal"
           icon={<EuiIcon size="xl" type={icon} color="primary" />}
           className="homSynopsis__card"
-          title={TabDescription[tab].title}
+          title={WAZUH_MODULES[tab].title}
           onClick={() => this.props.switchTab(tab)}
-          description={TabDescription[tab].description}
+          description={WAZUH_MODULES[tab].description}
         />
       </EuiFlexItem>
     );

diff --git a/public/components/common/welcome/overview-welcome.js b/public/components/common/welcome/overview-welcome.js
@@ -30,7 +30,7 @@ import { updateGlobalBreadcrumb } from '../../../redux/actions/globalBreadcrumbA
 import { updateCurrentTab } from '../../../redux/actions/appStateActions';
 import store from '../../../redux/store';
 import './welcome.scss';
-import { TabDescription } from '../../../../server/reporting/tab-description';
+import { WAZUH_MODULES } from '../../../../common/wazuh-modules';
 
 export class OverviewWelcome extends Component {
   constructor(props) {
@@ -58,10 +58,10 @@ export class OverviewWelcome extends Component {
           layout="horizontal"
           icon={<EuiIcon size="xl" type={icon} color="primary" />}
           className="homSynopsis__card"
-          title={TabDescription[tab].title}
+          title={WAZUH_MODULES[tab].title}
           onClick={() => store.dispatch(updateCurrentTab(tab))}
           data-test-subj={`overviewWelcome${this.strtools.capitalize(tab)}`}
-          description={TabDescription[tab].description}
+          description={WAZUH_MODULES[tab].description}
         />
       </EuiFlexItem>
     );

diff --git a/public/components/health-check/health-check.tsx b/public/components/health-check/health-check.tsx
@@ -9,7 +9,7 @@ import { ApiCheck } from '../../react-services/wz-api-check';
 import { WzRequest } from '../../react-services/wz-request';
 import { SavedObject } from '../../react-services/saved-objects';
 import { ErrorHandler } from '../../react-services/error-handler';
-import { WAZUH_MONITORING_PATTERN } from '../../../util/constants';
+import { WAZUH_MONITORING_PATTERN } from '../../../common/constants';
 import { checkKibanaSettings, checkKibanaSettingsTimeFilter } from './lib';
 
 export class HealthCheck extends Component {

diff --git a/public/components/health-check/lib/check-time-filter.ts b/public/components/health-check/lib/check-time-filter.ts
@@ -1,6 +1,6 @@
 import { AxiosResponse } from 'axios';
 import { GenericRequest } from '../../../react-services';
-import { WAZUH_TIME_FILTER_DEFAULT } from '../../../../util/constants'
+import { WAZUH_TIME_FILTER_DEFAULT } from '../../../../common/constants'
 import { getDataPlugin } from '../../../kibana-services';
 
 type userValue<T> = { userValue: T }

diff --git a/public/components/overview/compliance-table/compliance-table.tsx b/public/components/overview/compliance-table/compliance-table.tsx
@@ -22,11 +22,11 @@ import { I18nProvider } from '@kbn/i18n/react';
 import { ComplianceRequirements } from './components/requirements';
 import { ComplianceSubrequirements } from './components/subrequirements';
 import { getElasticAlerts, getIndexPattern, IFilterParams } from '../mitre/lib';
-import { pciRequirementsFile } from '../../../../server/integration-files/pci-requirements';
-import { gdprRequirementsFile } from '../../../../server/integration-files/gdpr-requirements';
-import { hipaaRequirementsFile } from '../../../../server/integration-files/hipaa-requirements';
-import { nistRequirementsFile } from '../../../../server/integration-files/nist-requirements';
-import { tscRequirementsFile } from '../../../../server/integration-files/tsc-requirements';
+import { pciRequirementsFile } from '../../../../common/compliance-requirements/pci-requirements';
+import { gdprRequirementsFile } from '../../../../common/compliance-requirements/gdpr-requirements';
+import { hipaaRequirementsFile } from '../../../../common/compliance-requirements/hipaa-requirements';
+import { nistRequirementsFile } from '../../../../common/compliance-requirements/nist-requirements';
+import { tscRequirementsFile } from '../../../../common/compliance-requirements/tsc-requirements';
 import { KbnSearchBar } from '../../kbn-search-bar';
 import { getDataPlugin } from '../../../kibana-services';
 

diff --git a/public/components/overview/compliance-table/components/subrequirements/subrequirements.tsx b/public/components/overview/compliance-table/components/subrequirements/subrequirements.tsx
@@ -30,7 +30,7 @@ import {
 import { AppNavigate } from '../../../../../react-services/app-navigate';
 import { AppState } from '../../../../../react-services/app-state';
 import { RequirementFlyout } from '../requirement-flyout/requirement-flyout'
-import { WAZUH_ALERTS_PATTERN } from '../../../../../../util/constants';
+import { WAZUH_ALERTS_PATTERN } from '../../../../../../common/constants';
 import { getDataPlugin } from '../../../../../kibana-services';
 
 export class ComplianceSubrequirements extends Component {

diff --git a/public/components/overview/mitre/components/techniques/techniques.tsx b/public/components/overview/mitre/components/techniques/techniques.tsx
@@ -33,7 +33,7 @@ import { mitreTechniques, getElasticAlerts, IFilterParams } from '../../lib'
 import { ITactic } from '../../';
 import { withWindowSize } from '../../../../../components/common/hocs/withWindowSize';
 import { WzRequest } from '../../../../../react-services/wz-request';
-import {WAZUH_ALERTS_PATTERN} from '../../../../../../util/constants';
+import {WAZUH_ALERTS_PATTERN} from '../../../../../../common/constants';
 import { AppState } from '../../../../../react-services/app-state';
 import { WzFieldSearchDelay } from '../../../../common/search'
 import { getDataPlugin } from '../../../../../kibana-services';

diff --git a/public/components/overview/mitre/lib/elastic-helpers.ts b/public/components/overview/mitre/lib/elastic-helpers.ts
@@ -76,7 +76,7 @@ export async function getElasticAlerts(indexPattern, filterParams:IFilterParams,
   }
   const searchResponse: IWzResponse = await GenericRequest.request(
     'POST',
-    '/elastic/esAlerts',
+    '/elastic/alerts',
     search
   );
   return searchResponse;

diff --git a/public/components/security/main.tsx b/public/components/security/main.tsx
@@ -16,7 +16,7 @@ import { Policies } from './policies/policies';
 import { RolesMapping } from './roles-mapping/roles-mapping';
 import { withReduxProvider, withGlobalBreadcrumb, withUserAuthorizationPrompt } from '../common/hocs';
 import { compose } from 'redux';
-import { WAZUH_ROLE_ADMINISTRATOR_NAME } from '../../../util/constants';
+import { WAZUH_ROLE_ADMINISTRATOR_NAME } from '../../../common/constants';
 import { updateSecuritySection } from '../../redux/actions/securityActions';
 
 const tabs = [

diff --git a/public/components/security/roles-mapping/components/rule-editor.tsx b/public/components/security/roles-mapping/components/rule-editor.tsx
@@ -26,7 +26,7 @@ import {
   decodeJsonRule,
   getSelectedUsersFromRules,
 } from '../helpers/rule-editor.helper';
-import { WAZUH_SECURITY_PLUGIN_OPEN_DISTRO_FOR_ELASTICSEARCH } from '../../../../../util/constants';
+import { WAZUH_SECURITY_PLUGIN_OPEN_DISTRO_FOR_ELASTICSEARCH } from '../../../../../common/constants';
 import 'brace/mode/json';
 import 'brace/snippets/json';
 import 'brace/ext/language_tools';

diff --git a/public/components/settings/configuration/configuration.tsx b/public/components/settings/configuration/configuration.tsx
@@ -31,7 +31,7 @@ import store from '../../../redux/store'
 import { updateSelectedSettingsSection } from '../../../redux/actions/appStateActions';
 import { withUserAuthorizationPrompt } from '../../common/hocs/withUserAuthorization'
 import { EuiSpacer } from '@elastic/eui';
-import { WAZUH_ROLE_ADMINISTRATOR_NAME } from '../../../../util/constants';
+import { WAZUH_ROLE_ADMINISTRATOR_NAME } from '../../../../common/constants';
 
 export type ISetting = {
   setting: string