Cleaned code

fastlorenzo · Oct 18, 2020 · c0b3b05 · c0b3b05
1 parent 07909ad
commit c0b3b05
Show file tree

Hide file tree

Showing 23 changed files with 81 additions and 59 deletions.
diff --git a/public/components/alarmsPage.tsx b/public/components/alarmsPage.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {useTopNav} from "../navHeaderHelper";
+import {useTopNav} from "../helpers/nav_header_helper";
 import {EmbeddedDashboard} from "./embeddedDashboard";
 
 export const AlarmsPage = () => {

diff --git a/public/components/app.tsx b/public/components/app.tsx
@@ -13,7 +13,7 @@ import {
   EuiLoadingSpinner,
   EuiPopover
 } from '@elastic/eui';
-import {setNavHeader} from "../navHeaderHelper";
+import {setNavHeader} from "../helpers/nav_header_helper";
 import {useDispatch, useSelector} from 'react-redux';
 import {PLUGIN_ID, PLUGIN_NAME} from "../../common";
 import {
@@ -39,23 +39,24 @@ import {
 import {History} from 'history';
 import {ActionCreators} from "../redux/rootActions";
 import {DEFAULT_ROUTE_ID, routes} from "../routes";
-import {RedelkURLGenerator} from "../url_generator";
+import {RedelkURLGenerator} from "../helpers/url_generator";
 import {KbnCallStatus, RedelkInitStatus} from "../types";
-import {getCurrentRoute, getInitStatus, getShowTopNav, getTopNavMenu} from "../selectors";
+import {getCurrentRoute, getInitStatus, getShowTopNav, getTopNavMenu} from "../redux/selectors";
 import {checkInit} from "../redux/config/configActions";
 import {AppState, defaultAppState} from '../redux/types';
 import {InitPage} from './initPage';
 import {HomePage} from './homePage';
 import {AlarmsPage} from "./alarmsPage";
 import {CredentialsPage} from "./credentialsPage";
-import { DownloadsPage } from './downloadsPage';
+import {DownloadsPage} from './downloadsPage';
 import {ImplantsPage} from "./implantsPage";
 import {RtopsPage} from "./rtopsPage";
 import {ScreenshotsPage} from "./screenshotsPage";
 import {TasksPage} from "./tasksPage";
 import {TrafficPage} from "./trafficPage";
 import {TTPPage} from "./ttpPage";
 import {IframePage} from "./iframePage";
+import {initSettings} from "../helpers/settings_helper";
 
 interface RedelkAppDeps {
   basename: string;
@@ -197,6 +198,7 @@ const RedelkAppInternal = ({basename, navigation, data, core, history, kbnUrlSta
     if (location.pathname !== currentRoute) {
       dispatch(ActionCreators.setCurrentRoute(location.pathname));
     }
+    initSettings(core);
   });
 
   // BEGIN top drop-down menu
@@ -420,18 +422,20 @@ const RedelkAppInternal = ({basename, navigation, data, core, history, kbnUrlSta
     <Router history={history}>
       {topNav}
 
-      <Route path="/" exact render={() => <Redirect to={routes.find(r => r.id === DEFAULT_ROUTE_ID)?.path || "/home"}/>}/>
-      <Route path="/home" exact component={HomePage} />
-      <Route path="/alarms" exact component={AlarmsPage} />
-      <Route path="/credentials" exact component={CredentialsPage} />
-      <Route path="/downloads" exact component={DownloadsPage} />
-      <Route path="/implants" exact component={ImplantsPage} />
-      <Route path="/rtops" exact component={RtopsPage} />
-      <Route path="/screenshots" exact component={ScreenshotsPage} />
-      <Route path="/tasks" exact component={TasksPage} />
-      <Route path="/traffic" exact component={TrafficPage} />
-      <Route path="/ttp" exact component={TTPPage} />
-      <Route path="/attack-navigator" exact component={() => IframePage({url:"/plugins/redelk/assets/attack-navigator/"})} />
+      <Route path="/" exact
+             render={() => <Redirect to={routes.find(r => r.id === DEFAULT_ROUTE_ID)?.path || "/home"}/>}/>
+      <Route path="/home" exact component={HomePage}/>
+      <Route path="/alarms" exact component={AlarmsPage}/>
+      <Route path="/credentials" exact component={CredentialsPage}/>
+      <Route path="/downloads" exact component={DownloadsPage}/>
+      <Route path="/implants" exact component={ImplantsPage}/>
+      <Route path="/rtops" exact component={RtopsPage}/>
+      <Route path="/screenshots" exact component={ScreenshotsPage}/>
+      <Route path="/tasks" exact component={TasksPage}/>
+      <Route path="/traffic" exact component={TrafficPage}/>
+      <Route path="/ttp" exact component={TTPPage}/>
+      <Route path="/attack-navigator" exact
+             component={() => IframePage({url: "/plugins/redelk/assets/attack-navigator/"})}/>
 
       <Route path="/summary" exact
              render={() =>

diff --git a/public/components/credentialsPage.tsx b/public/components/credentialsPage.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {useTopNav} from "../navHeaderHelper";
+import {useTopNav} from "../helpers/nav_header_helper";
 import {EmbeddedDashboard} from "./embeddedDashboard";
 
 export const CredentialsPage = () => {

diff --git a/public/components/downloadsPage.tsx b/public/components/downloadsPage.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {useTopNav} from "../navHeaderHelper";
+import {useTopNav} from "../helpers/nav_header_helper";
 import {EmbeddedDashboard} from "./embeddedDashboard";
 
 export const DownloadsPage = () => {

diff --git a/public/components/embeddedDashboard.tsx b/public/components/embeddedDashboard.tsx
@@ -1,9 +1,9 @@
 import React, {useEffect, useState} from 'react';
 import {SimpleSavedObject} from "kibana/public";
 import {DashboardContainerInput, SavedObjectDashboard} from '../../../../src/plugins/dashboard/public';
-import {getAppState, getRtopsLastRefreshDate} from "../selectors";
+import {getAppState, getRtopsLastRefreshDate} from "../redux/selectors";
 import {useDispatch, useSelector} from 'react-redux';
-import {savedObjectToDashboardContainerInput} from '../dashboard_helper';
+import {savedObjectToDashboardContainerInput} from '../helpers/dashboard_helper';
 import {useKibana} from '../../../../src/plugins/kibana_react/public';
 import {ActionCreators} from "../redux/rootActions";
 import {TopNavMenuData} from '../../../../src/plugins/navigation/public';
@@ -18,7 +18,7 @@ export const EmbeddedDashboard = ({dashboardId, extraTopNavMenu}: { dashboardId:
   // const [dashboard, setDashboard] = useState<ReactElement>(<p>Loading dashboard</p>);
 
   const dispatch = useDispatch();
-  const {services}: {services: RedelkKibanaService} = useKibana();
+  const {services}: { services: RedelkKibanaService } = useKibana();
 
   const appState = useSelector(getAppState);
   const rtopsLastRefreshDate = useSelector(getRtopsLastRefreshDate);
@@ -49,7 +49,8 @@ export const EmbeddedDashboard = ({dashboardId, extraTopNavMenu}: { dashboardId:
 
   if (dashboardConfig) {
     dashboard = (
-      <services.dashboard.DashboardContainerByValueRenderer input={dashboardConfig} onInputUpdated={setDashboardConfig} />
+      <services.dashboard.DashboardContainerByValueRenderer input={dashboardConfig}
+                                                            onInputUpdated={setDashboardConfig}/>
     );
   }
 

diff --git a/public/components/homePage.tsx b/public/components/homePage.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {useTopNav} from "../navHeaderHelper";
+import {useTopNav} from "../helpers/nav_header_helper";
 import {EmbeddedDashboard} from "./embeddedDashboard";
 
 export const HomePage = () => {

diff --git a/public/components/iframePage.tsx b/public/components/iframePage.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import {useTopNav} from "../navHeaderHelper";
+import {useTopNav} from "../helpers/nav_header_helper";
 
-export const IframePage = ({url}: {url: string}) => {
+export const IframePage = ({url}: { url: string }) => {
 
   useTopNav(false);
 

diff --git a/public/components/implantsPage.tsx b/public/components/implantsPage.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {useTopNav} from "../navHeaderHelper";
+import {useTopNav} from "../helpers/nav_header_helper";
 import {EmbeddedDashboard} from "./embeddedDashboard";
 
 export const ImplantsPage = () => {

diff --git a/public/components/iocPage.tsx b/public/components/iocPage.tsx
@@ -5,8 +5,8 @@ import {EuiFlyout, EuiFlyoutBody, EuiFlyoutHeader, EuiTitle} from '@elastic/eui'
 import {AddIOCForm} from "../features/rtops/addIocForm";
 import {DataPublicPluginStart} from '../../../../src/plugins/data/public';
 import {useDispatch, useSelector} from 'react-redux';
-import {useTopNav} from "../navHeaderHelper";
-import {getRtopsShowAddIOCForm} from "../selectors";
+import {useTopNav} from "../helpers/nav_header_helper";
+import {getRtopsShowAddIOCForm} from "../redux/selectors";
 import {ActionCreators} from "../redux/rootActions";
 import {EmbeddedDashboard} from "./embeddedDashboard";
 

diff --git a/public/components/rtopsPage.tsx b/public/components/rtopsPage.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {useTopNav} from "../navHeaderHelper";
+import {useTopNav} from "../helpers/nav_header_helper";
 import {EmbeddedDashboard} from "./embeddedDashboard";
 
 export const RtopsPage = () => {

diff --git a/public/components/screenshotsPage.tsx b/public/components/screenshotsPage.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {useTopNav} from "../navHeaderHelper";
+import {useTopNav} from "../helpers/nav_header_helper";
 import {EmbeddedDashboard} from "./embeddedDashboard";
 
 export const ScreenshotsPage = () => {

diff --git a/public/components/summaryPage.tsx b/public/components/summaryPage.tsx
@@ -18,8 +18,8 @@ import {KbnCallStatus} from "../types";
 import {useSelector} from 'react-redux';
 import {Axis, BarSeries, Chart, Partition, Settings} from '@elastic/charts';
 import {EUI_CHARTS_THEME_DARK, EUI_CHARTS_THEME_LIGHT} from '@elastic/eui/dist/eui_charts_theme';
-import {useTopNav} from "../navHeaderHelper";
-import {getRtopsAggs, getRtopsStatus} from "../selectors";
+import {useTopNav} from "../helpers/nav_header_helper";
+import {getRtopsAggs, getRtopsStatus} from "../redux/selectors";
 import {useKibana} from '../../../../src/plugins/kibana_react/public';
 
 interface RedelkAppDeps {

diff --git a/public/components/tasksPage.tsx b/public/components/tasksPage.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {useTopNav} from "../navHeaderHelper";
+import {useTopNav} from "../helpers/nav_header_helper";
 import {EmbeddedDashboard} from "./embeddedDashboard";
 
 export const TasksPage = () => {

diff --git a/public/components/trafficPage.tsx b/public/components/trafficPage.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {useTopNav} from "../navHeaderHelper";
+import {useTopNav} from "../helpers/nav_header_helper";
 import {EmbeddedDashboard} from "./embeddedDashboard";
 
 export const TrafficPage = () => {

diff --git a/public/components/ttpPage.tsx b/public/components/ttpPage.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {useTopNav} from "../navHeaderHelper";
+import {useTopNav} from "../helpers/nav_header_helper";
 import {EmbeddedDashboard} from "./embeddedDashboard";
 
 export const TTPPage = () => {

diff --git a/public/features/rtops/iocTable.tsx b/public/features/rtops/iocTable.tsx
@@ -13,7 +13,7 @@ import {
 } from '@elastic/eui';
 
 import {KbnCallStatus} from '../../types';
-import {getRtopsFilteredIOC, getRtopsStatus} from "../../selectors";
+import {getRtopsFilteredIOC, getRtopsStatus} from "../../redux/selectors";
 
 export const IOCTable = () => {
 

diff --git a/public/dashboard_helper.ts → public/helpers/dashboard_helper.ts b/public/dashboard_helper.ts → public/helpers/dashboard_helper.ts
@@ -1,13 +1,13 @@
 import {SimpleSavedObject} from "kibana/public";
-import {GridData} from '../../../src/plugins/dashboard/common';
-import {DashboardContainerInput, SavedObjectDashboard} from '../../../src/plugins/dashboard/public';
-import {DashboardPanelState} from '../../../src/plugins/dashboard/public/application';
-import {EmbeddableInput, ViewMode} from '../../../src/plugins/embeddable/public';
-import {AppState} from "./redux/types";
+import {GridData} from '../../../../src/plugins/dashboard/common';
+import {DashboardContainerInput, SavedObjectDashboard} from '../../../../src/plugins/dashboard/public';
+import {DashboardPanelState} from '../../../../src/plugins/dashboard/public/application';
+import {EmbeddableInput, ViewMode} from '../../../../src/plugins/embeddable/public';
+import {AppState} from "../redux/types";
 import {find} from "lodash";
 
 const uuidv4 = (): string => {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
     var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
     return v.toString(16);
   });

diff --git a/public/navHeaderHelper.ts → public/helpers/nav_header_helper.ts b/public/navHeaderHelper.ts → public/helpers/nav_header_helper.ts
@@ -2,8 +2,8 @@ import {EuiBreadcrumb} from '@elastic/eui';
 import {ChromeBadge, ChromeBrand, ChromeHelpExtension, CoreStart} from "kibana/public";
 import {useEffect} from 'react';
 import {useDispatch} from 'react-redux';
-import {PLUGIN_NAME} from "../common";
-import {ActionCreators} from "./redux/rootActions";
+import {PLUGIN_NAME} from "../../common";
+import {ActionCreators} from "../redux/rootActions";
 
 export const setNavHeader = (core: CoreStart, breadcrumbs: EuiBreadcrumb[]) => {
   const darkMode: boolean = core.uiSettings.get('theme:darkMode');

diff --git a/public/helpers/settings_helper.ts b/public/helpers/settings_helper.ts
@@ -0,0 +1,16 @@
+import {CoreStart} from "kibana/public";
+
+export const initSettings = async (core: CoreStart) => {
+  const defaultRoute = await core.uiSettings.get("defaultRoute");
+  if (defaultRoute !== "/app/redelk/") {
+    await core.uiSettings.set("theme:darkMode", true);
+    await core.uiSettings.set("telemetry:optIn", false);
+    await core.uiSettings.set("telemetry:enabled", false);
+    await core.uiSettings.set("shortDots:enabled", true);
+    await core.uiSettings.set("siem:enableNewsFeed", false);
+    await core.uiSettings.set("siem:defaultIndex", ["apm-*-transaction*", "auditbeat-*", "endgame-*", "filebeat-*", "packetbeat-*", "winlogbeat-*", "rtops-*", "redirtraffic-*"]);
+    await core.uiSettings.set("defaultIndex", "195a3f00-d04f-11ea-9301-a30a04251ae9");
+    await core.uiSettings.set("defaultRoute", "/app/redelk/");
+    window.location.reload();
+  }
+}
diff --git a/public/url_generator.ts → public/helpers/url_generator.ts b/public/url_generator.ts → public/helpers/url_generator.ts
@@ -1,5 +1,5 @@
-import {setStateToKbnUrl} from '../../../src/plugins/kibana_utils/public';
-import {esFilters, Filter, Query, QueryState, RefreshInterval, TimeRange} from '../../../src/plugins/data/public';
+import {setStateToKbnUrl} from '../../../../src/plugins/kibana_utils/public';
+import {esFilters, Filter, Query, QueryState, RefreshInterval, TimeRange} from '../../../../src/plugins/data/public';
 
 export const REDELK_APP_URL_GENERATOR = 'REDELK_APP_URL_GENERATOR';
 

diff --git a/public/plugin.ts b/public/plugin.ts
@@ -82,17 +82,17 @@ export class RedelkPlugin implements Plugin<RedelkPluginSetup, RedelkPluginStart
       },
     });
 
-    core.application.register({
-      id: 'redelk:attack-navigator',
-      title: 'MITRE ATT&CK Navigator',
-      category: redelkCategory,
-      async mount() {
-        window.open(window.location.protocol + '//' + window.location.host + '/attack-navigator', '_blank');
-        window.history.back();
-        return () => {
-        }
-      }
-    });
+    // core.application.register({
+    //   id: 'redelk:attack-navigator',
+    //   title: 'MITRE ATT&CK Navigator',
+    //   category: redelkCategory,
+    //   async mount() {
+    //     window.open(window.location.protocol + '//' + window.location.host + '/attack-navigator', '_blank');
+    //     window.history.back();
+    //     return () => {
+    //     }
+    //   }
+    // });
 
     core.application.register({
       id: 'redelk:jupyter-notebook',

diff --git a/public/selectors.ts → public/redux/selectors.ts b/public/selectors.ts → public/redux/selectors.ts
@@ -1,4 +1,4 @@
-import {RedELKState} from "./types";
+import {RedELKState} from "../types";
 import {createSelector} from 'reselect';
 import {filter} from 'lodash';
 

diff --git a/public/types.ts b/public/types.ts
@@ -26,6 +26,7 @@ export interface RedelkPluginStartDependencies {
   share: SharePluginStart;
   uiSettings: UiSettingsServiceStart;
 }
+
 export type RedelkKibanaService = RedelkPluginStartDependencies & CoreStart;
 
 export interface RedelkPluginSetupDependencies {