quantum/django-csp-advanced
1
0
Fork 0
mirror of https://github.com/quantum5/django-csp-advanced.git synced 2025-04-24 19:31:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove dependency on six

Browse source
This commit is contained in:
Quantum 2022-10-30 18:10:02 -04:00
parent 6363ff8b6f
commit c5869c11ee
3 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
csp_advanced/csp.py
View file

@ -1,7 +1,5 @@
from itertools import chain from itertools import chain
from django.utils import six
class InvalidCSPError(ValueError): class InvalidCSPError(ValueError):
pass pass
@ -76,7 +74,7 @@ class CSPCompiler(object):
def compile(self): def compile(self):
pieces = [] pieces = []
for name, value in six.iteritems(self.csp): for name, value in self.csp.items():
if name in self.CSP_LISTS: if name in self.CSP_LISTS:
if value: if value:
pieces.append(self.compile_list(name, value)) pieces.append(self.compile_list(name, value))
@ -128,5 +126,5 @@ class CSPCompiler(object):
@staticmethod @staticmethod
def ensure_str(name, value): def ensure_str(name, value):
if not isinstance(value, six.string_types): if not isinstance(value, str):
raise InvalidCSPError('Values for %s must be a string type, not %s', (name, type(value))) raise InvalidCSPError('Values for %s must be a string type, not %s', (name, type(value)))

5
csp_advanced/middleware.py
View file

@ -1,7 +1,6 @@
import logging import logging
from django.conf import settings from django.conf import settings
from django.core.exceptions import MiddlewareNotUsed from django.core.exceptions import MiddlewareNotUsed
from django.utils import six
from csp_advanced.csp import CSPCompiler, InvalidCSPError from csp_advanced.csp import CSPCompiler, InvalidCSPError
from csp_advanced.utils import is_callable_csp_dict, call_csp_dict, merge_csp_dict from csp_advanced.utils import is_callable_csp_dict, call_csp_dict, merge_csp_dict
@ -13,11 +12,11 @@ class AdvancedCSPMiddleware(object):
def __init__(self, get_response=None): def __init__(self, get_response=None):
self.get_response = get_response self.get_response = get_response
self.enforced_csp = getattr(settings, 'ADVANCED_CSP', None) or {} self.enforced_csp = getattr(settings, 'ADVANCED_CSP', None) or {}
self.enforced_csp_is_str = isinstance(self.enforced_csp, six.string_types) self.enforced_csp_is_str = isinstance(self.enforced_csp, str)
self.enforced_csp_callable = is_callable_csp_dict(self.enforced_csp) self.enforced_csp_callable = is_callable_csp_dict(self.enforced_csp)
self.report_csp = getattr(settings, 'ADVANCED_CSP_REPORT_ONLY', None) or {} self.report_csp = getattr(settings, 'ADVANCED_CSP_REPORT_ONLY', None) or {}
self.report_csp_callable = is_callable_csp_dict(self.report_csp) self.report_csp_callable = is_callable_csp_dict(self.report_csp)
self.report_csp_is_str = isinstance(self.enforced_csp, six.string_types) self.report_csp_is_str = isinstance(self.enforced_csp, str)
self.report_only_csp = not self.enforced_csp self.report_only_csp = not self.enforced_csp
if not self.enforced_csp and not self.report_csp: if not self.enforced_csp and not self.report_csp:

9
csp_advanced/utils.py
View file

@ -1,12 +1,9 @@
from django.utils import six
def is_callable_csp_dict(data): def is_callable_csp_dict(data):
if callable(data): if callable(data):
return True return True
if not isinstance(data, dict): if not isinstance(data, dict):
return False return False
return any(callable(value) for value in six.itervalues(data)) return any(callable(value) for value in data.values())
def call_csp_dict(data, request, response): def call_csp_dict(data, request, response):
@ -14,7 +11,7 @@ def call_csp_dict(data, request, response):
return data(request, response) return data(request, response)
result = {} result = {}
for key, value in six.iteritems(data): for key, value in data.items():
if callable(value): if callable(value):
result[key] = value(request, response) result[key] = value(request, response)
else: else:
@ -24,7 +21,7 @@ def call_csp_dict(data, request, response):
def merge_csp_dict(template, override): def merge_csp_dict(template, override):
result = template.copy() result = template.copy()
for key, value in six.iteritems(override): for key, value in override.items():
if key not in result: if key not in result:
result[key] = value result[key] = value
continue continue