From ce673960243169989e607aba1c3b422b97548171 Mon Sep 17 00:00:00 2001
From: l01c d3v <l01cd3v@gmail.com>
Date: Tue, 23 Feb 2016 21:40:22 -0800
Subject: [PATCH 1/2] Fix issue #79

---
 .../services.iam.credential_report.root_account.html | 12 ++++++------
 inc-scout2/scout2.js                                 |  7 +++++--
 rules/root-account-no-mfa.json                       |  1 +
 rules/root-account-used-recently.json                |  3 ++-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/html/summaries/services.iam.credential_report.root_account.html b/html/summaries/services.iam.credential_report.root_account.html
index 297aa83f..068803e4 100644
--- a/html/summaries/services.iam.credential_report.root_account.html
+++ b/html/summaries/services.iam.credential_report.root_account.html
@@ -1,17 +1,17 @@
 
   <!-- Root account usage -->
   <script id="services.iam.credential_report.root_account.details.template" type="text/x-handlebars-template">
-    <div id="services.iam.credential_report.root_account.details">
-        <div class="list-group" id="services.iam.credential_report.root_account.view">
+    <div id="services.iam.credential_report.<root_account>.details">
+        <div class="list-group" id="services.iam.credential_report.<root_account>.view">
           <div class="list-group-item active">
             <h4 class="list-group-item-heading">AWS root account</h4>
           </div>
           <div class="list-group-item">
             <div class="list-group-item-text item-margin">Creation date: {{items.user_creation_time}}</div>
-            <div class="list-group-item-text item-margin">Password last used: <span id="iam_CredentialReport-root-active-password-">{{items.password_last_used}}</span></div>
-            <div class="list-group-item-text item-margin">MFA enabled: <span id="iam_CredentialReport-root-no-mfa-">{{items.mfa_active}}</span></div>
-            <div class="list-group-item-text item-margin">Access key 1 active: <span id="iam_CredentialReport-root-active-key-access_key_1_active">{{items.access_key_1_active}}</span></div>
-            <div class="list-group-item-text item-margin">Access key 2 active: <span id="iam_CredentialReport-root-active-key-access_key_2_active">{{items.access_key_2_active}}</span></div>
+            <div class="list-group-item-text item-margin">Password last used: <span id="iam.credential_report.<root_account>.password_last_used">{{items.password_last_used}}</span></div>
+            <div class="list-group-item-text item-margin">MFA enabled: <span id="iam.credential_report.<root_account>.mfa_active">{{items.mfa_active}}</span></div>
+            <div class="list-group-item-text item-margin">Access key 1 active: <span id="iam.credential_report.<root_account>.access_key_1_active">{{items.access_key_1_active}}</span></div>
+            <div class="list-group-item-text item-margin">Access key 2 active: <span id="iam.credential_report.<root_account>.access_key_2_active">{{items.access_key_2_active}}</span></div>
             <div class="list-group-item-text item-margin">Signing cert 1 active: {{items.cert_1_active}}</div>
             <div class="list-group-item-text item-margin">Signing cert 2 active: {{items.cert_2_active}}</div>
           </div>
diff --git a/inc-scout2/scout2.js b/inc-scout2/scout2.js
index e4d9929a..94327bcf 100644
--- a/inc-scout2/scout2.js
+++ b/inc-scout2/scout2.js
@@ -129,7 +129,6 @@ function hideLinks(resource_path) {
 // Show list, details' container, links, and view for a given path
 //
 function showRowWithItems(path) {
-    path = path.replace('>', '').replace('<', '');
     showRow(path);
     showItems(path);
 }
@@ -581,8 +580,12 @@ function get_resource_path(path) {
             resource_path = get_value_at(path.replace('items', 'entities'));
         }
         resource_path_array = resource_path.split('.');
-        resource_path_array.pop();
+        last_value = resource_path_array.pop();
         resource_path = 'services.' + resource_path_array.join('.');
+        // Fix for issue #79
+        if (last_value == '<root_account>') {
+            resource_path += '.' + last_value;
+        }
     } else if (path.endsWith('.view')) {
         // Resource path is not changed (this may break when using `back' button in browser)
         var resource_path = current_resource_path;
diff --git a/rules/root-account-no-mfa.json b/rules/root-account-no-mfa.json
index 594e4dd5..448ab1de 100644
--- a/rules/root-account-no-mfa.json
+++ b/rules/root-account-no-mfa.json
@@ -6,5 +6,6 @@
         [ "iam.credential_report.<root_account>.mfa_active", "notTrue", "" ]
     ],
     "level": "danger",
+    "id_suffix": "mfa_active",
     "listing": { "keys": [ "this" ] }
 }
diff --git a/rules/root-account-used-recently.json b/rules/root-account-used-recently.json
index 6bc15eae..379c0db4 100644
--- a/rules/root-account-used-recently.json
+++ b/rules/root-account-used-recently.json
@@ -5,5 +5,6 @@
     "conditions": [ "and",
         [ "iam.credential_report.<root_account>.password_last_used", "dateNotOlderThan", "90" ]
     ],
-    "level": "danger"
+    "level": "danger",
+    "id_suffix": "password_last_used"
 }

From 6e40a06c8f7f481096a92d1276984199db9d4449 Mon Sep 17 00:00:00 2001
From: l01c d3v <l01cd3v@gmail.com>
Date: Tue, 23 Feb 2016 22:13:40 -0800
Subject: [PATCH 2/2] Python 3.2 + boto3 1.2.4 fails on S3 -- For now, fix
 boto3 version to 1.2.3

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 74114997..602ac29e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-boto3>=1.2.3
+boto3==1.2.3
 requests>=2.4.0
 python-dateutil>=2.2
 netaddr>=0.7.11