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

Merge pull request #415 from VakarisZ/config_submit_bugfix 

Bugfix: can't submit on import
This commit is contained in:
Itay Mizeretz 2019-08-27 10:42:28 +03:00 committed by GitHub
parent cd06065469 51b689366a
commit cc5795d99c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,13 +295,12 @@ class ConfigurePageComponent extends AuthComponent {
this.setState({PBAlinuxFile: [], PBAwinFile: []}); this.setState({PBAlinuxFile: [], PBAwinFile: []});
} }
onReadFile = (event) => { setConfigOnImport = (event) => {
try { try {
this.setState({ this.setState({
configuration: JSON.parse(event.target.result), configuration: JSON.parse(event.target.result),
lastAction: 'import_success' lastAction: 'import_success'
}, () => {this.sendConfig(); this.setInitialConfig(JSON.parse(event.target.result))}); }, () => {this.sendConfig(); this.setInitialConfig(JSON.parse(event.target.result))});
this.currentSection = 'basic';
this.currentFormData = {}; this.currentFormData = {};
} catch(SyntaxError) { } catch(SyntaxError) {
this.setState({lastAction: 'import_failure'}); this.setState({lastAction: 'import_failure'});
@ -335,7 +334,7 @@ class ConfigurePageComponent extends AuthComponent {
importConfig = (event) => { importConfig = (event) => {
let reader = new FileReader(); let reader = new FileReader();
reader.onload = this.onReadFile; reader.onload = this.setConfigOnImport;
reader.readAsText(event.target.files[0]); reader.readAsText(event.target.files[0]);
event.target.value = null; event.target.value = null;
}; };
@ -494,7 +493,6 @@ class ConfigurePageComponent extends AuthComponent {
} else if(this.state.selectedSection !== 'attack') { } else if(this.state.selectedSection !== 'attack') {
content = this.renderConfigContent(displayedSchema) content = this.renderConfigContent(displayedSchema)
} }
return ( return (
<Col xs={12} lg={10}> <Col xs={12} lg={10}>
{this.renderAttackAlertModal()} {this.renderAttackAlertModal()}