open-api-framework 0.6.0__tar.gz → 0.7.0__tar.gz

{open_api_framework-0.6.0 → open_api_framework-0.7.0}/CHANGELOG.rst

@@ -1,6 +1,35 @@
 Changelog
 =========
 
+0.7.0 (2024-08-15)
+------------------
+
+**New features**
+
+* Management command to generate documentation for environment variables
+* Made SESSION_COOKIE_SAMESITE and CSRF_COOKIE_SAMESITE configurable via environment variables (default ``Strict``)
+
+0.6.1 (2024-07-31)
+------------------
+
+**Project maintenance and QOL**
+
+* Updated dependencies:
+    - django ``4.2.11+`` to ``4.2.14+``
+    - django-axes ``6.3.0+`` to ``6.5.1+``
+    - django-cors-headers ``4.3.1+`` to ``4.4.0+``
+    - django-jsonform ``2.21.4+`` to ``2.22.0+``
+    - djangorestframework ``3.12.4+`` to ``3.15.2+``
+    - django-filter ``23.2+`` to ``24.2+``
+    - drf-spectacular ``0.27.0+`` to ``0.27.2+``
+    - mozilla-django-oidc-db ``0.14.1+`` to ``0.19.0+``
+    - requests ``2.31.0+`` to ``2.32.3+``
+    - sentry-sdk ``1.39.2+`` to ``2.11.0+``
+    - elastic-apm ``6.20.0+`` to ``6.22.0+``
+    - celery ``5.2.7+`` to ``5.4.0+``
+    - maykin-2fa ``1.0.0+`` to ``1.0.1+``
+
+
 0.6.0 (2024-07-04)
 ------------------
 

{open_api_framework-0.6.0 → open_api_framework-0.7.0}/MANIFEST.in

@@ -2,6 +2,7 @@ include *.rst
 include LICENSE
 include open_api_framework/py.typed
 recursive-include open_api_framework *.html
+recursive-include open_api_framework *.rst
 recursive-include open_api_framework *.txt
 recursive-include open_api_framework *.po
 recursive-include open_api_framework/static *.css

{open_api_framework-0.6.0/open_api_framework.egg-info → open_api_framework-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: open_api_framework
-Version: 0.6.0
+Version: 0.7.0
 Summary: A metapackage for registration components, that bundles the dependencies shared between these components and provides generic settings
 Author-email: Maykin Media <support@maykinmedia.nl>
 License: Copyright © Maykin 2024
@@ -30,33 +30,33 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: django>=4.2.11
-Requires-Dist: django-axes>=6.3.0
-Requires-Dist: django-cors-headers>=4.3.1
+Requires-Dist: django<5.0.0,>=4.2.14
+Requires-Dist: django-axes>=6.5.1
+Requires-Dist: django-cors-headers>=4.4.0
 Requires-Dist: django-markup>=1.8.1
-Requires-Dist: django-jsonform>=2.21.4
+Requires-Dist: django-jsonform>=2.22.0
 Requires-Dist: django-log-outgoing-requests>=0.6.1
 Requires-Dist: django-admin-index>=3.1.0
 Requires-Dist: django-redis>=5.4.0
-Requires-Dist: djangorestframework>=3.12.4
+Requires-Dist: djangorestframework>=3.15.2
 Requires-Dist: djangorestframework-gis>=1.0
-Requires-Dist: django-filter>=23.2
-Requires-Dist: drf-spectacular>=0.27.0
+Requires-Dist: django-filter>=24.2
+Requires-Dist: drf-spectacular>=0.27.2
 Requires-Dist: djangorestframework-inclusions>=1.2.0
 Requires-Dist: commonground-api-common>=1.12.1
-Requires-Dist: mozilla-django-oidc-db>=0.14.1
+Requires-Dist: mozilla-django-oidc-db>=0.19.0
 Requires-Dist: zgw-consumers>=0.27.0
 Requires-Dist: psycopg2>=2.9.9
 Requires-Dist: bleach>=6.1.0
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: python-decouple>=3.8
-Requires-Dist: requests>=2.31.0
+Requires-Dist: requests>=2.32.3
 Requires-Dist: uwsgi>=2.0.23
-Requires-Dist: sentry-sdk>=1.39.2
-Requires-Dist: elastic-apm>=6.20.0
-Requires-Dist: celery>=5.2.7
+Requires-Dist: sentry-sdk>=2.11.0
+Requires-Dist: elastic-apm>=6.22.0
+Requires-Dist: celery>=5.4.0
 Requires-Dist: flower>=2.0.1
-Requires-Dist: maykin-2fa>=1.0.0
+Requires-Dist: maykin-2fa>=1.0.1
 Requires-Dist: django-setup-configuration>=0.1.0
 Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
@@ -77,7 +77,7 @@ Requires-Dist: twine; extra == "release"
 Open API Framework
 ==================
 
-:Version: 0.6.0
+:Version: 0.7.0
 :Source: https://github.com/maykinmedia/open-api-framework
 :Keywords: metapackage, dependencies
 

{open_api_framework-0.6.0 → open_api_framework-0.7.0}/README.rst

@@ -1,7 +1,7 @@
 Open API Framework
 ==================
 
-:Version: 0.6.0
+:Version: 0.7.0
 :Source: https://github.com/maykinmedia/open-api-framework
 :Keywords: metapackage, dependencies
 

{open_api_framework-0.6.0 → open_api_framework-0.7.0}/open_api_framework/conf/base.py

@@ -30,19 +30,61 @@ BASE_DIR = Path(DJANGO_PROJECT_DIR).resolve().parents[1]
 #
 # Core Django settings
 #
-SITE_ID = config("SITE_ID", default=1)
+SITE_ID = config(
+    "SITE_ID",
+    default=1,
+    help_text="The database ID of the site object. You usually won't have to touch this.",
+)
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = config("SECRET_KEY")
+SECRET_KEY = config(
+    "SECRET_KEY",
+    help_text=(
+        "Secret key that's used for certain cryptographic utilities. "
+        "You should generate one via `miniwebtool <https://www.miniwebtool.com/django-secret-key-generator>`_"
+    ),
+)
 
 # NEVER run with DEBUG=True in production-like environments
-DEBUG = config("DEBUG", default=False)
+DEBUG = config(
+    "DEBUG",
+    default=False,
+    help_text=(
+        "Only set this to ``True`` on a local development environment. "
+        "Various other security settings are derived from this setting!"
+    ),
+)
 
 # = domains we're running on
-ALLOWED_HOSTS = config("ALLOWED_HOSTS", default="", split=True)
-USE_X_FORWARDED_HOST = config("USE_X_FORWARDED_HOST", default=False)
+ALLOWED_HOSTS = config(
+    "ALLOWED_HOSTS",
+    default="",
+    split=True,
+    help_text=(
+        "a comma separated (without spaces!) list of domains that serve "
+        "the installation. Used to protect against Host header attacks."
+    ),
+    group="Required",
+)
+USE_X_FORWARDED_HOST = config(
+    "USE_X_FORWARDED_HOST",
+    default=False,
+    help_text=(
+        "whether to grab the domain/host from the X-Forwarded-Host header or not. "
+        "This header is typically set by reverse proxies (such as nginx, traefik, Apache...). "
+        "Note: this is a header that can be spoofed and you need to ensure you control it before enabling this."
+    ),
+)
 
-IS_HTTPS = config("IS_HTTPS", default=not DEBUG)
+IS_HTTPS = config(
+    "IS_HTTPS",
+    default=not DEBUG,
+    help_text=(
+        "Used to construct absolute URLs and controls a variety of security settings. "
+        "Defaults to the inverse of ``DEBUG``."
+    ),
+    auto_display_default=False,
+)
 
 # Internationalization
 # https://docs.djangoproject.com/en/2.0/topics/i18n/
@@ -66,11 +108,37 @@ USE_THOUSAND_SEPARATOR = True
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.postgresql",
-        "NAME": config("DB_NAME", PROJECT_DIRNAME),
-        "USER": config("DB_USER", PROJECT_DIRNAME),
-        "PASSWORD": config("DB_PASSWORD", PROJECT_DIRNAME),
-        "HOST": config("DB_HOST", "localhost"),
-        "PORT": config("DB_PORT", 5432),
+        "NAME": config(
+            "DB_NAME",
+            PROJECT_DIRNAME,
+            group="Database",
+            help_text="name of the PostgreSQL database.",
+        ),
+        "USER": config(
+            "DB_USER",
+            PROJECT_DIRNAME,
+            group="Database",
+            help_text="username of the database user.",
+        ),
+        "PASSWORD": config(
+            "DB_PASSWORD",
+            PROJECT_DIRNAME,
+            group="Database",
+            help_text="password of the database user.",
+        ),
+        "HOST": config(
+            "DB_HOST",
+            "localhost",
+            group="Database",
+            help_text=(
+                "hostname of the PostgreSQL database. Defaults to ``db`` for the docker environment, "
+                "otherwise defaults to ``localhost``."
+            ),
+            auto_display_default=False,
+        ),
+        "PORT": config(
+            "DB_PORT", 5432, group="Database", help_text="port number of the database"
+        ),
     }
 }
 
