Merge pull request #39 from tmilos/idp-loop

Prevent IDP loop when misconfigured

Author: tmilos

src/LightSaml/SpBundle/DependencyInjection/Security/Factory/LightSamlSpFactory.php

@@ -24,7 +24,7 @@ public function addConfiguration(NodeDefinition $node)
         parent::addConfiguration($node);
         $node
             ->children()
-                ->booleanNode('force')->defaultFalse()->end()
+                ->booleanNode('force')->defaultTrue()->end()
                 ->scalarNode('username_mapper')->defaultValue('lightsaml_sp.username_mapper.simple')->end()
                 ->scalarNode('user_creator')->defaultNull()->end()
                 ->scalarNode('attribute_mapper')->defaultValue('lightsaml_sp.attribute_mapper.simple')->end()

src/LightSaml/SpBundle/Security/Authentication/Provider/LightsSamlSpAuthenticationProvider.php

@@ -201,15 +201,19 @@ private function createUser(SamlSpResponseToken $token)
     /**
      * @param SamlSpResponseToken $token
      *
-     * @return null|string
+     * @return string
      */
     private function createDefaultUser(SamlSpResponseToken $token)
     {
-        if (null === $this->usernameMapper) {
-            return null;
+        $result = null;
+        if ($this->usernameMapper) {
+            $result = $this->usernameMapper->getUsername($token->getResponse());
+        }
+        if (!$result) {
+            $result = 'Anon.';
         }
 
-        return $this->usernameMapper->getUsername($token->getResponse());
+        return $result;
     }
 
     /**

tests/LightSaml/SpBundle/Tests/DependencyInjection/Security/Factory/LightSamlSpFactoryTest.php

@@ -31,7 +31,7 @@ public function test_position()
     public function configuration_provider()
     {
         return [
-            ['force', BooleanNode::class, false],
+            ['force', BooleanNode::class, true],
             ['username_mapper', ScalarNode::class, 'lightsaml_sp.username_mapper.simple'],
             ['user_creator', ScalarNode::class, null],
             ['attribute_mapper', ScalarNode::class, 'lightsaml_sp.attribute_mapper.simple'],
@@ -177,7 +177,7 @@ public function test_injects_token_factory_to_auth_provider()
     private function getDefaultConfig()
     {
         return [
-            'force' => false,
+            'force' => true,
             'username_mapper' => 'lightsaml_sp.username_mapper.simple',
             'token_factory' => 'lightsaml_sp.token_factory',
             'user_creator' => 'some.user.creator',

tests/LightSaml/SpBundle/Tests/Security/Authentication/Provider/LightsSamlSpAuthenticationProviderTest.php

@@ -427,7 +427,7 @@ public function test_throws_logic_exception_if_attribute_mapper_does_not_return_
      */
     public function test_throws_authentication_exception_when_unable_to_resolve_user()
     {
-        $provider = new LightsSamlSpAuthenticationProvider('main', null, true);
+        $provider = new LightsSamlSpAuthenticationProvider('main', null, false);
         $provider->authenticate(new SamlSpResponseToken(new Response(), 'main'));
     }