Improved run monkey error modal to display any kind of error.
This commit is contained in:
VakarisZ
parent
6e10dd20d1
commit
c5e4493db5
|
|
@ -51,7 +51,7 @@ def run_local_monkey():
|
|||
logger.error('popen failed', exc_info=True)
|
||||
return False, "popen failed: %s" % exc
|
||||
|
||||
return True, "pis: %s" % pid
|
||||
return True, ""
|
||||
|
||||
|
||||
class LocalRun(flask_restful.Resource):
|
||||
|
|
|
|||
|
|
@ -0,0 +1,100 @@
|
|||
import {Modal} from 'react-bootstrap';
|
||||
import React from 'react';
|
||||
import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
|
||||
import {faExclamationTriangle} from '@fortawesome/free-solid-svg-icons';
|
||||
|
||||
|
||||
class IslandMonkeyRunErrorModal extends React.PureComponent {
|
||||
|
||||
constructor(props) {
|
||||
super(props);
|
||||
|
||||
this.state = {
|
||||
showModal: this.props.showModal,
|
||||
errorDetails: this.props.errorDetails
|
||||
};
|
||||
}
|
||||
|
||||
componentDidUpdate(prevProps) {
|
||||
if (this.props !== prevProps) {
|
||||
this.setState({
|
||||
showModal: this.props.showModal,
|
||||
errorDetails: this.props.errorDetails
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
getMissingBinariesContent() {
|
||||
return (
|
||||
<div>
|
||||
Some Monkey binaries are not found where they should be...<br/>
|
||||
You can download the files from <a href="https://github.com/guardicore/monkey/releases/latest"
|
||||
target="blank">here</a>,
|
||||
at the bottommost section titled "Assets", and place them under the
|
||||
directory <code>monkey/monkey_island/cc/binaries</code>.
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
getMonkeyAlreadyRunningContent() {
|
||||
return (
|
||||
<div>
|
||||
Most likely, monkey is already running on the Island. Wait until it finishes or kill the process to run again.
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
getUndefinedErrorContent() {
|
||||
return (
|
||||
<div>
|
||||
You encountered an undefined error. Please report it to support@infectionmonkey.com or our slack channel.
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
getDisplayContentByError(errorMsg) {
|
||||
if (errorMsg.includes('Permission denied:')) {
|
||||
return this.getMonkeyAlreadyRunningContent()
|
||||
} else if (errorMsg.startsWith('Copy file failed')) {
|
||||
return this.getMissingBinariesContent()
|
||||
} else {
|
||||
return this.getUndefinedErrorContent()
|
||||
}
|
||||
}
|
||||
|
||||
render = () => {
|
||||
return (
|
||||
<Modal show={this.state.showModal} onHide={() => this.props.onClose()}>
|
||||
<Modal.Body>
|
||||
<h3>
|
||||
<div className='text-center'>Uh oh...</div>
|
||||
</h3>
|
||||
<div style={{'marginTop': '1em', 'marginBottom': '1em'}}>
|
||||
<p className="alert alert-warning">
|
||||
<FontAwesomeIcon icon={faExclamationTriangle} style={{'marginRight': '5px'}}/>
|
||||
{this.getDisplayContentByError(this.state.errorDetails)}
|
||||
</p>
|
||||
</div>
|
||||
<hr/>
|
||||
<h4>
|
||||
Error Details
|
||||
</h4>
|
||||
<div style={{'marginTop': '1em', 'marginBottom': '1em'}}>
|
||||
<pre>
|
||||
{this.state.errorDetails}
|
||||
</pre>
|
||||
</div>
|
||||
<div className='text-center'>
|
||||
<button type='button' className='btn btn-success btn-lg' style={{margin: '5px'}}
|
||||
onClick={() => this.props.onClose()}>
|
||||
Dismiss
|
||||
</button>
|
||||
</div>
|
||||
</Modal.Body>
|
||||
</Modal>
|
||||
)
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
export default IslandMonkeyRunErrorModal;
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
import {Modal} from 'react-bootstrap';
|
||||
import React from 'react';
|
||||
|
||||
|
||||
class MissingBinariesModal extends React.PureComponent {
|
||||
|
||||
constructor(props) {
|
||||
super(props);
|
||||
|
||||
this.state = {
|
||||
showModal: this.props.showModal,
|
||||
errorDetails: this.props.errorDetails
|
||||
};
|
||||
}
|
||||
|
||||
componentDidUpdate(prevProps) {
|
||||
if (this.props !== prevProps) {
|
||||
this.setState({
|
||||
showModal: this.props.showModal,
|
||||
errorDetails: this.props.errorDetails
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
render = () => {
|
||||
return (
|
||||
<Modal show={this.state.showModal} onHide={() => this.props.onClose()}>
|
||||
<Modal.Body>
|
||||
<h3>
|
||||
<div className='text-center'>Uh oh...</div>
|
||||
</h3>
|
||||
<div style={{'marginTop': '1em', 'marginBottom': '1em'}}>
|
||||
<p className="alert alert-warning">
|
||||
<i className="glyphicon glyphicon-info-sign" style={{'marginRight': '5px'}}/>
|
||||
Some Monkey binaries are not found where they should be...<br/>
|
||||
You can download the files from <a href="https://github.com/guardicore/monkey/releases/latest" target="blank">here</a>,
|
||||
at the bottommost section titled "Assets", and place them under the directory <code>monkey/monkey_island/cc/binaries</code>.
|
||||
</p>
|
||||
</div>
|
||||
<hr/>
|
||||
<h4>
|
||||
Error Details
|
||||
</h4>
|
||||
<div style={{'marginTop': '1em', 'marginBottom': '1em'}}>
|
||||
<pre>
|
||||
{this.state.errorDetails}
|
||||
</pre>
|
||||
</div>
|
||||
<div className='text-center'>
|
||||
<button type='button' className='btn btn-success btn-lg' style={{margin: '5px'}}
|
||||
onClick={() => this.props.onClose()}>
|
||||
Dismiss
|
||||
</button>
|
||||
</div>
|
||||
</Modal.Body>
|
||||
</Modal>
|
||||
)
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
export default MissingBinariesModal;
|
||||
Loading…
Reference in New Issue