Merge pull request #5404 from benjaoming/unregistered-device

Simplify am_i_online which broke because of a 301 on kalite.learninequality.org

Author: benjaoming

docs/installguide/release_notes.rst

@@ -76,6 +76,7 @@ Bug fixes
  * Installation works with latest ``pip 9``. :url-issue:`5319`
  * ``kalite manage contentpackchecker all --update`` wrongly retrieved all available content packs. Now only updates *installed* content packs.
  * No content pack files are placed in ``STATIC_ROOT``, ensuring that ``kalite manage collectstatic`` will not remove any files from content packs (subtitles!). :url-issue:`5386` :url-issue:`5073`
+ * Online availability incorrectly detected, bypassing registration progress on Video and Language downloads :url-issue:`5401`
  * **Windows**: Logging works again: Writing to ``server.log`` was disabled on Windows :url-issue:`5057`
  * **Dev** Loading subtitles now works in ``bin/kalite manage runserver --settings=kalite.project.settings.dev``
  * **Dev** Auto-discovery of content-packs in well-known location ``/usr/share/kalite/preseed/contentpack-<version>.<lang>.zip``, example: ``/usr/share/kalite/preseed/contentpack-0.17.en.zip``. Happens during ``kalite.distributed.management.commands.setup``.

kalite/packages/bundled/fle_utils/internet/functions.py

@@ -2,46 +2,44 @@
 For functions mucking with internet access
 """
 import ifcfg
+import logging
 import os
 import platform
 import re
 import requests
-import socket
 
-from urlparse import parse_qs, urlsplit, urlunsplit
+
+from django.conf import settings
+from django.core.urlresolvers import reverse
+from urlparse import parse_qs, urlsplit, urlunsplit, urljoin
 from urllib import urlencode
 
 
-def am_i_online(url, expected_val=None, search_string=None, timeout=5, allow_redirects=True):
+logger = logging.getLogger(__name__)
+
+
+def am_i_online():
     """Test whether we are online or not.
     returns True or False.
-    Eats all exceptions!
+    Eats all exceptions!   <- great :( /benjaoming
     """
-    assert not (search_string and expected_val is not None), "Search string and expected value cannot both be set"
-
     from kalite.version import user_agent
 
+    url = urljoin(settings.CENTRAL_SERVER_URL, reverse("get_server_info"))
+
     try:
-        if not search_string and expected_val is None:
-            response = requests.head(url, headers={"user-agent": user_agent()})
-        else:
-            response = requests.get(url, timeout=timeout, allow_redirects=allow_redirects, headers={"user-agent": user_agent()})
+        response = requests.get(url, timeout=5, allow_redirects=False, headers={"user-agent": user_agent()})
 
         # Validate that response came from the requested url
         if response.status_code != 200:
+            
+            logger.warning("Unexpected response detecting online status: {}".format(response))
             return False
-        elif not allow_redirects and response.url != url:
-            return False
-
-        # Check the output, if expected values are specified
-        if expected_val is not None:
-            return expected_val == response.text
-        elif search_string:
-            return search_string in response.text
 
         return True
 
     except Exception as e:
+        logger.warning("Unhandled exception when detecting if online: {}".format(e))
         return False
 
 

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

@@ -209,7 +209,7 @@ def get_server_info(request):
             if settings.CENTRAL_SERVER:
                 device_info[field] =  True
             else:
-                device_info[field] = am_i_online(url="%s://%s%s" % (settings.SECURESYNC_PROTOCOL, settings.CENTRAL_SERVER_HOST, reverse("get_server_info")))
+                device_info[field] = am_i_online()
 
         elif field:
             # the field isn't one we know about, so add it to the list of invalid fields

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

@@ -14,7 +14,7 @@ def require_registration(resource_name):
     """
     def real_decorator_wrapper(handler):
         def real_decorator_wrapper_fn(request, *args, **kwargs):
-            if Device.get_own_device().is_registered() or not am_i_online(settings.CENTRAL_SERVER_URL):
+            if Device.get_own_device().is_registered() or not am_i_online():
                 return handler(request, *args, **kwargs)
             else:
                 messages.warning(

kalite/settings/base.py

@@ -72,6 +72,11 @@
             'level': LOGGING_LEVEL,
             'propagate': False,
         },
+        'fle_utils': {
+            'handlers': ['console'],
+            'level': LOGGING_LEVEL,
+            'propagate': False,
+        },
         'cherrypy.console': {
             'handlers': ['console'],
             'level': LOGGING_LEVEL,

kalite/updates/tests/regression_tests.py

@@ -24,7 +24,7 @@ def setUp(self):
     @override_settings(CENTRAL_SERVER_URL="http://127.0.0.1:8997")  # We hope this is unreachable
     def test_not_redirected_when_offline(self):
         self.assertFalse(Device.get_own_device().is_registered(), "The device should be unregistered!")
-        self.assertFalse(am_i_online(url=settings.CENTRAL_SERVER_URL), "Central server should be unreachable!")
+        self.assertFalse(am_i_online(), "Central server should be unreachable!")
         updated_videos_url = self.reverse("update_videos")
         response = self.client.get(updated_videos_url, follow=True)
         redirect_chain = response.redirect_chain  # Will be the empty list if there are no redirects