From ab9766d237ea0d30a4e271240cc0b07b16eaa7ce Mon Sep 17 00:00:00 2001
From: Yogesh Ojha <yogesh.ojha11@gmail.com>
Date: Sun, 3 Apr 2022 13:56:14 +0530
Subject: [PATCH] whois on modal

---
 web/api/views.py                                   | 1 -
 web/startScan/templates/startScan/detail_scan.html | 8 ++++++--
 web/targetApp/templates/target/list.html           | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/web/api/views.py b/web/api/views.py
index 55be3e9b..27876155 100644
--- a/web/api/views.py
+++ b/web/api/views.py
@@ -650,7 +650,6 @@ class Whois(APIView):
 			if Domain.objects.filter(name=ip_domain).exists():
 				domain = Domain.objects.get(name=ip_domain)
 				if domain.domain_info:
-					print(domain.domain_info.nameserver_history.all())
 					return Response({
 						'status': True,
 						'ip_domain': ip_domain,
diff --git a/web/startScan/templates/startScan/detail_scan.html b/web/startScan/templates/startScan/detail_scan.html
index ad9e2660..6f059a5e 100644
--- a/web/startScan/templates/startScan/detail_scan.html
+++ b/web/startScan/templates/startScan/detail_scan.html
@@ -358,7 +358,7 @@ Scan Findings
 						<div class="card" style="height: 95%">
 							<div class="card-body">
 								<div class="card-widgets">
-									<a href="javascript: fetch_whois('{{history.domain}}');" data-toggle="tooltip" title="Reload Whois"><i class="mdi mdi-refresh"></i></a>
+									<a href="javascript: fetch_whois('{{history.domain}}', true);" data-toggle="tooltip" title="Reload Whois"><i class="mdi mdi-refresh"></i></a>
 								</div>
 								<h4 class="header-title mb-0"><i class="fe-activity"></i>&nbsp;Target Information</h4>
 								<div class="row mt-3">
@@ -376,7 +376,7 @@ Scan Findings
 												{% if not history.domain.domain_info %}
 												<div class="alert alert-danger alert-dismissible fade show" role="alert" id="whois_not_fetched_alert">
 													<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-													WHOIS Record Has not been fetched, would you like to <a href="javascript: fetch_whois('{{history.domain}}');">fetch it now?</a>
+													WHOIS Record Has not been fetched, would you like to <a href="javascript: fetch_whois('{{history.domain}}', true);">fetch it now?</a>
 												</div>
 												{% endif %}
 												<div class="alert alert-info alert-dismissible fade show" role="alert" id="whois_fetching_alert" style="display: none">
@@ -419,6 +419,10 @@ Scan Findings
 														<td>Name</td>
 														<td id="registrant_name">{{history.domain.domain_info.whois.registrant.name}}</td>
 													</tr>
+													<tr>
+														<td>Email</td>
+														<td id="registrant_email">{{history.domain.domain_info.whois.registrant.email}}</td>
+													</tr>
 													<tr>
 														<td>Organization</td>
 														<td id="registrant_organization">{{history.domain.domain_info.whois.registrant.organization}}</td>
diff --git a/web/targetApp/templates/target/list.html b/web/targetApp/templates/target/list.html
index 14ab237e..4fe5c933 100644
--- a/web/targetApp/templates/target/list.html
+++ b/web/targetApp/templates/target/list.html
@@ -74,9 +74,9 @@ Targets
               <td class="checkbox-column"> {{ domain.id }} </td>
               <td class=""> {{ domain.id }} </td>
               <td>
-                <b>{{ domain.name }}</b>
+                <b>{{ domain.name }}</b>&nbsp;&nbsp;<a href="#" onclick="get_domain_whois('{{domain.name}}')">(view whois)</a>
                 <br>
-                <span class="text-muted">Added {{ domain.insert_date|naturaltime }}</span>
+                <small class="text-muted">Added {{ domain.insert_date|naturaltime }}</small>
                 {% if domain.get_organization %}
                 <br>
                 {% for organization in domain.get_organization %}