Merge branch 'master' of github.com:GeoNode/geonode into ISSUE_12996

Author: mattiagiupponi

create-envfile.py

@@ -42,12 +42,8 @@ def shuffle(chars):
     random.shuffle(chars_as_list)
     return "".join(chars_as_list)
 
-
 _simple_chars = shuffle(string.ascii_letters + string.digits)
-_strong_chars = shuffle(
-    string.ascii_letters + string.digits + string.punctuation.replace('"', "").replace("'", "").replace("`", "")
-)
-
+_strong_chars = shuffle(string.ascii_letters + string.digits + "#%*._~")
 
 def generate_env_file(args):
     # validity checks

docker-compose-test.yml

@@ -92,7 +92,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.24.3-latest
+    image: geonode/geoserver:2.24.4-latest
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     healthcheck:
       test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
@@ -118,7 +118,7 @@ services:
         condition: service_healthy
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.24.3-latest
+    image: geonode/geoserver_data:2.24.4-latest
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     entrypoint: sleep infinity
     volumes:

docker-compose.yml

@@ -91,7 +91,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.24.3-latest
+    image: geonode/geoserver:2.24.4-latest
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     healthcheck:
       test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
@@ -117,7 +117,7 @@ services:
         condition: service_healthy
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.24.3-latest
+    image: geonode/geoserver_data:2.24.4-latest
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     entrypoint: sleep infinity
     volumes:

geonode/base/api/views.py

@@ -680,11 +680,16 @@ def set_thumbnail_from_bbox(self, request, resource_id, *args, **kwargs):
         try:
             resource = ResourceBase.objects.get(id=ast.literal_eval(resource_id))
 
+            map_thumb_from_bbox = False
+            if isinstance(resource.get_real_instance(), Map):
+                map_thumb_from_bbox = True
+
             if not isinstance(resource.get_real_instance(), (Dataset, Map)):
                 raise NotImplementedError("Not implemented: Endpoint available only for Dataset and Maps")
 
             request_body = request.data if request.data else json.loads(request.body)
             try:
+                # bbox format: (xmin, xmax, ymin, ymax)
                 bbox = request_body["bbox"] + [request_body["srid"]]
                 zoom = request_body.get("zoom", None)
             except MultiValueDictKeyError:
