diff --git a/monkey/monkey_island/cc/services/zero_trust/scoutsuite/scoutsuite_auth_service.py b/monkey/monkey_island/cc/services/zero_trust/scoutsuite/scoutsuite_auth_service.py
index eb0d5dfbd..dc3f8d5ee 100644
--- a/monkey/monkey_island/cc/services/zero_trust/scoutsuite/scoutsuite_auth_service.py
+++ b/monkey/monkey_island/cc/services/zero_trust/scoutsuite/scoutsuite_auth_service.py
@@ -12,13 +12,12 @@ from monkey_island.cc.services.config_schema.config_value_paths import AWS_KEYS_
def is_cloud_authentication_setup(provider: CloudProviders) -> Tuple[bool, str]:
if provider == CloudProviders.AWS.value:
if is_aws_keys_setup():
- return True, "AWS keys already setup. Run Monkey on Island to start the scan."
+ return True, "AWS keys already setup."
import common.cloud.scoutsuite.ScoutSuite.providers.aws.authentication_strategy as auth_strategy
try:
profile = auth_strategy.AWSAuthenticationStrategy().authenticate()
- return True, f" Profile \"{profile.session.profile_name}\" is already setup. " \
- f"Run Monkey on Island to start the scan."
+ return True, f" Profile \"{profile.session.profile_name}\" is already setup. "
except AuthenticationException:
return False, ""
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage/scoutsuite-setup/CloudOptions.js b/monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage/scoutsuite-setup/CloudOptions.js
index 1e1d83c4a..bd9c83f04 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage/scoutsuite-setup/CloudOptions.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage/scoutsuite-setup/CloudOptions.js
@@ -29,7 +29,7 @@ const getContents = (props) => {
.then(res => res.json())
.then(res => {
if(res.is_setup){
- setDescription(res.message + ' Click next to change the configuration.');
+ setDescription(getDescription(res.message));
setIconType('icon-success');
setIcon(faCheck);
} else {
@@ -40,6 +40,14 @@ const getContents = (props) => {
});
}, [props]);
+ function getDescription(message){
+ return (
+ <>
+ {message} Run from the Island to start the scan. Click next to change the configuration.
+ >
+ )
+ }
+
return (
<>