Skip to content

Commit 204b402

Browse files
committed
Remove insecure default Django secret
1 parent ff60df7 commit 204b402

16 files changed

Lines changed: 18 additions & 19 deletions

File tree

CHANGES/+django_secret.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Stopped shipping an insecure default as DJANGO_SECRET.

pulp_file/tests/functional/api/test_domains.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
import uuid
33

44
import pytest
5+
from django.conf import settings
56

6-
from pulpcore.app import settings
77
from pulpcore.tests.functional.utils import download_file, generate_iso
88

99
pytestmark = pytest.mark.skipif(not settings.DOMAIN_ENABLED, reason="Domains not enabled.")

pulp_file/tests/functional/api/test_pulp_export.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import uuid
22

33
import pytest
4+
from django.conf import settings
45

5-
from pulpcore.app import settings
66
from pulpcore.client.pulpcore.exceptions import ApiException
77
from pulpcore.constants import TASK_STATES
88

pulpcore/app/access_policy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from copy import deepcopy
22

3+
from django.conf import settings
34
from rest_access_policy import AccessPolicy
45
from rest_framework.exceptions import APIException
56

6-
from pulpcore.app import settings
77
from pulpcore.app.models import AccessPolicy as AccessPolicyModel
88
from pulpcore.app.util import get_view_urlpattern, get_viewset_for_model
99

pulpcore/app/authentication.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from gettext import gettext as _
66

77
import jq
8+
from django.conf import settings
89
from django.contrib.auth import authenticate
910
from django.contrib.auth.backends import RemoteUserBackend
1011
from rest_framework.authentication import (
@@ -16,8 +17,6 @@
1617
)
1718
from rest_framework.exceptions import AuthenticationFailed
1819

19-
from pulpcore.app import settings
20-
2120
_logger = logging.getLogger(__name__)
2221

2322

pulpcore/app/redis_connection.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1+
from django.conf import settings
12
from redis import Redis
23
from redis.asyncio import Redis as aRedis
34

4-
from pulpcore.app.settings import settings
5-
65
_conn = None
76
_a_conn = None
87

pulpcore/app/serializers/exporter.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
import re
33
from gettext import gettext as _
44

5+
from django.conf import settings
56
from rest_framework import serializers
67
from rest_framework.validators import UniqueValidator
78

8-
from pulpcore.app import models, settings
9+
from pulpcore.app import models
910
from pulpcore.app.serializers import (
1011
DetailIdentityField,
1112
DetailRelatedField,

pulpcore/app/serializers/importer.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import os
22
from gettext import gettext as _
33

4+
from django.conf import settings
45
from django.core.exceptions import ObjectDoesNotExist
56
from rest_framework import serializers
67
from rest_framework.validators import UniqueValidator
78

8-
from pulpcore.app import models, settings
9+
from pulpcore.app import models
910
from pulpcore.app.serializers import (
1011
DetailIdentityField,
1112
ImportIdentityField,

pulpcore/app/serializers/repository.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
from urllib.parse import urlparse
44

55
from cryptography.x509 import load_pem_x509_certificate
6+
from django.conf import settings
67
from rest_framework import fields, serializers
78
from rest_framework_nested.serializers import NestedHyperlinkedModelSerializer
89

9-
from pulpcore.app import models, settings
10+
from pulpcore.app import models
1011
from pulpcore.app.serializers import (
1112
DetailIdentityField,
1213
DetailRelatedField,

pulpcore/app/settings.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@
8888
# List of upload handler classes to be applied in order.
8989
FILE_UPLOAD_HANDLERS = ("pulpcore.app.files.HashingFileUploadHandler",)
9090

91-
# SECURITY WARNING: this should be set to a unique, unpredictable value
92-
SECRET_KEY = "SECRET"
93-
9491
# Key used to encrypt fields in the database
9592
DB_ENCRYPTION_KEY = "/etc/pulp/certs/database_fields.symmetric.key"
9693

0 commit comments

Comments
 (0)