entrouvert
/
authentic
16
0
Fork 0
Code Issues Pull Requests 32 Releases Activity

add support for django 1.11 in url config (#21489)

This commit is contained in:
Elias Showk 2018-05-25 15:23:12 +02:00
parent 65de0f737c
commit 3352498ace
20 changed files with 105 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/authentic2/api_urls.py
View File

@ -1,8 +1,8 @@
from django.conf.urls import patterns, url
from django.conf.urls import url
from . import api_views
urlpatterns = patterns('',
urlpatterns = [
url(r'^register/$', api_views.register,
name='a2-api-register'),
url(r'^password-change/$', api_views.password_change,
@ -13,5 +13,6 @@ urlpatterns = patterns('',
api_views.role_memberships, name='a2-api-role-member'),
url(r'^check-password/$', api_views.check_password,
name='a2-api-check-password'),
)
]
urlpatterns += api_views.router.urls

6
src/authentic2/auth2_auth/auth2_ssl/__init__.py
View File

@ -1,13 +1,13 @@
class Plugin(object):
def get_before_urls(self):
from . import app_settings
from django.conf.urls import patterns, include
from django.conf.urls import include, url
from authentic2.decorators import setting_enabled, required
return required(
setting_enabled('ENABLE', settings=app_settings),
patterns('',
(r'^accounts/sslauth/', include(__name__ + '.urls'))))
[
url(r'^accounts/sslauth/', include(__name__ + '.urls'))])
def get_apps(self):
return [__name__]

10
src/authentic2/auth2_auth/auth2_ssl/urls.py
View File

@ -1,10 +1,10 @@
from django.conf.urls import patterns, url
from django.conf.urls import url
from .views import (handle_request, post_account_linking, delete_certificate,
error_ssl)
urlpatterns = patterns('authentic2.auth2_auth.auth2_ssl.views',
url(r'^$',
handle_request,
urlpatterns = [
url(r'^$',
handle_request,
name='user_signin_ssl'),
url(r'^post_account_linking/$',
post_account_linking,
@ -15,4 +15,4 @@ urlpatterns = patterns('authentic2.auth2_auth.auth2_ssl.views',
url(r'^error_ssl/$',
error_ssl,
name='error_ssl'),
)
]

10
src/authentic2/disco_service/disco_responder.py
View File

@ -13,7 +13,7 @@ import urllib
from xml.dom.minidom import parseString
from django.http import HttpResponseRedirect
from django.conf.urls import patterns
from django.conf.urls import url
from django.utils.translation import ugettext as _
from django.core.urlresolvers import reverse
from django.utils.http import urlquote
@ -228,7 +228,7 @@ def idp_selection(request):
return HttpResponseRedirect('%s?idp_selected=%s' \
% (reverse(disco), idp_selected))
urlpatterns = patterns('',
(r'^disco$', disco),
(r'^idp_selection$', idp_selection),
)
urlpatterns = [
url(r'^disco$', disco),
url(r'^idp_selection$', idp_selection),
]

4
src/authentic2/idp/saml/__init__.py
View File

@ -8,7 +8,7 @@ from django.apps import AppConfig
class Plugin(object):
def get_before_urls(self):
from . import app_settings
from django.conf.urls import patterns, include
from django.conf.urls import url, include
from authentic2.decorators import (setting_enabled, required,
lasso_required)
@ -17,7 +17,7 @@ class Plugin(object):
setting_enabled('ENABLE', settings=app_settings),
lasso_required()
),
patterns('', (r'^idp/saml2/', include(__name__ + '.urls'))))
[url(r'^idp/saml2/', include(__name__ + '.urls'))])
def get_apps(self):
return ['authentic2.idp.saml']

32
src/authentic2/idp/saml/urls.py
View File

@ -1,22 +1,26 @@
from django.conf.urls import patterns, url
from django.conf.urls import url
from . import views
from authentic2.idp.saml.saml2_endpoints import (metadata, sso, continue_sso,
slo, slo_soap, idp_slo,
slo_return, finish_slo,
artifact, idp_sso)
urlpatterns = patterns('authentic2.idp.saml.saml2_endpoints',
url(r'^metadata$', 'metadata', name='a2-idp-saml-metadata'),
url(r'^sso$', 'sso', name='a2-idp-saml-sso'),
url(r'^continue$', 'continue_sso', name='a2-idp-saml-continue'),
url(r'^slo$', 'slo', name='a2-idp-saml-slo'),
url(r'^slo/soap$', 'slo_soap', name='a2-idp-saml-slo-soap'),
url(r'^idp_slo/(.*)$', 'idp_slo', name='a2-idp-saml-slo-idp'),
url(r'^slo_return$', 'slo_return', name='a2-idp-saml-slo-return'),
url(r'^finish_slo$', 'finish_slo', name='a2-idp-saml-finish-slo'),
url(r'^artifact$', 'artifact', name='a2-idp-saml-artifact'),
urlpatterns = [
url(r'^metadata$', metadata, name='a2-idp-saml-metadata'),
url(r'^sso$', sso, name='a2-idp-saml-sso'),
url(r'^continue$', continue_sso, name='a2-idp-saml-continue'),
url(r'^slo$', slo, name='a2-idp-saml-slo'),
url(r'^slo/soap$', slo_soap, name='a2-idp-saml-slo-soap'),
url(r'^idp_slo/(.*)$', idp_slo, name='a2-idp-saml-slo-idp'),
url(r'^slo_return$', slo_return, name='a2-idp-saml-slo-return'),
url(r'^finish_slo$', finish_slo, name='a2-idp-saml-finish-slo'),
url(r'^artifact$', artifact, name='a2-idp-saml-artifact'),
# legacy endpoint, now it's prefered to pass the entity_id in a parameter
url(r'^idp_sso/(.+)$',
'idp_sso', name='a2-idp-saml-idp-sso-named'),
idp_sso, name='a2-idp-saml-idp-sso-named'),
url(r'^idp_sso/$',
'idp_sso',
idp_sso,
name='a2-idp-saml2-idp-sso'),
url(r'^federations/create/(?P<pk>\d+)/$',
views.create_federation,
@ -24,4 +28,4 @@ urlpatterns = patterns('authentic2.idp.saml.saml2_endpoints',
url(r'^federations/(?P<pk>\d+)/delete/$',
views.delete_federation,
name='a2-idp-saml2-federation-delete'),
)
]

14
src/authentic2/idp/urls.py
View File

@ -1,7 +1,9 @@
from django.conf.urls import url, patterns
from django.conf.urls import url
from authentic2.idp.interactions import consent_federation, consent_attributes
urlpatterns = patterns('authentic2.idp.interactions',
url(r'^consent_federation', 'consent_federation',
name='a2-consent-federation'),
url(r'^consent_attributes', 'consent_attributes',
name='a2-consent-attributes'))
urlpatterns = [
url(r'^consent_federation', consent_federation,
name='a2-consent-federation'),
url(r'^consent_attributes', consent_attributes,
name='a2-consent-attributes')
]

11
src/authentic2/manager/urls.py
View File

@ -1,4 +1,4 @@
from django.conf.urls import patterns, url
from django.conf.urls import url
from django.views.i18n import javascript_catalog
from django.contrib.auth.decorators import login_required
@ -13,8 +13,7 @@ def manager_login_required(func):
urlpatterns = required(
manager_login_required, patterns(
'authentic2.views',
manager_login_required, [
# homepage
url(r'^$', views.homepage, name='a2-manager-homepage'),
@ -119,12 +118,12 @@ urlpatterns = required(
# general management
url(r'^site-export/$', views.site_export, name='a2-manager-site-export'),
url(r'^site-import/$', views.site_import, name='a2-manager-site-import'),
)
]
)
urlpatterns += patterns('',
urlpatterns += [
url(r'^jsi18n/$', javascript_catalog,
{'packages': ('authentic2.manager',)},
name='a2-manager-javascript-catalog'),
url(r'^select2.json$', views.select2, name='django_select2-json'),
)
]

7
src/authentic2/plugins.py
View File

@ -7,7 +7,7 @@ import pkg_resources
import logging
from django.conf.urls import patterns, include, url
from django.conf.urls import include, url
logger = logging.getLogger(__name__)
@ -59,9 +59,8 @@ def register_plugins_urls(urlpatterns,
if hasattr(plugin, 'get_after_urls'):
urls = plugin.get_after_urls()
after_urls.append(url('^', include(urls)))
before_patterns = patterns('', *before_urls)
after_patterns = patterns('', *after_urls)
return before_patterns + urlpatterns + after_patterns
return before_urls + urlpatterns + after_urls
def register_plugins_installed_apps(installed_apps, group_name=DEFAULT_GROUP_NAME):
'''Call get_apps() on all plugins of group_name and add the returned

19
src/authentic2/profile_urls.py
View File

@ -1,4 +1,4 @@
from django.conf.urls import patterns, url
from django.conf.urls import url
from django.contrib.auth import views as auth_views, REDIRECT_FIELD_NAME
from django.contrib.auth.decorators import login_required
from django.core.urlresolvers import reverse
@ -9,6 +9,7 @@ from django.views.decorators.debug import sensitive_post_parameters
from authentic2.utils import import_module_or_class, redirect
from . import app_settings, decorators, profile_views, hooks
from .views import (logged_in, edit_profile, email_change, email_change_verify, profile)
SET_PASSWORD_FORM_CLASS = import_module_or_class(
app_settings.A2_REGISTRATION_SET_PASSWORD_FORM_CLASS)
@ -44,14 +45,14 @@ password_change_view.title = _('Password Change')
password_change_view.do_not_call_in_templates = True
urlpatterns = patterns('authentic2.views',
url(r'^logged-in/$', 'logged_in', name='logged-in'),
url(r'^edit/$', 'edit_profile', name='profile_edit'),
url(r'^edit/(?P<scope>[-\w]+)/$', 'edit_profile', name='profile_edit_with_scope'),
url(r'^change-email/$', 'email_change', name='email-change'),
url(r'^change-email/verify/$', 'email_change_verify',
urlpatterns = [
url(r'^logged-in/$', logged_in, name='logged-in'),
url(r'^edit/$', edit_profile, name='profile_edit'),
url(r'^edit/(?P<scope>[-\w]+)/$', edit_profile, name='profile_edit_with_scope'),
url(r'^change-email/$', email_change, name='email-change'),
url(r'^change-email/verify/$', email_change_verify,
name='email-change-verify'),
url(r'^$', 'profile', name='account_management'),
url(r'^$', profile, name='account_management'),
url(r'^password/change/$',
password_change_view,
{'password_change_form': CHANGE_PASSWORD_FORM_CLASS},
@ -90,4 +91,4 @@ urlpatterns = patterns('authentic2.views',
auth_views.password_reset_done,
name='auth_password_reset_done'),
url(r'^switch-back/$', profile_views.switch_back, name='a2-switch-back'),
)
]

5
src/authentic2/registration_backend/urls.py
View File

@ -1,4 +1,3 @@
from django.conf.urls import patterns
from django.conf.urls import url
from django.views.generic.base import TemplateView
@ -6,7 +5,7 @@ from django.contrib.auth.decorators import login_required
from .views import RegistrationView, registration_completion, DeleteView, registration_complete
urlpatterns = patterns('',
urlpatterns = [
url(r'^activate/(?P<registration_token>[\w: -]+)/$',
registration_completion, name='registration_activate'),
url(r'^register/$',
@ -21,4 +20,4 @@ urlpatterns = patterns('',
url(r'^delete/$',
login_required(DeleteView.as_view()),
name='delete_account'),
)
]

8
src/authentic2/saml/admin.py
View File

@ -2,7 +2,7 @@ import logging
from django.contrib import admin
from django.utils.translation import ugettext as _
from django.conf.urls import patterns, url
from django.conf.urls import url
from django.conf import settings
from django.forms import ModelForm
from django import forms
@ -160,14 +160,13 @@ class LibertyProviderAdmin(admin.ModelAdmin):
def get_urls(self):
urls = super(LibertyProviderAdmin, self).get_urls()
urls = patterns('',
urls = [
url(r'^add-from-url/$',
self.admin_site.admin_view(admin_views.AddLibertyProviderFromUrlView.as_view(model_admin=self)),
name='saml_libertyprovider_add_from_url'),
) + urls
] + urls
return urls
class LibertyFederationAdmin(admin.ModelAdmin):
search_fields = ('name_id_content', 'user__username')
list_display = ('user', 'creation', 'last_modification', 'name_id_content', 'format', 'sp')
@ -199,7 +198,6 @@ class SPOptionsIdPPolicyAdmin(admin.ModelAdmin):
'http_method_for_slo_request',
)
admin.site.register(SPOptionsIdPPolicy, SPOptionsIdPPolicyAdmin)
admin.site.register(LibertyProvider, LibertyProviderAdmin)

40
src/authentic2/urls.py
View File

@ -1,6 +1,7 @@
from django.conf.urls import patterns, url, include
from django.conf.urls import url, include
from django.conf import settings
from django.contrib import admin
from django.contrib.staticfiles.views import serve
from . import app_settings, plugins, views
@ -8,42 +9,41 @@ admin.autodiscover()
handler500 = 'authentic2.views.server_error'
urlpatterns = patterns(
'authentic2.views',
url(r'^$', 'homepage', name='auth_homepage'),
url(r'test_redirect/$', views.test_redirect),
)
urlpatterns = [
url(r'^$', views.homepage, name='auth_homepage'),
url(r'test_redirect/$', views.test_redirect)
]
not_homepage_patterns = patterns('authentic2.views',
url(r'^login/$', 'login', name='auth_login'),
url(r'^logout/$', 'logout', name='auth_logout'),
url(r'^redirect/(.*)', 'redirect', name='auth_redirect'),
url(r'^accounts/', include('authentic2.profile_urls')),
)
not_homepage_patterns = [
url(r'^login/$', views.login, name='auth_login'),
url(r'^logout/$', views.logout, name='auth_logout'),
url(r'^redirect/(.*)', views.redirect, name='auth_redirect'),
url(r'^accounts/', include('authentic2.profile_urls'))
]
not_homepage_patterns += patterns('',
not_homepage_patterns += [
url(r'^accounts/', include(app_settings.A2_REGISTRATION_URLCONF)),
url(r'^admin/', include(admin.site.urls)),
url(r'^idp/', include('authentic2.idp.urls')),
url(r'^manage/', include('authentic2.manager.urls')),
url(r'^api/', include('authentic2.api_urls')),
)
url(r'^api/', include('authentic2.api_urls'))
]
urlpatterns += not_homepage_patterns
try:
if getattr(settings, 'DISCO_SERVICE', False):
urlpatterns += patterns('',
urlpatterns += [
(r'^disco_service/', include('disco_service.disco_responder')),
)
]
except:
pass
if settings.DEBUG:
urlpatterns += patterns('django.contrib.staticfiles.views',
url(r'^static/(?P<path>.*)$', 'serve'),
)
urlpatterns += [
url(r'^static/(?P<path>.*)$', serve)
]
if settings.DEBUG and 'debug_toolbar' in settings.INSTALLED_APPS:
import debug_toolbar

6
src/authentic2_auth_oidc/urls.py
View File

@ -1,12 +1,10 @@
from django.conf.urls import patterns, url
from django.conf.urls import url
from . import views
__patterns = [
urlpatterns = [
url(r'^accounts/oidc/login/(?P<pk>\d+)/$', views.oidc_login, name='oidc-login'),
url(r'^accounts/oidc/login/$', views.login_initiate, name='oidc-login-initiate'),
url(r'^accounts/oidc/callback/$', views.login_callback, name='oidc-login-callback'),
]
urlpatterns = patterns('', *__patterns)

4
src/authentic2_auth_saml/urls.py
View File

@ -1,3 +1,3 @@
from django.conf.urls import patterns, url, include
from django.conf.urls import url, include
urlpatterns = patterns('', url(r'^accounts/saml/', include('mellon.urls')))
urlpatterns = [url(r'^accounts/saml/', include('mellon.urls'))]

5
src/authentic2_idp_cas/__init__.py
View File

@ -6,15 +6,14 @@ from .constants import SESSION_CAS_LOGOUTS
class Plugin(object):
def get_before_urls(self):
from . import app_settings
from django.conf.urls import patterns, include
from django.conf.urls import include, url
from authentic2.decorators import setting_enabled, required
return required(
(
setting_enabled('ENABLE', settings=app_settings),
),
patterns('',
(r'^idp/cas/', include(__name__ + '.urls'))))
[url(r'^idp/cas/', include(__name__ + '.urls'))])
def get_apps(self):
return [__name__]

6
src/authentic2_idp_cas/urls.py
View File

@ -1,8 +1,8 @@
from django.conf.urls import patterns, url
from django.conf.urls import url
from . import views
urlpatterns = patterns('',
urlpatterns = [
url('^login/?$', views.login, name='a2-idp-cas-login'),
url('^continue/$', views._continue, name='a2-idp-cas-continue'),
url('^validate/?$', views.validate, name='a2-idp-cas-validate'),
@ -12,4 +12,4 @@ urlpatterns = patterns('',
url('^proxy/?$', views.proxy, name='a2-idp-cas-proxy'),
url('^proxyValidate/?$', views.proxy_validate,
name='a2-idp-cas-proxy-validate'),
)
]

6
src/authentic2_idp_oidc/urls.py
View File

@ -1,9 +1,9 @@
from django.conf.urls import patterns, url
from django.conf.urls import url
from . import views
__patterns = [
urlpatterns = [
url(r'^.well-known/openid-configuration$',
views.openid_configuration,
name='oidc-openid-configuration'),
@ -23,5 +23,3 @@ __patterns = [
views.logout,
name='oidc-logout'),
]
urlpatterns = patterns('', *__patterns)

6
src/authentic2_idp_openid/__init__.py
View File

@ -7,13 +7,14 @@ except ImportError:
from . import app_settings
if app_settings.ENABLE:
raise ImproperlyConfigured('OpenID idp is enabled by python-openid is not installed')
class Plugin(object):
pass
else:
class Plugin(object):
def get_before_urls(self):
from . import app_settings
from django.conf.urls import patterns, include
from django.conf.urls import url, include
from authentic2.decorators import (setting_enabled, required,
lasso_required)
@ -22,8 +23,7 @@ else:
setting_enabled('ENABLE', settings=app_settings),
lasso_required()
),
patterns('',
(r'^idp/openid/', include(__name__ + '.urls'))))
[url(r'^idp/openid/', include(__name__ + '.urls'))])
def get_apps(self):
return [__name__]

6
src/authentic2_idp_openid/urls.py
View File

@ -1,9 +1,9 @@
# vim: set ts=4 sw=4 : */
from django.conf.urls import patterns, url
from django.conf.urls import url
from . import views
urlpatterns = patterns('authentic2.idp.idp_openid.views',
urlpatterns = [
url(r'^$',
views.openid_server,
name='a2-idp-openid-root'),
@ -23,4 +23,4 @@ urlpatterns = patterns('authentic2.idp.idp_openid.views',
url(r'^(?P<id>.+)/$',
views.openid_discovery,
name='a2-idp-openid-identity'),
)
]