0001-settings-remove-old-MIDDLEWARE_CLASSES-support-45671.patch
| debian/debian_config_common.py | ||
|---|---|---|
| 275 | 275 |
if 'MIDDLEWARE' not in globals(): |
| 276 | 276 |
MIDDLEWARE = global_settings.MIDDLEWARE |
| 277 | 277 | |
| 278 |
if 'MIDDLEWARE_CLASSES' in globals(): |
|
| 279 |
MIDDLEWARE_CLASSES = ( |
|
| 280 |
'hobo.middleware.RobotsTxtMiddleware', |
|
| 281 |
'hobo.middleware.VersionMiddleware', # /__version__ |
|
| 282 |
'hobo.middleware.cors.CORSMiddleware', |
|
| 283 |
) + MIDDLEWARE_CLASSES |
|
| 284 | ||
| 285 |
if PROJECT_NAME != 'wcs' and 'authentic2' not in INSTALLED_APPS: |
|
| 286 |
MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + ( |
|
| 287 |
'mellon.middleware.PassiveAuthenticationMiddleware', |
|
| 288 |
'hobo.provisionning.middleware.ProvisionningMiddleware', |
|
| 289 |
) |
|
| 290 | ||
| 291 |
if 'authentic2' in INSTALLED_APPS: |
|
| 292 |
MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + ( |
|
| 293 |
'hobo.agent.authentic2.middleware.ProvisionningMiddleware', |
|
| 294 |
) |
|
| 295 |
else: |
|
| 296 |
MIDDLEWARE = ( |
|
| 297 |
'hobo.middleware.VersionMiddleware', # /__version__ |
|
| 298 |
'hobo.middleware.cors.CORSMiddleware', |
|
| 299 |
) + MIDDLEWARE |
|
| 278 |
MIDDLEWARE = ( |
|
| 279 |
'hobo.middleware.VersionMiddleware', # /__version__ |
|
| 280 |
'hobo.middleware.cors.CORSMiddleware', |
|
| 281 |
) + MIDDLEWARE |
|
| 300 | 282 | |
| 301 |
if PROJECT_NAME != 'wcs':
|
|
| 302 |
MIDDLEWARE = ('hobo.middleware.RobotsTxtMiddleware',) + MIDDLEWARE
|
|
| 283 |
if PROJECT_NAME != 'wcs': |
|
| 284 |
MIDDLEWARE = ('hobo.middleware.RobotsTxtMiddleware',) + MIDDLEWARE
|
|
| 303 | 285 | |
| 304 |
if PROJECT_NAME != 'wcs' and 'authentic2' not in INSTALLED_APPS:
|
|
| 305 |
MIDDLEWARE = MIDDLEWARE + (
|
|
| 306 |
'mellon.middleware.PassiveAuthenticationMiddleware',
|
|
| 307 |
'hobo.provisionning.middleware.ProvisionningMiddleware',
|
|
| 308 |
)
|
|
| 286 |
if PROJECT_NAME != 'wcs' and 'authentic2' not in INSTALLED_APPS: |
|
| 287 |
MIDDLEWARE = MIDDLEWARE + ( |
|
| 288 |
'mellon.middleware.PassiveAuthenticationMiddleware', |
|
| 289 |
'hobo.provisionning.middleware.ProvisionningMiddleware', |
|
| 290 |
) |
|
| 309 | 291 | |
| 310 |
if 'authentic2' in INSTALLED_APPS:
|
|
| 311 |
MIDDLEWARE = MIDDLEWARE + (
|
|
| 312 |
'hobo.agent.authentic2.middleware.ProvisionningMiddleware',
|
|
| 313 |
)
|
|
| 292 |
if 'authentic2' in INSTALLED_APPS: |
|
| 293 |
MIDDLEWARE = MIDDLEWARE + ( |
|
| 294 |
'hobo.agent.authentic2.middleware.ProvisionningMiddleware', |
|
| 295 |
) |
|
| 314 | 296 | |
| 315 | 297 | |
| 316 | 298 |
if PROJECT_NAME != 'wcs': |
| ... | ... | |
| 319 | 301 |
TENANT_BASE = os.path.join(VAR_DIR, 'tenants') |
| 320 | 302 |
TENANT_MODEL = 'multitenant.Tenant' |
| 321 | 303 | |
| 322 |
if 'MIDDLEWARE_CLASSES' in globals(): |
|
| 323 |
MIDDLEWARE_CLASSES = ( |
|
| 324 |
'hobo.multitenant.middleware.TenantMiddleware', |
|
| 325 |
'hobo.middleware.CookiesSameSiteFixMiddleware', |
|
| 326 |
'hobo.middleware.debug.InternalIPMiddleware', |
|
| 327 |
) + MIDDLEWARE_CLASSES |
|
| 328 |
else: |
|
| 329 |
MIDDLEWARE = ( |
|
| 330 |
'hobo.multitenant.middleware.TenantMiddleware', |
|
| 331 |
'hobo.middleware.CookiesSameSiteFixMiddleware', |
|
| 332 |
'hobo.middleware.debug.InternalIPMiddleware', |
|
| 333 |
) + MIDDLEWARE |
|
| 304 |
MIDDLEWARE = ( |
|
| 305 |
'hobo.multitenant.middleware.TenantMiddleware', |
|
| 306 |
'hobo.middleware.CookiesSameSiteFixMiddleware', |
|
| 307 |
'hobo.middleware.debug.InternalIPMiddleware', |
|
| 308 |
) + MIDDLEWARE |
|
| 334 | 309 | |
| 335 | 310 |
DATABASES = {
|
| 336 | 311 |
'default': {
|
| ... | ... | |
| 399 | 374 |
MELLON_OPENED_SESSION_COOKIE_NAME = 'A2_OPENED_SESSION' |
| 400 | 375 |
MELLON_ADD_AUTHNREQUEST_NEXT_URL_EXTENSION = True |
| 401 | 376 | |
| 402 |
if 'MIDDLEWARE_CLASSES' in globals(): |
|
| 403 |
MIDDLEWARE_CLASSES = ( |
|
| 404 |
'hobo.middleware.utils.StoreRequestMiddleware', |
|
| 405 |
'hobo.middleware.xforwardedfor.XForwardedForMiddleware', |
|
| 406 |
) + MIDDLEWARE_CLASSES |
|
| 407 | ||
| 408 |
MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + ( |
|
| 409 |
'hobo.middleware.PrometheusStatsMiddleware',) |
|
| 410 |
else: |
|
| 411 |
MIDDLEWARE = ( |
|
| 412 |
'hobo.middleware.utils.StoreRequestMiddleware', |
|
| 413 |
'hobo.middleware.xforwardedfor.XForwardedForMiddleware', |
|
| 414 |
) + MIDDLEWARE |
|
| 377 |
MIDDLEWARE = ( |
|
| 378 |
'hobo.middleware.utils.StoreRequestMiddleware', |
|
| 379 |
'hobo.middleware.xforwardedfor.XForwardedForMiddleware', |
|
| 380 |
) + MIDDLEWARE |
|
| 415 | 381 | |
| 416 |
MIDDLEWARE = MIDDLEWARE + (
|
|
| 417 |
'hobo.middleware.PrometheusStatsMiddleware',)
|
|
| 382 |
MIDDLEWARE = MIDDLEWARE + ( |
|
| 383 |
'hobo.middleware.PrometheusStatsMiddleware',) |
|
| 418 | 384 | |
| 419 | 385 | |
| 420 | 386 |
HOBO_MANAGER_HOMEPAGE_URL_VAR = 'portal_agent_url' |
| hobo/multitenant/README | ||
|---|---|---|
| 25 | 25 | |
| 26 | 26 |
Add the middlewares for multitenant, they must be first: |
| 27 | 27 | |
| 28 |
MIDDLEWARE_CLASSES = (
|
|
| 28 |
MIDDLEWARE = ( |
|
| 29 | 29 |
'hobo.multitenant.middleware.TenantMiddleware', |
| 30 |
) + MIDDLEWARE_CLASSES
|
|
| 30 |
) + MIDDLEWARE |
|
| 31 | 31 |
TENANT_SETTINGS_LOADERS = ( |
| 32 | 32 |
'hobo.multitenant.settings_loaders.TemplateVars', |
| 33 | 33 |
'hobo.multitenant.settings_loaders.SettingsJSON', |
| hobo/settings.py | ||
|---|---|---|
| 52 | 52 |
'hobo.deploy', |
| 53 | 53 |
) |
| 54 | 54 | |
| 55 |
MIDDLEWARE_CLASSES = (
|
|
| 55 |
MIDDLEWARE = ( |
|
| 56 | 56 |
'hobo.middleware.xforwardedfor.XForwardedForMiddleware', |
| 57 | 57 |
'django.contrib.sessions.middleware.SessionMiddleware', |
| 58 | 58 |
'django.middleware.locale.LocaleMiddleware', |
| tests/settings.py | ||
|---|---|---|
| 10 | 10 | |
| 11 | 11 |
TEMPLATES[0]['OPTIONS']['debug'] = True |
| 12 | 12 | |
| 13 |
MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
|
|
| 13 |
MIDDLEWARE = MIDDLEWARE + (
|
|
| 14 | 14 |
'hobo.middleware.RobotsTxtMiddleware', |
| 15 | 15 |
'hobo.provisionning.middleware.ProvisionningMiddleware') |
| 16 | 16 | |
| tests/test_version.py | ||
|---|---|---|
| 10 | 10 |
# disable apt_cache to get stable test results |
| 11 | 11 |
hobo.scrutiny.wsgi.middleware.apt_cache = None |
| 12 | 12 | |
| 13 |
settings.MIDDLEWARE_CLASSES = (
|
|
| 13 |
settings.MIDDLEWARE = ( |
|
| 14 | 14 |
'hobo.middleware.version.VersionMiddleware', |
| 15 |
) + settings.MIDDLEWARE_CLASSES
|
|
| 15 |
) + settings.MIDDLEWARE |
|
| 16 | 16 |
json_response = client.get('/__version__').json()
|
| 17 | 17 |
assert set(json_response.keys()) == set(['pytest', 'pytest-django']) |
| tests_multitenant/settings.py | ||
|---|---|---|
| 12 | 12 | |
| 13 | 13 |
PROJECT_NAME = 'fake-agent' |
| 14 | 14 | |
| 15 |
if 'OLD_STYLE_MIDDLEWARE' in os.environ: |
|
| 16 |
MIDDLEWARE_CLASSES = ( |
|
| 17 |
'django.contrib.sessions.middleware.SessionMiddleware', |
|
| 18 |
'django.middleware.locale.LocaleMiddleware', |
|
| 19 |
'django.middleware.common.CommonMiddleware', |
|
| 20 |
'django.middleware.csrf.CsrfViewMiddleware', |
|
| 21 |
'django.contrib.auth.middleware.AuthenticationMiddleware', |
|
| 22 |
'django.contrib.messages.middleware.MessageMiddleware', |
|
| 23 |
'django.middleware.clickjacking.XFrameOptionsMiddleware', |
|
| 24 |
) |
|
| 25 |
else: |
|
| 26 |
MIDDLEWARE = ( |
|
| 27 |
'django.contrib.sessions.middleware.SessionMiddleware', |
|
| 28 |
'django.middleware.locale.LocaleMiddleware', |
|
| 29 |
'django.middleware.common.CommonMiddleware', |
|
| 30 |
'django.middleware.csrf.CsrfViewMiddleware', |
|
| 31 |
'django.contrib.auth.middleware.AuthenticationMiddleware', |
|
| 32 |
'django.contrib.messages.middleware.MessageMiddleware', |
|
| 33 |
'django.middleware.clickjacking.XFrameOptionsMiddleware', |
|
| 34 |
) |
|
| 15 |
MIDDLEWARE = ( |
|
| 16 |
'django.contrib.sessions.middleware.SessionMiddleware', |
|
| 17 |
'django.middleware.locale.LocaleMiddleware', |
|
| 18 |
'django.middleware.common.CommonMiddleware', |
|
| 19 |
'django.middleware.csrf.CsrfViewMiddleware', |
|
| 20 |
'django.contrib.auth.middleware.AuthenticationMiddleware', |
|
| 21 |
'django.contrib.messages.middleware.MessageMiddleware', |
|
| 22 |
'django.middleware.clickjacking.XFrameOptionsMiddleware', |
|
| 23 |
) |
|
| 35 | 24 | |
| 36 | 25 |
TEMPLATES = [ |
| 37 | 26 |
{
|
| tests_schemas/settings.py | ||
|---|---|---|
| 1 | 1 |
import tempfile |
| 2 | 2 |
TENANT_BASE = tempfile.mkdtemp('hobo-tenant-base')
|
| 3 | 3 |
TENANT_MODEL = 'multitenant.Tenant' |
| 4 |
MIDDLEWARE_CLASSES = ('hobo.multitenant.middleware.TenantMiddleware',) + MIDDLEWARE_CLASSES
|
|
| 4 |
MIDDLEWARE = ('hobo.multitenant.middleware.TenantMiddleware',) + MIDDLEWARE
|
|
| 5 | 5 |
DATABASES = {
|
| 6 | 6 |
'default': {
|
| 7 | 7 |
'ENGINE': 'tenant_schemas.postgresql_backend', |
| 8 |
- |
|