Fixes

lib/SimpleSAML/IdP/IFrameLogoutHandler.php

@@ -80,7 +80,7 @@ class IFrameLogoutHandler implements LogoutHandlerInterface
             $params['type'] = $state['core:Logout-IFrame:InitType'];
         }
 
-        $url = Module::getModuleURL('core/idp/logout-iframe.php', $params);
+        $url = Module::getModuleURL('core/logout-iframe', $params);
         $httpUtils = new Utils\HTTP();
         $httpUtils->redirectTrustedURL($url);
     }

modules/core/routing/routes/routes.yml

 core-welcome:
     path:       /welcome
-    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Login:welcome' }
+    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Login::welcome' }
 core-account-disco-clearchoices:
     path:       /account/disco/clearchoices
-    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Login:cleardiscochoices' }
+    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Login::cleardiscochoices' }
 core-loginuserpass:
     path:       /loginuserpass
-    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Login:loginuserpass' }
+    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Login::loginuserpass' }
 core-loginuserpassorg:
     path:       /loginuserpassorg
-    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Login:loginuserpassorg' }
+    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Login::loginuserpassorg' }
 core-error-nocookie:
     path:       /error/nocookie
-    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Exception:nocookie' }
+    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Exception::nocookie' }
 core-cardinality:
     path:       /error/cardinality
-    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Exception:cardinality' }
+    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Exception::cardinality' }
 core-warning-shortssointerval:
     path:       /warning/short_sso_interval
-    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Exception:shortSsoInterval' }
+    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Exception::shortSsoInterval' }
 core-post-redirect:
     path:       /postredirect
-    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Redirection:postredirect' }
+    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Redirection::postredirect' }
 core-legacy-welcome:
     path:       /frontpage_welcome.php
     defaults:   { _controller: 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::urlRedirectAction', path: /admin/, permanent: true }
@@ -36,16 +36,16 @@ core-legacy-federation:
     defaults:   { _controller: 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::urlRedirectAction', path: /admin/federation, permanent: true }
 core-logout:
     path:       /logout/{as}
-    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Logout:logout' }
+    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Logout::logout' }
 core-logout-resume:
-    path:       /logout/resume
-    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Logout:logoutResume' }
+    path:       /logout-resume
+    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Logout::resumeLogout' }
 core-logout-iframe:
-    path:       /logout/iframe
-    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Logout:logoutIframe' }
+    path:       /logout-iframe
+    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Logout::logoutIframe' }
 core-logout-iframe-done:
-    path:       /logout/iframe-done
-    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Logout:logoutIframeDone' }
+    path:       /logout-iframe-done
+    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Logout::logoutIframeDone' }
 core-logout-iframe-post:
-    path:       /logout/iframe-post
-    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Logout:logoutIframePost' }
+    path:       /logout-iframe-post
+    defaults:   { _controller: 'SimpleSAML\Module\core\Controller\Logout::logoutIframePost' }

modules/core/templates/logout-iframe.twig

@@ -7,7 +7,7 @@
     {%- if type != "init" %}
       {%- set content = '2' %}
       {%- if remaining_services|length == 0 %}
-        {%- set content = '0; url=module.php/core/logout/iframe-done?id=' ~ auth_state %}
+        {%- set content = '0; url=' ~ moduleURL('core/logout/iframe-done', {'id': auth_state }) %}
       {%- endif %}
 
     <meta http-equiv="refresh" content="{{ content }}">
@@ -79,7 +79,7 @@
         {% trans %}Unable to log out of one or more services. To ensure that all your sessions are closed, you are encouraged to <i>close your webbrowser</i>.{% endtrans %}
       </div>
     </div>
-    <form id="error-form" action="logout-iframe-done.php"
+    <form id="error-form" action="{{ moduleURL('core/logout-iframe-done') }}"
           {%- if (not failed or type == 'init') and remaining %} class="hidden"{% endif %}>
       <input type="hidden" name="id" value="{{ auth_state }}">
       <button type="submit" id="btn-continue" name="ok" class="pure-button pure-button-red">
@@ -89,7 +89,7 @@
     <div id="original-actions"{% if type != 'init' %} class="hidden"{% endif %}>
       <p>{% trans %}Do you want to logout from all the services above?{% endtrans %}</p>
       <div class="pure-button-group two-elements">
-        <form id="startform" action="logout-iframe.php">
+        <form id="startform" action="{{ moduleURL('core/logout-iframe') }}">
           <input type="hidden" name="id" value="{{ auth_state }}">
           <noscript>
             <input type="hidden" name="type" value="nojs" id="logout-type-selector">
@@ -98,7 +98,7 @@
             {%- trans %}Yes, all services{% endtrans -%}
           </button>
         </form>
-        <form action="logout-iframe-done.php">
+        <form action="{{ moduleURL('core/logout-iframe-done') }}">
           <input type="hidden" name="id" value="{{ auth_state }}">
           <input type="hidden" name="cancel" value="">
           <button id="btn-cancel" class="pure-button" type="submit">
@@ -111,7 +111,7 @@
       </div>
     </div>
   {%- else %}
-    <form id="error-form" action="logout-iframe-done.php">
+    <form id="error-form" action="{{ moduleURL('logout-iframe-done') }}">
       <input type="hidden" name="id" value="{{ auth_state }}">
       <button type="submit" id="btn-continue" name="ok" class="pure-button pure-button-red">
         {%- trans %}Continue{% endtrans -%}