[Fixes #3914] [Remote Services] Mitigate name clashes for service names

GeoNode · Sep 13, 2018 · bb6ead8 · bb6ead8
1 parent 60e1933
commit bb6ead8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/geonode/services/serviceprocessors/arcgis.py b/geonode/services/serviceprocessors/arcgis.py
@@ -24,7 +24,6 @@
 import traceback
 
 from uuid import uuid4
-from urlparse import urlsplit
 
 from django.conf import settings
 from django.template.defaultfilters import slugify, safe
@@ -87,7 +86,7 @@ def __init__(self, url):
         # ])
 
         self.indexing_method = INDEXED
-        self.name = slugify(urlsplit(self.url).netloc)[:40]
+        self.name = slugify(self.url)[:255]
         self.title = _title
 
     def create_cascaded_store(self):
@@ -328,5 +327,5 @@ def __init__(self, url):
         # ])
 
         self.indexing_method = INDEXED
-        self.name = slugify(urlsplit(self.url).netloc)[:40]
+        self.name = slugify(self.url)[:255]
         self.title = _title
diff --git a/geonode/services/serviceprocessors/wms.py b/geonode/services/serviceprocessors/wms.py
@@ -118,7 +118,7 @@ def __init__(self, url):
             INDEXED if self._offers_geonode_projection() else CASCADED)
         # self.url = self.parsed_service.url
         # TODO: Check if the name already esists
-        self.name = slugify(urlsplit(self.url).netloc)[:40]
+        self.name = slugify(self.url)[:255]
 
     def create_cascaded_store(self):
         store = self._get_store(create=True)
@@ -450,7 +450,7 @@ def __init__(self, url):
         self.indexing_method = (
             INDEXED if self._offers_geonode_projection() else CASCADED)
         # self.url = self.parsed_service.url
-        self.name = slugify(urlsplit(self.url).netloc)[:40]
+        self.name = slugify(self.url)[:255]
 
     def harvest_resource(self, resource_id, geonode_service):
         """Harvest a single resource from the service

diff --git a/geonode/services/tests.py b/geonode/services/tests.py
@@ -160,7 +160,7 @@ def test_has_valid_name_when_no_title_exists(self, mock_wms):
         mock_wms.return_value[1].identification.title = ""
         handler = wms.WmsServiceHandler(self.phony_url)
         self.assertEqual(
-            handler.name, self.phony_url.replace("http://", "")[:40])
+            handler.name, slugify(self.phony_url)[:255])
 
     @mock.patch("geonode.services.serviceprocessors.wms.WebMapService",
                 autospec=True)