Deduplicates code by using composite action

.github/actions/build_and_push/action.yml

@@ -0,0 +1,85 @@
+name: Builds and pushes Docker image
+description: Action to build and push images to docker 
+
+
+inputs:
+  dockerfile:
+    description: Path to the Dockerfile
+    default: ./Dockerfile
+    required: false
+  dockercontext:
+    description: Path to the Docker context
+    default: ./
+    required: false
+  # image coordinates
+  image:
+    description: Name of the image to build
+    required: true
+  tags:
+    description: Image Tag(s)
+    required: false
+    default: latest
+  # OCI metadata annotations
+  oci_title:
+    description: Image Title (OCI annotation)
+    required: true
+  oci_description:
+    description: Image Description (OCI annotation)
+    required: true
+  # registry credentials
+  registry_username:
+    description: The username for Docker hub sign-in
+    required: true
+  registry_password:
+    description: The password for Docker hub sign-in
+    required: true
+
+
+runs:
+  using: "composite"
+  steps:
+    -
+      name: Checkout
+      uses: actions/checkout@v3
+    - 
+      uses: dorny/paths-filter@v2
+      id: changes
+      with:
+        filters: |
+          src:
+            - '${{ inputs.dockercontext }}/**'
+    # -
+    #   name: Set up Docker Buildx
+    #   uses: docker/setup-buildx-action@v2
+    # - 
+    #   name: Extract metadata (tags, labels) for Docker
+    #   id: meta
+    #   uses: docker/metadata-action@v4
+    #   with:
+    #     images: ${{ inputs.image }}
+    #     labels: |
+    #       "org.opencontainers.image.vendor=52°North GmbH"
+    #       "org.opencontainers.image.authors=https://52North.org/"
+    #       "org.opencontainers.image.source=https://github.com/52North/geonode"
+    #       "org.opencontainers.image.description=${{ inputs.oci_description }}"
+    #       "org.opencontainers.image.title=${{ inputs.oci_title }}"
+    #       "org.opencontainers.image.licenses=GPL-3.0"
+    #     tags: |
+    #       ${{ inputs.tags }}
+    # -
+    #     name: Login to Docker registry
+    #     uses: docker/login-action@v2
+    #     with:
+    #       username: ${{ inputs.registry_username }}
+    #       password: ${{ inputs.registry_password }}
+    # -
+    #     name: Build and push
+    #     uses: docker/build-push-action@v4
+    #     with:
+    #       context: .
+    #       file: ${{ inputs.dockerfile }}
+    #       push: true
+    #       tags: ${{ steps.meta.outputs.tags }}
+    #       labels: ${{ steps.meta.outputs.labels }}
+    #       cache-from: type=registry,ref=${{ inputs.image }}:buildcache
+    #       cache-to: type=registry,ref=${{ inputs.image }}:buildcache,mode=max

.github/workflows/52n-build-master.yml