@@ -78,10 +146,21 @@ DATABASES = {
 # https://docs.djangoproject.com/en/4.0/ref/settings/#std:setting-DEFAULT_AUTO_FIELD
 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
 
+CACHE_DEFAULT = config(
+    "CACHE_DEFAULT",
+    "localhost:6379/0",
+    help_text="redis cache address for the default cache",
+)
+CACHE_AXES = config(
+    "CACHE_AXES",
+    "localhost:6379/0",
+    help_text="redis cache address for the brute force login protection cache",
+)
+
 CACHES = {
     "default": {
         "BACKEND": "django_redis.cache.RedisCache",
-        "LOCATION": f"redis://{config('CACHE_DEFAULT', 'localhost:6379/0')}",
+        "LOCATION": f"redis://{CACHE_DEFAULT}",
         "OPTIONS": {
             "CLIENT_CLASS": "django_redis.client.DefaultClient",
             "IGNORE_EXCEPTIONS": True,
@@ -89,7 +168,7 @@ CACHES = {
     },
     "axes": {
         "BACKEND": "django_redis.cache.RedisCache",
-        "LOCATION": f"redis://{config('CACHE_AXES', 'localhost:6379/0')}",
+        "LOCATION": f"redis://{CACHE_AXES}",
         "OPTIONS": {
             "CLIENT_CLASS": "django_redis.client.DefaultClient",
             "IGNORE_EXCEPTIONS": True,
@@ -97,7 +176,7 @@ CACHES = {
     },
     "oidc": {
         "BACKEND": "django_redis.cache.RedisCache",
-        "LOCATION": f"redis://{config('CACHE_DEFAULT', 'localhost:6379/0')}",
+        "LOCATION": f"redis://{CACHE_DEFAULT}",
         "OPTIONS": {
             "CLIENT_CLASS": "django_redis.client.DefaultClient",
             "IGNORE_EXCEPTIONS": True,
@@ -223,24 +302,68 @@ FILE_UPLOAD_PERMISSIONS = 0o644
 #
 # Sending EMAIL
 #
-EMAIL_HOST = config("EMAIL_HOST", default="localhost")
+EMAIL_HOST = config(
+    "EMAIL_HOST",
+    default="localhost",
+    help_text="hostname for the outgoing e-mail server",
+)
 EMAIL_PORT = config(
-    "EMAIL_PORT", default=25
+    "EMAIL_PORT",
+    default=25,
+    help_text=(
+        "port number of the outgoing e-mail server. Note that if you're on Google Cloud, "
+        "sending e-mail via port 25 is completely blocked and you should use 487 for TLS."
+    ),
 )  # disabled on Google Cloud, use 487 instead
-EMAIL_HOST_USER = config("EMAIL_HOST_USER", default="")
-EMAIL_HOST_PASSWORD = config("EMAIL_HOST_PASSWORD", default="")
-EMAIL_USE_TLS = config("EMAIL_USE_TLS", default=False)
+EMAIL_HOST_USER = config(
+    "EMAIL_HOST_USER", default="", help_text="username to connect to the mail server"
+)
+EMAIL_HOST_PASSWORD = config(
+    "EMAIL_HOST_PASSWORD",
+    default="",
+    help_text="password to connect to the mail server",
+)
+EMAIL_USE_TLS = config(
+    "EMAIL_USE_TLS",
+    default=False,
+    help_text=(
+        "whether to use TLS or not to connect to the mail server. "
+        "Should be True if you're changing the ``EMAIL_PORT`` to 487."
+    ),
+)
 EMAIL_TIMEOUT = 10
 
-DEFAULT_FROM_EMAIL = config("DEFAULT_FROM_EMAIL", f"{PROJECT_DIRNAME}@example.com")
+DEFAULT_FROM_EMAIL = config(
+    "DEFAULT_FROM_EMAIL",
+    f"{PROJECT_DIRNAME}@example.com",
+    help_text="The default email address from which emails are sent",
+)
 
 #
 # LOGGING
 #
-LOG_STDOUT = config("LOG_STDOUT", default=False)
-LOG_LEVEL = config("LOG_LEVEL", default="WARNING")
-LOG_QUERIES = config("LOG_QUERIES", default=False)
-LOG_REQUESTS = config("LOG_REQUESTS", default=False)
+LOG_STDOUT = config(
+    "LOG_STDOUT", default=False, help_text="whether to log to stdout or not"
+)
+LOG_LEVEL = config(
+    "LOG_LEVEL",
+    default="WARNING",
+    help_text=(
+        "control the verbosity of logging output. "
+        "Available values are ``CRITICAL``, ``ERROR``, ``WARNING``, ``INFO`` and ``DEBUG``"
+    ),
+)
+LOG_QUERIES = config(
+    "LOG_QUERIES",
+    default=False,
+    help_text=(
+        "enable (query) logging at the database backend level. Note that you "
+        "must also set ``DEBUG=1``, which should be done very sparingly!"
+    ),
+)
+LOG_REQUESTS = config(
+    "LOG_REQUESTS", default=False, help_text="enable logging of the outgoing requests"
+)
 if LOG_QUERIES and not DEBUG:
     warnings.warn(
         "Requested LOG_QUERIES=1 but DEBUG is false, no query logs will be emited.",
@@ -416,8 +539,10 @@ LOGOUT_REDIRECT_URL = reverse_lazy("admin:index")
 #
 SESSION_COOKIE_SECURE = IS_HTTPS
 SESSION_COOKIE_HTTPONLY = True
+SESSION_COOKIE_SAMESITE = config("SESSION_COOKIE_SAMESITE", "Strict")
 
 CSRF_COOKIE_SECURE = IS_HTTPS
+CSRF_COOKIE_SAMESITE = config("CSRF_COOKIE_SAMESITE", "Strict")
 
 X_FRAME_OPTIONS = "DENY"
 
@@ -438,11 +563,28 @@ DATA_UPLOAD_MAX_NUMBER_FIELDS = 10000
 #
 # Custom settings
 #
-ENVIRONMENT = config("ENVIRONMENT", "")
+ENVIRONMENT = config(
+    "ENVIRONMENT",
+    "",
+    help_text=(
+        "An identifier for the environment, displayed in the admin depending on "
+        "the settings module used and included in the error monitoring (see ``SENTRY_DSN``). "
+        "The default is set according to ``DJANGO_SETTINGS_MODULE``."
+    ),
+    auto_display_default=False,
+)
 ENVIRONMENT_SHOWN_IN_ADMIN = True
 
 # Generating the schema, depending on the component
-subpath = config("SUBPATH", None)
+subpath = config(
+    "SUBPATH",
+    None,
+    help_text=(
+        "If hosted on a subpath, provide the value here. If you provide ``/gateway``, "
+        "the component assumes its running at the base URL: ``https://somedomain/gateway/``. "
+        "Defaults to an empty string."
+    ),
+)
 if subpath:
     if not subpath.startswith("/"):
         subpath = f"/{subpath}"
@@ -462,12 +604,22 @@ elif (Path(BASE_DIR) / ".git").exists():
 else:
     GIT_SHA = None
 
-RELEASE = config("RELEASE", GIT_SHA)
+RELEASE = config(
+    "RELEASE",
+    GIT_SHA,
+    help_text="The version number or commit hash of the application (this is also sent to Sentry).",
+    auto_display_default=False,
+)
 
 NUM_PROXIES = config(  # TODO: this also is relevant for DRF settings if/when we have rate-limited endpoints
     "NUM_PROXIES",
     default=1,
     cast=lambda val: int(val) if val is not None else None,
+    help_text=(
+        "the number of reverse proxies in front of the application, as an integer. "
+        "This is used to determine the actual client IP adres. "
+        "On Kubernetes with an ingress you typically want to set this to 2."
+    ),
 )
 
 ##############################
@@ -516,10 +668,28 @@ IPWARE_META_PRECEDENCE_ORDER = (
 #
 # DJANGO-CORS-MIDDLEWARE
 #
-CORS_ALLOW_ALL_ORIGINS = config("CORS_ALLOW_ALL_ORIGINS", default=False)
-CORS_ALLOWED_ORIGINS = config("CORS_ALLOWED_ORIGINS", split=True, default=[])
+CORS_ALLOW_ALL_ORIGINS = config(
+    "CORS_ALLOW_ALL_ORIGINS",
+    default=False,
+    group="Cross-Origin-Resource-Sharing",
+    help_text="allow cross-domain access from any client",
+)
+CORS_ALLOWED_ORIGINS = config(
+    "CORS_ALLOWED_ORIGINS",
+    split=True,
+    default=[],
+    group="Cross-Origin-Resource-Sharing",
+    help_text=(
+        "explicitly list the allowed origins for cross-domain requests. "
+        "Example: http://localhost:3000,https://some-app.gemeente.nl"
+    ),
+)
 CORS_ALLOWED_ORIGIN_REGEXES = config(
-    "CORS_ALLOWED_ORIGIN_REGEXES", split=True, default=[]
+    "CORS_ALLOWED_ORIGIN_REGEXES",
+    split=True,
+    default=[],
+    group="Cross-Origin-Resource-Sharing",
+    help_text="same as ``CORS_ALLOWED_ORIGINS``, but supports regular expressions",
 )
 # Authorization is included in default_cors_headers
 CORS_ALLOW_HEADERS = (
@@ -528,7 +698,17 @@ CORS_ALLOW_HEADERS = (
         "accept-crs",
         "content-crs",
     ]
-    + config("CORS_EXTRA_ALLOW_HEADERS", split=True, default=[])
+    + config(
+        "CORS_EXTRA_ALLOW_HEADERS",
+        split=True,
+        default=[],
+        group="Cross-Origin-Resource-Sharing",
+        help_text=(
+            "headers that are allowed to be sent as part of the cross-domain request. "
+            "By default, Authorization, Accept-Crs and Content-Crs are already included. "
+            "The value of this variable is added to these already included headers."
+        ),
+    )
 )
 CORS_EXPOSE_HEADERS = [
     "content-crs",
@@ -545,6 +725,7 @@ CSRF_TRUSTED_ORIGINS = config(
     "CSRF_TRUSTED_ORIGINS",
     split=True,
     default=[strip_protocol_from_origin(origin) for origin in CORS_ALLOWED_ORIGINS],
+    help_text="A list of trusted origins for unsafe requests (e.g. POST)",
 )
 #
 # DJANGO-PRIVATES -- safely serve files after authorization
@@ -556,7 +737,16 @@ PRIVATE_MEDIA_URL = "/private-media/"
 #
 # NOTIFICATIONS-API-COMMON
 #
-NOTIFICATIONS_DISABLED = config("NOTIFICATIONS_DISABLED", default=False)
+NOTIFICATIONS_DISABLED = config(
+    "NOTIFICATIONS_DISABLED",
+    default=False,
+    help_text=(
+        "indicates whether or not notifications should be sent to the Notificaties API "
+        "for operations on the API endpoints. "
+        "Defaults to ``True`` for the ``dev`` environment, otherwise defaults to ``False``"
+    ),
+    auto_display_default=False,
+)
 
 #
 # SENTRY - error monitoring
@@ -564,7 +754,15 @@ NOTIFICATIONS_DISABLED = config("NOTIFICATIONS_DISABLED", default=False)
 
 
 def init_sentry(before_send: Callable | None = None):
-    SENTRY_DSN = config("SENTRY_DSN", None)
+    SENTRY_DSN = config(
+        "SENTRY_DSN",
+        None,
+        help_text=(
+            "URL of the sentry project to send error reports to. Default empty, "
+            "i.e. -> no monitoring set up. Highly recommended to configure this."
+        ),
+        auto_display_default=False,
+    )
 
     if SENTRY_DSN:
         SENTRY_CONFIG = {
@@ -587,8 +785,18 @@ def init_sentry(before_send: Callable | None = None):
 #
 # CELERY
 #
-CELERY_BROKER_URL = config("CELERY_RESULT_BACKEND", "redis://localhost:6379/1")
-CELERY_RESULT_BACKEND = config("CELERY_RESULT_BACKEND", "redis://localhost:6379/1")
+CELERY_BROKER_URL = config(
+    "CELERY_RESULT_BACKEND",
+    "redis://localhost:6379/1",
+    group="Celery",
+    help_text="the URL of the backend/broker that will be used by Celery to send the notifications",
+)
+CELERY_RESULT_BACKEND = config(
+    "CELERY_RESULT_BACKEND",
+    "redis://localhost:6379/1",
+    group="Celery",
+    help_text="the URL of the backend/broker that will be used by Celery to send the notifications",
+)
 
 
 #
@@ -611,15 +819,40 @@ MOZILLA_DJANGO_OIDC_DB_CACHE_TIMEOUT = 5 * 60
 #
 # Elastic APM
 #
-ELASTIC_APM_SERVER_URL = config("ELASTIC_APM_SERVER_URL", None)
+ELASTIC_APM_SERVER_URL = config(
+    "ELASTIC_APM_SERVER_URL",
+    None,
+    "URL where Elastic APM is hosted",
+    group="Elastic APM",
+)
 ELASTIC_APM = {
     # FIXME this does change the default service name, because PROJECT_DIRNAME != PROJECT_NAME
     "SERVICE_NAME": config(
-        "ELASTIC_APM_SERVICE_NAME", f"{PROJECT_DIRNAME} - {ENVIRONMENT}"
+        "ELASTIC_APM_SERVICE_NAME",
+        f"{PROJECT_DIRNAME} - {ENVIRONMENT}",
+        help_text=(
+            f"Name of the service for this application in Elastic APM. "
+            f"Defaults to ``{PROJECT_DIRNAME} - <environment>``"
+        ),
+        group="Elastic APM",
+        auto_display_default=False,
+    ),
+    "SECRET_TOKEN": config(
+        "ELASTIC_APM_SECRET_TOKEN",
+        "default",
+        "Token used to communicate with Elastic APM",
+        group="Elastic APM",
     ),
-    "SECRET_TOKEN": config("ELASTIC_APM_SECRET_TOKEN", "default"),
     "SERVER_URL": ELASTIC_APM_SERVER_URL,
-    "TRANSACTION_SAMPLE_RATE": config("ELASTIC_APM_TRANSACTION_SAMPLE_RATE", 0.1),
+    "TRANSACTION_SAMPLE_RATE": config(
+        "ELASTIC_APM_TRANSACTION_SAMPLE_RATE",
+        0.1,
+        help_text=(
+            "By default, the agent will sample every transaction (e.g. request to your service). "
+            "To reduce overhead and storage requirements, set the sample rate to a value between 0.0 and 1.0"
+        ),
+        group="Elastic APM",
+    ),
 }
 if not ELASTIC_APM_SERVER_URL:
     ELASTIC_APM["ENABLED"] = False
@@ -652,7 +885,11 @@ MAYKIN_2FA_ALLOW_MFA_BYPASS_BACKENDS = [
 
 # if DISABLE_2FA is true, fill the MAYKIN_2FA_ALLOW_MFA_BYPASS_BACKENDS with all
 # configured AUTHENTICATION_BACKENDS and thus disabeling the entire 2FA chain.
-if config("DISABLE_2FA", default=False):  # pragma: no cover
+if config(
+    "DISABLE_2FA",
+    default=False,
+    help_text="Whether or not two factor authentication should be disabled",
+):  # pragma: no cover
     MAYKIN_2FA_ALLOW_MFA_BYPASS_BACKENDS = AUTHENTICATION_BACKENDS
 
 
@@ -660,13 +897,23 @@ if config("DISABLE_2FA", default=False):  # pragma: no cover
 # LOG OUTGOING REQUESTS
 #
 LOG_OUTGOING_REQUESTS_EMIT_BODY = config(
-    "LOG_OUTGOING_REQUESTS_EMIT_BODY", default=True
+    "LOG_OUTGOING_REQUESTS_EMIT_BODY",
+    default=True,
+    help_text="Whether or not outgoing request bodies should be logged",
+)
+LOG_OUTGOING_REQUESTS_DB_SAVE = config(
+    "LOG_OUTGOING_REQUESTS_DB_SAVE",
+    default=False,
+    help_text="Whether or not outgoing request logs should be saved to the database",
 )
 LOG_OUTGOING_REQUESTS_DB_SAVE_BODY = config(
-    "LOG_OUTGOING_REQUESTS_DB_SAVE_BODY", default=True
+    "LOG_OUTGOING_REQUESTS_DB_SAVE_BODY",
+    default=True,
+    help_text="Whether or not outgoing request bodies should be saved to the database",
 )
-LOG_OUTGOING_REQUESTS_DB_SAVE = config("LOG_OUTGOING_REQUESTS_DB_SAVE", default=False)
 LOG_OUTGOING_REQUESTS_RESET_DB_SAVE_AFTER = None
 LOG_OUTGOING_REQUESTS_MAX_AGE = config(
-    "LOG_OUTGOING_REQUESTS_MAX_AGE", default=7
+    "LOG_OUTGOING_REQUESTS_MAX_AGE",
+    default=7,
+    help_text="The amount of time after which request logs should be deleted from the database",
 )  # number of days

open_api_framework-0.7.0/open_api_framework/conf/utils.py

@@ -0,0 +1,121 @@
+import sys
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Any, Optional
+from urllib.parse import urlparse
+
+from decouple import Csv, Undefined, config as _config, undefined
+from sentry_sdk.integrations import DidNotEnable, django, redis
+
+
+@dataclass
+class EnvironmentVariable:
+    name: str
+    default: Any
+    help_text: str
+    group: Optional[str] = None
+    auto_display_default: bool = True
+
+    def __post_init__(self):
+        if not self.group:
+            self.group = (
+                "Required" if isinstance(self.default, Undefined) else "Optional"
+            )
+
+    def __eq__(self, other):
+        return isinstance(other, EnvironmentVariable) and self.name == other.name
+
+
+ENVVAR_REGISTRY = []
+
+
+def config(
+    option: str,
+    default: Any = undefined,
+    help_text="",
+    group=None,
+    add_to_docs=True,
+    auto_display_default=True,
+    *args,
+    **kwargs,
+):
+    """
+    An override of ``decouple.config``, with custom options to construct documentation
+    for environment variables.
+
+    Pull a config parameter from the environment.
+
+    Read the config variable ``option``. If it's optional, use the ``default`` value.
+    Input is automatically cast to the correct type, where the type is derived from the
+    default value if possible.
+
+    Pass ``split=True`` to split the comma-separated input into a list.
+
+    Additionally, the variable is added to a registry that is used to construct documentation
+    via the ``generate_envvar_docs`` management command. The following arguments are added for this:
+
+    :param help_text: The help text to be displayed for this variable in the documentation. Default `""`
+    :param group: The name of the section under which this variable will be grouped. Default ``None``
+    :param add_to_docs: Whether or not this variable will be displayed in the documentation. Default ``True``
+    :param auto_display_default: Whether or not the passed ``default`` value is displayed in the docs, this can be
+        set to ``False`` in case a default needs more explanation that can be added to the ``help_text``
+        (e.g. if it is computed or based on another variable). Default ``True``
+    """
+    if add_to_docs:
+        variable = EnvironmentVariable(
+            name=option,
+            default=default,
+            help_text=help_text,
+            group=group,
+            auto_display_default=auto_display_default,
+        )
+        if variable not in ENVVAR_REGISTRY:
+            ENVVAR_REGISTRY.append(variable)
+        else:
+            # If the same variable is defined again (i.e. because a project defines a custom default), override it
+            ENVVAR_REGISTRY[ENVVAR_REGISTRY.index(variable)] = variable
+
+    if "split" in kwargs:
+        kwargs.pop("split")
+        kwargs["cast"] = Csv()
+        if isinstance(default, list):
+            default = ",".join(default)
+
+    if default is not undefined and default is not None:
+        kwargs.setdefault("cast", type(default))
+    return _config(option, default=default, *args, **kwargs)
+
+
+def get_sentry_integrations() -> list:
+    """
+    Determine which Sentry SDK integrations to enable.
+    """
+    default = [
+        django.DjangoIntegration(),
+        redis.RedisIntegration(),
+    ]
+    extra = []
+
+    try:
+        from sentry_sdk.integrations import celery
+    except DidNotEnable:  # happens if the celery import fails by the integration
+        pass
+    else:
+        extra.append(celery.CeleryIntegration())
+
+    return [*default, *extra]
+
+
+def strip_protocol_from_origin(origin: str) -> str:
+    parsed = urlparse(origin)
+    return parsed.netloc
+
+
+def get_project_dirname() -> str:
+    return config("DJANGO_SETTINGS_MODULE", add_to_docs=False).split(".")[0]
+
+
+def get_django_project_dir() -> str:
+    # Get the path of the importing module
+    base_dirname = get_project_dirname()
+    return Path(sys.modules[base_dirname].__file__).parent

open_api_framework-0.7.0/open_api_framework/management/commands/generate_envvar_docs.py

@@ -0,0 +1,58 @@
+import warnings
+from collections import defaultdict
+
+from django.core.management.base import BaseCommand
+from django.template import loader
+
+from open_api_framework.conf.utils import EnvironmentVariable
+
+
+def convert_variables_to_rst(variables: list[EnvironmentVariable]) -> str:
+    template = loader.get_template("open_api_framework/env_config.rst")
+    grouped_vars = defaultdict(list)
+    for var in variables:
+        if not var.help_text:
+            warnings.warn(f"missing help_text for environment variable {var}")
+        grouped_vars[var.group].append(var)
+    return template.render({"vars": grouped_vars.items()})
+
+
+class Command(BaseCommand):
+    help = "Generate documentation for all used envvars"
+
+    def add_arguments(self, parser):
+        super().add_arguments(parser)
+
+        parser.add_argument(
+            "--file",
+            help="Name and path of the file to which the documentation will be written.",
+            nargs="?",
+            default="docs/env_config.rst",
+        )
+        parser.add_argument(
+            "--exclude-group",
+            help="Names of groups that should not be excluded in the generated docs.",
+            action="append",
+        )
+
+    def handle(self, *args, **options):
+        from open_api_framework.conf.utils import ENVVAR_REGISTRY
+
+        file_path = options["file"]
+        exclude_groups = options["exclude_group"] or []
+
+        def _sort(envvar):
+            match envvar.group:
+                case "Required":
+                    return 0
+                case "Optional":
+                    return 2
+                case _:
+                    return 1
+
+        sorted_registry = sorted(
+            [var for var in ENVVAR_REGISTRY if var.group not in exclude_groups],
+            key=_sort,
+        )
+        with open(file_path, "w") as f:
+            f.write(convert_variables_to_rst(sorted_registry))

open_api_framework-0.7.0/open_api_framework/templates/open_api_framework/env_config.rst

@@ -0,0 +1,50 @@
+{% load doc_tags %}.. _installation_env_config:
+
+===================================
+Environment configuration reference
+===================================
+
+{% block intro %}{% endblock %}
+
+Available environment variables
+===============================
+
+{% for group_name, vars in vars %}
+{{group_name}}
+{{group_name|repeat_char:"-"}}
+
+{% for var in vars %}* ``{{var.name}}``: {% if var.help_text %}{{var.help_text|safe|ensure_endswith:"."}}{% endif %}{% if var.auto_display_default and not var.default|is_undefined %} Defaults to: ``{{var.default|to_str}}``.{% endif %}
+{% endfor %}
+{% endfor %}
+
+{% block extra %}{% endblock %}
+
+Specifying the environment variables
+=====================================
+
+There are two strategies to specify the environment variables:
+
+* provide them in a ``.env`` file
+* start the component processes (with uwsgi/gunicorn/celery) in a process
+  manager that defines the environment variables
+
+Providing a .env file
+---------------------
+
+This is the most simple setup and easiest to debug. The ``.env`` file must be
+at the root of the project - i.e. on the same level as the ``src`` directory (
+NOT *in* the ``src`` directory).
+
+The syntax is key-value:
+
+.. code::
+
+   SOME_VAR=some_value
+   OTHER_VAR="quoted_value"
+
+
+Provide the envvars via the process manager
+-------------------------------------------
+
+If you use a process manager (such as supervisor/systemd), use their techniques
+to define the envvars. The component will pick them up out of the box.

open_api_framework-0.7.0/open_api_framework/templatetags/doc_tags.py

@@ -0,0 +1,35 @@
+from django import template
+
+from decouple import Undefined
+
+register = template.Library()
+
+
+@register.filter(name="repeat_char")
+def repeat_char(value, char="-"):
+    try:
+        length = len(value)
+        return char * length
+    except TypeError:
+        return ""
+
+
+@register.filter(name="is_undefined")
+def is_undefined(value):
+    return isinstance(value, Undefined)
+
+
+@register.filter(name="to_str")
+def to_str(value):
+    if value == "":
+        return "(empty string)"
+    return str(value)
+
+
+@register.filter(name="ensure_endswith")
+def ensure_endswith(value, char):
+    if not isinstance(value, str):
+        value = str(value)
+    if not value.endswith(char):
+        value += char
+    return value

{open_api_framework-0.6.0 → open_api_framework-0.7.0/open_api_framework.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: open_api_framework
-Version: 0.6.0
+Version: 0.7.0
 Summary: A metapackage for registration components, that bundles the dependencies shared between these components and provides generic settings
 Author-email: Maykin Media <support@maykinmedia.nl>
 License: Copyright © Maykin 2024
@@ -30,33 +30,33 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: django>=4.2.11
-Requires-Dist: django-axes>=6.3.0
-Requires-Dist: django-cors-headers>=4.3.1
+Requires-Dist: django<5.0.0,>=4.2.14
+Requires-Dist: django-axes>=6.5.1
+Requires-Dist: django-cors-headers>=4.4.0
 Requires-Dist: django-markup>=1.8.1
-Requires-Dist: django-jsonform>=2.21.4
+Requires-Dist: django-jsonform>=2.22.0
 Requires-Dist: django-log-outgoing-requests>=0.6.1
 Requires-Dist: django-admin-index>=3.1.0
 Requires-Dist: django-redis>=5.4.0
-Requires-Dist: djangorestframework>=3.12.4
+Requires-Dist: djangorestframework>=3.15.2
 Requires-Dist: djangorestframework-gis>=1.0
-Requires-Dist: django-filter>=23.2
-Requires-Dist: drf-spectacular>=0.27.0
+Requires-Dist: django-filter>=24.2
+Requires-Dist: drf-spectacular>=0.27.2
 Requires-Dist: djangorestframework-inclusions>=1.2.0
 Requires-Dist: commonground-api-common>=1.12.1
-Requires-Dist: mozilla-django-oidc-db>=0.14.1
+Requires-Dist: mozilla-django-oidc-db>=0.19.0
 Requires-Dist: zgw-consumers>=0.27.0
 Requires-Dist: psycopg2>=2.9.9
 Requires-Dist: bleach>=6.1.0
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: python-decouple>=3.8
-Requires-Dist: requests>=2.31.0
+Requires-Dist: requests>=2.32.3
 Requires-Dist: uwsgi>=2.0.23
-Requires-Dist: sentry-sdk>=1.39.2
-Requires-Dist: elastic-apm>=6.20.0
-Requires-Dist: celery>=5.2.7
+Requires-Dist: sentry-sdk>=2.11.0
+Requires-Dist: elastic-apm>=6.22.0
+Requires-Dist: celery>=5.4.0
 Requires-Dist: flower>=2.0.1
-Requires-Dist: maykin-2fa>=1.0.0
+Requires-Dist: maykin-2fa>=1.0.1
 Requires-Dist: django-setup-configuration>=0.1.0
 Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
@@ -77,7 +77,7 @@ Requires-Dist: twine; extra == "release"
 Open API Framework
 ==================
 
-:Version: 0.6.0
+:Version: 0.7.0
 :Source: https://github.com/maykinmedia/open-api-framework
 :Keywords: metapackage, dependencies
 

{open_api_framework-0.6.0 → open_api_framework-0.7.0}/open_api_framework.egg-info/SOURCES.txt

@@ -16,10 +16,16 @@ open_api_framework.egg-info/top_level.txt
 open_api_framework/conf/__init__.py
 open_api_framework/conf/base.py
 open_api_framework/conf/utils.py
+open_api_framework/management/__init__.py
+open_api_framework/management/commands/__init__.py
+open_api_framework/management/commands/generate_envvar_docs.py
 open_api_framework/static/open_api_framework/css/admin.css
+open_api_framework/templates/open_api_framework/env_config.rst
 open_api_framework/templates/open_api_framework/admin/base_site.html
 open_api_framework/templates/open_api_framework/components/environment.html
 open_api_framework/templates/open_api_framework/components/version.html
 open_api_framework/templatetags/__init__.py
+open_api_framework/templatetags/doc_tags.py
 open_api_framework/templatetags/open_api_framework.py
-tests/test_config_helpers.py
+tests/test_config_helpers.py
+tests/test_generate_envvar_docs.py

{open_api_framework-0.6.0 → open_api_framework-0.7.0}/open_api_framework.egg-info/requires.txt

@@ -1,30 +1,30 @@
-django>=4.2.11
-django-axes>=6.3.0
-django-cors-headers>=4.3.1
+django<5.0.0,>=4.2.14
+django-axes>=6.5.1
+django-cors-headers>=4.4.0
 django-markup>=1.8.1
-django-jsonform>=2.21.4
+django-jsonform>=2.22.0
 django-log-outgoing-requests>=0.6.1
 django-admin-index>=3.1.0
 django-redis>=5.4.0
-djangorestframework>=3.12.4
+djangorestframework>=3.15.2
 djangorestframework-gis>=1.0
-django-filter>=23.2
-drf-spectacular>=0.27.0
+django-filter>=24.2
+drf-spectacular>=0.27.2
 djangorestframework-inclusions>=1.2.0
 commonground-api-common>=1.12.1
-mozilla-django-oidc-db>=0.14.1
+mozilla-django-oidc-db>=0.19.0
 zgw-consumers>=0.27.0
 psycopg2>=2.9.9
 bleach>=6.1.0
 python-dotenv>=1.0.0
 python-decouple>=3.8
-requests>=2.31.0
+requests>=2.32.3
 uwsgi>=2.0.23
-sentry-sdk>=1.39.2
-elastic-apm>=6.20.0
-celery>=5.2.7
+sentry-sdk>=2.11.0
+elastic-apm>=6.22.0
+celery>=5.4.0
 flower>=2.0.1
-maykin-2fa>=1.0.0
+maykin-2fa>=1.0.1
 django-setup-configuration>=0.1.0
 
 [coverage]

{open_api_framework-0.6.0 → open_api_framework-0.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "open_api_framework"
-version = "0.6.0"
+version = "0.7.0"
 description = "A metapackage for registration components, that bundles the dependencies shared between these components and provides generic settings"
 authors = [
     {name = "Maykin Media", email = "support@maykinmedia.nl"}
@@ -27,33 +27,33 @@ classifiers = [
 ]
 requires-python = ">=3.9"
 dependencies = [
-    "django>=4.2.11",
-    "django-axes>=6.3.0",
-    "django-cors-headers>=4.3.1",
+    "django>=4.2.14,<5.0.0",
+    "django-axes>=6.5.1",
+    "django-cors-headers>=4.4.0",
     "django-markup>=1.8.1",
-    "django-jsonform>=2.21.4",
+    "django-jsonform>=2.22.0",
     "django-log-outgoing-requests>=0.6.1",
     "django-admin-index>=3.1.0",
     "django-redis>=5.4.0",
-    "djangorestframework>=3.12.4",
+    "djangorestframework>=3.15.2",
     "djangorestframework-gis>=1.0",
-    "django-filter>=23.2",
-    "drf-spectacular>=0.27.0",
+    "django-filter>=24.2",
+    "drf-spectacular>=0.27.2",
     "djangorestframework-inclusions>=1.2.0",
     "commonground-api-common>=1.12.1",
-    "mozilla-django-oidc-db>=0.14.1",
+    "mozilla-django-oidc-db>=0.19.0",
     "zgw-consumers>=0.27.0",
     "psycopg2>=2.9.9",
     "bleach>=6.1.0",
     "python-dotenv>=1.0.0",
     "python-decouple>=3.8",
-    "requests>=2.31.0",
+    "requests>=2.32.3",
     "uwsgi>=2.0.23",
-    "sentry-sdk>=1.39.2",
-    "elastic-apm>=6.20.0",
-    "celery>=5.2.7",
+    "sentry-sdk>=2.11.0",
+    "elastic-apm>=6.22.0",
+    "celery>=5.4.0",
     "flower>=2.0.1",
-    "maykin-2fa>=1.0.0",
+    "maykin-2fa>=1.0.1",
     "django-setup-configuration>=0.1.0",
 ]
 
@@ -100,7 +100,7 @@ testpaths = ["tests"]
 DJANGO_SETTINGS_MODULE = "testapp.settings"
 
 [tool.bumpversion]
-current_version = "0.6.0"
+current_version = "0.7.0"
 files = [
     {filename = "pyproject.toml"},
     {filename = "README.rst"},

{open_api_framework-0.6.0 → open_api_framework-0.7.0}/tests/test_config_helpers.py

@@ -2,12 +2,12 @@ from open_api_framework.conf.utils import config
 
 
 def test_empty_list_as_default():
-    value = config("SOME_TEST_ENVVAR", split=True, default=[])
+    value = config("SOME_TEST_ENVVAR", split=True, default=[], add_to_docs=False)
 
     assert value == []
 
 
 def test_non_empty_list_as_default():
-    value = config("SOME_TEST_ENVVAR", split=True, default=["foo"])
+    value = config("SOME_TEST_ENVVAR", split=True, default=["foo"], add_to_docs=False)
 
     assert value == ["foo"]

open_api_framework-0.7.0/tests/test_generate_envvar_docs.py

@@ -0,0 +1,85 @@
+from unittest.mock import mock_open, patch
+
+from django.core.management import call_command
+
+EXPECTED_OUTPUT = """\
+.. _installation_env_config:
+
+===================================
+Environment configuration reference
+===================================
+
+
+
+Available environment variables
+===============================
+
+
+Required
+--------
+
+* ``SECRET_KEY``: Secret key that's used for certain cryptographic utilities. Defaults to: \
+``so-secret-i-cant-believe-you-are-looking-at-this``.
+
+
+Optional
+--------
+
+* ``DEBUG``: Only set this to ``True`` on a local development environment. Various other \
+security settings are derived from this setting!. Defaults to: ``False``.
+* ``IS_HTTPS``: Used to construct absolute URLs and controls a variety of security settings. \
+Defaults to the inverse of ``DEBUG``.
+
+
+
+
+
+Specifying the environment variables
+=====================================
+
+There are two strategies to specify the environment variables:
+
+* provide them in a ``.env`` file
+* start the component processes (with uwsgi/gunicorn/celery) in a process
+  manager that defines the environment variables
+
+Providing a .env file
+---------------------
+
+This is the most simple setup and easiest to debug. The ``.env`` file must be
+at the root of the project - i.e. on the same level as the ``src`` directory (
+NOT *in* the ``src`` directory).
+
+The syntax is key-value:
+
+.. code::
+
+   SOME_VAR=some_value
+   OTHER_VAR="quoted_value"
+
+
+Provide the envvars via the process manager
+-------------------------------------------
+
+If you use a process manager (such as supervisor/systemd), use their techniques
+to define the envvars. The component will pick them up out of the box.
+"""
+
+
+def test_generate_envvar_docs():
+    mock_file = mock_open()
+    with patch(
+        "open_api_framework.management.commands.generate_envvar_docs.open", mock_file
+    ):
+        call_command(
+            "generate_envvar_docs", file="some/file/path.txt", exclude_group="Excluded"
+        )
+
+        mock_file.assert_called_once_with("some/file/path.txt", "w")
+
+        handle = mock_file()
+
+        # Check the entire content written to the mock file
+        written_content = "".join(call.args[0] for call in handle.write.call_args_list)
+
+        assert written_content == EXPECTED_OUTPUT

open_api_framework-0.6.0/open_api_framework/conf/utils.py

@@ -1,63 +0,0 @@
-import sys
-from pathlib import Path
-from typing import Any
-from urllib.parse import urlparse
-
-from decouple import Csv, config as _config, undefined
-from sentry_sdk.integrations import DidNotEnable, django, redis
-
-
-def config(option: str, default: Any = undefined, *args, **kwargs):
-    """
-    Pull a config parameter from the environment.
-
-    Read the config variable ``option``. If it's optional, use the ``default`` value.
-    Input is automatically cast to the correct type, where the type is derived from the
-    default value if possible.
-
-    Pass ``split=True`` to split the comma-separated input into a list.
-    """
-    if "split" in kwargs:
-        kwargs.pop("split")
-        kwargs["cast"] = Csv()
-        if isinstance(default, list):
-            default = ",".join(default)
-
-    if default is not undefined and default is not None:
-        kwargs.setdefault("cast", type(default))
-    return _config(option, default=default, *args, **kwargs)
-
-
-def get_sentry_integrations() -> list:
-    """
-    Determine which Sentry SDK integrations to enable.
-    """
-    default = [
-        django.DjangoIntegration(),
-        redis.RedisIntegration(),
-    ]
-    extra = []
-
-    try:
-        from sentry_sdk.integrations import celery
-    except DidNotEnable:  # happens if the celery import fails by the integration
-        pass
-    else:
-        extra.append(celery.CeleryIntegration())
-
-    return [*default, *extra]
-
-
-def strip_protocol_from_origin(origin: str) -> str:
-    parsed = urlparse(origin)
-    return parsed.netloc
-
-
-def get_project_dirname() -> str:
-    return config("DJANGO_SETTINGS_MODULE").split(".")[0]
-
-
-def get_django_project_dir() -> str:
-    # Get the path of the importing module
-    base_dirname = get_project_dirname()
-    return Path(sys.modules[base_dirname].__file__).parent