Merge pull request '475_Wrong_uuid' (#476) from 475_Wrong_uuid into master

Reviewed-on: #476

compensation/views/compensation/report.py

@@ -12,11 +12,12 @@ from django.utils.translation import gettext_lazy as _
 
 from compensation.models import Compensation
 from konova.contexts import BaseContext
+from konova.decorators import uuid_required
 from konova.forms import SimpleGeomForm
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.generators import generate_qr_code
 
-
+@uuid_required
 def report_view(request: HttpRequest, id: str):
     """ Renders the public report view
 

compensation/views/eco_account/report.py

@@ -12,11 +12,13 @@ from django.utils.translation import gettext_lazy as _
 
 from compensation.models import EcoAccount
 from konova.contexts import BaseContext
+from konova.decorators import uuid_required
 from konova.forms import SimpleGeomForm
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.generators import generate_qr_code
 
 
+@uuid_required
 def report_view(request: HttpRequest, id: str):
     """ Renders the public report view
 

ema/views/report.py

@@ -12,11 +12,12 @@ from django.utils.translation import gettext_lazy as _
 
 from ema.models import Ema
 from konova.contexts import BaseContext
+from konova.decorators import uuid_required
 from konova.forms import SimpleGeomForm
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.generators import generate_qr_code
 
-
+@uuid_required
 def report_view(request:HttpRequest, id: str):
     """ Renders the public report view
 

konova/decorators.py

@@ -11,7 +11,7 @@ from uuid import UUID
 
 from bootstrap_modal_forms.mixins import is_ajax
 from django.contrib import messages
-from django.http import Http404
+from django.core.exceptions import BadRequest
 from django.shortcuts import redirect, get_object_or_404, render
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
@@ -185,7 +185,7 @@ def uuid_required(function):
         try:
             uuid = UUID(uuid)
         except ValueError:
-            raise Http404(
+            raise BadRequest(
                 "Invalid UUID"
             )
         return function(request, *args, **kwargs)

konova/sub_settings/django_settings.py

@@ -66,7 +66,6 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'django.contrib.gis',
     'django.contrib.humanize',
-    'simple_sso.sso_server',
     'django_tables2',
     'bootstrap_modal_forms',
     'fontawesome_5',

konova/urls.py

@@ -42,5 +42,6 @@ urlpatterns = [
     path('client/proxy/wfs', ClientProxyParcelWFS.as_view(), name="client-proxy-wfs"),
 ]
 
+handler400 = "konova.views.error.get_400_view"
 handler404 = "konova.views.error.get_404_view"
 handler500 = "konova.views.error.get_500_view"

konova/utils/messenger.py

@@ -1,78 +0,0 @@
-"""
-Author: Michel Peltriaux
-Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
-Contact: michel.peltriaux@sgdnord.rlp.de
-Created on: 17.08.21
-
-"""
-from collections import Iterable
-
-import requests
-from user.models import User
-from django.utils.translation import gettext_lazy as _
-
-from konova.settings import SSO_SERVER_BASE, SSO_PUBLIC_KEY, PROXIES
-from konova.sub_settings.context_settings import BASE_TITLE_SHORT
-
-
-class Messenger:
-    """ Used to send messages to the SSO server.
-
-    Messages can be seen by the user the next time they login on their SSO dashboard.
-    Documentation for SSO Server-Client communication can be found here:
-    https://git.naturschutz.rlp.de/SGD-Nord/arnova/wiki/Messages
-
-    """
-    server_url = "{}communication/message/".format(SSO_SERVER_BASE)
-
-    def __init__(self, users: Iterable, subject: str = None, body: str = None, type: str = None):
-        self.users = users
-        self.msg_subject = subject
-        self.msg_body = body
-        self.msg_type = type
-
-    def send(self):
-        """ Sends a message
-
-        """
-        if self.msg_body is None or len(self.msg_body) == 0:
-            raise AttributeError("No message body set")
-
-        headers = {
-            "x-services-public-key": SSO_PUBLIC_KEY
-        }
-        for user in self.users:
-            data = {
-                "type": self.msg_type,
-                "sender": BASE_TITLE_SHORT,
-                "receiver": user.username,
-                "subject": self.msg_subject,
-                "body": self.msg_body,
-            }
-            requests.post(
-                self.server_url,
-                data=data,
-                headers=headers,
-                proxies=PROXIES
-            )
-
-    def send_object_checked(self, obj_identifier: str, performing_user: User, detail_view_url: str = ""):
-        """ Wraps sending of a message related to the checking of an object, like an intervention
-
-        Args:
-            obj_identifier (str): The object's identifier (e.g. 'EIV-123'
-            performing_user (User): The user who performed the checking
-            detail_view_url (str): If a direct link to the object shall be added to the message, it can be provided here
-
-        Returns:
-
-        """
-        self.msg_subject = _("{} checked").format(obj_identifier)
-        if len(detail_view_url) > 0:
-            detail_view_url = _('<a href="{}">Check it out</a>').format(detail_view_url)
-        self.msg_body = _("{} has been checked successfully by user {}! {}").format(
-            obj_identifier,
-            performing_user.username,
-            detail_view_url
-        )
-        self.send()

konova/utils/schneider/fetcher.py

@@ -11,6 +11,7 @@ from json import JSONDecodeError
 import requests
 
 from konova.sub_settings import schneider_settings
+from konova.sub_settings.lanis_settings import DEFAULT_SRID
 from konova.sub_settings.proxy_settings import PROXIES
 
 
@@ -34,6 +35,7 @@ class ParcelFetcher:
         if geom.area < buffer_threshold:
             # Fallback for malicious geometries which are way too small and would disappear on negative buffering
             geom = geometry.geom
+        geom.transform(DEFAULT_SRID)
         self.geojson = geom.ewkt
         self.results = []
 

konova/views/error.py

@@ -25,6 +25,20 @@ def get_404_view(request: HttpRequest, exception=None):
     return render(request, "404.html", context, status=404)
 
 
+def get_400_view(request: HttpRequest, exception=None):
+    """ Returns a 400 handling view
+
+    Args:
+        request ():
+        exception ():
+
+    Returns:
+
+    """
+    context = BaseContext.context
+    return render(request, "400.html", context, status=400)
+
+
 def get_500_view(request: HttpRequest):
     """ Returns a 404 handling view
 

locale/de/LC_MESSAGES/django.po

@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-08 15:26+0100\n"
+"POT-Creation-Date: 2025-05-12 14:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1303,8 +1303,8 @@ msgstr "Kompensation {} bearbeitet"
 msgid "Edit {}"
 msgstr "Bearbeite {}"
 
-#: compensation/views/compensation/report.py:34
+#: compensation/views/compensation/report.py:35
-#: compensation/views/eco_account/report.py:34 ema/views/report.py:34
+#: compensation/views/eco_account/report.py:35 ema/views/report.py:35
 #: intervention/views/report.py:35
 msgid "Report {}"
 msgstr "Bericht {}"
@@ -1928,11 +1928,11 @@ msgstr "Kontrolle am"
 msgid "Other"
 msgstr "Sonstige"
 
-#: konova/sub_settings/django_settings.py:157
+#: konova/sub_settings/django_settings.py:156
 msgid "German"
 msgstr ""
 
-#: konova/sub_settings/django_settings.py:158
+#: konova/sub_settings/django_settings.py:157
 msgid "English"
 msgstr ""
 
@@ -2287,18 +2287,6 @@ msgstr "Momentane Daten noch nicht geprüft"
 msgid "New token generated. Administrators need to validate."
 msgstr "Neuer Token generiert. Administratoren sind informiert."
 
-#: konova/utils/messenger.py:70
-msgid "{} checked"
-msgstr "{} geprüft"
-
-#: konova/utils/messenger.py:72
-msgid "<a href=\"{}\">Check it out</a>"
-msgstr "<a href=\"{}\">Schauen Sie rein</a>"
-
-#: konova/utils/messenger.py:73
-msgid "{} has been checked successfully by user {}! {}"
-msgstr "{} wurde erfolgreich vom Nutzer {} geprüft! {}"
-
 #: konova/utils/quality.py:32
 msgid "missing"
 msgstr "fehlend"
@@ -2389,6 +2377,18 @@ msgstr "Alle"
 msgid "News"
 msgstr "Neuigkeiten"
 
+#: templates/400.html:7
+msgid "Request was invalid"
+msgstr "Anfrage fehlerhaft"
+
+#: templates/400.html:10
+msgid "There seems to be a problem with the link you opened."
+msgstr "Es scheint ein Problem mit dem Link zu geben, den Sie geöffnet haben."
+
+#: templates/400.html:11
+msgid "Make sure the URL is valid (no whitespaces, properly copied, ...)."
+msgstr "Stellen Sie sicher, dass die URL gültig ist (keine Leerzeichen, fehlerfrei kopiert, ...)."
+
 #: templates/404.html:7
 msgid "Not found"
 msgstr "Nicht gefunden"
@@ -2884,7 +2884,8 @@ msgid ""
 "You are about to create a new API token. The existing one will not be usable "
 "afterwards."
 msgstr ""
-"Wenn Sie fortfahren, generieren Sie einen neuen API Token. Ihren existierenden werden Sie dann nicht länger nutzen können."
+"Wenn Sie fortfahren, generieren Sie einen neuen API Token. Ihren "
+"existierenden werden Sie dann nicht länger nutzen können."
 
 #: user/forms/modals/api_token.py:31
 msgid "A new token needs to be validated by an administrator!"
@@ -2912,11 +2913,11 @@ msgstr ""
 "Mehrfachauswahl möglich - Sie können nur Nutzer wählen, die noch nicht "
 "Mitglieder dieses Teams sind. Geben Sie den ganzen Nutzernamen an."
 
-#: user/forms/modals/team.py:56 user/tests/unit/test_forms.py:29
+#: user/forms/modals/team.py:56 user/tests/unit/test_forms.py:30
 msgid "Create new team"
 msgstr "Neues Team anlegen"
 
-#: user/forms/modals/team.py:57 user/tests/unit/test_forms.py:30
+#: user/forms/modals/team.py:57 user/tests/unit/test_forms.py:31
 msgid ""
 "You will become the administrator for this group by default. You do not need "
 "to add yourself to the list of members."
@@ -2945,11 +2946,11 @@ msgid "There must be at least one admin on this team."
 msgstr "Es muss mindestens einen Administrator für das Team geben."
 
 #: user/forms/modals/team.py:160 user/templates/user/team/index.html:60
-#: user/tests/unit/test_forms.py:86
+#: user/tests/unit/test_forms.py:87
 msgid "Edit team"
 msgstr "Team bearbeiten"
 
-#: user/forms/modals/team.py:187 user/tests/unit/test_forms.py:163
+#: user/forms/modals/team.py:187 user/tests/unit/test_forms.py:164
 msgid ""
 "ATTENTION!\n"
 "\n"
@@ -2966,7 +2967,7 @@ msgstr ""
 "Sind Sie sicher, dass Sie dieses Team löschen möchten?"
 
 #: user/forms/modals/team.py:197 user/templates/user/team/index.html:56
-#: user/tests/unit/test_forms.py:196
+#: user/tests/unit/test_forms.py:197
 msgid "Leave team"
 msgstr "Team verlassen"
 
@@ -2998,7 +2999,7 @@ msgstr "Benachrichtigungen"
 msgid "Select the situations when you want to receive a notification"
 msgstr "Wann wollen Sie per E-Mail benachrichtigt werden?"
 
-#: user/forms/user.py:38 user/tests/unit/test_forms.py:232
+#: user/forms/user.py:38 user/tests/unit/test_forms.py:233
 msgid "Edit notifications"
 msgstr "Benachrichtigungen bearbeiten"
 
@@ -3112,7 +3113,7 @@ msgstr "Token noch nicht freigeschaltet"
 msgid "Valid until"
 msgstr "Läuft ab am"
 
-#: user/views/api_token.py:33
+#: user/views/api_token.py:34
 msgid "User API token"
 msgstr "API Nutzer Token"
 

requirements.txt

@@ -24,13 +24,11 @@ django-environ==0.11.2
 django-filter==24.3
 django-fontawesome-5==1.0.18
 django-oauth-toolkit==3.0.1
-django-simple-sso==1.2.0
 django-tables2==2.7.1
 et_xmlfile==2.0.0
 gunicorn==23.0.0
 idna==3.10
 importlib_metadata==8.5.0
-itsdangerous==0.24
 jwcrypto==1.5.6
 kombu==5.4.0rc1
 oauthlib==3.2.2

templates/400.html

@@ -0,0 +1,21 @@
+{% extends 'public_base.html' %}
+{% load i18n fontawesome_5 static %}
+
+{% block body %}
+    <div class="jumbotron">
+        <div class="row">
+            <div class="col-auto">
+                <img src="{% static 'images/error_imgs/croc_technician_400.png' %}" style="max-width: 150px">
+            </div>
+            <div class="col-sm-12 col-md-9 col-lg-9 col-xl-10">
+                <h1 class="display-4">{% fa5_icon 'question-circle' %}400</h1>
+                <h1 class="display-4">{% trans 'Request was invalid' %}</h1>
+            </div>
+        </div>
+        <hr>
+        <p class="lead">
+            {% trans 'There seems to be a problem with the link you opened.' %}
+            {% trans 'Make sure the URL is valid (no whitespaces, properly copied, ...).' %}
+        </p>
+    </div>
+{% endblock %}

templates/500.html

@@ -1,10 +1,17 @@
 {% extends 'public_base.html' %}
-{% load i18n fontawesome_5 %}
+{% load i18n fontawesome_5 static %}
 
 {% block body %}
     <div class="jumbotron">
-        <h1 class="display-4">{% fa5_icon 'fire-extinguisher' %} {% fa5_icon 'fire-alt' %} 500</h1>
+        <div class="row">
-        <h1 class="display-4">{% trans 'Server Error' %}</h1>
+            <div class="col-auto">
+                <img src="{% static 'images/error_imgs/croc_technician_500.png' %}" style="max-width: 150px">
+            </div>
+            <div class="col-sm-12 col-md-9 col-lg-9 col-xl-10">
+                <h1 class="display-4">{% fa5_icon 'fire-alt' %} 500</h1>
+                <h1 class="display-4">{% trans 'Server Error' %}</h1>
+            </div>
+        </div>
         <hr>
         <p class="lead">
             {% trans 'Something happened. Admins have been informed. We are working on it!' %}

templates/map/client/config.json

@@ -1,19 +1,21 @@
 {
 	"layers":
 	[
-		{ "folder": 5, "type": "WMS", "title": "KOM Flächen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=kom_f&", "name": "kom_f" },
+		{ "folder": 5, "type": "WMS", "title": "KOM", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=kom_recorded&", "name": "kom_recorded" },
-		{ "folder": 5, "type": "WMS", "title": "KOM Linien", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=kom_l&", "name": "kom_l" },
+		{ "folder": 5, "type": "WMS", "title": "KOM - In Bearbeitung", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=kom_unrecorded&", "name": "kom_unrecorded" },
-		{ "folder": 5, "type": "WMS", "title": "KOM Punkte", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=komon&", "name": "kom_p" },
+		{ "folder": 5, "type": "WMS", "title": "KOM - Unvollständige Altfälle", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=kom_unrecorded_old_entries&", "name": "kom_unrecorded_old_entries" },
 
-		{ "folder": 6, "type": "WMS", "title": "EIV Flächen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=eiv_f&", "name": "eiv_f" },
+		{ "folder": 6, "type": "WMS", "title": "EIV", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=eiv_recorded&", "name": "eiv_recorded" },
-		{ "folder": 6, "type": "WMS", "title": "EIV Linien", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=eiv_l&", "name": "eiv_l" },
+		{ "folder": 6, "type": "WMS", "title": "EIV - In Bearbeitung", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=eiv_unrecorded&", "name": "eiv_unrecorded" },
-		{ "folder": 6, "type": "WMS", "title": "EIV Punkte", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=eiv_p&", "name": "eiv_p" },
+		{ "folder": 6, "type": "WMS", "title": "EIV - Unvollständige Altfälle", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=eiv_unrecorded_old_entries&", "name": "eiv_unrecorded_old_entries" },
 
-		{ "folder": 7, "type": "WMS", "title": "OEK Flächen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=oek_f&", "name": "oek_f" },
+		{ "folder": 7, "type": "WMS", "title": "OEK", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=oek_recorded&", "name": "oek_recorded" },
+		{ "folder": 7, "type": "WMS", "title": "OEK - In Bearbeitung", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=oek_unrecorded&", "name": "oek_unrecorded" },
 
-		{ "folder": 8, "type": "WMS", "title": "EMA Flächen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=ema_f&", "name": "ema_f" },
+		{ "folder": 8, "type": "WMS", "title": "EMA", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=ema_recorded&", "name": "ema_recorded" },
+		{ "folder": 8, "type": "WMS", "title": "EMA - In Bearbeitung", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=ema_unrecorded&", "name": "ema_unrecorded" },
 
-		{ "folder": 9, "type": "WMS", "title": "MAE Flächen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=mae&", "name": "mae" },
+		{ "folder": 9, "type": "WMS", "title": "MAE", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=mae&", "name": "mae" },
 
 		{ "folder": 10, "type": "WMS", "title": "Naturschutzgebiete", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=naturschutzgebiet&", "name": "naturschutzgebiet" },
 		{ "folder": 10, "type": "WMS", "title": "Naturparkzonen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=naturparkzonen&", "name": "naturparkzonen" },
@@ -39,7 +41,7 @@
 
 		{ "folder": 15, "type": "WMS", "order": -1, "title": "farbig", "attribution": "LVermGeo", "url": "https://maps.service24.rlp.de/gisserver/services/RP/RP_WebAtlasRP/MapServer/WmsServer?", "name": "RP_WebAtlasRP", "active": true},
 		{ "folder": 15, "type": "WMS", "title": "grau", "attribution": "LVermGeo", "url": "https://maps.service24.rlp.de/gisserver/services/RP/RP_ETRS_Gt/MapServer/WmsServer?", "name": "0", "active": false },
-		{ "folder": 0, "type": "WMS", "title": "Luftbilder", "attribution": "LVermGeo", "url": "http://geo4.service24.rlp.de/wms/dop_basis.fcgi?", "name": "rp_dop", "active": false },
+		{ "folder": 0, "type": "WMS", "title": "Luftbilder", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/rp_dop20.fcgi?", "name": "rp_dop20", "active": false },
 		{ "folder": 14, "type": "WMS", "title": "farbig", "attribution": "BKG", "url": "https://sgx.geodatenzentrum.de/wms_basemapde?", "name": "de_basemapde_web_raster_farbe", "active": false },
 		{ "folder": 14, "type": "WMS", "title": "grau", "attribution": "BKG", "url": "https://sgx.geodatenzentrum.de/wms_basemapde?", "name": "de_basemapde_web_raster_grau", "active": false },
 		{ "folder": 13, "type": "WMS", "title": "farbig", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/dtk5_rp.fcgi?", "name": "rp_dtk5", "active": false },