Merge pull request #25 from HumanDynamics/features/docker

Server now saves the hub's IP address
HumanDynamics · Jul 9, 2017 · 404d3ba · 404d3ba
2 parents f6c5d77 + 7a073c1
commit 404d3ba
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/openbadge-server/openbadge/permissions.py b/openbadge-server/openbadge/permissions.py
@@ -32,6 +32,13 @@ def has_permission(self, request, view):
         if hub_time is not None:
             hub.last_hub_time_ts = hub_time
 
+        remote_addr = request.META.get("REMOTE_ADDR")
+        x_forwarded = request.META.get("HTTP_X_FORWARDED_FOR")
+        if x_forwarded is not None:
+            hub.ip_address = x_forwarded
+        elif remote_addr is not None:
+            hub.ip_address = remote_addr
+
         hub.save()
 
         return True

diff --git a/openbadge-server/openbadge/urls.py b/openbadge-server/openbadge/urls.py
@@ -48,7 +48,7 @@
     url(r'hubs/(?P<name>[\w-]+)', hubs_details, name='hub-details'),
     url(r'hubs/(?P<name>[\w-]+)/upload', hubs_details, name='hub-details'),
 
-
+    url(r'^showip/$', views.showip, name='showip'),
     # Reports
     # url(r'^internal_report/$', views.internal_report, name='internal_report'),
     # url(r'^weekly_group_report/(?P<group_key>\w+)/(?P<week_num>[0-9]+)$', views.weekly_group_report, name='weekly_group_report'),

diff --git a/openbadge-server/openbadge/views.py b/openbadge-server/openbadge/views.py
@@ -462,3 +462,16 @@ def get_members(request, project_key):
 def post_members(request, project_key):
 
     return JsonResponse({"status": "Not Implemented"})
+
+
+#########################
+# Test #
+#########################
+@api_view(['GET'])
+def showip(request):
+    remote_addr = request.META.get("REMOTE_ADDR")
+    x_forwarded = request.META.get("HTTP_X_FORWARDED_FOR")
+    if x_forwarded is not None:
+        return JsonResponse({"HTTP_X_FORWARDED_FOR": x_forwarded})
+    else:
+        return JsonResponse({"REMOTE_ADDR":remote_addr})