Merge pull request #5405 from benjaoming/assert-device-registration

Additional fixes for device registration

Author: benjaoming

docs/installguide/release_notes.rst

@@ -70,6 +70,7 @@ Bug fixes
  * Redirect to front page if user logs in from the signup page :url-issue:`3926`
  * Progress bar missing when decimals in progress percentage :url-issue:`5321`
  * Missing cache invalidation for JavaScript meant client-side breakage: Upgraded CherryPy HTTP server to 3.3.0 :url-issue:`5317`
+ * Error pages now include Traceback information to include for technical support :url-issue:`5405`
  * Implement friendlier user-facing error messages during unexpected JS failures :url-issue:`5123`
  * Source distribution and `ka-lite` + `ka-lite-raspberry-pi` debian packages no longer ship with English content.db, means they have reduced ~40% in file size :url-issue:`5318`
  * Installation works with latest ``setuptools >= 30.0`` affecting almost any recent system using ``pip install``. :url-issue:`5352`

kalite/distributed/templates/distributed/500.html

@@ -6,7 +6,14 @@
 {% block content %}
     <h1>{% trans "Error" %}</h1>
 
-    <p><b>{% trans "Sorry, but there was an error while trying to load the page." %}</b></p>
+    {{ errormsg|safe }}
 
-    ({{ errortype }}: {{ value }})
-{% endblock content %}
+    <p>{% trans "If you are reporting the error, please make sure to include the following information:" %}</p>
+    
+    <p><textarea style="width: 500px; max-width: 80%; height: 100px; font-family: monospace;" onclick="$(this).height(400), $(this).width('100%'); this.select()">URL: {{ request.path }}
+querystring: {{ request.GET }}
+{{ errortype }}: {{ value }}
+
+{{ traceback }}</textarea></p>
+    
+{% endblock content %}

kalite/distributed/views.py

@@ -6,6 +6,8 @@
 and more!
 """
 import sys
+import traceback
+
 from annoying.decorators import render_to
 from annoying.functions import get_object_or_None
 
@@ -277,8 +279,8 @@ def crypto_login(request):
 
 
 def handler_403(request, *args, **kwargs):
-    context = RequestContext(request)
-    #message = None  # Need to retrieve, but can't figure it out yet.
+    # context = RequestContext(request)
+    # message = None  # Need to retrieve, but can't figure it out yet.
 
     if request.is_ajax():
         return JsonResponseMessageError(_("You must be logged in with an account authorized to view this page (API)."), status=403)
@@ -294,7 +296,10 @@ def handler_404(request):
 def handler_500(request):
     errortype, value, tb = sys.exc_info()
     context = {
+        "request": request,
+        "errormsg": settings.AJAX_ERROR,
         "errortype": errortype.__name__,
         "value": unicode(value),
+        "traceback": traceback.format_exc(),
     }
     return HttpResponseServerError(render_to_string("distributed/500.html", context, context_instance=RequestContext(request)))

kalite/packages/bundled/securesync/devices/views.py

@@ -43,6 +43,8 @@ def initialize_registration():
 @render_to("securesync/register_public_key_client.html")
 def register_public_key_client(request):
 
+    raise Exception("Ben is testing")
+
     # Delete the registration state from the session to ensure it is refreshed next pageload
     del request.session["registered"]
 

kalite/updates/tests/regression_tests.py

@@ -1,4 +1,5 @@
-from django.conf import settings
+import requests
+
 from django.test.utils import override_settings
 
 from fle_utils.internet.functions import am_i_online
@@ -20,6 +21,11 @@ def setUp(self):
         admin_data = {"username": "admin", "password": "admin"}
         self.create_admin(**admin_data)
         self.client.login(**admin_data)
+    
+    def test_online(self):
+        response = requests.get("http://google.com",)
+        google_is_online = response.status_code in (200, 301)
+        self.assertEqual(am_i_online(), google_is_online)
 
     @override_settings(CENTRAL_SERVER_URL="http://127.0.0.1:8997")  # We hope this is unreachable
     def test_not_redirected_when_offline(self):