Settings: black - sentry:filter disallowed host

1 files changed, 156 insertions, 156 deletions

diff --git a/example_project/settings.py b/example_project/settings.py
index 7b9b8ee63..94ab13a92 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -21,7 +21,7 @@ DJANGO_EXTENSIONS = False
 TEST_VIEWS = True
 
 if "test" in sys.argv:
-    sys.path.insert(0, '..')
+    sys.path.insert(0, "..")
 
 IMAGE_MAX_SIZE = (1280, 960)  # put None if no resizing
 THUMB_MAX_SIZE = (600, 600)
@@ -31,32 +31,29 @@ DISABLE_TASK_TIMEOUT = True
 CACHE_TASK_TIMEOUT = 4
 CACHE_SMALLTIMEOUT = 60
 CACHE_TIMEOUT = 3600
-CACHE_BACKEND = 'memcached://127.0.0.1:11211/'
+CACHE_BACKEND = "memcached://127.0.0.1:11211/"
 
 SEP = os.path.sep
-ROOT_PATH = SEP.join(
-    os.path.abspath(__file__).split(SEP)[:-1]) + SEP
-STATIC_URL = '/static/'
-STATIC_ROOT = ROOT_PATH + 'static/'
+ROOT_PATH = SEP.join(os.path.abspath(__file__).split(SEP)[:-1]) + SEP
+STATIC_URL = "/static/"
+STATIC_ROOT = ROOT_PATH + "static/"
 BASE_URL = "/"
 URL_PATH = ""
-EXTRA_VERSION = 'git'
+EXTRA_VERSION = "git"
 
 LOCALE_PATHS = [os.path.abspath(os.path.join(ROOT_PATH, "..", "locale"))]
 
 STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-    'compressor.finders.CompressorFinder',
+    "django.contrib.staticfiles.finders.FileSystemFinder",
+    "django.contrib.staticfiles.finders.AppDirectoriesFinder",
+    "compressor.finders.CompressorFinder",
 )
 
 BS_STATIC = ROOT_PATH + "../bootstrap_datepicker/static"
 if not os.path.exists(BS_STATIC):
     BS_STATIC = "/usr/lib/python3/dist-packages/bootstrap_datepicker/static"
 
-STATICFILES_DIRS = (
-    BS_STATIC,
-)
+STATICFILES_DIRS = (BS_STATIC,)
 
 ODT_TEMPLATE = ROOT_PATH + "../ishtar_common/static/template.odt"
 
@@ -66,13 +63,13 @@ ACCOUNT_ACTIVATION_DAYS = 7
 
 # change this in local_settings
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.contrib.gis.db.backends.postgis',
-        'NAME': 'ishtar',
-        'USER': 'ishtar',
-        'PASSWORD': 'ishtar',
-        'HOST': '127.0.0.1',
-        'PORT': '5432',
+    "default": {
+        "ENGINE": "django.contrib.gis.db.backends.postgis",
+        "NAME": "ishtar",
+        "USER": "ishtar",
+        "PASSWORD": "ishtar",
+        "HOST": "127.0.0.1",
+        "PORT": "5432",
     }
 }
 
@@ -83,11 +80,11 @@ DATABASES = {
 # timezone as the operating system.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
-TIME_ZONE = 'Europe/Paris'
+TIME_ZONE = "Europe/Paris"
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'fr-fr'
+LANGUAGE_CODE = "fr-fr"
 
 COUNTRY = "fr"
 
@@ -105,80 +102,78 @@ USE_I18N = True
 # calendars according to the current locale
 USE_L10N = True
 LANGUAGES = (
-    ('fr', 'Français'),
-    ('en', 'English'),
+    ("fr", "Français"),
+    ("en", "English"),
 )
 DEFAULT_LANGUAGE = 1
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = ROOT_PATH + 'media/'
+MEDIA_ROOT = ROOT_PATH + "media/"
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = '/media/'
+MEDIA_URL = "/media/"
 
 MIDDLEWARE = [
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
+    "django.middleware.common.CommonMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.locale.LocaleMiddleware",
 ]
 
 TEMPLATES = [
     {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [os.path.join(ROOT_PATH, 'templates')],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [os.path.join(ROOT_PATH, "templates")],
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
                 "django.template.context_processors.debug",
                 "django.template.context_processors.request",
-                'ishtar_common.context_processors.get_base_context',
+                "ishtar_common.context_processors.get_base_context",
                 "django.contrib.auth.context_processors.auth",
-                'django.contrib.messages.context_processors.messages',
+                "django.contrib.messages.context_processors.messages",
                 "django.template.context_processors.i18n",
                 "django.template.context_processors.media",
                 "django.template.context_processors.static",
-                "django.template.context_processors.csrf"
+                "django.template.context_processors.csrf",
             ],
         },
     },
 ]
 
 
