Update CI files for branch 3.63

.ci/ansible/settings.py.j2

@@ -1,3 +1,4 @@
+SECRET_KEY = "{{ django_secret }}"
 CONTENT_ORIGIN = "{{ pulp_scheme }}://pulp:{{ 443 if pulp_scheme == 'https' else 80 }}"
 ANSIBLE_API_HOSTNAME = "{{ pulp_scheme }}://pulp:{{ 443 if pulp_scheme == 'https' else 80 }}"
 ANSIBLE_CONTENT_HOSTNAME = "{{ pulp_scheme }}://pulp:{{ 443 if pulp_scheme == 'https' else 80 }}/pulp/content"

.ci/ansible/start_container.yaml

@@ -18,6 +18,8 @@
       ansible.builtin.template:
         src: "settings.py.j2"
         dest: "settings/settings.py"
+      vars:
+        django_secret: "lookup('community.general.random_string', length=50, overwrite_all='abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)')"
 
     - name: "Setup docker networking"
       community.docker.docker_network:

CHANGES/+django_secret.bugfix

@@ -0,0 +1 @@
+Stopped shipping an insecure default as DJANGO_SECRET.

pulp_file/tests/functional/api/test_domains.py

@@ -2,8 +2,8 @@
 import uuid
 
 import pytest
+from django.conf import settings
 
-from pulpcore.app import settings
 from pulpcore.client.pulp_file import ApiException
 from pulpcore.client.pulpcore import ApiException as CoreApiException
 from pulpcore.client.pulpcore import Repair

pulp_file/tests/functional/api/test_pulp_export.py

@@ -1,8 +1,8 @@
 import uuid
 
 import pytest
+from django.conf import settings
 
-from pulpcore.app import settings
 from pulpcore.client.pulpcore.exceptions import ApiException
 from pulpcore.constants import TASK_STATES
 

pulpcore/app/authentication.py

@@ -5,13 +5,12 @@
 from gettext import gettext as _
 
 import jq
+from django.conf import settings
 from django.contrib.auth import authenticate
 from django.contrib.auth.backends import RemoteUserBackend
 from rest_framework.authentication import BaseAuthentication, RemoteUserAuthentication
 from rest_framework.exceptions import AuthenticationFailed
 
-from pulpcore.app import settings
-
 _logger = logging.getLogger(__name__)
 
 

pulpcore/app/redis_connection.py

@@ -1,8 +1,7 @@
+from django.conf import settings
 from redis import Redis
 from redis.asyncio import Redis as aRedis
 
-from pulpcore.app.settings import settings
-
 _conn = None
 _a_conn = None
 

pulpcore/app/serializers/exporter.py

@@ -2,10 +2,11 @@
 import re
 from gettext import gettext as _
 
+from django.conf import settings
 from rest_framework import serializers
 from rest_framework.validators import UniqueValidator
 
-from pulpcore.app import models, settings
+from pulpcore.app import models
 from pulpcore.app.serializers import (
     DetailIdentityField,
     DetailRelatedField,

pulpcore/app/serializers/importer.py

@@ -1,11 +1,12 @@
 import os
 from gettext import gettext as _
 
+from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from rest_framework import serializers
 from rest_framework.validators import UniqueValidator
 
-from pulpcore.app import models, settings
+from pulpcore.app import models
 from pulpcore.app.serializers import (
     DetailIdentityField,
     ImportIdentityField,

pulpcore/app/serializers/repository.py

@@ -3,10 +3,11 @@
 from urllib.parse import urlparse
 
 from cryptography.x509 import load_pem_x509_certificate
+from django.conf import settings
 from rest_framework import fields, serializers
 from rest_framework_nested.serializers import NestedHyperlinkedModelSerializer
 
-from pulpcore.app import models, settings
+from pulpcore.app import models
 from pulpcore.app.serializers import (
     DetailIdentityField,
     DetailRelatedField,

pulpcore/app/settings.py

@@ -82,9 +82,6 @@
 # List of upload handler classes to be applied in order.
 FILE_UPLOAD_HANDLERS = ("pulpcore.app.files.HashingFileUploadHandler",)
 
-# SECURITY WARNING: this should be set to a unique, unpredictable value
-SECRET_KEY = "SECRET"
-
 # Key used to encrypt fields in the database
 DB_ENCRYPTION_KEY = "/etc/pulp/certs/database_fields.symmetric.key"
 

pulpcore/app/views/importer.py

@@ -2,11 +2,11 @@
 import os
 from gettext import gettext as _
 
+from django.conf import settings
 from drf_spectacular.utils import extend_schema
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from pulpcore.app import settings
 from pulpcore.app.serializers import PulpImportCheckResponseSerializer, PulpImportCheckSerializer
 
 

pulpcore/cache/cache.py

@@ -5,6 +5,7 @@
 
 from aiohttp.web import FileResponse, HTTPSuccessful, Request, Response
 from aiohttp.web_exceptions import HTTPFound
+from django.conf import settings
 from django.http import FileResponse as ApiFileResponse
 from django.http import HttpResponse, HttpResponseRedirect
 from redis import ConnectionError
@@ -16,7 +17,6 @@
     get_async_redis_connection,
     get_redis_connection,
 )
-from pulpcore.app.settings import settings
 from pulpcore.responses import ArtifactResponse
 
 DEFAULT_EXPIRES_TTL = settings.CACHE_SETTINGS["EXPIRES_TTL"]

pulpcore/tasking/kafka.py

@@ -6,7 +6,7 @@
 
 from django.conf import settings
 
-_bootstrap_servers = settings.get("KAFKA_BOOTSTRAP_SERVERS")
+_bootstrap_servers = getattr(settings, "KAFKA_BOOTSTRAP_SERVERS")
 
 
 if _bootstrap_servers is None:

pulpcore/tests/functional/api/test_auth.py

@@ -8,8 +8,8 @@
 from base64 import b64encode
 
 import pytest
+from django.conf import settings
 
-from pulpcore.app import settings
 from pulpcore.client.pulpcore import ApiException
 
 

pulpcore/tests/functional/api/using_plugin/test_filesystemexport.py

@@ -8,8 +8,8 @@
 import uuid
 
 import pytest
+from django.conf import settings
 
-from pulpcore.app import settings
 from pulpcore.client.pulp_file import RepositorySyncURL
 from pulpcore.client.pulpcore.exceptions import ApiException
 

pulpcore/tests/functional/api/using_plugin/test_pulpimport.py

@@ -11,8 +11,8 @@
 from pathlib import Path
 
 import pytest
+from django.conf import settings
 
-from pulpcore.app import settings
 from pulpcore.client.pulp_file import RepositorySyncURL
 from pulpcore.client.pulpcore.exceptions import ApiException
 

pyproject.toml

@@ -162,7 +162,6 @@ replace = "version = \"{new_version}\""
 [[tool.bumpversion.files]]
 filename = "./setup.py"
 
-
 [tool.ruff]
 # This section is managed by the plugin template. Do not edit manually.
 line-length = 100
@@ -184,6 +183,7 @@ extend-select = [
 [tool.ruff.lint.flake8-tidy-imports.banned-api]
 # This section is managed by the plugin template. Do not edit manually.
 "distutils".msg = "The 'distutils' module has been deprecated since Python 3.9."
+"pulpcore.app.settings".msg = "Always import 'settings' from 'django.conf' instead."
 
 [tool.ruff.lint.isort]
 # This section is managed by the plugin template. Do not edit manually.