shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 18:21:12 +03:00
Code Releases Activity

AC-170 Disable REST session auth and Django admin by default.

Browse Source
This commit is contained in:
Chris Church 2013-11-19 14:45:39 -05:00
parent ccbef21c42
commit a25a162229
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/admin.py
View File

@ -1,9 +1,13 @@
# Copyright (c) 2013 AnsibleWorks, Inc. # Copyright (c) 2013 AnsibleWorks, Inc.
# All Rights Reserved. # All Rights Reserved.
# Django admin isn't officially supported!
# Python
import json import json
import urllib import urllib
# Django
from django.conf.urls import * from django.conf.urls import *
from django.contrib import admin from django.contrib import admin
from django.contrib.admin.util import unquote from django.contrib.admin.util import unquote
@ -15,6 +19,7 @@ from django.utils.translation import ugettext_lazy as _
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.auth.admin import UserAdmin from django.contrib.auth.admin import UserAdmin
# AWX
from awx.lib.compat import format_html from awx.lib.compat import format_html
from awx.main.models import * from awx.main.models import *
from awx.main.forms import * from awx.main.forms import *

5
awx/settings/defaults.py
View File

@ -117,7 +117,6 @@ ROOT_URLCONF = 'awx.urls'
WSGI_APPLICATION = 'awx.wsgi.application' WSGI_APPLICATION = 'awx.wsgi.application'
INSTALLED_APPS = ( INSTALLED_APPS = (
'django.contrib.admin',
'django.contrib.auth', 'django.contrib.auth',
'django.contrib.contenttypes', 'django.contrib.contenttypes',
'django.contrib.messages', 'django.contrib.messages',
@ -133,6 +132,8 @@ INSTALLED_APPS = (
'awx.main', 'awx.main',
'awx.api', 'awx.api',
'awx.ui', 'awx.ui',
# Django admin is disabled and not supported by default.
#'django.contrib.admin',
) )
INTERNAL_IPS = ('127.0.0.1',) INTERNAL_IPS = ('127.0.0.1',)
@ -144,7 +145,7 @@ REST_FRAMEWORK = {
'DEFAULT_AUTHENTICATION_CLASSES': ( 'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.BasicAuthentication', 'rest_framework.authentication.BasicAuthentication',
'awx.api.authentication.TokenAuthentication', 'awx.api.authentication.TokenAuthentication',
'rest_framework.authentication.SessionAuthentication', #'rest_framework.authentication.SessionAuthentication',
), ),
'DEFAULT_PERMISSION_CLASSES': ( 'DEFAULT_PERMISSION_CLASSES': (
'awx.api.permissions.ModelAccessPermission', 'awx.api.permissions.ModelAccessPermission',

12
awx/urls.py
View File

@ -22,7 +22,13 @@ if 'django.contrib.admin' in settings.INSTALLED_APPS:
if settings.DEBUG: if settings.DEBUG:
urlpatterns += patterns('awx.main.views', urlpatterns += patterns('awx.main.views',
url(r'^(?:admin/)?403.html$', 'handle_403'), url(r'^403.html$', 'handle_403'),
url(r'^(?:admin/)?404.html$', 'handle_404'), url(r'^404.html$', 'handle_404'),
url(r'^(?:admin/)?500.html$', 'handle_500'), url(r'^500.html$', 'handle_500'),
)
if 'django.contrib.admin' in settings.INSTALLED_APPS:
urlpatterns += patterns('awx.main.views',
url(r'^admin/403.html$', 'handle_403'),
url(r'^admin/404.html$', 'handle_404'),
url(r'^admin/500.html$', 'handle_500'),
) )