Compare commits
15 Commits
1.26
..
oauth_update
| Author | SHA1 | Date | |
|---|---|---|---|
| da5def5d6f | |||
| cc0f4007f3 | |||
| 87aea5e19b | |||
| e3d5ee82ee | |||
| 8de467ec24 | |||
| 238a9c4db8 | |||
| 7fe5340995 | |||
| 606f1ed311 | |||
| b6b740a31c | |||
| 7c200d9034 | |||
| 750715105e | |||
| a994554650 | |||
| 4c7c667bdb | |||
| 7e136f4022 | |||
| 1393491fb7 |
@@ -35,7 +35,6 @@ SCHNEIDER_AUTH_HEADER=auth
|
|||||||
|
|
||||||
# SSO
|
# SSO
|
||||||
SSO_SERVER_BASE_URL=https://login.naturschutz.rlp.de
|
SSO_SERVER_BASE_URL=https://login.naturschutz.rlp.de
|
||||||
OAUTH_CODE_VERIFIER=CHANGE_ME
|
|
||||||
OAUTH_CLIENT_ID=CHANGE_ME
|
OAUTH_CLIENT_ID=CHANGE_ME
|
||||||
OAUTH_CLIENT_SECRET=CHANGE_ME
|
OAUTH_CLIENT_SECRET=CHANGE_ME
|
||||||
PROPAGATION_SECRET=CHANGE_ME
|
PROPAGATION_SECRET=CHANGE_ME
|
||||||
|
|||||||
+31
-22
@@ -1,7 +1,9 @@
|
|||||||
|
import datetime
|
||||||
import json
|
import json
|
||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
|
from authlib.oauth2.rfc6749 import OAuth2Token
|
||||||
from django.core.exceptions import ObjectDoesNotExist
|
from django.core.exceptions import ObjectDoesNotExist
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
@@ -78,27 +80,25 @@ class OAuthToken(UuidModel):
|
|||||||
return str(self.access_token)
|
return str(self.access_token)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def from_access_token_response(access_token_data: str, received_on):
|
def create_from_oauth2_token(oauth2_token: OAuth2Token):
|
||||||
"""
|
"""
|
||||||
Creates an OAuthToken based on retrieved access token data (OAuth2.0 specification)
|
Creates an OAuthToken based on retrieved access token data (OAuth2.0 specification)
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
access_token_data (str): OAuth2.0 response data
|
oauth2_token (str): OAuth2.0 response data
|
||||||
received_on (): Timestamp when the response has been received
|
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
|
|
||||||
"""
|
"""
|
||||||
oauth_token = OAuthToken()
|
oauth_token = OAuthToken()
|
||||||
data = json.loads(access_token_data)
|
|
||||||
|
|
||||||
oauth_token.access_token = data.get("access_token")
|
oauth_token.access_token = oauth2_token.get("access_token")
|
||||||
oauth_token.refresh_token = data.get("refresh_token")
|
oauth_token.refresh_token = oauth2_token.get("refresh_token")
|
||||||
|
oauth_token.expires_on = datetime.datetime.fromtimestamp(oauth2_token.get("expires_at"))
|
||||||
|
|
||||||
expires_on = received_on + timedelta(
|
assert (oauth_token.access_token is not None and
|
||||||
seconds=(data.get("expires_in") + OAuthToken.ASSUMED_LATENCY)
|
oauth_token.refresh_token is not None and
|
||||||
)
|
oauth_token.expires_on is not None)
|
||||||
oauth_token.expires_on = expires_on
|
|
||||||
|
|
||||||
return oauth_token
|
return oauth_token
|
||||||
|
|
||||||
@@ -155,25 +155,34 @@ class OAuthToken(UuidModel):
|
|||||||
|
|
||||||
return user
|
return user
|
||||||
|
|
||||||
def revoke(self) -> int:
|
def revoke(self) -> None:
|
||||||
""" Revokes the OAuth2 token of the user
|
""" Revokes the OAuth2 token of the user
|
||||||
|
|
||||||
(/o/revoke_token/ indeed removes the corresponding access token on provider side and invalidates the
|
(/o/revoke_token/ indeed removes the corresponding access token on provider side and invalidates the
|
||||||
submitted refresh token in one step)
|
submitted refresh token in one step)
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
revocation_status_code (int): HTTP status code for revocation of refresh_token
|
|
||||||
"""
|
"""
|
||||||
revoke_url = f"{SSO_SERVER_BASE}o/revoke_token/"
|
revoke_url = f"{SSO_SERVER_BASE}o/revoke_token/"
|
||||||
token = self.refresh_token
|
token_types = [
|
||||||
revocation_status_code = requests.post(
|
(self.refresh_token, "refresh_token"),
|
||||||
revoke_url,
|
(self.access_token, "access_token"),
|
||||||
data={
|
]
|
||||||
'token': token,
|
status_codes = []
|
||||||
'token_type_hint': "refresh_token",
|
for entry in token_types:
|
||||||
},
|
status_codes.append(
|
||||||
auth=(OAUTH_CLIENT_ID, OAUTH_CLIENT_SECRET),
|
requests.post(
|
||||||
).status_code
|
revoke_url,
|
||||||
|
data={
|
||||||
|
'token': entry[0],
|
||||||
|
'token_type_hint': entry[1],
|
||||||
|
},
|
||||||
|
auth=(OAUTH_CLIENT_ID, OAUTH_CLIENT_SECRET),
|
||||||
|
).status_code
|
||||||
|
)
|
||||||
|
|
||||||
|
assert len(status_codes) == 2
|
||||||
|
assert status_codes[0] == 200 and status_codes[1] == 200
|
||||||
|
|
||||||
return revocation_status_code
|
|
||||||
|
|
||||||
|
|||||||
@@ -12,8 +12,6 @@ SSO_SERVER_BASE = env("SSO_SERVER_BASE_URL")
|
|||||||
SSO_SERVER = f"{SSO_SERVER_BASE}sso/"
|
SSO_SERVER = f"{SSO_SERVER_BASE}sso/"
|
||||||
|
|
||||||
# OAuth settings
|
# OAuth settings
|
||||||
OAUTH_CODE_VERIFIER = env("OAUTH_CODE_VERIFIER")
|
|
||||||
|
|
||||||
OAUTH_CLIENT_ID = env("OAUTH_CLIENT_ID")
|
OAUTH_CLIENT_ID = env("OAUTH_CLIENT_ID")
|
||||||
OAUTH_CLIENT_SECRET = env("OAUTH_CLIENT_SECRET")
|
OAUTH_CLIENT_SECRET = env("OAUTH_CLIENT_SECRET")
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,9 @@ Created on: 09.11.20
|
|||||||
import secrets
|
import secrets
|
||||||
import string
|
import string
|
||||||
|
|
||||||
|
from authlib.common.security import generate_token as authlib_generate_token
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def generate_token(length: int = 64) -> str:
|
def generate_token(length: int = 64) -> str:
|
||||||
""" Shortcut for default generating of e.g. API token
|
""" Shortcut for default generating of e.g. API token
|
||||||
@@ -15,11 +18,7 @@ def generate_token(length: int = 64) -> str:
|
|||||||
Returns:
|
Returns:
|
||||||
token (str)
|
token (str)
|
||||||
"""
|
"""
|
||||||
return generate_random_string(
|
return authlib_generate_token(length)
|
||||||
length=length,
|
|
||||||
use_numbers=True,
|
|
||||||
use_letters_lc=True
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def generate_random_string(length: int, use_numbers: bool = False, use_letters_lc: bool = False, use_letters_uc: bool = False) -> str:
|
def generate_random_string(length: int, use_numbers: bool = False, use_letters_lc: bool = False, use_letters_uc: bool = False) -> str:
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ from django.contrib.gis.geos.prototypes.io import WKTWriter
|
|||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
from konova.settings import GEOM_MAX_VERTICES
|
from konova.settings import GEOM_MAX_VERTICES
|
||||||
from konova.sub_settings.lanis_settings import DEFAULT_SRID_RLP
|
from konova.sub_settings.lanis_settings import DEFAULT_SRID_RLP, DEFAULT_SRID
|
||||||
|
|
||||||
|
|
||||||
class GeometryProcessor:
|
class GeometryProcessor:
|
||||||
@@ -50,7 +50,7 @@ class GeometryProcessor:
|
|||||||
return geometry.num_coords <= GEOM_MAX_VERTICES
|
return geometry.num_coords <= GEOM_MAX_VERTICES
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def is_valid_4326(geometry):
|
def is_valid_4326(geometry: MultiPolygon) -> bool:
|
||||||
""" Checks whether a given geometry's coordinates are in a valid range to be of EPSG:4326
|
""" Checks whether a given geometry's coordinates are in a valid range to be of EPSG:4326
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
@@ -59,13 +59,69 @@ class GeometryProcessor:
|
|||||||
Returns:
|
Returns:
|
||||||
ret_val (bool): Whether the geometry is valid EPSG:4326
|
ret_val (bool): Whether the geometry is valid EPSG:4326
|
||||||
"""
|
"""
|
||||||
|
assert geometry.srid == DEFAULT_SRID
|
||||||
|
return GeometryProcessor.is_valid_coord_range(
|
||||||
|
geometry,
|
||||||
|
-90.0,
|
||||||
|
90.0,
|
||||||
|
-180.0,
|
||||||
|
180.0,
|
||||||
|
)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def is_valid_25832(geometry: MultiPolygon) -> bool:
|
||||||
|
""" Checks whether a given geometry's coordinates are in a valid range to be of EPSG:25832
|
||||||
|
|
||||||
|
Args:
|
||||||
|
geometry: The geometry
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
ret_val (bool): Whether the geometry is valid EPSG:25832
|
||||||
|
"""
|
||||||
|
assert geometry.srid == DEFAULT_SRID_RLP
|
||||||
|
return GeometryProcessor.is_valid_coord_range(
|
||||||
|
geometry,
|
||||||
|
166_000,
|
||||||
|
834_000,
|
||||||
|
0,
|
||||||
|
9_329_000,
|
||||||
|
)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def is_valid_coord_range(geometry: MultiPolygon,
|
||||||
|
min_x:float|int,
|
||||||
|
max_x:float|int,
|
||||||
|
min_y:float|int,
|
||||||
|
max_y: float|int) -> bool:
|
||||||
|
""" Checks whether a given geometry's coordinates are in a valid range defined by input parameters
|
||||||
|
|
||||||
|
Args:
|
||||||
|
geometry: The geometry
|
||||||
|
min_x (float|int): The min x value
|
||||||
|
max_x (float|int): The max x value
|
||||||
|
min_y (float|int): The min y value
|
||||||
|
max_y (float|int): The max y value
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
ret_val (bool): Whether the geometry's coordinates stays inside the defined range
|
||||||
|
"""
|
||||||
if not geometry.centroid.coords:
|
if not geometry.centroid.coords:
|
||||||
# No coordinates at all found, therefore technically proper 4326
|
# No coordinates at all found, therefore technically proper 4326
|
||||||
return True
|
return True
|
||||||
|
|
||||||
try:
|
try:
|
||||||
lat,lon = geometry.centroid.coords
|
env_min_x = geometry.envelope.min_x
|
||||||
return (-90.0 <= lat <= 90.0) and (-180.0 <= lon <= 180.0)
|
env_max_x = geometry.envelope.max_x
|
||||||
|
env_min_y = geometry.envelope.min_y
|
||||||
|
env_max_y = geometry.envelope.max_x
|
||||||
|
|
||||||
|
valid = (
|
||||||
|
min_x <= env_min_x and
|
||||||
|
env_max_x <= max_x and
|
||||||
|
min_y <= env_min_y and
|
||||||
|
env_max_y <= max_y
|
||||||
|
)
|
||||||
|
return valid
|
||||||
except IndexError:
|
except IndexError:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@@ -124,6 +180,24 @@ class GeometryProcessor:
|
|||||||
is_area_valid = geom.area > 1 # > 1m² (SRID:25832)
|
is_area_valid = geom.area > 1 # > 1m² (SRID:25832)
|
||||||
return is_area_valid
|
return is_area_valid
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def is_valid_geometry(geom: gdal.OGRGeometry) -> bool:
|
||||||
|
""" Checks whether the geometry is technically valid
|
||||||
|
|
||||||
|
Args:
|
||||||
|
geom (OGRGeometry): The geom
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
# Check geometry validity by triggering some low cost processing like centroid calculation
|
||||||
|
geom.centroid
|
||||||
|
geom.boundary
|
||||||
|
return True
|
||||||
|
except gdal.GDALException as e:
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
class GeoJsonValidator:
|
class GeoJsonValidator:
|
||||||
""" GeoJson Validator validates geojson (e.g. from API or form input)
|
""" GeoJson Validator validates geojson (e.g. from API or form input)
|
||||||
@@ -204,7 +278,7 @@ class GeoJsonValidator:
|
|||||||
features = self._input_geojson.get("features", [])
|
features = self._input_geojson.get("features", [])
|
||||||
|
|
||||||
is_input_geojson_empty = len(self._input_geojson) == 0
|
is_input_geojson_empty = len(self._input_geojson) == 0
|
||||||
no_features_in_input_found = not features
|
no_features_in_input_found = len(features) == 0
|
||||||
|
|
||||||
if not is_input_geojson_empty and no_features_in_input_found:
|
if not is_input_geojson_empty and no_features_in_input_found:
|
||||||
# check if _input_geojson is a feature itself
|
# check if _input_geojson is a feature itself
|
||||||
@@ -217,7 +291,6 @@ class GeoJsonValidator:
|
|||||||
else:
|
else:
|
||||||
self.__add_error("Input does not seem to be geojson")
|
self.__add_error("Input does not seem to be geojson")
|
||||||
return
|
return
|
||||||
|
|
||||||
try:
|
try:
|
||||||
validated_features = self.__validate_single_features(features)
|
validated_features = self.__validate_single_features(features)
|
||||||
except AssertionError as e:
|
except AssertionError as e:
|
||||||
@@ -250,7 +323,13 @@ class GeoJsonValidator:
|
|||||||
g = gdal.OGRGeometry(feature_geom, srs=self._srs)
|
g = gdal.OGRGeometry(feature_geom, srs=self._srs)
|
||||||
if g.empty:
|
if g.empty:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
if not GeometryProcessor.is_valid_geometry(g):
|
||||||
|
raise AssertionError(_("This feature holds malicious parts and can not be processed!"))
|
||||||
|
|
||||||
g = GeometryProcessor.cast_to_rlp_srid(g)
|
g = GeometryProcessor.cast_to_rlp_srid(g)
|
||||||
|
if not GeometryProcessor.is_valid_25832(g):
|
||||||
|
raise AssertionError(_("This feature does not hold valid EPSG:25832 coordinates:\n {}".format(g.geojson)))
|
||||||
|
|
||||||
geometry_has_unwanted_dimensions = g.coord_dim > 2
|
geometry_has_unwanted_dimensions = g.coord_dim > 2
|
||||||
if geometry_has_unwanted_dimensions:
|
if geometry_has_unwanted_dimensions:
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import json
|
|||||||
from json import JSONDecodeError
|
from json import JSONDecodeError
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
|
from django.contrib.gis import gdal
|
||||||
|
|
||||||
from konova.sub_settings import schneider_settings
|
from konova.sub_settings import schneider_settings
|
||||||
from konova.sub_settings.lanis_settings import DEFAULT_SRID
|
from konova.sub_settings.lanis_settings import DEFAULT_SRID
|
||||||
@@ -35,7 +36,10 @@ class ParcelFetcher:
|
|||||||
if geom.area < buffer_threshold:
|
if geom.area < buffer_threshold:
|
||||||
# Fallback for malicious geometries which are way too small and would disappear on negative buffering
|
# Fallback for malicious geometries which are way too small and would disappear on negative buffering
|
||||||
geom = geometry.geom
|
geom = geometry.geom
|
||||||
geom.transform(DEFAULT_SRID)
|
try:
|
||||||
|
geom.transform(DEFAULT_SRID)
|
||||||
|
except gdal.GDALException as e:
|
||||||
|
raise ValueError(f"{str(e)}\nCould not transform geometry (id: {geometry.id}) to {DEFAULT_SRID}:\n {geom.geojson}")
|
||||||
self.geojson = geom.ewkt
|
self.geojson = geom.ewkt
|
||||||
self.results = []
|
self.results = []
|
||||||
|
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ class LogoutView(View):
|
|||||||
oauth_token = user.oauth_token
|
oauth_token = user.oauth_token
|
||||||
if oauth_token:
|
if oauth_token:
|
||||||
oauth_token.revoke()
|
oauth_token.revoke()
|
||||||
|
oauth_token.delete()
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
+61
-75
@@ -7,33 +7,52 @@ Created on: 26.04.24
|
|||||||
"""
|
"""
|
||||||
import base64
|
import base64
|
||||||
import hashlib
|
import hashlib
|
||||||
from urllib.parse import urlencode
|
|
||||||
|
|
||||||
import requests
|
from authlib.common.security import generate_token
|
||||||
|
from authlib.integrations.base_client import OAuthError
|
||||||
|
from authlib.integrations.django_client import OAuth
|
||||||
|
|
||||||
from django.contrib.auth import login
|
from django.contrib.auth import login
|
||||||
from django.http import HttpRequest
|
from django.http import HttpRequest, HttpResponse
|
||||||
from django.shortcuts import redirect
|
from django.shortcuts import redirect
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils.timezone import now
|
|
||||||
from django.views import View
|
from django.views import View
|
||||||
|
|
||||||
from api.models import OAuthToken
|
from api.models import OAuthToken
|
||||||
from konova.sub_settings.django_settings import BASE_URL
|
from konova.sub_settings.django_settings import BASE_URL
|
||||||
from konova.sub_settings.sso_settings import SSO_SERVER_BASE, OAUTH_CODE_VERIFIER, OAUTH_CLIENT_ID, OAUTH_CLIENT_SECRET
|
from konova.sub_settings.sso_settings import SSO_SERVER_BASE, OAUTH_CLIENT_ID, OAUTH_CLIENT_SECRET
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
_OAUTH = OAuth()
|
||||||
|
_OAUTH.register(
|
||||||
|
name="sso",
|
||||||
|
client_id=OAUTH_CLIENT_ID,
|
||||||
|
client_secret=OAUTH_CLIENT_SECRET,
|
||||||
|
authorize_url=f"{SSO_SERVER_BASE}o/authorize/",
|
||||||
|
access_token_url=f"{SSO_SERVER_BASE}o/token/",
|
||||||
|
code_challenge_method="S256",
|
||||||
|
client_kwargs={},
|
||||||
|
)
|
||||||
|
|
||||||
class OAuthLoginView(View):
|
class OAuthLoginView(View):
|
||||||
"""
|
""" View for OAuth2 login step
|
||||||
Starts OAuth Login procedure
|
|
||||||
-> AnonymousUser is redirected to SSO component using specific parameters
|
|
||||||
-> After successful login (in SSO component), user will be redirected to a specific callback url (OAuthCallbackView)
|
|
||||||
-> Callback view uses retrieved authorization token to get a proper access token from SSO component
|
|
||||||
-> SSO component answers with access token
|
|
||||||
-> OAuthCallbackView uses token in Authorization header to access user data of logged-in user in SSO component
|
|
||||||
-> OAuthCallbackView creates/updates user
|
|
||||||
-> OAuthCallbackView logs in user and redirects to default home view
|
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
def get(self, request: HttpRequest, *args, **kwargs):
|
||||||
|
redirect_uri = f'{BASE_URL}{reverse("oauth-callback")}'
|
||||||
|
|
||||||
|
# create new PKCE-Verifier
|
||||||
|
code_verifier, code_challenge = self.__create_code_challenge()
|
||||||
|
|
||||||
|
# keep verifier in session, so it can be read out for callback
|
||||||
|
request.session["oauth_code_verifier"] = code_verifier
|
||||||
|
|
||||||
|
return _OAUTH.sso.authorize_redirect(
|
||||||
|
request,
|
||||||
|
redirect_uri,
|
||||||
|
code_verifier=code_verifier,
|
||||||
|
)
|
||||||
|
|
||||||
def __create_code_challenge(self):
|
def __create_code_challenge(self):
|
||||||
"""
|
"""
|
||||||
@@ -44,82 +63,49 @@ class OAuthLoginView(View):
|
|||||||
Returns:
|
Returns:
|
||||||
|
|
||||||
"""
|
"""
|
||||||
code_verifier = OAUTH_CODE_VERIFIER
|
code_verifier = generate_token(128)
|
||||||
|
|
||||||
code_challenge = hashlib.sha256(code_verifier.encode('utf-8')).digest()
|
code_challenge = hashlib.sha256(code_verifier.encode('utf-8')).digest()
|
||||||
code_challenge = base64.urlsafe_b64encode(code_challenge).decode('utf-8').replace('=', '')
|
code_challenge = base64.urlsafe_b64encode(code_challenge).decode('utf-8').replace('=', '')
|
||||||
return code_verifier, code_challenge
|
return code_verifier, code_challenge
|
||||||
|
|
||||||
def get(self, request: HttpRequest, *args, **kwargs):
|
|
||||||
"""
|
|
||||||
Redirects user to OAuth SSO webservice for credential based login there
|
|
||||||
|
|
||||||
Args:
|
|
||||||
request ():
|
|
||||||
*args ():
|
|
||||||
**kwargs ():
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
|
|
||||||
"""
|
|
||||||
oauth_authentication_code_url = f"{SSO_SERVER_BASE}o/authorize/"
|
|
||||||
redirect_uri = f'{BASE_URL}{reverse("oauth-callback")}'
|
|
||||||
|
|
||||||
code_verifier, code_challenge = self.__create_code_challenge()
|
|
||||||
|
|
||||||
urlencode_params = urlencode(
|
|
||||||
{
|
|
||||||
"response_type": "code",
|
|
||||||
"code_challenge": code_challenge,
|
|
||||||
"code_challenge_method": "S256",
|
|
||||||
"client_id": OAUTH_CLIENT_ID,
|
|
||||||
"redirect_uri": redirect_uri,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
url = f"{oauth_authentication_code_url}?{urlencode_params}"
|
|
||||||
return redirect(url)
|
|
||||||
|
|
||||||
|
|
||||||
class OAuthCallbackView(View):
|
class OAuthCallbackView(View):
|
||||||
"""
|
""" View for OAuth2 callback step
|
||||||
Callback view for OAuth2.0 authentication token.
|
|
||||||
Authentication tokens will be exchanged for access token.
|
|
||||||
Access Token will be used for fetching user data from SSO component.
|
|
||||||
User data will be used for creating/updating user data inside this app.
|
|
||||||
User will be logged-in and redirected to default home view.
|
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def get(self, request: HttpRequest, *args, **kwargs):
|
def get(self, request: HttpRequest, *args, **kwargs):
|
||||||
authentication_code = request.GET.get("code")
|
# Get code verifier (created on oatuh-login step) from session
|
||||||
oauth_acces_token_url = f"{SSO_SERVER_BASE}o/token/"
|
code_verifier = request.session.pop(
|
||||||
|
"oauth_code_verifier",
|
||||||
callback_url = f'{BASE_URL}{reverse("oauth-callback")}'
|
None,
|
||||||
|
|
||||||
params = {
|
|
||||||
"grant_type": "authorization_code",
|
|
||||||
"code": authentication_code,
|
|
||||||
"redirect_uri": callback_url,
|
|
||||||
"code_verifier": OAUTH_CODE_VERIFIER,
|
|
||||||
"client_id": OAUTH_CLIENT_ID,
|
|
||||||
"client_secret": OAUTH_CLIENT_SECRET
|
|
||||||
}
|
|
||||||
access_code_response = requests.post(
|
|
||||||
oauth_acces_token_url,
|
|
||||||
data=params
|
|
||||||
)
|
)
|
||||||
received_on = now()
|
if not code_verifier:
|
||||||
|
return HttpResponse(
|
||||||
|
"PKCE code_verifier missing or is invalid.",
|
||||||
|
status=400,
|
||||||
|
)
|
||||||
|
|
||||||
access_code_response_body = access_code_response.content.decode("utf-8")
|
try:
|
||||||
status_code_invalid = access_code_response.status_code != 200
|
token = _OAUTH.sso.authorize_access_token(
|
||||||
if status_code_invalid:
|
request
|
||||||
raise RuntimeError(f"OAuth access token could not be fetched: {access_code_response.text}")
|
)
|
||||||
|
except OAuthError as e:
|
||||||
|
print(e)
|
||||||
|
return HttpResponse(
|
||||||
|
"OAuth-Login failed while authorizing with OAuth.",
|
||||||
|
status=400,
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
oauth_token = OAuthToken.create_from_oauth2_token(token)
|
||||||
|
except AssertionError:
|
||||||
|
return HttpResponse(
|
||||||
|
"OAuth-Login failed due to unexpected token content.",
|
||||||
|
status=400,
|
||||||
|
)
|
||||||
|
|
||||||
oauth_token = OAuthToken.from_access_token_response(access_code_response_body, received_on)
|
|
||||||
oauth_token.save()
|
oauth_token.save()
|
||||||
user = oauth_token.update_and_get_user()
|
user = oauth_token.update_and_get_user()
|
||||||
user.oauth_replace_token(oauth_token)
|
user.oauth_replace_token(oauth_token)
|
||||||
|
|
||||||
login(request, user)
|
login(request, user)
|
||||||
return redirect("home")
|
return redirect("home")
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
@@ -30,7 +30,7 @@
|
|||||||
#: konova/filters/mixins/office.py:57 konova/filters/mixins/record.py:23
|
#: konova/filters/mixins/office.py:57 konova/filters/mixins/record.py:23
|
||||||
#: konova/filters/mixins/self_created.py:24 konova/filters/mixins/share.py:23
|
#: konova/filters/mixins/self_created.py:24 konova/filters/mixins/share.py:23
|
||||||
#: konova/filters/mixins/user_log.py:17 konova/filters/mixins/user_log.py:18
|
#: konova/filters/mixins/user_log.py:17 konova/filters/mixins/user_log.py:18
|
||||||
#: konova/forms/geometry_form.py:32 konova/forms/modals/document_form.py:26
|
#: konova/forms/geometry_form.py:31 konova/forms/modals/document_form.py:26
|
||||||
#: konova/forms/modals/document_form.py:36
|
#: konova/forms/modals/document_form.py:36
|
||||||
#: konova/forms/modals/document_form.py:50
|
#: konova/forms/modals/document_form.py:50
|
||||||
#: konova/forms/modals/document_form.py:62
|
#: konova/forms/modals/document_form.py:62
|
||||||
@@ -45,7 +45,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2025-12-14 17:23+0100\n"
|
"POT-Creation-Date: 2026-09-17 16:25+0200\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
@@ -129,6 +129,7 @@ msgstr ""
|
|||||||
#: analysis/templates/analysis/reports/includes/old_data/amount.html:3
|
#: analysis/templates/analysis/reports/includes/old_data/amount.html:3
|
||||||
#: compensation/forms/modals/compensation_action.py:66
|
#: compensation/forms/modals/compensation_action.py:66
|
||||||
#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:34
|
#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:34
|
||||||
|
#: compensation/templates/compensation/report/eco_account/report.html:50
|
||||||
#: intervention/templates/intervention/detail/includes/deductions.html:31
|
#: intervention/templates/intervention/detail/includes/deductions.html:31
|
||||||
msgid "Amount"
|
msgid "Amount"
|
||||||
msgstr "Menge"
|
msgstr "Menge"
|
||||||
@@ -334,6 +335,7 @@ msgstr "Typ"
|
|||||||
|
|
||||||
#: analysis/templates/analysis/reports/includes/old_data/amount.html:24
|
#: analysis/templates/analysis/reports/includes/old_data/amount.html:24
|
||||||
#: compensation/tables/compensation.py:87
|
#: compensation/tables/compensation.py:87
|
||||||
|
#: compensation/templates/compensation/report/eco_account/report.html:47
|
||||||
#: intervention/forms/modals/deduction.py:58
|
#: intervention/forms/modals/deduction.py:58
|
||||||
#: intervention/forms/modals/deduction.py:65 intervention/tables.py:92
|
#: intervention/forms/modals/deduction.py:65 intervention/tables.py:92
|
||||||
#: intervention/templates/intervention/detail/view.html:19
|
#: intervention/templates/intervention/detail/view.html:19
|
||||||
@@ -448,7 +450,8 @@ msgid "Select the intervention for which this compensation compensates"
|
|||||||
msgstr "Wählen Sie den Eingriff, für den diese Kompensation bestimmt ist"
|
msgstr "Wählen Sie den Eingriff, für den diese Kompensation bestimmt ist"
|
||||||
|
|
||||||
#: compensation/forms/compensation.py:114
|
#: compensation/forms/compensation.py:114
|
||||||
#: compensation/views/compensation/compensation.py:121
|
#: compensation/views/compensation/compensation.py:96
|
||||||
|
#: compensation/views/compensation/compensation.py:160
|
||||||
msgid "New compensation"
|
msgid "New compensation"
|
||||||
msgstr "Neue Kompensation"
|
msgstr "Neue Kompensation"
|
||||||
|
|
||||||
@@ -475,7 +478,8 @@ msgid "When did the parties agree on this?"
|
|||||||
msgstr "Wann wurde dieses Ökokonto offiziell vereinbart?"
|
msgstr "Wann wurde dieses Ökokonto offiziell vereinbart?"
|
||||||
|
|
||||||
#: compensation/forms/eco_account.py:73
|
#: compensation/forms/eco_account.py:73
|
||||||
#: compensation/views/eco_account/eco_account.py:105
|
#: compensation/views/eco_account/eco_account.py:77
|
||||||
|
#: compensation/views/eco_account/eco_account.py:127
|
||||||
msgid "New Eco-Account"
|
msgid "New Eco-Account"
|
||||||
msgstr "Neues Ökokonto"
|
msgstr "Neues Ökokonto"
|
||||||
|
|
||||||
@@ -503,7 +507,8 @@ msgstr ""
|
|||||||
|
|
||||||
#: compensation/forms/eco_account.py:257
|
#: compensation/forms/eco_account.py:257
|
||||||
msgid "Please contact the responsible conservation office to find a solution!"
|
msgid "Please contact the responsible conservation office to find a solution!"
|
||||||
msgstr "Kontaktieren Sie die zuständige Naturschutzbehörde um eine Lösung zu finden!"
|
msgstr ""
|
||||||
|
"Kontaktieren Sie die zuständige Naturschutzbehörde um eine Lösung zu finden!"
|
||||||
|
|
||||||
#: compensation/forms/mixins.py:37
|
#: compensation/forms/mixins.py:37
|
||||||
#: compensation/templates/compensation/detail/eco_account/view.html:63
|
#: compensation/templates/compensation/detail/eco_account/view.html:63
|
||||||
@@ -818,6 +823,7 @@ msgstr "Am {} von {} verzeichnet worden"
|
|||||||
|
|
||||||
#: compensation/tables/eco_account.py:39
|
#: compensation/tables/eco_account.py:39
|
||||||
#: compensation/templates/compensation/detail/eco_account/view.html:36
|
#: compensation/templates/compensation/detail/eco_account/view.html:36
|
||||||
|
#: compensation/templates/compensation/report/eco_account/report.html:34
|
||||||
#: konova/templates/konova/widgets/progressbar.html:3
|
#: konova/templates/konova/widgets/progressbar.html:3
|
||||||
msgid "Available"
|
msgid "Available"
|
||||||
msgstr "Verfügbar"
|
msgstr "Verfügbar"
|
||||||
@@ -948,7 +954,7 @@ msgstr "Wiedervorlage"
|
|||||||
|
|
||||||
#: compensation/templates/compensation/detail/compensation/includes/controls.html:20
|
#: compensation/templates/compensation/detail/compensation/includes/controls.html:20
|
||||||
#: compensation/templates/compensation/detail/eco_account/includes/controls.html:34
|
#: compensation/templates/compensation/detail/eco_account/includes/controls.html:34
|
||||||
#: ema/templates/ema/detail/includes/controls.html:34
|
#: ema/templates/ema/detail/includes/controls.html:32
|
||||||
#: intervention/templates/intervention/detail/includes/controls.html:39
|
#: intervention/templates/intervention/detail/includes/controls.html:39
|
||||||
msgid "Edit"
|
msgid "Edit"
|
||||||
msgstr "Bearbeiten"
|
msgstr "Bearbeiten"
|
||||||
@@ -962,7 +968,7 @@ msgstr "Log anzeigen"
|
|||||||
|
|
||||||
#: compensation/templates/compensation/detail/compensation/includes/controls.html:27
|
#: compensation/templates/compensation/detail/compensation/includes/controls.html:27
|
||||||
#: compensation/templates/compensation/detail/eco_account/includes/controls.html:41
|
#: compensation/templates/compensation/detail/eco_account/includes/controls.html:41
|
||||||
#: ema/templates/ema/detail/includes/controls.html:41
|
#: ema/templates/ema/detail/includes/controls.html:43
|
||||||
#: intervention/templates/intervention/detail/includes/controls.html:46
|
#: intervention/templates/intervention/detail/includes/controls.html:46
|
||||||
msgid "Delete"
|
msgid "Delete"
|
||||||
msgstr "Löschen"
|
msgstr "Löschen"
|
||||||
@@ -1154,7 +1160,7 @@ msgstr "Verzeichnet am"
|
|||||||
#: compensation/templates/compensation/detail/compensation/view.html:107
|
#: compensation/templates/compensation/detail/compensation/view.html:107
|
||||||
#: compensation/templates/compensation/detail/eco_account/view.html:85
|
#: compensation/templates/compensation/detail/eco_account/view.html:85
|
||||||
#: compensation/templates/compensation/report/compensation/report.html:54
|
#: compensation/templates/compensation/report/compensation/report.html:54
|
||||||
#: compensation/templates/compensation/report/eco_account/report.html:47
|
#: compensation/templates/compensation/report/eco_account/report.html:75
|
||||||
#: ema/templates/ema/detail/view.html:71
|
#: ema/templates/ema/detail/view.html:71
|
||||||
#: ema/templates/ema/report/report.html:34
|
#: ema/templates/ema/report/report.html:34
|
||||||
#: intervention/templates/intervention/detail/view.html:113
|
#: intervention/templates/intervention/detail/view.html:113
|
||||||
@@ -1188,7 +1194,7 @@ msgid "other users"
|
|||||||
msgstr "weitere Nutzer"
|
msgstr "weitere Nutzer"
|
||||||
|
|
||||||
#: compensation/templates/compensation/detail/eco_account/includes/controls.html:18
|
#: compensation/templates/compensation/detail/eco_account/includes/controls.html:18
|
||||||
#: ema/templates/ema/detail/includes/controls.html:18
|
#: ema/templates/ema/detail/includes/controls.html:19
|
||||||
#: intervention/forms/modals/share.py:62
|
#: intervention/forms/modals/share.py:62
|
||||||
#: intervention/templates/intervention/detail/includes/controls.html:18
|
#: intervention/templates/intervention/detail/includes/controls.html:18
|
||||||
#: intervention/tests/unit/test_forms.py:150
|
#: intervention/tests/unit/test_forms.py:150
|
||||||
@@ -1258,11 +1264,11 @@ msgstr "Maßnahmenträger"
|
|||||||
msgid "Report"
|
msgid "Report"
|
||||||
msgstr "Bericht"
|
msgstr "Bericht"
|
||||||
|
|
||||||
#: compensation/templates/compensation/report/eco_account/report.html:34
|
#: compensation/templates/compensation/report/eco_account/report.html:43
|
||||||
msgid "Deductions for"
|
msgid "Deductions for"
|
||||||
msgstr "Abbuchungen für"
|
msgstr "Abbuchungen für"
|
||||||
|
|
||||||
#: compensation/templates/compensation/report/eco_account/report.html:42
|
#: compensation/templates/compensation/report/eco_account/report.html:64
|
||||||
#: intervention/templates/intervention/report/report.html:53
|
#: intervention/templates/intervention/report/report.html:53
|
||||||
#: intervention/templates/intervention/report/report.html:66
|
#: intervention/templates/intervention/report/report.html:66
|
||||||
#: intervention/templates/intervention/report/report.html:76
|
#: intervention/templates/intervention/report/report.html:76
|
||||||
@@ -1292,40 +1298,44 @@ msgstr ""
|
|||||||
msgid "Responsible data"
|
msgid "Responsible data"
|
||||||
msgstr "Daten zu den verantwortlichen Stellen"
|
msgstr "Daten zu den verantwortlichen Stellen"
|
||||||
|
|
||||||
#: compensation/views/compensation/compensation.py:52
|
#: compensation/views/compensation/compensation.py:53
|
||||||
msgid "Compensations - Overview"
|
msgid "Compensations - Overview"
|
||||||
msgstr "Kompensationen - Übersicht"
|
msgstr "Kompensationen - Übersicht"
|
||||||
|
|
||||||
#: compensation/views/compensation/compensation.py:167
|
#: compensation/views/compensation/compensation.py:203
|
||||||
|
#: compensation/views/compensation/compensation.py:261
|
||||||
|
#: compensation/views/eco_account/eco_account.py:169
|
||||||
|
#: compensation/views/eco_account/eco_account.py:224 ema/views/ema.py:175
|
||||||
|
#: ema/views/ema.py:229 intervention/views/intervention.py:176
|
||||||
|
#: intervention/views/intervention.py:230
|
||||||
|
msgid "Edit {}"
|
||||||
|
msgstr "Bearbeite {}"
|
||||||
|
|
||||||
|
#: compensation/views/compensation/compensation.py:242
|
||||||
#: konova/utils/message_templates.py:40
|
#: konova/utils/message_templates.py:40
|
||||||
msgid "Compensation {} edited"
|
msgid "Compensation {} edited"
|
||||||
msgstr "Kompensation {} bearbeitet"
|
msgstr "Kompensation {} bearbeitet"
|
||||||
|
|
||||||
#: compensation/views/compensation/compensation.py:190
|
|
||||||
#: compensation/views/eco_account/eco_account.py:168 ema/views/ema.py:173
|
|
||||||
#: intervention/views/intervention.py:175
|
|
||||||
msgid "Edit {}"
|
|
||||||
msgstr "Bearbeite {}"
|
|
||||||
|
|
||||||
#: compensation/views/compensation/report.py:35
|
#: compensation/views/compensation/report.py:35
|
||||||
#: compensation/views/eco_account/report.py:35 ema/views/report.py:35
|
#: compensation/views/eco_account/report.py:35 ema/views/report.py:35
|
||||||
#: intervention/views/report.py:36
|
#: intervention/views/report.py:36
|
||||||
msgid "Report {}"
|
msgid "Report {}"
|
||||||
msgstr "Bericht {}"
|
msgstr "Bericht {}"
|
||||||
|
|
||||||
#: compensation/views/eco_account/eco_account.py:49
|
#: compensation/views/eco_account/eco_account.py:51
|
||||||
msgid "Eco-account - Overview"
|
msgid "Eco-account - Overview"
|
||||||
msgstr "Ökokonten - Übersicht"
|
msgstr "Ökokonten - Übersicht"
|
||||||
|
|
||||||
#: compensation/views/eco_account/eco_account.py:82
|
#: compensation/views/eco_account/eco_account.py:108
|
||||||
msgid "Eco-Account {} added"
|
msgid "Eco-Account {} added"
|
||||||
msgstr "Ökokonto {} hinzugefügt"
|
msgstr "Ökokonto {} hinzugefügt"
|
||||||
|
|
||||||
#: compensation/views/eco_account/eco_account.py:145
|
#: compensation/views/eco_account/eco_account.py:205
|
||||||
msgid "Eco-Account {} edited"
|
msgid "Eco-Account {} edited"
|
||||||
msgstr "Ökokonto {} bearbeitet"
|
msgstr "Ökokonto {} bearbeitet"
|
||||||
|
|
||||||
#: ema/forms.py:42 ema/tests/unit/test_forms.py:27 ema/views/ema.py:107
|
#: ema/forms.py:42 ema/tests/unit/test_forms.py:27 ema/views/ema.py:79
|
||||||
|
#: ema/views/ema.py:129
|
||||||
msgid "New EMA"
|
msgid "New EMA"
|
||||||
msgstr "Neue EMA hinzufügen"
|
msgstr "Neue EMA hinzufügen"
|
||||||
|
|
||||||
@@ -1357,11 +1367,11 @@ msgstr "Ersatzzahlungsmaßnahme"
|
|||||||
msgid "EMAs - Overview"
|
msgid "EMAs - Overview"
|
||||||
msgstr "EMAs - Übersicht"
|
msgstr "EMAs - Übersicht"
|
||||||
|
|
||||||
#: ema/views/ema.py:85
|
#: ema/views/ema.py:111
|
||||||
msgid "EMA {} added"
|
msgid "EMA {} added"
|
||||||
msgstr "EMA {} hinzugefügt"
|
msgstr "EMA {} hinzugefügt"
|
||||||
|
|
||||||
#: ema/views/ema.py:150
|
#: ema/views/ema.py:211
|
||||||
msgid "EMA {} edited"
|
msgid "EMA {} edited"
|
||||||
msgstr "EMA {} bearbeitet"
|
msgstr "EMA {} bearbeitet"
|
||||||
|
|
||||||
@@ -1425,7 +1435,7 @@ msgstr "Datum Bestandskraft bzw. Rechtskraft"
|
|||||||
|
|
||||||
#: intervention/forms/intervention.py:216
|
#: intervention/forms/intervention.py:216
|
||||||
#: intervention/tests/unit/test_forms.py:36
|
#: intervention/tests/unit/test_forms.py:36
|
||||||
#: intervention/views/intervention.py:109
|
#: intervention/views/intervention.py:82 intervention/views/intervention.py:134
|
||||||
msgid "New intervention"
|
msgid "New intervention"
|
||||||
msgstr "Neuer Eingriff"
|
msgstr "Neuer Eingriff"
|
||||||
|
|
||||||
@@ -1661,15 +1671,15 @@ msgstr ""
|
|||||||
msgid "Check performed"
|
msgid "Check performed"
|
||||||
msgstr "Prüfung durchgeführt"
|
msgstr "Prüfung durchgeführt"
|
||||||
|
|
||||||
#: intervention/views/intervention.py:53
|
#: intervention/views/intervention.py:56
|
||||||
msgid "Interventions - Overview"
|
msgid "Interventions - Overview"
|
||||||
msgstr "Eingriffe - Übersicht"
|
msgstr "Eingriffe - Übersicht"
|
||||||
|
|
||||||
#: intervention/views/intervention.py:86
|
#: intervention/views/intervention.py:114
|
||||||
msgid "Intervention {} added"
|
msgid "Intervention {} added"
|
||||||
msgstr "Eingriff {} hinzugefügt"
|
msgstr "Eingriff {} hinzugefügt"
|
||||||
|
|
||||||
#: intervention/views/intervention.py:150
|
#: intervention/views/intervention.py:212
|
||||||
msgid "Intervention {} edited"
|
msgid "Intervention {} edited"
|
||||||
msgstr "Eingriff {} bearbeitet"
|
msgstr "Eingriff {} bearbeitet"
|
||||||
|
|
||||||
@@ -1797,16 +1807,11 @@ msgstr "Speichern"
|
|||||||
msgid "Not editable"
|
msgid "Not editable"
|
||||||
msgstr "Nicht editierbar"
|
msgstr "Nicht editierbar"
|
||||||
|
|
||||||
#: konova/forms/geometry_form.py:31 konova/utils/quality.py:44
|
#: konova/forms/geometry_form.py:30 konova/utils/quality.py:44
|
||||||
#: konova/utils/quality.py:46 templates/form/collapsable/form.html:45
|
#: konova/utils/quality.py:46 templates/form/collapsable/form.html:45
|
||||||
msgid "Geometry"
|
msgid "Geometry"
|
||||||
msgstr "Geometrie"
|
msgstr "Geometrie"
|
||||||
|
|
||||||
#: konova/forms/geometry_form.py:105
|
|
||||||
msgid "Only surfaces allowed. Points or lines must be buffered."
|
|
||||||
msgstr ""
|
|
||||||
"Nur Flächen erlaubt. Punkte oder Linien müssen zu Flächen gepuffert werden."
|
|
||||||
|
|
||||||
#: konova/forms/modals/document_form.py:37
|
#: konova/forms/modals/document_form.py:37
|
||||||
msgid "When has this file been created? Important for photos."
|
msgid "When has this file been created? Important for photos."
|
||||||
msgstr "Wann wurde diese Datei erstellt oder das Foto aufgenommen?"
|
msgstr "Wann wurde diese Datei erstellt oder das Foto aufgenommen?"
|
||||||
@@ -1961,6 +1966,7 @@ msgstr "Raumreferenz"
|
|||||||
#: konova/templates/konova/includes/parcels/parcels.html:28
|
#: konova/templates/konova/includes/parcels/parcels.html:28
|
||||||
msgid "No geometry entry found on database. Please contact an admin!"
|
msgid "No geometry entry found on database. Please contact an admin!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
"Keine Geometrie in Datenbank gefunden. Kontaktieren Sie einen Administrator!"
|
||||||
|
|
||||||
#: konova/templates/konova/includes/quickstart/compensations.html:20
|
#: konova/templates/konova/includes/quickstart/compensations.html:20
|
||||||
#: konova/templates/konova/includes/quickstart/ecoaccounts.html:20
|
#: konova/templates/konova/includes/quickstart/ecoaccounts.html:20
|
||||||
@@ -2006,39 +2012,56 @@ msgstr "In Zwischenablage kopiert"
|
|||||||
msgid "Search"
|
msgid "Search"
|
||||||
msgstr "Suchen"
|
msgstr "Suchen"
|
||||||
|
|
||||||
#: konova/utils/mailer.py:69 konova/utils/mailer.py:146
|
#: konova/utils/geometry/geometry_validator.py:328
|
||||||
|
msgid "This feature holds malicious parts and can not be processed!"
|
||||||
|
msgstr "Teile der Geometrie sind ungültig und können nicht verarbeitet werden!"
|
||||||
|
|
||||||
|
#: konova/utils/geometry/geometry_validator.py:332
|
||||||
|
msgid ""
|
||||||
|
"This feature does not hold valid EPSG:25832 coordinates:\n"
|
||||||
|
" {}"
|
||||||
|
msgstr ""
|
||||||
|
"Dieses Feature enthält keine validen EPSG:25832 Koordinaten:\n"
|
||||||
|
" {}"
|
||||||
|
|
||||||
|
#: konova/utils/geometry/geometry_validator.py:340
|
||||||
|
msgid "Only surfaces allowed. Points or lines must be buffered."
|
||||||
|
msgstr ""
|
||||||
|
"Nur Flächen erlaubt. Punkte oder Linien müssen zu Flächen gepuffert werden."
|
||||||
|
|
||||||
|
#: konova/utils/mailer.py:82 konova/utils/mailer.py:159
|
||||||
msgid "{} - Shared access removed"
|
msgid "{} - Shared access removed"
|
||||||
msgstr "{} - Zugriff entzogen"
|
msgstr "{} - Zugriff entzogen"
|
||||||
|
|
||||||
#: konova/utils/mailer.py:94 konova/utils/mailer.py:120
|
#: konova/utils/mailer.py:107 konova/utils/mailer.py:133
|
||||||
msgid "{} - Shared access given"
|
msgid "{} - Shared access given"
|
||||||
msgstr "{} - Zugriff freigegeben"
|
msgstr "{} - Zugriff freigegeben"
|
||||||
|
|
||||||
#: konova/utils/mailer.py:172 konova/utils/mailer.py:325
|
#: konova/utils/mailer.py:185 konova/utils/mailer.py:338
|
||||||
msgid "{} - Shared data unrecorded"
|
msgid "{} - Shared data unrecorded"
|
||||||
msgstr "{} - Freigegebene Daten entzeichnet"
|
msgstr "{} - Freigegebene Daten entzeichnet"
|
||||||
|
|
||||||
#: konova/utils/mailer.py:198 konova/utils/mailer.py:300
|
#: konova/utils/mailer.py:211 konova/utils/mailer.py:313
|
||||||
msgid "{} - Shared data recorded"
|
msgid "{} - Shared data recorded"
|
||||||
msgstr "{} - Freigegebene Daten verzeichnet"
|
msgstr "{} - Freigegebene Daten verzeichnet"
|
||||||
|
|
||||||
#: konova/utils/mailer.py:224 konova/utils/mailer.py:375
|
#: konova/utils/mailer.py:237 konova/utils/mailer.py:388
|
||||||
msgid "{} - Shared data checked"
|
msgid "{} - Shared data checked"
|
||||||
msgstr "{} - Freigegebene Daten geprüft"
|
msgstr "{} - Freigegebene Daten geprüft"
|
||||||
|
|
||||||
#: konova/utils/mailer.py:249 konova/utils/mailer.py:401
|
#: konova/utils/mailer.py:262 konova/utils/mailer.py:414
|
||||||
msgid "{} - Deduction changed"
|
msgid "{} - Deduction changed"
|
||||||
msgstr "{} - Abbuchung geändert"
|
msgstr "{} - Abbuchung geändert"
|
||||||
|
|
||||||
#: konova/utils/mailer.py:275 konova/utils/mailer.py:350
|
#: konova/utils/mailer.py:288 konova/utils/mailer.py:363
|
||||||
msgid "{} - Shared data deleted"
|
msgid "{} - Shared data deleted"
|
||||||
msgstr "{} - Freigegebene Daten gelöscht"
|
msgstr "{} - Freigegebene Daten gelöscht"
|
||||||
|
|
||||||
#: konova/utils/mailer.py:422 templates/email/api/verify_token.html:4
|
#: konova/utils/mailer.py:435 templates/email/api/verify_token.html:4
|
||||||
msgid "Request for new API token"
|
msgid "Request for new API token"
|
||||||
msgstr "Anfrage für neuen API Token"
|
msgstr "Anfrage für neuen API Token"
|
||||||
|
|
||||||
#: konova/utils/mailer.py:447
|
#: konova/utils/mailer.py:460
|
||||||
msgid "Resubmission - {}"
|
msgid "Resubmission - {}"
|
||||||
msgstr "Wiedervorlage - {}"
|
msgstr "Wiedervorlage - {}"
|
||||||
|
|
||||||
@@ -2289,11 +2312,11 @@ msgstr "Neuer Token generiert. Administratoren sind informiert."
|
|||||||
msgid "missing"
|
msgid "missing"
|
||||||
msgstr "fehlend"
|
msgstr "fehlend"
|
||||||
|
|
||||||
#: konova/utils/tables.py:222
|
#: konova/utils/tables.py:224
|
||||||
msgid "Full access granted"
|
msgid "Full access granted"
|
||||||
msgstr "Für Sie freigegeben - Datensatz kann bearbeitet werden"
|
msgstr "Für Sie freigegeben - Datensatz kann bearbeitet werden"
|
||||||
|
|
||||||
#: konova/utils/tables.py:222
|
#: konova/utils/tables.py:224
|
||||||
msgid "Access not granted"
|
msgid "Access not granted"
|
||||||
msgstr "Nicht freigegeben - Datensatz nur lesbar"
|
msgstr "Nicht freigegeben - Datensatz nur lesbar"
|
||||||
|
|
||||||
@@ -2303,7 +2326,7 @@ msgstr ""
|
|||||||
"Dieses Datum ist unrealistisch. Geben Sie bitte das korrekte Datum ein "
|
"Dieses Datum ist unrealistisch. Geben Sie bitte das korrekte Datum ein "
|
||||||
"(>1950)."
|
"(>1950)."
|
||||||
|
|
||||||
#: konova/views/home.py:75 templates/navbars/navbar.html:16
|
#: konova/views/home.py:76 templates/navbars/navbar.html:16
|
||||||
msgid "Home"
|
msgid "Home"
|
||||||
msgstr "Home"
|
msgstr "Home"
|
||||||
|
|
||||||
@@ -2323,7 +2346,7 @@ msgstr "{} verzeichnet"
|
|||||||
msgid "Errors found:"
|
msgid "Errors found:"
|
||||||
msgstr "Fehler gefunden:"
|
msgstr "Fehler gefunden:"
|
||||||
|
|
||||||
#: konova/views/remove.py:35
|
#: konova/views/remove.py:34
|
||||||
msgid "{} removed"
|
msgid "{} removed"
|
||||||
msgstr "{} entfernt"
|
msgstr "{} entfernt"
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
amqp==5.3.1
|
amqp==5.3.1
|
||||||
asgiref==3.12.1
|
asgiref==3.12.1
|
||||||
async-timeout==5.0.1
|
async-timeout==5.0.1
|
||||||
|
Authlib==1.8.0
|
||||||
beautifulsoup4==4.15.0
|
beautifulsoup4==4.15.0
|
||||||
billiard==4.2.4
|
billiard==4.2.4
|
||||||
cached-property==2.0.1
|
cached-property==2.0.1
|
||||||
@@ -30,6 +31,7 @@ gunicorn==26.2.0
|
|||||||
idna==3.19
|
idna==3.19
|
||||||
importlib_metadata==9.0.1
|
importlib_metadata==9.0.1
|
||||||
itsdangerous==2.2.0
|
itsdangerous==2.2.0
|
||||||
|
joserfc==1.7.5
|
||||||
jwcrypto==1.6.0
|
jwcrypto==1.6.0
|
||||||
kombu==5.6.2
|
kombu==5.6.2
|
||||||
oauthlib==3.3.1
|
oauthlib==3.3.1
|
||||||
|
|||||||
Reference in New Issue
Block a user