Base URL fixes and allowance for http localhost

Author: buske

mme_server/cli.py

@@ -97,7 +97,7 @@ def add_server(id, direction='out', key=None, label=None, base_url=None):
         label = id
 
     if direction == 'out' and not base_url:
-        raise Exception('--base-url must be specified for outgoing servers')
+        raise Exception('base-url must be specified for outgoing servers')
 
     with app.app_context():
         backend = get_backend()

mme_server/compat.py

@@ -11,3 +11,8 @@
     from urllib2 import urlopen, Request
 except ImportError:
     from urllib.request import urlopen, Request
+
+try:
+    from urlparse import urlsplit
+except ImportError:
+    from urllib.parse import urlsplit

mme_server/managers/__init__.py

@@ -5,7 +5,6 @@
 
 import logging
 
-# Import managers to register them
 from .patients import PatientManager
 from .servers import ServerManager
 from .vocabularies import VocabularyManager

mme_server/managers/servers.py

@@ -6,6 +6,7 @@
 import json
 import logging
 
+from ..compat import urlsplit
 from .base import BaseManager
 
 logger = logging.getLogger(__name__)
@@ -62,7 +63,10 @@ class ServerManager(BaseManager):
     def add(self, server_id, server_label, server_key, direction, base_url=None):
         assert server_id and server_key and direction in ['in', 'out']
 
-        if base_url and not base_url.startswith('https://'):
+        # Normalize url
+        parsed_url = urlsplit(base_url)
+        base_url = parsed_url.geturl()
+        if base_url and not parsed_url.scheme == 'https' and not parsed_url.hostname == 'localhost':
             logger.error('base URL must start with "https://"')
             return
 
@@ -89,7 +93,7 @@ def add(self, server_id, server_label, server_key, direction, base_url=None):
                 'server_key': server_key,
             }
             if doc_type == 'server':
-                data['base_url'] = base_url,
+                data['base_url'] = base_url
 
             self.save(id=id, doc_type=doc_type, doc=data)
             logger.info("Authorized {}:\n{}".format(doc_type, json.dumps(data, indent=4, sort_keys=True)))