Update app.py

app.py

@@ -13,73 +13,81 @@ def analyze_email(file_path, export_pdf=False):
     if file_path is None:
         return "<p style='color:red;'>Please upload a .eml file to analyze.</p>", None
 
-    results = analyze(file_path)
+    # Get structured results
+    summary, details = analyze(file_path)
 
-    # Ensure all items are strings
-    results_str = [str(r) for r in results]
-
-    # Extract basic verdict info
-    attack_score = results_str[0]
-    attack_type = results_str[1]
-    verdict = results_str[2]
-
-    # Correct handling of attack_score
-    score_val = int(attack_score)
-    if score_val > 100:  
+    # Safely extract summary fields
+    attack_score = summary.get("Attack Score", 0)
+    try:
+        score_val = int(round(float(attack_score)))
+    except Exception:
+        score_val = 0
+    if score_val > 100:
         score_val = 100
+    if score_val < 0:
+        score_val = 0
+
+    attack_type = summary.get("Attack Type", "Unknown")
+    verdict = summary.get("Final Verdict", "No Verdict")
 
     # Verdict color
-    verdict_color = "#2ecc71"  # default green
-    if "Malicious" in verdict:
+    verdict_color = "#2ecc71"
+    v_lower = verdict.lower()
+    if "malicious" in v_lower:
         verdict_color = "#e74c3c"
-    elif "Suspicious" in verdict:
+    elif "suspicious" in v_lower:
         verdict_color = "#e67e22"
-    elif "Spam" in verdict:
+    elif "spam" in v_lower:
         verdict_color = "#f1c40f"
 
-    # Extract sections safely
-    try:
-        tags_index = results_str.index("---- Attack Analysis Tags ----")
-        findings_index = results_str.index("---- Detailed Findings ----")
-        body_index = results_str.index("---- Highlighted Body ----")
-    except ValueError:
-        html = "<pre>" + "\n".join(results_str) + "</pre>"
-        return html, None
+    # Collect details safely
+    header_findings = details.get("Header Findings", []) or []
+    body_findings = details.get("Body Findings", []) or []
+    url_findings = details.get("URL Findings", []) or []
+    highlighted_body = details.get("Highlighted Body", "") or ""
 
-    tags = results_str[tags_index + 1 : findings_index]
-    findings = results_str[findings_index + 1 : body_index]
-    highlighted_body = results_str[body_index + 1 :]
+    # Tags (from summary Main Tags if present)
+    main_tags_str = summary.get("Main Tags", "")
+    tags = [t.strip() for t in main_tags_str.split(",")] if main_tags_str else []
 
     # HTML Report
     html = f"""
-    <div style='font-family: Arial, sans-serif; padding: 20px; max-width: 800px; margin:auto;'>
+    <div style='font-family: Arial, sans-serif; padding: 20px; max-width: 900px; margin:auto;'>
       <h2 style="color:#2c3e50;">📧 Email Security Report</h2>
-      <h3>Attack Score</h3>
-      <div style="background:#ecf0f1; border-radius:10px; overflow:hidden; height:24px; width:100%;">
+
+      <h3 style="margin-bottom:6px;">Attack Score</h3>
+      <div style="background:#ecf0f1; border-radius:10px; overflow:hidden; height:24px; width:100%; margin-bottom:8px;">
         <div style="width:{score_val}%; background:#3498db; height:100%; text-align:center; color:white; line-height:24px;">
           {score_val}/100
         </div>
       </div>
+
       <p><b>Attack Type:</b> {attack_type}</p>
       <p><b>Final Verdict:</b> <span style="background:{verdict_color}; color:white; padding:4px 10px; border-radius:6px;">
-        {verdict.replace('Final Verdict:', '').strip()}
+        {verdict}
       </span></p>
-      <details style="margin-top:15px;">
+
+      <details style="margin-top:15px;" open>
         <summary>🔖 Attack Analysis Tags ({len(tags)})</summary>
-        <ul>
-          {''.join(f'<li>{tag}</li>' for tag in tags)}
-        </ul>
+        {"<ul>" + "".join(f"<li>{tag}</li>" for tag in tags if tag) + "</ul>" if tags else "<p>No special tags</p>"}
       </details>
-      <details style="margin-top:15px;">
-        <summary>🕵️ Detailed Findings ({len(findings)})</summary>
-        <ul>
-          {''.join(f'<li>{finding}</li>' for finding in findings)}
-        </ul>
+
+      <details style="margin-top:15px;" open>
+        <summary>🕵️ Detailed Findings</summary>
+        <h4>Headers ({len(header_findings)})</h4>
+        {"<ul>" + "".join(f"<li>{f}</li>" for f in header_findings) + "</ul>" if header_findings else "<p>No header findings.</p>"}
+
+        <h4>Body ({len(body_findings)})</h4>
+        {"<ul>" + "".join(f"<li>{f}</li>" for f in body_findings) + "</ul>" if body_findings else "<p>No body findings.</p>"}
+
+        <h4>URLs ({len(url_findings)})</h4>
+        {"<ul>" + "".join(f"<li>{f}</li>" for f in url_findings) + "</ul>" if url_findings else "<p>No URL findings.</p>"}
       </details>
+
       <details style="margin-top:15px;">
         <summary>📩 Highlighted Email Body</summary>
-        <div style='border:1px solid #ccc; padding:15px; background:#fdfdfd; border-radius:8px;'>
-          {"<br>".join(highlighted_body)}
+        <div style='border:1px solid #ccc; padding:15px; background:#fdfdfd; border-radius:8px; white-space:pre-wrap;'>
+          {highlighted_body}
         </div>
       </details>
     </div>
@@ -87,7 +95,10 @@ def analyze_email(file_path, export_pdf=False):
 
     pdf_path = None
     if export_pdf:
-        pdf_path = html_to_pdf(html)
+        try:
+            pdf_path = html_to_pdf(html)
+        except Exception as e:
+            html += f"<p style='color:#c0392b;'><b>PDF export failed:</b> {e}</p>"
 
     return html, pdf_path