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

Merge pull request #2158 from guardicore/2071-POST-to-PUT 

Change POST to PUT in /api/agent-configuration
This commit is contained in:
Mike Salvatore 2022-08-03 13:31:47 -04:00 committed by GitHub
parent 3aafa60e53 722e1afb63
commit efec473b08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monkey/monkey_island/cc/resources/agent_configuration.py
View File

@ -24,7 +24,7 @@ class AgentConfiguration(AbstractResource):
return make_response(configuration_json, 200) return make_response(configuration_json, 200)
@jwt_required @jwt_required
def post(self): def put(self):
try: try:
configuration_object = AgentConfigurationObject.from_mapping(request.json) configuration_object = AgentConfigurationObject.from_mapping(request.json)
self._agent_configuration_repository.store_configuration(configuration_object) self._agent_configuration_repository.store_configuration(configuration_object)

21
monkey/monkey_island/cc/ui/src/components/configuration-components/ImportConfigModal.tsx
View File

@ -97,7 +97,7 @@ const ConfigImportModal = (props: Props) => {
delete config['advanced']; delete config['advanced'];
authComponent.authFetch(configImportEndpoint, authComponent.authFetch(configImportEndpoint,
{ {
method: 'POST', method: 'PUT',
headers: {'Content-Type': 'application/json'}, headers: {'Content-Type': 'application/json'},
body: JSON.stringify(config) body: JSON.stringify(config)
} }
@ -107,7 +107,7 @@ const ConfigImportModal = (props: Props) => {
props.onClose(true); props.onClose(true);
} else { } else {
setUploadStatus(UploadStatuses.error); setUploadStatus(UploadStatuses.error);
setErrorMessage("Configuration file is corrupt or in an outdated format."); setErrorMessage("Configuration file is corrupt or in an outdated format");
} }
}) })
} }
@ -142,9 +142,20 @@ const ConfigImportModal = (props: Props) => {
setErrorMessage('File is not in a valid json format'); setErrorMessage('File is not in a valid json format');
return return
} }
setConfigEncrypted(importContents['metadata']['encrypted']);
setConfigContents(importContents['configuration']); try {
setConfigCredentials(importContents['credentials']); setConfigEncrypted(importContents['metadata']['encrypted']);
setConfigContents(importContents['configuration']);
setConfigCredentials(importContents['credentials']);
} catch (e) {
if (e instanceof TypeError) {
setErrorMessage('Missing required fields; configuration file is most '
+ 'likely from an older version of Infection Monkey.')
}
else {
throw e;
}
}
}; };
reader.readAsText(event.target.files[0]); reader.readAsText(event.target.files[0]);
} }

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

@ -276,7 +276,7 @@ class ConfigurePageComponent extends AuthComponent {
return ( return (
this.authFetch(CONFIG_URL, this.authFetch(CONFIG_URL,
{ {
method: 'POST', method: 'PUT',
headers: {'Content-Type': 'application/json'}, headers: {'Content-Type': 'application/json'},
body: JSON.stringify(config) body: JSON.stringify(config)
}) })

6
monkey/tests/unit_tests/monkey_island/cc/resources/test_agent_configuration.py
View File

@ -26,7 +26,7 @@ def flask_client(build_flask_client):
def test_agent_configuration_endpoint(flask_client): def test_agent_configuration_endpoint(flask_client):
resp = flask_client.post( resp = flask_client.put(
AGENT_CONFIGURATION_URL, AGENT_CONFIGURATION_URL,
json=AgentConfiguration.to_mapping(AGENT_CONFIGURATION), json=AgentConfiguration.to_mapping(AGENT_CONFIGURATION),
follow_redirects=True, follow_redirects=True,
@ -39,12 +39,12 @@ def test_agent_configuration_endpoint(flask_client):
def test_agent_configuration_invalid_config(flask_client): def test_agent_configuration_invalid_config(flask_client):
resp = flask_client.post(AGENT_CONFIGURATION_URL, json={"invalid_config": "invalid_stuff"}) resp = flask_client.put(AGENT_CONFIGURATION_URL, json={"invalid_config": "invalid_stuff"})
assert resp.status_code == 400 assert resp.status_code == 400
def test_agent_configuration_invalid_json(flask_client): def test_agent_configuration_invalid_json(flask_client):
resp = flask_client.post(AGENT_CONFIGURATION_URL, data="InvalidJson!") resp = flask_client.put(AGENT_CONFIGURATION_URL, data="InvalidJson!")
assert resp.status_code == 400 assert resp.status_code == 400