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

UI: Submit config before exporting 

Previously config was not getting submitted before exporting. This could cause a misunderstanding where user exports a different configuration to the one he sees on the screen
This commit is contained in:
vakarisz 2022-06-28 16:14:40 +03:00
parent 69ca2d541d
commit 20c68ff25c
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,10 @@ const CONFIG_URL = '/api/configuration/island';
export const API_PBA_LINUX = '/api/file-upload/PBAlinux';
export const API_PBA_WINDOWS = '/api/file-upload/PBAwindows';
const configSubmitAction = 'config-submit';
const configExportAction = 'config-export';
const configSaveAction = 'config-saved';
class ConfigurePageComponent extends AuthComponent {
constructor(props) {
@ -87,14 +91,16 @@ class ConfigurePageComponent extends AuthComponent {
};
onUnsafeConfirmationCancelClick = () => {
this.setState({showUnsafeOptionsConfirmation: false});
this.setState({showUnsafeOptionsConfirmation: false, lastAction: 'none'});
}
onUnsafeConfirmationContinueClick = () => {
this.setState({showUnsafeOptionsConfirmation: false});
if (this.state.lastAction === 'submit_attempt') {
if (this.state.lastAction === configSubmitAction) {
this.configSubmit();
} else if (this.state.lastAction === configExportAction) {
this.configSubmit();
this.setState({showConfigExportModal: true});
}
}
@ -113,37 +119,31 @@ class ConfigurePageComponent extends AuthComponent {
};
onSubmit = () => {
this.attemptConfigSubmit();
this.setState({lastAction: configSubmitAction}, this.attemptConfigSubmit)
};
canSafelySubmitConfig(config) {
return !isUnsafeOptionSelected(this.state.schema, config);
}
checkAndShowUnsafeAttackWarning = () => {
if (isUnsafeOptionSelected(this.state.schema, this.state.configuration)) {
this.setState({showUnsafeAttackOptionsWarning: true});
}
}
attemptConfigSubmit() {
this.updateConfigSection();
this.setState({lastAction: 'submit_attempt'}, () => {
async attemptConfigSubmit() {
await this.updateConfigSection();
if (this.canSafelySubmitConfig(this.state.configuration)) {
this.configSubmit();
if(this.state.lastAction === configExportAction){
this.setState({showConfigExportModal: true})
}
} else {
this.setState({showUnsafeOptionsConfirmation: true});
}
}
);
}
configSubmit() {
this.sendConfig()
return this.sendConfig()
.then(res => res.json())
.then(res => {
this.setState({
lastAction: 'saved',
lastAction: configSaveAction,
schema: res.schema,
configuration: res.configuration
});
@ -167,11 +167,12 @@ class ConfigurePageComponent extends AuthComponent {
if (Object.keys(this.state.currentFormData).length > 0) {
newConfig[this.currentSection] = this.state.currentFormData;
}
this.setState({configuration: newConfig, lastAction: 'none'});
this.setState({configuration: newConfig});
};
renderConfigExportModal = () => {
return (<ConfigExportModal show={this.state.showConfigExportModal}
configuration={this.state.configuration}
onHide={() => {
this.setState({showConfigExportModal: false});
}}/>);
@ -307,9 +308,9 @@ class ConfigurePageComponent extends AuthComponent {
this.authFetch(apiEndpoint, request_options);
}
exportConfig = () => {
this.updateConfigSection();
this.setState({showConfigExportModal: true});
exportConfig = async () => {
await this.setState({lastAction: configExportAction});
await this.attemptConfigSubmit();
};
sendConfig() {
@ -451,7 +452,7 @@ class ConfigurePageComponent extends AuthComponent {
Configuration reset successfully.
</div>
: ''}
{this.state.lastAction === 'saved' ?
{this.state.lastAction === configSaveAction ?
<div className='alert alert-success'>
<FontAwesomeIcon icon={faCheck} style={{'marginRight': '5px'}}/>
Configuration saved successfully.