-ROOT_URLCONF = 'example_project.urls'
+ROOT_URLCONF = "example_project.urls"
 
-AUTHENTICATION_BACKENDS = (
-    'ishtar_common.backend.ObjectPermBackend',
-)
+AUTHENTICATION_BACKENDS = ("ishtar_common.backend.ObjectPermBackend",)
 
 INSTALLED_APPS = [
-    'registration',
-    'ishtar_common',
-    'archaeological_files_pdl',
-    'archaeological_files',
-    'archaeological_operations',
-    'archaeological_context_records',
-    'archaeological_warehouse',
-    'archaeological_finds',
-    'ajax_select',
-    'compressor',
-    'rest_framework',
-    'rest_framework.authtoken',
-    'django.contrib.auth',
-    'django.contrib.admin',
-    'django.contrib.contenttypes',
-    'django.contrib.postgres',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.gis',
-    'django.contrib.staticfiles',
-    'django.contrib.messages',
-    'django.contrib.humanize',
+    "registration",
+    "ishtar_common",
+    "archaeological_files_pdl",
+    "archaeological_files",
+    "archaeological_operations",
+    "archaeological_context_records",
+    "archaeological_warehouse",
+    "archaeological_finds",
+    "ajax_select",
+    "compressor",
+    "rest_framework",
+    "rest_framework.authtoken",
+    "django.contrib.auth",
+    "django.contrib.admin",
+    "django.contrib.contenttypes",
+    "django.contrib.postgres",
+    "django.contrib.sessions",
+    "django.contrib.sites",
+    "django.contrib.gis",
+    "django.contrib.staticfiles",
+    "django.contrib.messages",
+    "django.contrib.humanize",
     # 'debug_toolbar',
 ]
 
@@ -187,64 +182,60 @@ TRANSLATION_OVERLOAD_DEBUG = False
 
 MAIN_APP = ""
 
-LOGFILE = ''
+LOGFILE = ""
 
