dnsbl: Split whitelisted domains from added domains

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/backend/dnsbl.py b/src/backend/dnsbl.py
index 3f590827a3cead4c75cd7bc2655ca2558342cebd..cd83093807ea46018b35a149470180a8d74fb97c 100644 (file)
--- a/src/backend/dnsbl.py
+++ b/src/backend/dnsbl.py
@@ -353,8 +353,11 @@ class History(Model):
        # Timestamp
        ts: datetime.datetime
 
-       # Domains Added
-       domains_added: typing.List[str] = []
+       # Domains Blocked
+       domains_blocked: typing.List[str] = []
+
+       # Domains Allowed
+       domains_allowed: typing.List[str] = []
 
        # Domains Removed
        domains_removed: typing.List[str] = []

diff --git a/src/templates/dnsbl/lists/history.html b/src/templates/dnsbl/lists/history.html
index fa281920c0e7383f47f183be8ec94929626cb65b..c6cb252ebd1a55e74768b2f25faf8d6627b53fa7 100644 (file)
--- a/src/templates/dnsbl/lists/history.html
+++ b/src/templates/dnsbl/lists/history.html
@@ -58,9 +58,15 @@
 
                                {# Tags #}
                                <span class="tags">
-                                       {% if event.domains_added %}
+                                       {% if event.domains_allowed %}
+                                               <span class="tag is-info">
+                                                       &plus; {{ len(event.domains_allowed) }}
+                                               </span>
+                                       {% end %}
+
+                                       {% if event.domains_blocked %}
                                                <span class="tag is-success">
-                                                       &plus; {{ len(event.domains_added) }}
+                                                       &plus; {{ len(event.domains_blocked) }}
                                                </span>
                                        {% end %}
 
@@ -72,16 +78,23 @@
                                </span>
 
                                <ul>
-                                       {# Domains Added #}
-                                       {% for domain in event.domains_added %}
-                                               <li class="has-text-success">
+                                       {# Domains Allowed #}
+                                       {% for domain in event.domains_allowed %}
+                                               <li class="has-text-info" title="{{ _("Allowed") }}">
+                                                       &plus; {{ domain }}
+                                               </li>
+                                       {% end %}
+
+                                       {# Domains Blocked #}
+                                       {% for domain in event.domains_blocked %}
+                                               <li class="has-text-success" title="{{ _("Blocked") }}">
                                                        &plus; {{ domain }}
                                                </li>
                                        {% end %}
 
                                        {# Domains Removed #}
                                        {% for domain in event.domains_removed %}
-                                               <li class="has-text-danger">
+                                               <li class="has-text-danger" title="{{ _("Removed") }}">
                                                        &minus; {{ domain }}
                                                </li>
                                        {% end %}