@@ -0,0 +1,71 @@
+name: "[52n-master -> latest] Builds GeoNode Docker Images"
+
+concurrency:
+  group: "geonode_build_master"
+  cancel-in-progress: true
+
+env:
+  TAG: latest
+
+on:
+  push:
+    branches:
+      - "52n-master"
+
+jobs:
+  build_and_push_geonode:
+    runs-on: ubuntu-22.04
+    steps:
+      - 
+        name: Checkout
+        uses: actions/checkout@v3
+      - 
+        name: build and push geonode
+        uses: ./.github/actions/build_and_push
+        with:
+          image: 52north/geonode
+          tags: ${{ env.TAG }}
+          oci_title: "52°North GeoNode image"
+          oci_description: "GeoNode built from 52n fork"
+          registry_username: ${{ secrets.DOCKERHUB_USERNAME }}
+          registry_password: ${{ secrets.DOCKERHUB_TOKEN_52N_MASTER }}
+
+  build_and_push_nginx:
+    runs-on: ubuntu-22.04
+    steps:
+      - 
+        name: Checkout
+        uses: actions/checkout@v3
+      - 
+        name: build and push nginx
+        uses: ./.github/actions/build_and_push
+        with:
+          dockerfile: ./scripts/docker/nginx/Dockerfile
+          dockercontext: ./scripts/docker/nginx/
+          image: 52north/geonode-nginx
+          tags: ${{ env.TAG }}
+          oci_title: "52°North Nginx image for GeoNode"
+          oci_description: "Nginx built for GeoNode from a 52n fork"
+          registry_username: ${{ secrets.DOCKERHUB_USERNAME }}
+          registry_password: ${{ secrets.DOCKERHUB_TOKEN_52N_MASTER }}
+
+  build_and_push_geoserver:
+    runs-on: ubuntu-22.04
+    env:
+      IMAGE: 52north/geonode-geoserver
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: build and push geoserver
+        uses: ./.github/actions/build_and_push
+        with:
+          dockerfile: ./scripts/docker/geoserver/Dockerfile
+          dockercontext: ./scripts/docker/geoserver/
+          image: 52north/geonode-geoserver
+          tags: ${{ env.TAG }}
+          oci_title: "52°North GeoServer image for GeoNode"
+          oci_description: "GeoServer built for GeoNode from a 52n fork"
+          registry_username: ${{ secrets.DOCKERHUB_USERNAME }}
+          registry_password: ${{ secrets.DOCKERHUB_TOKEN_52N_MASTER }}

.github/workflows/dockerhub-description.yml

@@ -0,0 +1,23 @@
+name: Update Docker Hub Description
+on:
+  push:
+    branches:
+      - 52n-master
+    paths:
+      - README_52n.md
+      - .github/workflows/dockerhub-description.yml
+jobs:
+  dockerHubDescription:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Docker Hub Description
+      uses: peter-evans/dockerhub-description@v3
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN_52N_MASTER }}
+        repository: 52north/geonode
+        short-description: "Geospatial content management system"
+        readme-filepath: ./README_52n.md
+        enable-url-completion: true

.gitignore

