Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix UI bug in ATT&CK Report #949

Merged
merged 1 commit into from
Jan 30, 2021
Merged

Fix UI bug in ATT&CK Report #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1003.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class T1003 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<StolenPasswordsComponent
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1005.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class T1005 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1016.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class T1016 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1018.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class T1018 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1021.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class T1021 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1035.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class T1035 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.services.length !== 0 ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1041.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class T1041 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1053.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class T1053 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1059.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class T1059 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1064.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class T1064 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.scripts.length !== 0 ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1065.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class T1065 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<MitigationsComponent mitigations={this.props.data.mitigations}/>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1075.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class T1075 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1082.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class T1082 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1086.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class T1086 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1087.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class T1087 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1090.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class T1090 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1099.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class T1099 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1105.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class T1105 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status !== ScanStatus.UNSCANNED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1106.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class T1106 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.api_uses.length !== 0 ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1107.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class T1107 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.deleted_files.length !== 0 ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1110.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class T1110 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status !== ScanStatus.UNSCANNED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1129.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class T1129 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.dlls.length !== 0 ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1136.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class T1136 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1145.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class T1145 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1146.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class T1146 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1154.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class T1154 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1156.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class T1156 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1158.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class T1158 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1166.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class T1166 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1168.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class T1168 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1188.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class T1188 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1197.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class T1210 extends React.Component {
return (
<div className="data-table-container">
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
{this.props.data.bits_jobs.length > 0 ? <div>BITS jobs were used in these machines: </div> : ''}
</div>
<br/>
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1210.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class T1210 extends React.Component {
let scanned_services = this.props.data.scanned_services.map(T1210.formatScanned).flat();
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
{scanned_services.length > 0 ?
this.renderScannedServices(scanned_services) : ''}
{this.props.data.exploited_services.length > 0 ?
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1216.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class T1216 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1222.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class T1222 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/ui/src/components/attack/techniques/T1504.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class T1504 extends React.Component {
render() {
return (
<div>
<div>{this.props.data.message}</div>
<div>{this.props.data.message_html}</div>
<br/>
{this.props.data.status === ScanStatus.USED ?
<ReactTable
Expand Down
4 changes: 2 additions & 2 deletions monkey/monkey_island/cc/ui/src/components/report-components/AttackReport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ class AttackReport extends React.Component {
}
}
}
// modify techniques' messages
// compiles techniques' message string from markdown to HTML
for (const tech_id in techniques){
techniques[tech_id]['message'] = <div dangerouslySetInnerHTML={{__html: marked(techniques[tech_id]['message'])}} />;
techniques[tech_id]['message_html'] = <div dangerouslySetInnerHTML={{__html: marked(techniques[tech_id]['message'])}} />;
}

return techniques
Expand Down