@@ -695,7 +700,11 @@ def set_thumbnail_from_bbox(self, request, resource_id, *args, **kwargs):
                 zoom = request_body.get("zoom", None)
 
             thumbnail_url = create_thumbnail(
-                resource.get_real_instance(), bbox=bbox, background_zoom=zoom, overwrite=True
+                resource.get_real_instance(),
+                bbox=bbox,
+                background_zoom=zoom,
+                overwrite=True,
+                map_thumb_from_bbox=map_thumb_from_bbox,
             )
             return Response(
                 {"message": "Thumbnail correctly created.", "success": True, "thumbnail_url": thumbnail_url}, status=200

geonode/documents/forms.py

@@ -163,7 +163,7 @@ def clean(self):
             raise forms.ValidationError(_("A document cannot have both a file and a url."))
 
         if extension:
-            cleaned_data["extension"] = extension.replace(".", "")
+            cleaned_data["extension"] = extension.replace(".", "").lower()
 
         return cleaned_data
 

geonode/documents/migrations/0037_delete_documentresourcelink.py

@@ -11,9 +11,10 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RunSQL(
-            "INSERT INTO base_linkedresource(source_id, target_id, internal)"
+            "INSERT INTO base_linkedresource(source_id, target_id, internal) "
             "SELECT document_id, object_id, false as internal "
-            "FROM documents_documentresourcelink;"
+            "FROM documents_documentresourcelink "
+            "WHERE EXISTS (SELECT 1 FROM base_resourcebase base WHERE base.id=object_id);"
         ),
         migrations.DeleteModel(
             name="DocumentResourceLink",

geonode/documents/tests.py

@@ -32,6 +32,7 @@
 
 from unittest.mock import patch
 from urllib.parse import urlparse
+from pathlib import Path
 
 from django.urls import reverse
 from django.conf import settings
@@ -42,7 +43,7 @@
 
 from guardian.shortcuts import get_anonymous_user
 
-from geonode.assets.utils import create_asset_and_link
+from geonode.assets.utils import create_asset_and_link, get_default_asset
 from geonode.base.forms import LinkedResourceForm
 from geonode.maps.models import Map
 from geonode.layers.models import Dataset
@@ -194,6 +195,25 @@ def test_create_document_url_view(self):
         d = Document.objects.get(title="GeoNode Map")
         self.assertEqual(d.doc_url, "http://www.geonode.org/map.pdf")
 
+    def test_uploaded_csv_with_uppercase_extension(self):
+        """
+        The extension of the file should always be lowercase
+        """
+
+        self.client.login(username="admin", password="admin")
+        try:
+            with open(os.path.join(os.path.dirname(__file__), "tests/data/test.CSV"), "rb") as f:
+                data = {"title": "CSV with uppercase extension", "doc_file": f, "extension": "CSV"}
+                self.client.post(reverse("document_upload"), data=data)
+            d = Document.objects.get(title="CSV with uppercase extension")
+            # verify that the extension is not lowercase
+            self.assertEqual(d.extension, "csv")
+            # be sure that also the file extension is not lowercase
+            asset = get_default_asset(d)
+            self.assertEqual(Path(asset.location[0]).suffix, ".csv")
+        finally:
+            Document.objects.filter(title="CSV with uppercase extension").delete()
+
     def test_upload_document_form(self):
         """
         Tests the Upload form.

geonode/documents/tests/data/test.CSV

@@ -0,0 +1,6 @@
+Username; Identifier;First name;Last name
+booker12;9012;Rachel;Booker
+grey07;2070;Laura;Grey
+johnson81;4081;Craig;Johnson
+jenkins46;9346;Mary;Jenkins
+smith79;5079;Jamie;Smith

geonode/documents/views.py

@@ -53,6 +53,8 @@
 from geonode.base.models import Thesaurus, TopicCategory
 from geonode.base import enumerations
 
+from pathlib import Path
+
 from .utils import get_download_response
 
 from .models import Document
@@ -162,7 +164,8 @@ def form_valid(self, form):
         if file:
             tempdir = mkdtemp()
             dirname = os.path.basename(tempdir)
-            filepath = storage_manager.save(f"{dirname}/{file.name}", file)
+            name = Path(file.name)
+            filepath = storage_manager.save(f"{dirname}/{name.stem}{name.suffix.lower()}", file)
             storage_path = storage_manager.path(filepath)
             self.object = resource_manager.create(
                 None,

geonode/metadata/api/views.py

@@ -38,6 +38,7 @@
 from geonode.base.utils import remove_country_from_languagecode
 from geonode.base.views import LinkedResourcesAutocomplete, RegionAutocomplete, HierarchicalKeywordAutocomplete
 from geonode.groups.models import GroupProfile
+from geonode.metadata.i18n import get_localized_label
 from geonode.metadata.manager import metadata_manager
 from geonode.people.utils import get_available_users
 
@@ -96,32 +97,35 @@ def schema(self, request, pk=None):
     def schema_instance(self, request, pk=None):
         try:
             resource = ResourceBase.objects.get(pk=pk)
+            lang = request.query_params.get("lang", get_language_from_request(request)[:2])
 
             if request.method == "GET":
-                lang = request.query_params.get("lang", get_language_from_request(request)[:2])
                 schema_instance = metadata_manager.build_schema_instance(resource, lang)
                 return JsonResponse(
                     schema_instance, content_type="application/schema-instance+json", json_dumps_params={"indent": 3}
                 )
 
-            elif request.method in ("PUT"):
+            elif request.method == "PUT":
                 logger.debug(f"handling request {request.method}")
                 # try:
                 #     logger.debug(f"handling content {json.dumps(request.data, indent=3)}")
                 # except Exception as e:
                 #     logger.warning(f"Can't parse JSON {request.data}: {e}")
                 errors = metadata_manager.update_schema_instance(resource, request.data)
 
+                msg_t = (
+                    ("m_metadata_update_error", "Some errors were found while updating the resource")
+                    if errors
+                    else ("m_metadata_update_ok", "The resource was updated successfully")
+                )
+                msg = get_localized_label(lang, msg_t[0]) or msg_t[1]
+
                 response = {
-                    "message": (
-                        "Some errors were found while updating the resource"
-                        if errors
-                        else "The resource was updated successfully"
-                    ),
+                    "message": msg,
                     "extraErrors": errors,
                 }
 
-                return Response(response, status=400 if errors else 200)
+                return Response(response, status=422 if errors else 200)
 
         except ResourceBase.DoesNotExist:
             result = {"message": "The dataset was not found"}