@@ -96,4 +96,4 @@ scripts/spcgeonode/_volume_*
 !hooks/*
 
 .env
-
+.secret

.pre-commit-config.yaml

@@ -9,6 +9,6 @@ repos:
     -   id: check-yaml
     -   id: check-added-large-files
 -   repo: https://github.com/psf/black
-    rev: 19.10b0
+    rev: 23.9.1
     hooks:
     -   id: black

CHANGELOG.md

@@ -1,5 +1,63 @@
 # Change Log
 
+## [4.1.2](https://github.com/GeoNode/geonode/tree/4.1.2) (2023-08-11)
+## Bug Fixes
+- Upgrade to importer 1.0.5 which fixes the import with filenames longer then 63 chars
+- Fixed parsing and rendering of ISO TC211 spatial representetion type
+## [4.1.1](https://github.com/GeoNode/geonode/tree/4.1.1) (2023-06-05)
+## Security and Bug Fixes
+- Upgrade to Ubuntu 22.10
+- Upgrade to Django 3.2.20
+- Fixed direct download URL not working in some cases when local files are not available
+- Fixed assignment of regions crossing the dateline
+- Fixed harvesting of ArcGIS REST ImageServer services
+- Fixed some italian translations
+- Disabling of the (deprecated) Monitoring module
+## [4.1.0](https://github.com/GeoNode/geonode/tree/4.1.0) (2023-06-05)
+### New upload engine
+GeoNode integrates a brand new importer module based on [GDAL/OGR](https://gdal.org/), which offers increased robustness and reliability to the upload UI and API services. GeoPackage (vector), GeoJSON, KML/KMZ formats and a new CSV handler have been implemented.
+
+### Thesaurus faceting and date filtering
+If thesaurus and thesaurus keywords are configured and assigned to resources, they will be available inside the filters panel, along with the number of associated resources.
+Date filtering (from/top) has also been added.
+
+### Time series configurable after the upload
+The configuration of (potential) time series at upload time was confusing for users, and not very robust.
+With the new importer, the optional configuration of vector time series can be done afterward, through the Settings tab inside the Metadata editing page
+Only vector fomats that provide date(time) fields natively are supported. Conversion from string fields is not implemented.
+
+### Related resources
+This restore a functionality available in previous versions of GeoNode.
+A tab inside the info panel has been added where relationships between datasets, maps and documents are reported. 
+
+### Vector dataset attributes
+A tab inside the info panel has been added showing the attributes of vector datasets
+
+### Remote documents
+The API has been extended to permit the creation of document resources referencing remote URLs
+
+### ISO-19115 XML upload via API
+The API now supports the upload of a metadata XML file along with the resource data
+
+### Software upgrades
+
+ - [Geoserver 2.23.0](https://geoserver.org/announcements/2023/04/05/geoserver-2-23-0-released.html) is now the reference version. This version includes Geofence WPS rules which are employed by GeoNode to strengthen the security of the OGC/WPS processes.
+- [MapStore 2022.02.xx](https://github.com/geosolutions-it/MapStore2/tree/2022.02.xx)
+- [Django 3.2.19](https://docs.djangoproject.com/en/4.2/releases/3.2.19/)
+- PostgreSQL 13 and PostGIS 3.3.3
+
+
+## Security and Bug Fixes
+- [CVE-2023-26043](https://github.com/GeoNode/geonode/security/advisories/GHSA-mcmc-c59m-pqq8)
+Fixed a vulnerability to XML External Entity (XXE) injection
+- [CVE-2023-28442](https://github.com/GeoNode/geonode/security/advisories/GHSA-87mh-vw7c-5v6w)
+Fixed information leak
+
+You can see the **full list of closed issues [here](https://github.com/GeoNode/geonode/compare/4.1.0...4.0.3)**.
+
+## System requirements
+Python >3.9 is required to run GeoNode 4.1.0, since many of its dependencies have dropped support for older versions.
+
 ## [4.0.2](https://github.com/GeoNode/geonode/tree/4.0.2) (2022-12-20)
 
 ### Breaking Changes

Dockerfile

@@ -1,4 +1,4 @@
-FROM geonode/geonode-base:latest-ubuntu-22.10
+FROM geonode/geonode-base:latest-ubuntu-22.04
 LABEL GeoNode development team
 
 # add bower and grunt command

README_52n.md

@@ -0,0 +1,25 @@
+# 52°North Fork of GeoNode
+
+This image is built from a fork of [Geonode](https://github.com/geonode/geonode).
+[52°North GmbH](https://52north.org) maintains an own fork of GeoNode in order to make necessary adjustments within projects which are not part of GeoNode core.
+
+However, we are interested to stay as close to upstream as possible, to benefit from ongoing development, but also to contribute features and fixes we develop in our projects.
+
+Starting from version `4` this image is built from the `52n-master` branch of the [`52north/geonode` repository](https://github.com/52North/geonode/tree/52n-master).
+The repository builds and publishes three images:
+
+* [`52north/geonode`](https://hub.docker.com/r/52north/geonode) (this image)
+* [`52north/geonode-nginx`](https://hub.docker.com/r/52north/geonode-nginx)
+* [`52north/geonode-geoserver`](https://hub.docker.com/r/52north/geonode-geoserver) 
+
+The Dockerfiles can be found under the [`./scripts/docker` folder](https://github.com/52North/geonode/tree/52n-master/scripts/docker).
+
+The official Docker configuration of [GeoServer for GeoNode](https://github.com/GeoNode/geoserver-docker) seems to be outdated.
+Therefore, our fork adds a `./scripts/docker/geoserver` Docker config which is based on [the geonode-project](https://github.com/geonode/geonode-project) template.
+
+Depending on our current project contexts we merge regularly from upstream, and create new pull requests based on this fork.
+
+> **Note on version `3` tags**
+>
+> Images containing a `3.x` version tag were experimental and do have a different code base.
+> These image are considered to be removed in the near future.

celery-cmd

@@ -3,7 +3,7 @@
 # Luca Pasquali <[email protected]>
 CELERY_BIN=${CELERY_BIN:-"$(which celery||echo celery)"}
 CELERY_APP=${CELERY_APP:-"geonode.celery_app:app"}
-CELERY__STATE_DB=${CELERY__STATE_DB:-"/mnt/volumes/statics/worker.state"}
+CELERY__STATE_DB=${CELERY__STATE_DB:-"/mnt/volumes/statics/worker@%h.state"}
 # expressed in KB
 CELERY__MAX_MEMORY_PER_CHILD=${CELERY__MAX_MEMORY_PER_CHILD:-"200000"}
 CELERY__AUTOSCALE_VALUES=${CELERY__AUTOSCALE_VALUES:-"15,10"}

docker-compose-test.yml

@@ -3,7 +3,7 @@ version: '3.9'
 # Common Django template for GeoNode and Celery services below
 x-common-django:
   &default-common-django
-  image: geonode/geonode:latest-ubuntu-22.10
+  image: geonode/geonode:latest-ubuntu-22.04
   restart: unless-stopped
   env_file:
     - .env_test

docker-compose.yml

@@ -3,7 +3,7 @@ version: '3.9'
 # Common Django template for GeoNode and Celery services below
 x-common-django:
   &default-common-django
-  image: geonode/geonode:latest-ubuntu-22.10
+  image: geonode/geonode:latest-ubuntu-22.04
   restart: unless-stopped
   env_file:
     - .env

geonode/api/api.py

@@ -543,6 +543,7 @@ def dehydrate(self, bundle):
                 documents_count=bundle.data.get("documents_count", 0),
                 maps_count=bundle.data.get("maps_count", 0),
                 layers_count=bundle.data.get("layers_count", 0),
+                organization=bundle.data.get("organization", 0),
             )
         return bundle
 

geonode/base/api/serializers.py

@@ -20,6 +20,7 @@
 from slugify import slugify
 from urllib.parse import urljoin
 import json
+import warnings
 
 from django.db.models import Q
 from django.conf import settings
@@ -54,6 +55,7 @@
     ThesaurusKeyword,
     ThesaurusKeywordLabel,
     ExtraMetadata,
+    LinkedResource,
 )
 from geonode.documents.models import Document
 from geonode.geoapps.models import GeoApp
@@ -197,7 +199,7 @@ class SimpleTopicCategorySerializer(DynamicModelSerializer):
     class Meta:
         model = TopicCategory
         name = "TopicCategory"
-        fields = ("identifier",)
+        fields = ("identifier", "gn_description")
 
 
 class RestrictionCodeTypeSerializer(DynamicModelSerializer):
@@ -787,7 +789,43 @@ class Meta:
 
 
 class SimpleResourceSerializer(DynamicModelSerializer):
+    warnings.warn("SimpleResourceSerializer is deprecated", DeprecationWarning, stacklevel=2)
+
     class Meta:
         name = "linked_resources"
         model = ResourceBase
         fields = ("pk", "title", "resource_type", "detail_url", "thumbnail_url")
+
+    def to_representation(self, instance: LinkedResource):
+        return {
+            "pk": instance.pk,
+            "title": f"{'>>>' if instance.is_target else '<<<'} {instance.title}",
+            "resource_type": instance.resource_type,
+            "detail_url": instance.detail_url,
+            "thumbnail_url": instance.thumbnail_url,
+        }
+
+
+class LinkedResourceSerializer(DynamicModelSerializer):
+    def __init__(self, *kargs, serialize_source: bool = False, **kwargs):
+        super().__init__(*kargs, **kwargs)
+        self.serialize_target = not serialize_source
+
+    class Meta:
+        name = "linked_resources"
+        model = LinkedResource
+        fields = ("internal",)
+
+    def to_representation(self, instance: LinkedResource):
+        data = super().to_representation(instance)
+        item: ResourceBase = instance.target if self.serialize_target else instance.source
+        data.update(
+            {
+                "pk": item.pk,
+                "title": item.title,
+                "resource_type": item.resource_type,
+                "detail_url": item.detail_url,
+                "thumbnail_url": item.thumbnail_url,
+            }
+        )
+        return data