p15693087
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Merge branch 'develop' into 764/swimm-tutorials

This commit is contained in:
Shay Nehmad 2020-09-02 23:02:20 +03:00
parent 080962cfa1 c0e6467a48
commit a83348e857
7 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/static/images/usage/reports/mitre-report-0.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 159 KiB

After

Width:  |  Height:  |  Size: 158 KiB

12
monkey/monkey_island/cc/ui/package-lock.json generated
View File

@ -8701,9 +8701,9 @@
} }
}, },
"needle": { "needle": {
"version": "2.5.0", "version": "2.5.2",
"resolved": "https://registry.npmjs.org/needle/-/needle-2.5.0.tgz", "resolved": "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz",
"integrity": "sha512-o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA==", "integrity": "sha512-LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ==",
"requires": { "requires": {
"debug": "^3.2.6", "debug": "^3.2.6",
"iconv-lite": "^0.4.4", "iconv-lite": "^0.4.4",
@ -14858,9 +14858,9 @@
} }
}, },
"snyk": { "snyk": {
"version": "1.372.0", "version": "1.373.0",
"resolved": "https://registry.npmjs.org/snyk/-/snyk-1.372.0.tgz", "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.373.0.tgz",
"integrity": "sha512-5eX7cEmbPtpZ9w+vQIEIf9tlb3FOEN36cnSFpla4bTim2biGTx50lWPKYAclX3z1tlLt654rdJfpTt5tOqWxUQ==", "integrity": "sha512-P/BF3DnMbP2NFHw4RcQ2w4MwashUH2/lkezNq0bn51OJqktfrn/aebcJxe6RtSKemww5z8DSen8D2REz1Vzc6Q==",
"requires": { "requires": {
"@snyk/cli-interface": "2.8.1", "@snyk/cli-interface": "2.8.1",
"@snyk/dep-graph": "1.18.3", "@snyk/dep-graph": "1.18.3",

2
monkey/monkey_island/cc/ui/package.json
View File

@ -105,7 +105,7 @@
"react-tooltip-lite": "^1.12.0", "react-tooltip-lite": "^1.12.0",
"redux": "^4.0.4", "redux": "^4.0.4",
"sha3": "^2.1.3", "sha3": "^2.1.3",
"snyk": "^1.372.0" "snyk": "^1.373.0"
}, },
"snyk": true "snyk": true
} }

3
monkey/monkey_island/cc/ui/src/components/report-components/attack/SelectedTechnique.js
View File

@ -38,7 +38,8 @@ class SelectedTechnique extends React.Component {
</span> </span>
<span> <span>
<a href={this.state.techniques[tech_id].link} rel="noopener noreferrer" target='_blank' className={'link-to-technique'}> <a href={this.state.techniques[tech_id].link} rel="noopener noreferrer" target='_blank' className={'link-to-technique'}>
<FontAwesomeIcon icon={faQuestionCircle}/> <FontAwesomeIcon icon={faQuestionCircle}
color={AttackReport.getComponentClass(tech_id, this.state.techniques) === 'collapse-default' ? '#ffffff' : '#000000'}/>
</a> </a>
</span> </span>
</button> </button>

5
monkey/monkey_island/cc/ui/src/components/report-components/attack/TechniqueDropdowns.js
View File

@ -43,8 +43,9 @@ class TechniqueDropdowns extends React.Component{
{this.state.techniques[tech_id].title} {this.state.techniques[tech_id].title}
</span> </span>
<span> <span>
<a href={this.state.techniques[tech_id].link} rel="noopener noreferrer" target='_blank' className={'link-to-technique'}> <a href={this.state.techniques[tech_id].link} rel="noopener noreferrer" target='_blank'>
<FontAwesomeIcon icon={faQuestionCircle}/> <FontAwesomeIcon icon={faQuestionCircle} className={'link-to-technique'}
color={AttackReport.getComponentClass(tech_id, this.state.techniques) === 'collapse-default' ? '#ffffff' : '#000000'}/>
</a> </a>
<FontAwesomeIcon icon={this.state.collapseOpen === tech_id ? faChevronDown : faChevronUp}/> <FontAwesomeIcon icon={this.state.collapseOpen === tech_id ? faChevronDown : faChevronUp}/>
</span> </span>

5
monkey/monkey_island/cc/ui/src/styles/components/Collapse.scss
View File

@ -1,9 +1,9 @@
$transition: 300ms cubic-bezier(0.6, 0.3, 0.3, 0.6); $transition: 300ms cubic-bezier(0.6, 0.3, 0.3, 0.6);
$danger-color: #ebbcba; $danger-color: #ebbcba;
$disabled-color: #f4f4f4; $disabled-color: #f2f2f2;
$info-color: #ade3eb; $info-color: #ade3eb;
$default-color: #cbcbcb; $default-color: #8c8c8c;
$warning-color: #ffe28d; $warning-color: #ffe28d;
.collapse-item button { .collapse-item button {
@ -53,6 +53,7 @@ $warning-color: #ffe28d;
.collapse-default { .collapse-default {
background-color: $default-color !important; background-color: $default-color !important;
color: #ffffff;
} }
.collapse-disabled { .collapse-disabled {

7
monkey/monkey_island/cc/ui/src/styles/pages/report/ReportAttackMatrix.scss
View File

@ -1,13 +1,13 @@
// colors // colors
$disabled: #f4f4f4; $disabled: #f2f2f2;
$not-attempted: #cbcbcb; $not-attempted: #8c8c8c;
$attempted: #ffe28d; $attempted: #ffe28d;
$used: #ebbcba; $used: #ebbcba;
$black: #3a3a3a; $black: #3a3a3a;
.attack-matrix .status-0 { .attack-matrix .status-0 {
background-color: $not-attempted !important; background-color: $not-attempted !important;
color: $black; color: #ffffff;
} }
.attack-matrix .status-1 { .attack-matrix .status-1 {
@ -23,6 +23,7 @@ $black: #3a3a3a;
.attack-matrix .status-3 { .attack-matrix .status-3 {
background-color: $disabled !important; background-color: $disabled !important;
color: $black; color: $black;
text-decoration: line-through;
} }
.attack-matrix div.rt-td:hover { .attack-matrix div.rt-td:hover {