From 8a1a2071aa9e055568ec43d0c1486ab3f655d49d Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Wed, 4 Apr 2012 20:17:18 +0100
Subject: [PATCH] Added some DNS lookup for the IP viewer

---
 app/sso/models.py                                | 16 ++++++++++++++++
 app/sso/templates/sso/ssouseripaddress_list.html |  5 +++--
 requirements.txt                                 |  2 ++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/sso/models.py b/app/sso/models.py
index d8d9abc..27da92f 100644
--- a/app/sso/models.py
+++ b/app/sso/models.py
@@ -11,6 +11,9 @@ from django.contrib.contenttypes import generic
 from django.utils import simplejson as json
 
 from jsonfield.fields import JSONField
+from IPy import IP
+import dns.resolver
+
 from eve_api.models import EVEAccount, EVEPlayerCorporation, EVEPlayerAlliance, EVEPlayerCharacter
 
 from sso.app_defines import *
@@ -89,6 +92,19 @@ class SSOUserIPAddress(models.Model):
     ip_address = models.CharField("IP Address", max_length=200, blank=False)
     user = models.ForeignKey(User, blank=False, null=False, related_name='ip_addresses')
 
+    @property
+    def hostname(self):
+        arpa = IP(self.ip_address).reverseName()
+        try:
+            res = dns.resolver.query(arpa, 'PTR').response
+            return res.answer[0][0].to_text()
+        except:
+            return arpa
+
+    @property
+    def related_users(self):
+        return SSOUserIPAddress.objects.filter(ip_address=self.ip_address).count()
+
     def __unicode__(self):
         return self.ip_address
 
diff --git a/app/sso/templates/sso/ssouseripaddress_list.html b/app/sso/templates/sso/ssouseripaddress_list.html
index 9b825a4..171392f 100644
--- a/app/sso/templates/sso/ssouseripaddress_list.html
+++ b/app/sso/templates/sso/ssouseripaddress_list.html
@@ -8,11 +8,12 @@
 {% if object_list %}
 <table>
 <thead>
-  <tr><th>IP Address</th><th>User</th><th>First Use</th><th>Last Use</th></tr>
+  <tr><th>IP Address</th><th>Hostname</th><th>User</th><th>First Use</th><th>Last Use</th></tr>
 </thead>
 <tbody>
 {% for object in object_list %}
-  <tr><td><a href="{% url sso-ipaddress  %}?ip={{ object.ip_address }}">{{ object.ip_address }}</a></td>
+  <tr><td><a href="{% url sso-ipaddress  %}?ip={{ object.ip_address }}">{{ object.ip_address }}</a> {% if object.related_users > 1 %}({{ object.related_users }} users){% endif %}</td>
+    <td>{{ object.hostname }}</td>
     <td><a href="{% url sso-ipaddress  %}?user={{ object.user.username }}">{{ object.user }}</a> (<a href="{% url sso-viewuser object.user.username %}">Profile</a>)</td>
     <td>{{ object.first_seen }}</td>
     <td>{{ object.last_seen }}</td>
diff --git a/requirements.txt b/requirements.txt
index dca717d..acea387 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,3 +17,5 @@ nexus
 -e git+https://github.com/nikdoof/gargoyle.git@dca57fc4b437b85f8cbc#egg=gargoyle
 beautifulsoup
 django-redis-cache
+IPy==0.75
+dnspython