Symfony 3: updates to @famoser's fork

.gitignore

@@ -0,0 +1,2 @@
+.idea
+vendor

README.md

@@ -1,12 +1,17 @@
+What is Shibboleth again?
+==================
+Sibboleth is a tool installed on the server, depending on the setup you can activate it with the .htaccess configuration as provided below or you may need to ask your server administration. If activated correctly it allows for your user to login at the provider used by your server, and afterwards adds additional header containing the authentication information on __each__ request, to be used by your application. You can test if all works nicely by simply dumping the headers: `dump($request->headers)`.  
+The Shibboleth bundle aims to integrate this authentication fully into symfony; it adds firewalls and user managers to archive this. This fork simply makes the project compatible with symfony 3, and tries not to change existing behaviour. If an additional firewall is overkill for you, you might want to skip the installation of this Bundle, and rather set up listeners on kernel events which handle the authentification.  
+
 ShibbolethBundle
 ================
 
-This bundle adds a shibboleth authentication provider for your Symfony2 project.
+This bundle adds a shibboleth authentication provider for your Symfony3 project.
 
 Requirements
 ------------
 * [PHP](http://php.net) 5.3.3 and up.
-* [Symfony 2.2+][http://symfony.com]
+* [Symfony 3.0+][http://symfony.com]
 
 Installation
 ------------

Resources/config/services.xml

@@ -36,7 +36,7 @@
         <service id="security.authentication.listener.shibboleth"
             class="KULeuven\ShibbolethBundle\Security\ShibbolethListener" public="false">
             <tag name="monolog.logger" channel="security" />
-            <argument type="service" id="security.context"/>
+            <argument type="service" id="security.token_storage"/>
             <argument type="service" id="security.authentication.manager" />
             <argument type="service" id="shibboleth" />
             <argument /> <!-- Provider-shared Key -->

Security/ShibbolethListener.php

@@ -25,9 +25,9 @@
 namespace KULeuven\ShibbolethBundle\Security;
 
 use KULeuven\ShibbolethBundle\Service\Shibboleth;
-use Symfony\Component\Security\Core\SecurityContextInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
-use Symfony\Component\HttpKernel\Log\LoggerInterface;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Http\Firewall\ListenerInterface;
@@ -40,6 +40,7 @@
 
 class ShibbolethListener implements ListenerInterface
 {
+    /* @var TokenStorageInterface $securityContext */
     private $securityContext;
     private $authenticationManager;
     private $providerKey;
@@ -50,7 +51,7 @@ class ShibbolethListener implements ListenerInterface
     private $shibboleth;
 
     public function __construct(
-        SecurityContextInterface $securityContext,
+        TokenStorageInterface $securityContext,
         AuthenticationManagerInterface $authenticationManager,
         Shibboleth $shibboleth,
         $providerKey = null,
@@ -74,6 +75,7 @@ public function __construct(
 
     public function handle(GetResponseEvent $event)
     {
+        /** @var Request $request */
         $request = $event->getRequest();
 
         if (!$this->shibboleth->isAuthenticated($request)) {
@@ -85,6 +87,7 @@ public function handle(GetResponseEvent $event)
         }
 
         $username = $this->shibboleth->getUser($request);
+        $username = substr($username, 0, strpos($username, '@'));
 
         if (null !== $this->logger) {
             $this->logger->debug(sprintf('Shibboleth service returned user: %s', $username));

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "kuleuven/shibboleth-bundle",
+    "name": "famoser/shibboleth-bundle",
     "description": "Symfony2 authentication provider for Shibboleth",
     "keywords": ["authentication","security","shibboleth"],
     "type": "symfony-bundle",
@@ -10,9 +10,15 @@
         },
         {
             "name": "Bert Van Gelder"
+        },
+        {
+            "name": "Florian Moser"
         }
     ],
     "autoload": {
         "psr-4": { "KULeuven\\ShibbolethBundle\\": "" }
+    },
+    "require": {
+        "symfony/symfony": "^3.1"
     }
-}	
+}