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

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/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/security/tests.py

@@ -755,7 +755,11 @@ def test_dataset_permissions(self):
         bobby = get_user_model().objects.get(username="bobby")
 
         self.client.force_login(get_user_model().objects.get(username="admin"))
-        payload = {"base_file": open(f"{project_dir}/tests/fixture/valid.geojson", "rb"), "action": "upload"}
+        payload = {
+            "base_file": open(f"{project_dir}/tests/fixture/valid.geojson", "rb"),
+            "action": "upload",
+            "override_existing_layer": True,
+        }
         response = self.client.post(reverse("importer_upload"), data=payload)
         layer = ResourceHandlerInfo.objects.filter(execution_request=response.json()["execution_id"]).first().resource
         if layer is None:
@@ -806,6 +810,18 @@ def test_dataset_permissions(self):
         self.assertTrue(b"Could not find layer" in response.content)
         self.assertEqual(response.headers.get("Content-Type"), "application/vnd.ogc.se_xml;charset=UTF-8")
 
+        # In circleCI we load some sample data via paver, but is not a mandatory action
+        # in other cases when we dont have those layer, we have to rely on the one
+        # we upload earlier on line 763 (same test)
+        url = (
+            f"{settings.GEOSERVER_LOCATION}ows?"
+            f"LAYERS={layer.alternate}&STYLES="
+            "&FORMAT=image%2Fpng&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap"
+            "&SRS=EPSG%3A4326"
+            "&BBOX=-81.394599749999,13.316009005566,"
+            "-81.370560451855,13.372728455566"
+            "&WIDTH=217&HEIGHT=512"
+        )
         # test WMS with authenticated user that has access to the Dataset
         response = requests.get(
             url,

geonode/thumbs/thumbnails.py

@@ -62,6 +62,7 @@ def create_thumbnail(
     styles: Optional[List] = None,
     overwrite: bool = False,
     background_zoom: Optional[int] = None,
+    map_thumb_from_bbox: bool = False,
 ) -> None:
     """
     Function generating and saving a thumbnail of the given instance (Dataset or Map), which is composed of
@@ -111,7 +112,7 @@ def create_thumbnail(
 
     if isinstance(instance, Map):
         is_map_with_datasets = MapLayer.objects.filter(map=instance, local=True).exclude(dataset=None).exists()
-        if is_map_with_datasets:
+        if is_map_with_datasets and not map_thumb_from_bbox:
             compute_bbox_from_datasets = True
     if bbox:
         bbox = bbox_utils.clean_bbox(bbox, target_crs)

geonode/upload/handlers/common/remote.py

@@ -90,7 +90,8 @@ def is_valid_url(url, **kwargs):
             r.raise_for_status()
         except requests.exceptions.Timeout:
             raise ImportException("Timed out")
-        except Exception:
+        except Exception as e:
+            logger.exception(e)
             raise ImportException("The provided URL is not reachable")
         return True
 

geonode/upload/handlers/remote/wms.py

@@ -157,7 +157,8 @@ def generate_resource_payload(self, layer_name, alternate, asset, _exec, workspa
             .encode("utf-8", "ignore")
             .decode("utf-8")
             .replace(".", "")
-            .replace("/", ""),
+            .replace("/", "")
+            .replace(":", ""),
             ptype="gxp_wmscsource",
             ows_url=_exec.input_params.get("ows_url"),
         )