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

Merge branch 'develop' into 393/python-3

This commit is contained in:
Shay Nehmad 2019-11-04 15:29:27 +02:00 committed by GitHub
parent 7de03d8db0 811b2b28f5
commit 38c45ccc72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,6 @@
"fetch": "^1.1.0", "fetch": "^1.1.0",
"file-saver": "^2.0.2", "file-saver": "^2.0.2",
"filepond": "^4.7.3", "filepond": "^4.7.3",
"js-file-download": "^0.4.8",
"json-loader": "^0.5.7", "json-loader": "^0.5.7",
"jwt-decode": "^2.2.0", "jwt-decode": "^2.2.0",
"moment": "^2.24.0", "moment": "^2.24.0",

7
monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
View File

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import Form from 'react-jsonschema-form'; import Form from 'react-jsonschema-form';
import {Col, Modal, Nav, NavItem} from 'react-bootstrap'; import {Col, Modal, Nav, NavItem} from 'react-bootstrap';
import fileDownload from 'js-file-download'; import FileSaver from 'file-saver';
import AuthComponent from '../AuthComponent'; import AuthComponent from '../AuthComponent';
import { FilePond } from 'react-filepond'; import { FilePond } from 'react-filepond';
import 'filepond/dist/filepond.min.css'; import 'filepond/dist/filepond.min.css';
@ -309,7 +309,10 @@ class ConfigurePageComponent extends AuthComponent {
exportConfig = () => { exportConfig = () => {
this.updateConfigSection(); this.updateConfigSection();
fileDownload(JSON.stringify(this.state.configuration, null, 2), 'monkey.conf'); const configAsJson = JSON.stringify(this.state.configuration, null, 2);
const configAsBinary = new Blob([configAsJson], {type: "text/plain;charset=utf-8"});
FileSaver.saveAs(configAsBinary, 'monkey.conf');
}; };
sendConfig() { sendConfig() {