From 2b237a7416f7b68c497459eca2b8b6dc208c2151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Tue, 8 Sep 2020 19:18:55 +0200
Subject: [PATCH] new: Use rendered HTML

---
 lookyloo/lookyloo.py                      | 3 ++-
 website/web/templates/hostname_popup.html | 2 +-
 website/web/templates/macros.html         | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lookyloo/lookyloo.py b/lookyloo/lookyloo.py
index 9c750d26..f77a21c5 100644
--- a/lookyloo/lookyloo.py
+++ b/lookyloo/lookyloo.py
@@ -565,10 +565,11 @@ class Lookyloo():
         with open((capture_dir / 'uuid'), 'r') as f:
             uuid = f.read()
         har_files = sorted(capture_dir.glob('*.har'))
+        html_files = sorted(capture_dir.glob('*.html'))
         # NOTE: We only index the public captures
         index = True
         try:
-            ct = CrawledTree(har_files, uuid)
+            ct = CrawledTree(zip(har_files, html_files), uuid)
             if self.is_public_instance:
                 cache = self.capture_cache(capture_uuid)
                 if cache.get('no_index') is not None:
diff --git a/website/web/templates/hostname_popup.html b/website/web/templates/hostname_popup.html
index 419311f3..67503d0a 100644
--- a/website/web/templates/hostname_popup.html
+++ b/website/web/templates/hostname_popup.html
@@ -179,7 +179,7 @@
               {% endif %}
               {{ ressource_legitimacy_details(details['legitimacy'], details['body_size']) }}
               <div>
-                  This file (<b>{{ details['type'] }}</b>) can be found <b>{{ details['hash_freq'] }}</b> times
+                  This file {% if details['type'] %}(<b>{{ details['type'] }}</b>){% endif %} can be found <b>{{ details['hash_freq'] }}</b> times
                 across all the captures on this lookyloo instance, in <b>{{ details['hash_domains_freq'] }}</b> unique domains.
                 {{ get_ressource_button(tree_uuid, url['url_object'].uuid, hash, 'Download the embedded ressource') }}
                 </br>
diff --git a/website/web/templates/macros.html b/website/web/templates/macros.html
index 38753934..71693e44 100644
--- a/website/web/templates/macros.html
+++ b/website/web/templates/macros.html
@@ -73,6 +73,7 @@ Body size: {{ sizeof_fmt(ressource_size) }}
   - This file is known <b>legitimate</b> on the following domains: {{ ', '.join(details[1]) }}.
   {% elif details[0] == False %}
     </br>
+    <p>
     The response sould be considered as
     {% if details[1] is mapping and details[1].get('tag') %}
     <b>{{ ', '.join(details[1]['tag']) }}</b>
@@ -84,7 +85,7 @@ Body size: {{ sizeof_fmt(ressource_size) }}
     {% else %}
       unless it is served by <b>the following domain(s)</b>: {{ ', '.join(details[1]) }}
     {%endif%}
-    </br>
+    </p>
   {%endif%}
 {%endif%}
 {% endmacro %}