Feature/change tactis and techniques resources #3346

eze9252 · 2021-06-07T11:27:42Z

Merge whit mitre intellingence section

Closes #3290

...onents/overview/mitre/components/techniques/components/flyout-technique/flyout-technique.tsx

public/components/overview/mitre/components/techniques/techniques.tsx

Desvelao · 2021-06-08T09:26:18Z

...onents/overview/mitre/components/techniques/components/flyout-technique/flyout-technique.tsx

+  getArrayFormatted(arrObj) {
+      try {
+        arrObj.map(obj => {
+        return ( <EuiToolTip
+          position="top"
+          content={"Open " + obj.name + " details in a new page"}>
+          <EuiLink href="" external target="_blank">
+            {obj.name}
+          </EuiLink>
+        </EuiToolTip>)
+      })
+      }
+      catch{
+        return ""
+      }


Should this function return something or there is some I can't undestand.

This function is obsolete. I delete now

Desvelao · 2021-06-08T10:03:39Z

Testing:

Clicking in the link of flyout redirect to the Intelligence section

Should we display the resource information (the flyout) instead of applying a filter?

Desvelao · 2021-06-08T10:07:11Z

public/components/overview/mitre/components/techniques/techniques.tsx

+  openIntelligence(e,redirectTo,itemId){
+    sessionStorage.setItem("tabRedirect", redirectTo);
+    sessionStorage.setItem("idToRedirect", itemId);
+    this.props.onSelectedTabChanged('intelligence');
+  }
+


Maybe we could do the redirection through a query param in the URL instead of using the sessionStorage.

Yes we should show the flyout, it was my mistake. I fix this

pablomarga · 2021-06-09T07:39:50Z

...ents/overview/mitre_attack_intelligence/module_mitre_attack_intelligence_resource_flyout.tsx

+import {
+  EuiBasicTableColumn,
+  EuiButtonIcon,
+    EuiFlyout,


Different indetation inside the import

pablomarga · 2021-06-09T07:40:23Z

...ents/overview/mitre_attack_intelligence/module_mitre_attack_intelligence_resource_flyout.tsx

+      let contador = 0;
+      array.forEach((element) => {
+        //The character limit of a request is 8190, if the characters of our request exceed 8100, we divide said call into several to avoid errors
+        if(namesContatenated[contador].length + element.length >= 8100)


Apply prettier

pablomarga · 2021-06-09T07:40:35Z

public/components/overview/mitre_attack_intelligence/module_mitre_intelligence.tsx

+  useEffect(() => {
+    const redirectTab = sessionStorage.getItem("tabRedirect")
+    const idToRedirect = sessionStorage.getItem("idToRedirect")
+    if(redirectTab && idToRedirect){


Apply prettier

pablomarga · 2021-06-09T07:41:42Z

public/components/overview/mitre_attack_intelligence/module_mitre_intelligence.tsx

-
+
+  useEffect(() => {
+    const redirectTab = sessionStorage.getItem("tabRedirect")


pablomarga · 2021-06-09T07:42:03Z

public/components/overview/mitre_attack_intelligence/module_mitre_intelligence.tsx

+
+  useEffect(() => {
+    const redirectTab = sessionStorage.getItem("tabRedirect")
+    const idToRedirect = sessionStorage.getItem("idToRedirect")


gabiwassan

Some suggestions 👍🏼

gabiwassan · 2021-06-09T12:20:04Z

...onents/overview/mitre_attack_intelligence/module_mitre_attack_intelligence_all_resources.tsx


 export const ModuleMitreAttackIntelligenceAllResources = withGuard(({didSearch}) => !didSearch, ModuleMitreAttackIntelligenceAllResourcesWelcome)(({ results, loading }) => {
+  const [isDetailsOpen, setIsDetailsOpen] = useState(false);


Should you use types for useStates like:
const [isDetailsOpen, setIsDetailsOpen] = useState<boolean>(false);
Same for the item if it possible create an interface WzItem { ... } and assigne that.

gabiwassan · 2021-06-09T12:20:16Z

...onents/overview/mitre_attack_intelligence/module_mitre_attack_intelligence_all_resources.tsx

+  },[]);
+
+  const rowPropsFlyout = useCallback((item) => ({
+    // 'data-test-subj': `row-${file}`,


Clear this comments 🤓

gabiwassan · 2021-06-09T12:22:04Z

...ents/overview/mitre_attack_intelligence/module_mitre_attack_intelligence_resource_flyout.tsx

+                // maxWidth="70%"
+                // className=""


Comments 🤓

frankeros · 2021-06-09T13:45:24Z

public/components/overview/mitre/components/techniques/techniques.tsx

@@ -177,29 +181,47 @@ export const Techniques = withWindowSize(class Techniques extends Component {
    }
  }

+  async getMitreTechniques () {
+    const data = await WzRequest.apiReq('GET', '/mitre/techniques', {}).then(res => res).catch(err => mitreTechniques);
+    const result = (((data || {}).data || {}).data || {}).affected_items;


it will throw if data comes from the catch
.catch(err => mitreTechniques);
I think there is needed a better error handling

frankeros · 2021-06-09T13:48:01Z

public/components/overview/mitre/components/techniques/techniques.tsx

+      .filter(techniqueID => this.state.filteredTechniques ? this.state.filteredTechniques.includes(techniqueID.id) : techniqueID.id)
      .map(techniqueID => {


replace techniqueID with technique

frankeros · 2021-06-09T13:50:44Z

public/components/overview/mitre/components/techniques/techniques.tsx

+  openIntelligence(e,redirectTo,itemId){
+    sessionStorage.setItem("tabRedirect", redirectTo);
+    sessionStorage.setItem("idToRedirect", itemId);
+    this.props.onSelectedTabChanged('intelligence');
+    window.location.href = window.location+`&tabRedirect=${redirectTo}&idToRedirect=${itemId}`
+  }


why it is storing and sending in the URL the same data?

the storing was not used, now I delete it

…s flyout

CPAlejandro · 2021-06-10T11:45:00Z

I have just found a problem that can be fixed paginating the query of techniques

CPAlejandro

I have found these 3 errors:

When you try to navigate from Framework flyout to a technique, the response flyout stay loading
When you try to navigate from Framework flyout to a RuleID, sometimes, there's a bad query to /Mitre from an old endpoint
When you did the last error and you go against Mitre/Framework, sometimes appears a No data notice, it refreshes itself and shows properly info

CPAlejandro

LGTM!
Testing: ✅
CR: ✅

Sometimes when I enter to /Mitre/Framework appears a warning that says No data noticed but it refresh itself and show the info later than 2-3 seconds

CPAlejandro · 2021-06-11T10:46:23Z

When you pinned an agent, go to another window, come back, and unpinned this agent, the Framework panel loads two times.
https://user-images.githubusercontent.com/17100196/121674926-fa76a100-cab2-11eb-89f8-31cac0cd4789.mp4

Desvelao · 2021-06-14T07:28:16Z

...onents/overview/mitre/components/techniques/components/flyout-technique/flyout-technique.tsx

+      const tactic = Object.values(tacticsObject).find(obj => obj.id === element);
+      return { id:tactic.references[0].external_id, name: tactic.name};
+    };
+    return tactics.reduce((tacticsObj, element) => [...tacticsObj, getTactic(element)], []);


You could use .map instead of .reduce here.

Desvelao · 2021-06-14T07:28:49Z

...onents/overview/mitre/components/techniques/components/flyout-technique/flyout-technique.tsx

+    const tacticsObj = this.findTacticName(tactics)
+
+    this.setState({techniqueData: { name, mitre_version, tacticsObj }, loading: false  })


Desvelao · 2021-06-14T07:30:12Z

public/components/overview/mitre/components/techniques/techniques.tsx

@@ -29,14 +29,14 @@ import {
  EuiLoadingSpinner,
 } from '@elastic/eui';
 import { FlyoutTechnique } from './components/flyout-technique/';
-import { mitreTechniques, getElasticAlerts, IFilterParams } from '../../lib'
+import { getElasticAlerts, IFilterParams } from '../../lib'


Desvelao · 2021-06-14T07:32:39Z

public/components/overview/mitre/components/techniques/techniques.tsx

+    let mitreTechniques = [];
+    if (totalItems && output.data && output.data.data && totalItems > 500) {
+      params.offset = 0;
+      mitreTechniques.push(...output.data.data.affected_items);
+      while (mitreTechniques.length < totalItems && params.offset < totalItems) {
+        params.offset += params.limit;
+        const tmpData = await this.getMitreTechniques(params)
+        mitreTechniques.push(...tmpData.data.data.affected_items);
+      }
+    }
+    this.setState({ mitreTechniques: mitreTechniques, isSearching: false })


When the totalItems is lower than 500, the mitreTechniques variable seems to be an empty array. Is this a bug?

Yes, is a bug. Before validation I have to save output.data.data.affected_items first.

Desvelao · 2021-06-14T07:34:19Z

public/components/overview/mitre/components/techniques/techniques.tsx

+      const mitreObj = this.state.mitreTechniques.filter(item => item.id === element);
+      if(mitreObj.length != 0){
+        const mitreTechniqueName =  mitreObj[0].name;
+        const mitreTechniqueID = mitreObj[0].references.filter(item => item.source === "mitre-attack")[0].external_id;
+        mitreTechniqueID ? techniquesObj.push({ id : mitreTechniqueID, name: mitreTechniqueName}) : '';
+      }


To search one element, you could be used the .find instead of .filter.

Desvelao · 2021-06-14T07:36:04Z

.../components/overview/mitre_attack_intelligence/module_mitre_attack_intelligence_resource.tsx

+  useEffect(() => {
+    const urlParams = new URLSearchParams(location.href);
+    const redirectTab = urlParams.get('tabRedirect');
+    const idToRedirect = urlParams.get("idToRedirect")


Desvelao · 2021-06-14T07:36:20Z

.../components/overview/mitre_attack_intelligence/module_mitre_attack_intelligence_resource.tsx

+      getMitreItemToRedirect(endpoint)
+      urlParams.delete('tabRedirect')
+      urlParams.delete('idToRedirect')


Desvelao · 2021-06-14T07:36:40Z

.../components/overview/mitre_attack_intelligence/module_mitre_attack_intelligence_resource.tsx

+          ...item,
+          ['references.external_id']: item?.references?.find(reference => reference.source === 'mitre-attack')?.external_id
+        }))
+        setIsDetailsOpen(true)
+        setDetails(data[0])


Desvelao · 2021-06-14T07:38:09Z

public/controllers/management/components/management/ruleset/rule-info.js

+        let tacticsObj = []
+        const data = await WzRequest.apiReq('GET', '/mitre/tactics', { 
+          params: {
+            tactic_ids: tactics.toString()
+          }
+        })
+        const formattedData = (((((data || {}).data).data || {}).affected_items || []) || {});
+        formattedData && formattedData.forEach(item => {
+          tacticsObj.push(item.name);
+        });
+        return tacticsObj;
+    }catch(error){
+      return []


Desvelao · 2021-06-14T07:39:02Z

.../components/overview/mitre_attack_intelligence/module_mitre_attack_intelligence_resource.tsx

+
+
+  const getMitreItemToRedirect = (endpoint) => {
+       WzRequest.apiReq('GET', endpoint, {}).then(res => {


Maybe you could replace the .then/.catch block with try/catch that is trending to use.

…ature/change-tactis-and-techniques-resources

…s://github.com/wazuh/wazuh-kibana-app into feature/change-tactis-and-techniques-resources

Desvelao

LGTM!

eze9252 added 6 commits June 4, 2021 12:06

change endpoint and adapt component in mitre

7ea3633

fix flyout

d809f34

add redirect to intelligence

75774a1

fix merge

b63b4d5

fix merge flyout

aad3eaa

fix package version

5adeba6

frankeros suggested changes Jun 7, 2021

View reviewed changes

fix PR comments and add intelligence section redirect

dc6c792

Desvelao reviewed Jun 8, 2021

View reviewed changes

Created new Mitre flyout

38a5d62

Desvelao assigned eze9252 Jun 8, 2021

CPAlejandro and others added 2 commits June 8, 2021 16:07

Changelog

57cb78f

fix comments PR

acec181

pablomarga reviewed Jun 9, 2021

View reviewed changes

eze9252 added 2 commits June 9, 2021 13:52

add redirect values in query params

80fcf26

apply prettier

8c2f505

gabiwassan suggested changes Jun 9, 2021

View reviewed changes

frankeros requested review from pablomarga, frankeros, gabiwassan and Desvelao June 9, 2021 13:40

frankeros reviewed Jun 9, 2021

View reviewed changes

CPAlejandro added 2 commits June 10, 2021 10:37

Resolving comments and upgrading code

4546afc

Applying comments upgrades to references table

a3f5b42

CPAlejandro and others added 5 commits June 10, 2021 10:38

Applying more upgrade comments

c47e246

fix(mitre_intelligence): Remove the Promise.reject in resource detail…

e217c98

…s flyout

clear comments and imports

8ad0be8

fix error handler techniques

1a0c446

delete session storage

f9f37fe

delete files and fix get techniques data

57381b3

CPAlejandro suggested changes Jun 11, 2021

View reviewed changes

fix redirect flyout to rules

9a53d05

CPAlejandro approved these changes Jun 11, 2021

View reviewed changes

Desvelao reviewed Jun 14, 2021

View reviewed changes

Merge branch 'feature/3291-mitre-attack-intelligence-section' into fe…

34b01ff

…ature/change-tactis-and-techniques-resources

frankeros self-requested a review June 14, 2021 13:40

eze9252 added 2 commits June 14, 2021 17:22

fix comments PR

b030b2b

Merge branch 'feature/change-tactis-and-techniques-resources' of http…

f919a27

…s://github.com/wazuh/wazuh-kibana-app into feature/change-tactis-and-techniques-resources

Desvelao approved these changes Jun 15, 2021

View reviewed changes

eze9252 merged commit 4ef11a9 into feature/3291-mitre-attack-intelligence-section Jun 15, 2021

eze9252 deleted the feature/change-tactis-and-techniques-resources branch June 15, 2021 08:18

MauGaP mentioned this pull request Nov 30, 2021

Release 4.3.0 - Release Candidate 1 - Kibana UI regression testing #3684

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/change tactis and techniques resources #3346

Feature/change tactis and techniques resources #3346

eze9252 commented Jun 7, 2021 •

edited by frankeros

Desvelao Jun 8, 2021

eze9252 Jun 8, 2021

Desvelao commented Jun 8, 2021 •

edited

Desvelao Jun 8, 2021

eze9252 Jun 8, 2021 •

edited

pablomarga Jun 9, 2021

pablomarga Jun 9, 2021

pablomarga Jun 9, 2021

pablomarga Jun 9, 2021

pablomarga Jun 9, 2021

gabiwassan left a comment

gabiwassan Jun 9, 2021

gabiwassan Jun 9, 2021

gabiwassan Jun 9, 2021

frankeros Jun 9, 2021

frankeros Jun 9, 2021

frankeros Jun 9, 2021

eze9252 Jun 9, 2021

CPAlejandro commented Jun 10, 2021

CPAlejandro left a comment •

edited

CPAlejandro left a comment

CPAlejandro commented Jun 11, 2021

Desvelao Jun 14, 2021

Desvelao Jun 14, 2021

Desvelao Jun 14, 2021

Desvelao Jun 14, 2021 •

edited

eze9252 Jun 14, 2021

Desvelao Jun 14, 2021

Desvelao Jun 14, 2021

Desvelao Jun 14, 2021

Desvelao Jun 14, 2021

Desvelao Jun 14, 2021

Desvelao Jun 14, 2021

Desvelao left a comment



		useEffect(() => {
		const redirectTab = sessionStorage.getItem("tabRedirect")


		export const ModuleMitreAttackIntelligenceAllResources = withGuard(({didSearch}) => !didSearch, ModuleMitreAttackIntelligenceAllResourcesWelcome)(({ results, loading }) => {
		const [isDetailsOpen, setIsDetailsOpen] = useState(false);

		.filter(techniqueID => this.state.filteredTechniques ? this.state.filteredTechniques.includes(techniqueID.id) : techniqueID.id)
		.map(techniqueID => {

		const tacticsObj = this.findTacticName(tactics)

		this.setState({techniqueData: { name, mitre_version, tacticsObj }, loading: false })



		const getMitreItemToRedirect = (endpoint) => {
		WzRequest.apiReq('GET', endpoint, {}).then(res => {

Feature/change tactis and techniques resources #3346

Feature/change tactis and techniques resources #3346

Conversation

eze9252 commented Jun 7, 2021 • edited by frankeros

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Desvelao commented Jun 8, 2021 • edited

Choose a reason for hiding this comment

eze9252 Jun 8, 2021 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gabiwassan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CPAlejandro commented Jun 10, 2021

CPAlejandro left a comment • edited

Choose a reason for hiding this comment

CPAlejandro left a comment

Choose a reason for hiding this comment

CPAlejandro commented Jun 11, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Desvelao Jun 14, 2021 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Desvelao left a comment

Choose a reason for hiding this comment

eze9252 commented Jun 7, 2021 •

edited by frankeros

Desvelao commented Jun 8, 2021 •

edited

eze9252 Jun 8, 2021 •

edited

CPAlejandro left a comment •

edited

Desvelao Jun 14, 2021 •

edited