From b3654d50c8ad0775df5ff97d5958a1aa129d4ac0 Mon Sep 17 00:00:00 2001
From: geoffrey <geoffrey.bucchino@protonmail.com>
Date: Tue, 13 Jun 2023 20:18:34 +0200
Subject: [PATCH] Update report

---
 core/main.py                      |  1 -
 core/report.py                    | 13 +++++++++--
 reports/templates/postfix.html.j2 | 39 +++++++++++--------------------
 reports/templates/sysctl.html.j2  | 17 ++++++++++++++
 4 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/core/main.py b/core/main.py
index f2be5f5..c8a7a9e 100644
--- a/core/main.py
+++ b/core/main.py
@@ -45,7 +45,6 @@ def main():
     if args.audit == "application":
         pass
 
-    print(report)
     generateHtmlReport(report) 
 
 @Dispatcher.register_plugins
diff --git a/core/report.py b/core/report.py
index 53c1d4c..e1875d7 100644
--- a/core/report.py
+++ b/core/report.py
@@ -25,6 +25,17 @@ def generateHtmlReport(data):
         print(plugin)
         dataJinja2['plugins'].append(f"{plugin}.html.j2")
 
+    if 'postfix' in dataJinja2['plugins']:
+        pass
+
+    if 'sysctl' in data['system']:
+        dataJinja2['sysctl'] = dict()
+
+        for sysctl in data['system']['sysctl']['file']:
+            print(data['system']['sysctl']['file'][sysctl])
+
+    
+
     dataJinja2['year'] = '2023'
     rdr = tmplIndex.render(data=dataJinja2)
 
@@ -49,9 +60,7 @@ def generateHtmlReport(data):
                 #    body += f"Description: {result['description']}<br /><br />"
                 #body += f"</p>"
 
-    html += body
     #print(body)
-    html += "</body></html>"
     with open(f"reports/reports_{today}.html", "w") as f:
         f.write(rdr)
 
diff --git a/reports/templates/postfix.html.j2 b/reports/templates/postfix.html.j2
index 3e1498c..29601f0 100644
--- a/reports/templates/postfix.html.j2
+++ b/reports/templates/postfix.html.j2
@@ -1,29 +1,18 @@
 <h3 class="fs-3">Postfix</h3>
 
-    <div class="accordion" id="accordionExample">
-      <div class="accordion-item">
-        <h2 class="accordion-header">
-          <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-            Accordion Item #1
-          </button>
-        </h2>
-        <div id="collapseOne" class="accordion-collapse collapse show" data-bs-parent="#accordionExample">
-          <div class="accordion-body">
-            <strong>This is the first item's accordion body.</strong> It is shown by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions. You can modify any of this with custom CSS or overriding our default variables. It's also worth noting that just about any HTML can go within the <code>.accordion-body</code>, though the transition does limit overflow.
-          </div>
-        </div>
-      </div>
-      <div class="accordion-item">
-        <h2 class="accordion-header">
-          <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
-            Accordion Item #2
-          </button>
-        </h2>
-        <div id="collapseTwo" class="accordion-collapse collapse" data-bs-parent="#accordionExample">
-          <div class="accordion-body">
-            <strong>This is the second item's accordion body.</strong> It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions. You can modify any of this with custom CSS or overriding our default variables. It's also worth noting that just about any HTML can go within the <code>.accordion-body</code>, though the transition does limit overflow.
-          </div>
-        </div>
+{% for item in data['postfix'] %}
+<div class="accordion" id="accordionPostfix">
+  <div class="accordion-item">
+    <h2 class="accordion-header">
+      <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#{{ item['accordion-id'] }}" aria-expanded="true" aria-controls="collapseOne">
+        Accordion Item #1
+      </button>
+    </h2>
+    <div id="{{ item['accordion-id'] }}" class="accordion-collapse collapse show" data-bs-parent="#accordionPostfix">
+      <div class="accordion-body">
+        <strong></strong>
       </div>
     </div>
-
+  </div>
+</div>
+{% endfor %}
diff --git a/reports/templates/sysctl.html.j2 b/reports/templates/sysctl.html.j2
index 2413230..fb427a0 100644
--- a/reports/templates/sysctl.html.j2
+++ b/reports/templates/sysctl.html.j2
@@ -1 +1,18 @@
 <h3 class="fs-3">Sysctl</h3>
+
+{% for item in data['sysctl'] %}
+<div class="accordion" id="accordionSysctl">
+  <div class="accordion-item">
+    <h2 class="accordion-header">
+      <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#{{ item['accordion-id'] }}" aria-expanded="true" aria-controls="collapseOne">
+        Accordion Item #1
+      </button>
+    </h2>
+    <div id="{{ item['accordion-id'] }}" class="accordion-collapse collapse show" data-bs-parent="#accordionSysctl">
+      <div class="accordion-body">
+        <strong></strong>
+      </div>
+    </div>
+  </div>
+</div>
+{% endfor %}