Merge lp:~julian-edwards/maas/1.5-clickjacking into lp:maas/1.5

Proposed by Julian Edwards on 2014-05-05
Status: Merged
Approved by: Julian Edwards on 2014-05-05
Approved revision: 2263
Merged at revision: 2263
Proposed branch: lp:~julian-edwards/maas/1.5-clickjacking
Merge into: lp:maas/1.5
Diff against target: 11 lines (+1/-0)
1 file modified
src/maas/settings.py (+1/-0)
To merge this branch: bzr merge lp:~julian-edwards/maas/1.5-clickjacking
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve on 2014-05-05
Review via email: mp+218252@code.launchpad.net

Commit message

backport trunk r2299: Enable Django's clickjacking protection.

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/maas/settings.py'
--- src/maas/settings.py 2014-02-14 12:12:28 +0000
+++ src/maas/settings.py 2014-05-05 07:46:33 +0000
@@ -249,6 +249,7 @@
249 'maasserver.middleware.ExternalComponentsMiddleware',249 'maasserver.middleware.ExternalComponentsMiddleware',
250 'metadataserver.middleware.MetadataErrorsMiddleware',250 'metadataserver.middleware.MetadataErrorsMiddleware',
251 'django.middleware.transaction.TransactionMiddleware',251 'django.middleware.transaction.TransactionMiddleware',
252 'django.middleware.clickjacking.XFrameOptionsMiddleware',
252 'django.middleware.csrf.CsrfViewMiddleware',253 'django.middleware.csrf.CsrfViewMiddleware',
253 'maasserver.middleware.ExceptionLoggerMiddleware',254 'maasserver.middleware.ExceptionLoggerMiddleware',
254 'django.contrib.auth.middleware.AuthenticationMiddleware',255 'django.contrib.auth.middleware.AuthenticationMiddleware',

Subscribers

People subscribed via source and target branches

to all changes: