From fffb4464c6f4de33afa800f59e2d4107bb24aa77 Mon Sep 17 00:00:00 2001
From: Terrtia <or1994@hotmail.fr>
Date: Mon, 16 Dec 2019 15:24:47 +0100
Subject: [PATCH] fix: [Domain] domain was up

---
 bin/lib/Domain.py                                  |  9 +++++++++
 .../templates/correlation/show_correlation.html    | 14 +++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/bin/lib/Domain.py b/bin/lib/Domain.py
index 7e61e4e9..4073f751 100755
--- a/bin/lib/Domain.py
+++ b/bin/lib/Domain.py
@@ -148,6 +148,9 @@ def sanathyse_port(port, domain, domain_type, strict=False, current_port=None):
             port = get_random_domain_port(domain, domain_type)
     return port
 
+def domain_was_up(domain, domain_type):
+    return r_serv_onion.hexists('{}_metadata:{}'.format(domain_type, domain), 'ports')
+
 def is_domain_up(domain, domain_type, ports=[]):
     if not ports:
         ports = get_domain_all_ports(domain, domain_type)
@@ -581,6 +584,12 @@ class Domain(object):
         '''
         return get_domain_last_origin(self.domain, self.type)
 
+    def domain_was_up(self):
+        '''
+        Return True if this domain was UP at least one time
+        '''
+        return domain_was_up(self.domain, self.type)
+
     def is_domain_up(self): # # TODO: handle multiple ports
         '''
         Return True if this domain is UP
diff --git a/var/www/templates/correlation/show_correlation.html b/var/www/templates/correlation/show_correlation.html
index 48b5c598..4f7086d6 100644
--- a/var/www/templates/correlation/show_correlation.html
+++ b/var/www/templates/correlation/show_correlation.html
@@ -443,7 +443,19 @@ if (d.popover) {
 					var desc = pop_header + "<div class=\"card-body bg-dark pb-1 pt-2\"><dl class=\"row py-0 my-0\">"
 					Object.keys(data).forEach(function(key) {
 						if (key=="status") {
-							desc = desc + "<dt class=\"col-sm-3 px-0\">status</dt><dd class=\"col-sm-9 px-0\"><div class=\"badge badge-pill badge-light flex-row-reverse\" style=\"color:Green;\"><i class=\"fas fa-check-circle\"></i>UP</div></dd>"
+							desc = desc + "<dt class=\"col-sm-3 px-0\">status</dt><dd class=\"col-sm-9 px-0\"><div class=\"badge badge-pill badge-light flex-row-reverse\" style=\"color:"
+							if (data["status"]) {
+								desc = desc + "Green"
+							} else {
+								desc = desc + "Red"
+							}
+							desc = desc + ";\"><i class=\"fas"
+							if (data["status"]) {
+								desc = desc + "fa-check-circle"
+							} else {
+								desc = desc + "fa-times-circle"
+							}
+							desc = desc + "\"></i>UP</div></dd>"
 						} else if (key!="tags" && key!="id") {
 							desc = desc + "<dt class=\"col-sm-3 px-0\">" + sanitize_text(key) + "</dt><dd class=\"col-sm-9 px-0\">" + sanitize_text(data[key]) + "</dd>"
 						}