Merge pull request #125 from a-menshchikov/v2_saml-logout_sf5.1

v2: Symfony 5.1, PHP 7.3, PhpUnit 9

Author: hslavich

.gitignore

@@ -2,3 +2,4 @@ composer.lock
 phpunit.xml
 /vendor/
 /build/
+.phpunit.result.cache

.travis.yml

@@ -1,22 +1,16 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
+  - 7.3
+  - 7.4
 
 matrix:
   fast_finish: true
   include:
-    - php: 5.6
-      env: SYMFONY_VERSION=2.3.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.7.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.8.*
-    - php: 7.2
-      env: SYMFONY_VERSION=4.2.*
+    - php: 7.3
+      env: SYMFONY_VERSION=5.1.*
+    - php: 7.4
+      env: SYMFONY_VERSION=5.1.*
 
 sudo: false
 

DependencyInjection/Security/Factory/SamlFactory.php

@@ -4,7 +4,6 @@
 
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AbstractFactory;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 
@@ -18,7 +17,7 @@ public function __construct()
         $this->addOption('user_factory');
         $this->addOption('token_factory');
         $this->addOption('persist_user', false);
-        
+
         if (!isset($this->options['success_handler'])) {
             $this->options['success_handler'] = 'hslavich_onelogin_saml.saml_authentication_success_handler';
         }
@@ -60,8 +59,7 @@ protected function getListenerId()
     protected function createAuthProvider(ContainerBuilder $container, $id, $config, $userProviderId)
     {
         $providerId = 'security.authentication.provider.saml.'.$id;
-        $definitionClassname = $this->getDefinitionClassname();
-        $definition = $container->setDefinition($providerId, new $definitionClassname('hslavich_onelogin_saml.saml_provider'))
+        $definition = $container->setDefinition($providerId, new ChildDefinition('hslavich_onelogin_saml.saml_provider'))
             ->replaceArgument(0, new Reference($userProviderId))
             ->addArgument(array(
                  'persist_user' => $config['persist_user']
@@ -79,44 +77,16 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $config,
         return $providerId;
      }
 
-    protected function createListener($container, $id, $config, $userProvider)
-    {
-        $listenerId = parent::createListener($container, $id, $config, $userProvider);
-        $this->createLogoutHandler($container, $id, $config);
-
-        return $listenerId;
-    }
-
     protected function createEntryPoint($container, $id, $config, $defaultEntryPoint)
     {
         $entryPointId = 'security.authentication.form_entry_point.'.$id;
-        $definitionClassname = $this->getDefinitionClassname();
         $container
-            ->setDefinition($entryPointId, new $definitionClassname('security.authentication.form_entry_point'))
+            ->setDefinition($entryPointId, new ChildDefinition('security.authentication.form_entry_point'))
             ->addArgument(new Reference('security.http_utils'))
             ->addArgument($config['login_path'])
             ->addArgument($config['use_forward'])
         ;
 
         return $entryPointId;
     }
-
-    protected function createLogoutHandler($container, $id, $config)
-    {
-        if ($container->hasDefinition('security.logout_listener.'.$id)) {
-            $logoutListener = $container->getDefinition('security.logout_listener.'.$id);
-            $samlListenerId = 'hslavich_onelogin_saml.saml_logout';
-
-            $definitionClassname = $this->getDefinitionClassname();
-            $container
-                ->setDefinition($samlListenerId, new $definitionClassname('saml.security.http.logout'))
-                ->replaceArgument(2, array_intersect_key($config, $this->options));
-            $logoutListener->addMethodCall('addHandler', array(new Reference($samlListenerId)));
-        }
-    }
-
-    private function getDefinitionClassname()
-    {
-        return class_exists(ChildDefinition::class) ? ChildDefinition::class : DefinitionDecorator::class;
-    }
 }

EventListener/Security/SamlLogoutListener.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hslavich\OneloginSamlBundle\EventListener\Security;
+
+use Hslavich\OneloginSamlBundle\Security\Authentication\Token\SamlTokenInterface;
+use Symfony\Component\Security\Http\Event\LogoutEvent;
+
+class SamlLogoutListener
+{
+    protected $samlAuth;
+
+    public function __construct(\OneLogin\Saml2\Auth $samlAuth)
+    {
+        $this->samlAuth = $samlAuth;
+    }
+
+    public function __invoke(LogoutEvent $event)
+    {
+        $token = $event->getToken();
+        if (!$token instanceof SamlTokenInterface) {
+            return;
+        }
+
+        try {
+            $this->samlAuth->processSLO();
+        } catch (\OneLogin\Saml2\Error $e) {
+            if (!empty($this->samlAuth->getSLOurl())) {
+                $sessionIndex = $token->hasAttribute('sessionIndex') ? $token->getAttribute('sessionIndex') : null;
+                $this->samlAuth->logout(null, array(), $token->getUsername(), $sessionIndex);
+            }
+        }
+    }
+}

README.md

@@ -1,5 +1,5 @@
 # OneloginSamlBundle
-OneLogin SAML Bundle for Symfony2. (https://github.com/onelogin/php-saml)
+OneLogin SAML Bundle for Symfony. (https://github.com/onelogin/php-saml)
 
 [![Build Status](https://travis-ci.org/hslavich/OneloginSamlBundle.svg?branch=master)](https://travis-ci.org/hslavich/OneloginSamlBundle)
 [![Coverage Status](https://coveralls.io/repos/github/hslavich/OneloginSamlBundle/badge.svg?branch=master)](https://coveralls.io/github/hslavich/OneloginSamlBundle?branch=master)

Resources/config/services.yml

@@ -27,7 +27,10 @@ services:
         calls:
             - [setOneLoginAuth, ["@onelogin_auth"]]
 
-    hslavich_onelogin_saml.saml_logout:
-        class: Hslavich\OneloginSamlBundle\Security\Logout\SamlLogoutHandler
+    hslavich_onelogin_saml.saml_logout_listener:
+        class: Hslavich\OneloginSamlBundle\EventListener\Security\SamlLogoutListener
         arguments:
             - "@onelogin_auth"
+        tags:
+            - name: kernel.event_listener
+              event: Symfony\Component\Security\Http\Event\LogoutEvent