diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index f98eb5337e06..0b5e000b40b0 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -346,7 +346,6 @@ 'DEFAULT_PAGINATION_CLASS': 'awx.api.pagination.Pagination', 'PAGE_SIZE': 25, 'DEFAULT_AUTHENTICATION_CLASSES': ( - 'ansible_base.authentication.session.SessionAuthentication', 'awx.api.authentication.LoggedOAuth2Authentication', 'awx.api.authentication.SessionAuthentication', 'awx.api.authentication.LoggedBasicAuthentication', @@ -372,7 +371,12 @@ } AUTHENTICATION_BACKENDS = ( - "ansible_base.authentication.backend.AnsibleBaseAuth", + 'awx.sso.backends.LDAPBackend', + 'awx.sso.backends.LDAPBackend1', + 'awx.sso.backends.LDAPBackend2', + 'awx.sso.backends.LDAPBackend3', + 'awx.sso.backends.LDAPBackend4', + 'awx.sso.backends.LDAPBackend5', 'awx.sso.backends.RADIUSBackend', 'awx.sso.backends.TACACSPlusBackend', 'social_core.backends.google.GoogleOAuth2', @@ -873,7 +877,6 @@ 'awx.analytics.broadcast_websocket': {'handlers': ['console', 'file', 'wsrelay', 'external_logger'], 'level': 'INFO', 'propagate': False}, 'awx.analytics.performance': {'handlers': ['console', 'file', 'tower_warnings', 'external_logger'], 'level': 'DEBUG', 'propagate': False}, 'awx.analytics.job_lifecycle': {'handlers': ['console', 'job_lifecycle'], 'level': 'DEBUG', 'propagate': False}, - 'ansible_base': {'handlers': ['console'], 'level': 'DEBUG'}, 'django_auth_ldap': {'handlers': ['console', 'file', 'tower_warnings'], 'level': 'DEBUG'}, 'social': {'handlers': ['console', 'file', 'tower_warnings'], 'level': 'DEBUG'}, 'system_tracking_migrations': {'handlers': ['console', 'file', 'tower_warnings'], 'level': 'DEBUG'}, @@ -965,8 +968,6 @@ # K8S only. Use receptor_log_level on AWX spec to set this properly RECEPTOR_LOG_LEVEL = 'info' -ANSIBLE_BASE_AUTHENTICATOR_CLASS_PREFIXES = ["ansible_base.authenticator_plugins"] - MIDDLEWARE = [ 'django_guid.middleware.guid_middleware', 'awx.main.middleware.SettingsCacheMiddleware', @@ -977,7 +978,6 @@ 'django.middleware.locale.LocaleMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', - 'ansible_base.utils.middleware.AuthenticatorBackendMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'awx.main.middleware.DisableLocalAuthMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', diff --git a/awx/urls.py b/awx/urls.py index cd274ff2041d..605f549d2317 100644 --- a/awx/urls.py +++ b/awx/urls.py @@ -5,14 +5,12 @@ from django.urls import re_path, include from awx.main.views import handle_400, handle_403, handle_404, handle_500, handle_csp_violation, handle_login_redirect -from ansible_base.urls import urls as base_urls urlpatterns = [ re_path(r'', include('awx.ui.urls', namespace='ui')), re_path(r'^ui_next/.*', include('awx.ui_next.urls', namespace='ui_next')), re_path(r'^api/', include('awx.api.urls', namespace='api')), - re_path(r'^api/v1/', include(base_urls)), re_path(r'^sso/', include('awx.sso.urls', namespace='sso')), re_path(r'^sso/', include('social_django.urls', namespace='social')), re_path(r'^(?:api/)?400.html$', handle_400),