p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #740 from guardicore/snyk-fix-e85f472f3a236fafae1b14a45dcea76c 

[Snyk] Security upgrade marked from 0.8.2 to 1.1.1
This commit is contained in:
VakarisZ 2020-07-28 12:50:02 +03:00 committed by GitHub
parent c1c412f176 ac21aca70d
commit 1f961678c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -83,7 +83,7 @@ script:
- cd monkey_island/cc/ui - cd monkey_island/cc/ui
- npm ci # See https://docs.npmjs.com/cli/ci.html - npm ci # See https://docs.npmjs.com/cli/ci.html
- eslint ./src --quiet # Test for errors - eslint ./src --quiet # Test for errors
- JS_WARNINGS_AMOUNT_UPPER_LIMIT=25 - JS_WARNINGS_AMOUNT_UPPER_LIMIT=28
- eslint ./src --max-warnings $JS_WARNINGS_AMOUNT_UPPER_LIMIT # Test for max warnings - eslint ./src --max-warnings $JS_WARNINGS_AMOUNT_UPPER_LIMIT # Test for max warnings
# Build documentation # Build documentation

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

@ -8220,9 +8220,9 @@
} }
}, },
"marked": { "marked": {
"version": "0.8.2", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/marked/-/marked-0.8.2.tgz", "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz",
"integrity": "sha512-EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw==" "integrity": "sha512-mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw=="
}, },
"mathml-tag-names": { "mathml-tag-names": {
"version": "2.1.3", "version": "2.1.3",

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

@ -75,7 +75,7 @@
"filepond": "^4.18.0", "filepond": "^4.18.0",
"jwt-decode": "^2.2.0", "jwt-decode": "^2.2.0",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"marked": "^0.8.2", "marked": "^1.1.1",
"normalize.css": "^8.0.0", "normalize.css": "^8.0.0",
"npm": "^6.14.6", "npm": "^6.14.6",
"pluralize": "^7.0.0", "pluralize": "^7.0.0",

8
monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsTable.js
View File

@ -18,13 +18,11 @@ const columns = [
{ {
Header: 'Events', id: 'events', Header: 'Events', id: 'events',
accessor: x => { accessor: x => {
const comp = <EventsButton finding_id={x.finding_id} return <EventsButton finding_id={x.finding_id}
latest_events={x.latest_events} latest_events={x.latest_events}
oldest_events={x.oldest_events} oldest_events={x.oldest_events}
event_count={x.event_count} event_count={x.event_count}
exportFilename={'Events_' + x.test_key} />; exportFilename={'Events_' + x.test_key} />;
comp.displayName = 'EventsButton_' + x.finding_id;
return comp;
}, },
maxWidth: EVENTS_COLUMN_MAX_WIDTH maxWidth: EVENTS_COLUMN_MAX_WIDTH
}, },
@ -36,9 +34,7 @@ const columns = [
const pillarLabels = pillars.map((pillar) => const pillarLabels = pillars.map((pillar) =>
<PillarLabel key={pillar.name} pillar={pillar.name} status={pillar.status}/> <PillarLabel key={pillar.name} pillar={pillar.name} status={pillar.status}/>
); );
const comp = <div style={{textAlign: 'center'}}>{pillarLabels}</div>; return <div style={{textAlign: 'center'}}>{pillarLabels}</div>;
comp.displayName = 'PillarsLabels';
return comp;
}, },
maxWidth: PILLARS_COLUMN_MAX_WIDTH, maxWidth: PILLARS_COLUMN_MAX_WIDTH,
style: {'whiteSpace': 'unset'} style: {'whiteSpace': 'unset'}

8
monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PrinciplesStatusTable.js
View File

@ -13,9 +13,7 @@ const columns = [
{ {
Header: 'Status', id: 'status', Header: 'Status', id: 'status',
accessor: x => { accessor: x => {
const comp = <StatusLabel status={x.status} size="3x" showText={false}/>; return <StatusLabel status={x.status} size="3x" showText={false}/>;
comp.displayName = 'StatusLabel';
return comp;
}, },
maxWidth: MAX_WIDTH_STATUS_COLUMN maxWidth: MAX_WIDTH_STATUS_COLUMN
}, },
@ -27,9 +25,7 @@ const columns = [
Header: 'Monkey Tests', id: 'tests', Header: 'Monkey Tests', id: 'tests',
style: {'whiteSpace': 'unset'}, // This enables word wrap style: {'whiteSpace': 'unset'}, // This enables word wrap
accessor: x => { accessor: x => {
const comp = <TestsStatus tests={x.tests}/>; return <TestsStatus tests={x.tests}/>;
comp.displayName = 'TestsStatus';
return comp;
} }
} }
] ]