-default_handler = {
-    'handlers': ['logfile'],
-    'level': 'INFO',
-    'propogate': False
-}
+default_handler = {"handlers": ["logfile"], "level": "INFO", "propogate": False}
 
 LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'handlers': {
+    "version": 1,
+    "disable_existing_loggers": False,
+    "handlers": {
         # Include the default Django email handler for errors
         # This is what you'd get without configuring logging at all.
-        'mail_admins': {
-            'class': 'django.utils.log.AdminEmailHandler',
-            'level': 'ERROR',
+        "mail_admins": {
+            "class": "django.utils.log.AdminEmailHandler",
+            "level": "ERROR",
             # But the emails are plain text by default - HTML is nicer
-            'include_html': True,
+            "include_html": True,
         },
         # Log to a text file that can be rotated by logrotate
-        'logfile': {
-            'class': 'logging.handlers.WatchedFileHandler',
-            'filename': '/var/log/django/ishtar.log'
+        "logfile": {
+            "class": "logging.handlers.WatchedFileHandler",
+            "filename": "/var/log/django/ishtar.log",
         },
-        'console': {
-            'level': 'DEBUG',
-            'class': 'logging.StreamHandler',
+        "console": {
+            "level": "DEBUG",
+            "class": "logging.StreamHandler",
         },
     },
-    'loggers': {
-        'django.request': {
-            'handlers': ['mail_admins', 'logfile'],
-            'level': 'ERROR',
-            'propagate': True,
+    "loggers": {
+        "django.request": {
+            "handlers": ["mail_admins", "logfile"],
+            "level": "ERROR",
+            "propagate": True,
         },
-        'django': {
-            'handlers': ['logfile'],
-            'level': 'ERROR',
-            'propagate': False,
+        "django": {
+            "handlers": ["logfile"],
+            "level": "ERROR",
+            "propagate": False,
         },
-        'django.server': {
-            'handlers': ['console'],
-            'level': 'INFO',
-            'propagate': False,
+        "django.server": {
+            "handlers": ["console"],
+            "level": "INFO",
+            "propagate": False,
         },
-        'django.security.DisallowedHost': {
-            'handlers': ['logfile'],
-            'propagate': False,
+        "django.security.DisallowedHost": {
+            "handlers": ["logfile"],
+            "propagate": False,
         },
-        'ishtar_pdl': default_handler,
-        'ishtar_common': default_handler,
-        'archaeological_files_pdl': default_handler,
-        'archaeological_files': default_handler,
-        'archaeological_operations': default_handler,
-        'archaeological_context_records': default_handler,
-        'archaeological_warehouse': default_handler,
-        'archaeological_finds': default_handler,
+        "ishtar_pdl": default_handler,
+        "ishtar_common": default_handler,
+        "archaeological_files_pdl": default_handler,
+        "archaeological_files": default_handler,
+        "archaeological_operations": default_handler,
+        "archaeological_context_records": default_handler,
+        "archaeological_warehouse": default_handler,
+        "archaeological_finds": default_handler,
     },
 }
 
@@ -266,11 +257,11 @@ ISHTAR_SLUGS = {
 
 SRID = 4326  # WGS84 - World
 SURFACE_SRID = 4326  # WGS84 - World
-ENCODING = 'windows-1252'
-ALT_ENCODING = 'ISO-8859-15'
+ENCODING = "windows-1252"
+ALT_ENCODING = "ISO-8859-15"
 APP_NAME = "SRA - Pays de la Loire"
-SURFACE_UNIT = 'square-metre'
-SURFACE_UNIT_LABEL = 'm²'
+SURFACE_UNIT = "square-metre"
+SURFACE_UNIT_LABEL = "m²"
 JOINT = " | "
 # dir for ishtar maintenance script - as it can be a serious security issue if
 # not managed cautiously the dir contening these scripts is not set by default
@@ -302,8 +293,8 @@ MAX_UPLOAD_SIZE = 100  # in Mo
 # path to the "dot" program to generate graph
 DOT_BINARY = "/usr/bin/dot"
 
-TEST_RUNNER = 'ishtar_common.tests.ManagedModelTestRunner'
-CELERY_BROKER_URL = ''
+TEST_RUNNER = "ishtar_common.tests.ManagedModelTestRunner"
+CELERY_BROKER_URL = ""
 SENTRY_ID = None
 
 try:
@@ -317,10 +308,10 @@ except ImportError as e:
     try:
         from .local_settings import *
     except ImportError as e:
-        print('Unable to load local_settings.py:', e)
+        print("Unable to load local_settings.py:", e)
 
 if USE_TRANSLATION_OVERLOAD:
-    INSTALLED_APPS.insert(0, 'overload_translation')
+    INSTALLED_APPS.insert(0, "overload_translation")
 
 if "SECRET_KEY" not in globals():  # explicit import from the root for celery
     current_path = os.path.abspath(__file__)
@@ -330,7 +321,7 @@ if "SECRET_KEY" not in globals():  # explicit import from the root for celery
     try:
         to_import = my_module.__all__
     except AttributeError:
-        to_import = [name for name in module_dict if not name.startswith('_')]
+        to_import = [name for name in module_dict if not name.startswith("_")]
     globals().update({name: module_dict[name] for name in to_import})
 
 if LANGUAGE_CODE == "fr-fr" and SRID == 4326:
@@ -342,78 +333,86 @@ COL_LABELS = {}
 
 if MAIN_APP:
     INSTALLED_APPS.insert(INSTALLED_APPS.index("ishtar_common"), MAIN_APP)
-    extra_module = import_module(MAIN_APP + '.extra_settings')
-    if hasattr(extra_module, 'TABLE_COLS'):
+    extra_module = import_module(MAIN_APP + ".extra_settings")
+    if hasattr(extra_module, "TABLE_COLS"):
         TABLE_COLS = extra_module.TABLE_COLS
-    if hasattr(extra_module, 'COL_LABELS'):
+    if hasattr(extra_module, "COL_LABELS"):
         COL_LABELS = extra_module.COL_LABELS
 
-TESTING = sys.argv[1:2] == ['test']
+TESTING = sys.argv[1:2] == ["test"]
 
-PROJECT_SLUG = locals().get('PROJECT_SLUG', 'default')
+PROJECT_SLUG = locals().get("PROJECT_SLUG", "default")
 
 if LOGFILE:
-    LOGGING['handlers']['logfile']['filename'] = LOGFILE
+    LOGGING["handlers"]["logfile"]["filename"] = LOGFILE
 else:
-    LOGGING['handlers']['logfile']['filename'] = \
-        '/var/log/django/ishtar-' + PROJECT_SLUG + '.log'
+    LOGGING["handlers"]["logfile"]["filename"] = (
+        "/var/log/django/ishtar-" + PROJECT_SLUG + ".log"
+    )
 
-INTERNAL_IPS = ('127.0.0.1',)
+INTERNAL_IPS = ("127.0.0.1",)
 
 JQUERY_URL = STATIC_URL + "js/jquery.min.js"
 JQUERY_UI_URL = STATIC_URL + "js/jquery-ui/"
 
 if DEBUG:
     # make all loggers use the console
-    for logger in LOGGING['loggers']:
+    for logger in LOGGING["loggers"]:
         if DEBUG_TO_CONSOLE:
-            LOGGING['loggers'][logger]['handlers'] = ['console']
-        elif 'console' not in LOGGING['loggers'][logger]['handlers']:
-            LOGGING['loggers'][logger]['handlers'] += ['console']
+            LOGGING["loggers"][logger]["handlers"] = ["console"]
+        elif "console" not in LOGGING["loggers"][logger]["handlers"]:
+            LOGGING["loggers"][logger]["handlers"] += ["console"]
 
 if USE_BACKGROUND_TASK:
     if not CELERY_BROKER_URL:
-        CELERY_BROKER_URL = 'amqp://localhost'
+        CELERY_BROKER_URL = "amqp://localhost"
 
 if DJANGO_EXTENSIONS:
-    INSTALLED_APPS.append('django_extensions')
+    INSTALLED_APPS.append("django_extensions")
 
 if DEBUG_TOOLBAR:
-    if '..' not in sys.path:
-        sys.path.insert(0, '..')
+    if ".." not in sys.path:
+        sys.path.insert(0, "..")
     global DEBUG_TOOLBAR_PANELS
     global DEBUG_TOOLBAR_CONFIG
-    MIDDLEWARE += ['debug_toolbar.middleware.DebugToolbarMiddleware']
-    INSTALLED_APPS += ['debug_toolbar']
+    MIDDLEWARE += ["debug_toolbar.middleware.DebugToolbarMiddleware"]
+    INSTALLED_APPS += ["debug_toolbar"]
     DEBUG_TOOLBAR_PANELS = (
-        'debug_toolbar.panels.versions.VersionsPanel',
-        'debug_toolbar.panels.timer.TimerPanel',
-        'debug_toolbar.panels.settings.SettingsPanel',
-        'debug_toolbar.panels.headers.HeadersPanel',
-        'debug_toolbar.panels.request.RequestPanel',
-        'debug_toolbar.panels.sql.SQLPanel',
-        'debug_toolbar.panels.staticfiles.StaticFilesPanel',
-        'debug_toolbar.panels.templates.TemplatesPanel',
-        'debug_toolbar.panels.cache.CachePanel',
-        'debug_toolbar.panels.signals.SignalsPanel',
-        'debug_toolbar.panels.logging.LoggingPanel',
-        'debug_toolbar.panels.redirects.RedirectsPanel',
+        "debug_toolbar.panels.versions.VersionsPanel",
+        "debug_toolbar.panels.timer.TimerPanel",
+        "debug_toolbar.panels.settings.SettingsPanel",
+        "debug_toolbar.panels.headers.HeadersPanel",
+        "debug_toolbar.panels.request.RequestPanel",
+        "debug_toolbar.panels.sql.SQLPanel",
+        "debug_toolbar.panels.staticfiles.StaticFilesPanel",
+        "debug_toolbar.panels.templates.TemplatesPanel",
+        "debug_toolbar.panels.cache.CachePanel",
+        "debug_toolbar.panels.signals.SignalsPanel",
+        "debug_toolbar.panels.logging.LoggingPanel",
+        "debug_toolbar.panels.redirects.RedirectsPanel",
     )
-    DEBUG_TOOLBAR_CONFIG = {'INTERCEPT_REDIRECTS': False}
+    DEBUG_TOOLBAR_CONFIG = {"INTERCEPT_REDIRECTS": False}
 
 
 if SQL_DEBUG:
-    LOGGING['loggers']['django.db.backends'] = {
-        'level': 'DEBUG',
-        'handlers': ['console'],
+    LOGGING["loggers"]["django.db.backends"] = {
+        "level": "DEBUG",
+        "handlers": ["console"],
     }
 
-if 'test' in sys.argv:
+if "test" in sys.argv:
     PROJECT_SLUG += "-test"
 
 if not DEBUG:
     # persistent connection
-    DATABASES['default']['CONN_MAX_AGE'] = 600
+    DATABASES["default"]["CONN_MAX_AGE"] = 600
+
+
+def filter_irrelevant_errors(event, hint):
+    if event.get("logger", None) == "django.security.DisallowedHost":
+        return None
+    return event
+
 
 if SENTRY_ID and sentry_sdk:
     sentry_integrations = [DjangoIntegration()]
@@ -422,5 +421,6 @@ if SENTRY_ID and sentry_sdk:
     sentry_sdk.init(
         dsn=SENTRY_ID,
         integrations=sentry_integrations,
-        send_default_pii=True
+        before_send=filter_irrelevant_errors,
+        send_default_pii=True,
     )