Improved style and text of SS setup tutorials

monkey/monkey_island/cc/services/zero_trust/scoutsuite/scoutsuite_auth_service.py

@@ -23,12 +23,13 @@ _add_scoutsuite_to_python_path()
 def is_cloud_authentication_setup(provider: PROVIDERS) -> Tuple[bool, str]:
     if provider == PROVIDERS.AWS.value:
         if is_aws_keys_setup():
-            return True, "AWS keys already setup. Run monkey on Island to scan."
+            return True, "AWS keys already setup. Run Monkey on Island to start the scan."
 
         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. Run monkey on Island to scan."
+            return True, f" Profile \"{profile.session.profile_name}\" is already setup. " \
+                         f"Run Monkey on Island to start the scan."
         except Exception:
             return False, ""
 

monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage/scoutsuite-setup/AWSConfiguration/AWSCLISetup.js

@@ -20,7 +20,7 @@ export default function AWSCLISetup(props) {
 const getContents = (props) => {
   return (
     <div className={'aws-scoutsuite-configuration'}>
-      <h2>ScoutSuite configuration for AWS</h2>
+      <h2>AWS CLI configuration for scan</h2>
       <p>To assess your AWS infrastructure's security do the following:</p>
       <ol>
         <li>
@@ -34,10 +34,11 @@ const getContents = (props) => {
             <li>
               2. Run <code>aws configure</code>. It's important to configure credentials, which
               allows ScoutSuite to get information about your cloud configuration. The most trivial way to do so is to
-              provide
+              provide&nbsp;
               <Button
                 href={'https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-quickstart.html#cli-configure-quickstart-creds'}
                 variant={'link'}
+                className={'cli-link'}
                 target={'_blank'}>
               Access key ID and secret access key
             </Button>.
@@ -48,7 +49,10 @@ const getContents = (props) => {
           2. If you change the configuration, make sure not to disable AWS system info collector.
         </li>
         <li>
-          3. Go back and run Monkey on the Island server.
+          3. Go <Button onClick={() => props.setComponent()}
+                        variant={'link'}
+                        className={'cli-link'}>back</Button>
+          &nbsp;and run Monkey on the Island server.
         </li>
         <li>
           4. Assess results in Zero Trust report.

monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage/scoutsuite-setup/AWSConfiguration/AWSKeySetup.js

@@ -83,7 +83,7 @@ const getContents = (props) => {
 
         <h5>Keys for custom user</h5>
         <p>1. Open the IAM console at <a href={'https://console.aws.amazon.com/iam/'}
-                                         target={'_blank'}>https://console.aws.amazon.com/iam/</a> .</p>
+                                         target={'_blank'}>https://console.aws.amazon.com/iam/</a>.</p>
         <p>2. In the navigation pane, choose Users.</p>
         <p>3. Choose the name of the user whose access keys you want to create, and then choose the Security credentials
           tab.</p>

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(res.message + ' Click next to change the configuration.');
           setIconType('icon-success');
           setIcon(faCheck);
         } else {

monkey/monkey_island/cc/ui/src/styles/components/scoutsuite/AWSSetup.scss

@@ -13,9 +13,21 @@
 }
 
 .aws-scoutsuite-configuration li {
+  margin-bottom: 0;
+}
+
+.aws-scoutsuite-configuration h2 {
+  margin-bottom: 20px;
+}
+
+.aws-scoutsuite-configuration p {
   margin-bottom: 5px;
 }
 
+.aws-scoutsuite-configuration .cli-link {
+  padding: 0 0 4px 0;
+}
+
 .monkey-submit-button {
   margin-bottom: 15px;
 }