[Fixes #13520] Improve Error Robustness for special characters and wh… (#13655)

Author: mattiagiupponi

geonode/upload/handlers/base.py

@@ -24,6 +24,8 @@
 import zipfile
 import re
 
+import slugify
+
 from geonode.assets.utils import create_asset_and_link
 from geonode.resource.enumerator import ExecutionRequestAction as exa
 from geonode.layers.models import Dataset
@@ -232,7 +234,7 @@ def fixup_name(self, name):
         # Remove unwanted characters in one pass
         name = re.sub(r'[.(),!"$%\'*+/:;<=>?@\[\]^`{|}~]', "", name)
 
-        return name[:62]
+        return slugify.slugify(name[:62], separator="_")
 
     def extract_resource_to_publish(self, files, layer_name, alternate, **kwargs):
         """

geonode/upload/handlers/gpkg/handler.py

@@ -138,7 +138,7 @@ def is_valid(files, user, **kwargs):
 
         validator = validate(
             gpkg_path=files.get("base_file"),
-            validations="RQ1, RQ2, RQ13, RQ14, RQ15, RC18",
+            validations="RQ2, RQ13, RQ14, RQ15, RC18",
         )
         if not validator[-1]:
             error_to_raise = []

geonode/upload/handlers/gpkg/tests.py

@@ -19,7 +19,6 @@
 import shutil
 
 from django.test import TestCase, override_settings
-from geonode.upload.handlers.gpkg.exceptions import InvalidGeopackageException
 from django.contrib.auth import get_user_model
 from geonode.upload.handlers.gpkg.handler import GPKGFileHandler
 from geonode.upload import project_dir
@@ -69,13 +68,6 @@ def test_task_list_is_the_expected_one_geojson(self):
         self.assertEqual(len(self.handler.TASKS["copy"]), 5)
         self.assertTupleEqual(expected, self.handler.TASKS["copy"])
 
-    def test_is_valid_should_raise_exception_if_the_gpkg_is_invalid(self):
-        with self.assertRaises(InvalidGeopackageException) as _exc:
-            self.handler.is_valid(files=self.invalid_files, user=self.user)
-
-        self.assertIsNotNone(_exc)
-        self.assertTrue("Error layer: INVALID LAYER_name" in str(_exc.exception.detail))
-
     def test_is_valid_should_raise_exception_if_the_parallelism_is_met(self):
         parallelism, created = UploadParallelismLimit.objects.get_or_create(slug="default_max_parallel_uploads")
         old_value = parallelism.max_number

geonode/upload/handlers/tests.py

@@ -89,12 +89,12 @@ def test_fixup_name_replace_digits_with_underscore(self):
         If the layer start with a digit, we should translate as a string
         """
         layer_name = "1layername"
-        expected_name = "_layername"
+        expected_name = "layername"
         actual = BaseHandler().fixup_name(layer_name)
         self.assertEqual(expected_name, actual)
 
     def test_fixup_name_replace_digits_with_special_character(self):
         layer_name = "5Test-Name# \\&.()!$%*+@[]~end"
-        expected_name = "_test_name____end"
+        expected_name = "test_name_end"
         actual = BaseHandler().fixup_name(layer_name)
         self.assertEqual(expected_name, actual)

requirements.txt

@@ -94,7 +94,7 @@ gisdata==0.5.4
 
 # importer dependencies
 setuptools>=59
-pdok-geopackage-validator==0.8.5
+pdok-geopackage-validator==0.14.4
 geonode-django-dynamic-model==0.4.0
 
 

setup.cfg

@@ -119,7 +119,7 @@ install_requires =
 
     # importer dependencies
     setuptools>=59
-    pdok-geopackage-validator==0.8.5
+    pdok-geopackage-validator==0.14.4
     geonode-django-dynamic-model==0.4.0
 
     # datetimepicker widget