Merge branch 'develop' into snyk-upgrade-7f12d9c688d2cf1b551e62e93453c526

monkey/monkey_island/cc/ui/.snyk

@@ -0,0 +1,22 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.16.0
+ignore: {}
+# patches apply the minimum changes required to fix a vulnerability
+patch:
+  SNYK-JS-LODASH-567746:
+    - react-data-components > lodash:
+        patched: '2020-07-14T15:09:05.611Z'
+    - react-graph-vis > lodash:
+        patched: '2020-07-14T15:09:05.611Z'
+    - react-jsonschema-form > lodash:
+        patched: '2020-07-14T15:09:05.611Z'
+    - react-particles-js > lodash:
+        patched: '2020-07-14T15:09:05.611Z'
+    - react-bootstrap > @restart/hooks > lodash:
+        patched: '2020-07-14T15:09:05.611Z'
+    - react-bootstrap > react-overlays > @restart/hooks > lodash:
+        patched: '2020-07-14T15:09:05.611Z'
+    - '@emotion/core > @emotion/css > babel-plugin-emotion > @babel/helper-module-imports > @babel/types > lodash':
+        patched: '2020-07-14T15:09:05.611Z'
+    - react-spinners > @emotion/core > @emotion/css > babel-plugin-emotion > @babel/helper-module-imports > @babel/types > lodash:
+        patched: '2020-07-14T15:09:05.611Z'

monkey/monkey_island/cc/ui/package.json

@@ -1,6 +1,7 @@
 {
   "private": true,
-  "version": "1.0.0",
+  "version": "1.8.2",
+  "name": "infection-monkey",
   "description": "Infection Monkey C&C UI",
   "scripts": {
     "clean": "rimraf dist/*",
@@ -14,7 +15,9 @@
     "release:patch": "npm version patch && npm publish && git push --follow-tags",
     "serve": "node server.js --env=dev",
     "serve:dist": "node server.js --env=dist",
-    "start": "webpack-dev-server --verbose --mode development --open --history-api-fallback --port 8000"
+    "start": "webpack-dev-server --verbose --mode development --open --history-api-fallback --port 8000",
+    "snyk-protect": "snyk protect",
+    "prepare": "npm run snyk-protect"
   },
   "repository": "",
   "keywords": [],
@@ -74,7 +77,7 @@
     "jwt-decode": "^2.2.0",
     "marked": "^0.8.2",
     "normalize.css": "^8.0.0",
-    "npm": "^6.14.5",
+    "npm": "^6.14.6",
     "pluralize": "^7.0.0",
     "prop-types": "^15.7.2",
     "rainge": "^1.0.1",
@@ -102,6 +105,8 @@
     "react-toggle": "^4.1.1",
     "react-tooltip-lite": "^1.10.0",
     "redux": "^4.0.4",
-    "sha3": "^2.0.7"
-  }
+    "sha3": "^2.0.7",
+    "snyk": "^1.361.3"
+  },
+  "snyk": true
 }