Server now shows a list of all ips reported by the hub

openbadge-server/openbadge/admin.py

@@ -48,7 +48,7 @@ def render(self, name, value, attrs=None):
 class MemberInline(admin.TabularInline, GetLocalTimeMixin):
     model = Member
     extra = 3
-    fields = ('key','id', 'name', 'badge', 'observed_id',
+    fields = ('key', 'id', 'name', 'badge', 'observed_id',
               'last_seen', 'last_voltage', 'last_audio', 'last_proximity', 'last_unsync', 'last_contacted',
               'active', 'comments',
               'last_audio_ts', 'last_audio_ts_fract', 'last_proximity_ts', 'last_unsync_ts', 'last_contacted_ts',
@@ -93,7 +93,8 @@ class MeetingInLine(admin.TabularInline, GetLocalTimeMixin):
 class HubInline(admin.TabularInline, GetLocalTimeMixin):
     model = Hub
 
-    fields = ("name", "god", "uuid", "last_seen", "last_hub_time", "time_difference_in_seconds", "ip_address", "key")
+    fields = ("name", "god", "uuid", "last_seen", "last_hub_time", "time_difference_in_seconds", "ip_address",
+              "all_ip_addresses", "key")
     readonly_fields = ("key", 'last_seen', "last_hub_time", "time_difference_in_seconds")
 
     def last_seen(self, obj):
@@ -109,7 +110,8 @@ def time_difference_in_seconds(self, obj):
 @register(Project)
 class ProjectAdmin(admin.ModelAdmin):
     readonly_fields = ("key",)
-    list_display = ('name', 'key', 'id', 'advertisement_project_id', 'number_of_members', 'number_of_beacons', 'number_of_meetings', 'total_meeting_time')
+    list_display = ('name', 'key', 'id', 'advertisement_project_id', 'number_of_members', 'number_of_beacons',
+                    'number_of_meetings', 'total_meeting_time')
     list_filter = ('name',)
     inlines = (MemberInline, BeaconInline, HubInline, MeetingInLine)
     actions_on_top = True

openbadge-server/openbadge/migrations/0009_hub_all_ip_addresses.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('openbadge', '0008_auto_20180516_1520'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='hub',
+            name='all_ip_addresses',
+            field=models.CharField(max_length=512, null=True, blank=True),
+        ),
+    ]

openbadge-server/openbadge/models.py

@@ -217,6 +217,9 @@ class Hub(BaseModel):
     ip_address = models.GenericIPAddressField(null=True, blank=True)
     """IP address of the hub (if relevant)"""
 
+    all_ip_addresses = models.CharField(max_length=512, blank=True, null=True)
+    """All IP addresses of the hub (if relevant)"""
+
     last_seen_ts = models.DecimalField(max_digits=20, decimal_places=3, default=Decimal(0))
     """The last time the hub was seen by the server (in epoch time)"""
 

openbadge-server/openbadge/permissions.py

@@ -26,7 +26,7 @@ def has_permission(self, request, view):
         try:
             hub = Hub.objects.get(uuid=hub_uuid)
         except Hub.DoesNotExist:
-           return False
+            return False
 
         hub.last_seen_ts = int(time.time())
         if hub_time is not None:
@@ -39,6 +39,10 @@ def has_permission(self, request, view):
         elif remote_addr is not None:
             hub.ip_address = remote_addr
 
+        hub_all_ips = request.META.get("HTTP_X_ALL_IPS")
+        if hub_all_ips is not None:
+            hub.all_ip_addresses = hub_all_ips
+
         hub.save()
 
         return True