0001-remove-authentic2_auth_cas-from-plugin-system-44329.patch

Emmanuel Cazenave, 23 juin 2020 11:41

Voir les différences: en ligne côte à côte

Subject: [PATCH] remove authentic2_auth_cas from plugin system (#44329)

 setup.py                           |  1 -
 src/authentic2/settings.py         |  1 +
 src/authentic2/urls.py             | 10 ++++++++
 src/authentic2_idp_cas/__init__.py | 34 +-------------------------
 src/authentic2_idp_cas/apps.py     | 38 ++++++++++++++++++++++++++++++
 5 files changed, 50 insertions(+), 34 deletions(-)
 create mode 100644 src/authentic2_idp_cas/apps.py

setup.py
169	169	},
170	170	entry_points={
171	171	'authentic2.plugin': [
172		'authentic2-idp-cas = authentic2_idp_cas:Plugin',
173	172	'authentic2-idp-oidc = authentic2_idp_oidc:Plugin',
174	173	'authentic2-provisionning-ldap = authentic2_provisionning_ldap:Plugin',
175	174	'authentic2-auth-fc = authentic2_auth_fc:Plugin',

src/authentic2/settings.py
131	131	'mellon',
132	132	'authentic2_auth_saml',
133	133	'authentic2_auth_oidc',
	134	'authentic2_idp_cas',
134	135	'authentic2.nonce',
135	136	'authentic2.saml',
136	137	'authentic2.idp',

     from authentic2.decorators import setting_enabled, required, lasso_required
     import authentic2_auth_oidc.urls
     import authentic2_auth_saml.urls
     import authentic2_idp_cas.app_settings
     import authentic2.idp.saml.app_settings
-...
         ),
         [url(r'^idp/saml2/', include('authentic2.idp.saml.urls'))]
+    )
     authentic2_idp_cas_urls = required(
+        (
             setting_enabled('ENABLE', settings=authentic2_idp_cas.app_settings),
         ),
         [url(r'^idp/cas/', include('authentic2_idp_cas.urls'))]
+    )
     urlpatterns = (
         authentic2_idp_cas_urls +
         authentic2_auth_oidc.urls.urlpatterns +
         authentic2_auth_saml.urls.urlpatterns +
         authentic2_idp_saml_urls +

     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     from django.template.loader import render_to_string
     from .constants import SESSION_CAS_LOGOUTS
     class Plugin(object):
         def get_before_urls(self):
             from . import app_settings
             from django.conf.urls import include, url
             from authentic2.decorators import setting_enabled, required
             return required(
+                (
                     setting_enabled('ENABLE', settings=app_settings),
                 ),
                 [url(r'^idp/cas/', include(__name__ + '.urls'))])
         def get_apps(self):
             return [__name__]
         def logout_list(self, request):
             fragments = []
             cas_logouts = request.session.get(SESSION_CAS_LOGOUTS, [])
             for name, url, use_iframe, use_iframe_timeout in cas_logouts:
                 ctx = {
                     'needs_iframe': use_iframe,
                     'name': name,
                     'url': url,
                     'iframe_timeout': use_iframe_timeout,
+                }
                 content = render_to_string('authentic2_idp_cas/logout_fragment.html', ctx)
                 fragments.append(content)
             return fragments
     default_app_config = 'authentic2_idp_cas.apps.AppConfig'

     # authentic2 - versatile identity manager
     # Copyright (C) 2010-2020 Entr'ouvert
+    #
     # This program is free software: you can redistribute it and/or modify it
     # under the terms of the GNU Affero General Public License as published
     # by the Free Software Foundation, either version 3 of the License, or
     # (at your option) any later version.
+    #
     # This program is distributed in the hope that it will be useful,
     # but WITHOUT ANY WARRANTY; without even the implied warranty of
     # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     # GNU Affero General Public License for more details.
+    #
     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     import django.apps
     from django.template.loader import render_to_string
     from .constants import SESSION_CAS_LOGOUTS
     class AppConfig(django.apps.AppConfig):
         name = 'authentic2_idp_cas'
         def logout_list(self, request):
             fragments = []
             cas_logouts = request.session.get(SESSION_CAS_LOGOUTS, [])
             for name, url, use_iframe, use_iframe_timeout in cas_logouts:
                 ctx = {
                     'needs_iframe': use_iframe,
                     'name': name,
                     'url': url,
                     'iframe_timeout': use_iframe_timeout,
+                }
                 content = render_to_string('authentic2_idp_cas/logout_fragment.html', ctx)
                 fragments.append(content)
             return fragments
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-remove-authentic2_auth_cas-from-plugin-system-44329.patch