partkeepr

commit 74c0b2bc06d411a3bb0b11e6e8f24a2c8bae1069
parent a9c4639a0c53b9501fd2dbf42e4b1a003086b4a0
Author: Felicitus <felicitus@felicitus.org>
Date:   Mon, 12 Oct 2015 12:55:06 +0200

Added own version of the fr3d ldap bundle to support the enable flag, fixed configuration for enabling/disabling ldap

Diffstat:
M
app/config/config_ldap.yml
 | 
2
++
M
app/config/parameters.php.dist
 | 
2
+-
M
app/config/security.yml
 | 
16
++++++++++++----
M
composer.json
 | 
6
+++++-
M
src/PartKeepr/SetupBundle/Resources/views/parameters.php.twig
 | 
2
+-

5 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/app/config/config_ldap.yml b/app/config/config_ldap.yml
@@ -14,6 +14,8 @@ fr3d_ldap:
         accountDomainName:      "%fr3d_ldap.driver.accountDomainName%"
         accountDomainNameShort: "%fr3d_ldap.driver.accountDomainNameShort%"
     user:
+        enabled: "%fr3d_ldap.user.enabled%"
+        enabled: "%fr3d_ldap.user.enabled%"
         baseDn: "%fr3d_ldap.user.baseDn%"
         filter: "%fr3d_ldap.user.filter%"
         attributes: # Specify ldap attributes mapping [ldap attribute, user object method]
diff --git a/app/config/parameters.php.dist b/app/config/parameters.php.dist
@@ -19,7 +19,6 @@ $container->setParameter('locale', 'en');
 
 $container->setParameter('secret', 'COAAFJGGLPHPDGGNCNILHFGECFMMACKC');
 
-$container->setParameter('fr3d_ldap.enabled', false);
 $container->setParameter('fr3d_ldap.driver.host', '127.0.0.1');
 $container->setParameter('fr3d_ldap.driver.port', null);
 $container->setParameter('fr3d_ldap.driver.username', null);
@@ -33,6 +32,7 @@ $container->setParameter('fr3d_ldap.driver.useStartTls', null);
 $container->setParameter('fr3d_ldap.driver.accountCanonicalForm', null);
 $container->setParameter('fr3d_ldap.driver.accountDomainName', null);
 $container->setParameter('fr3d_ldap.driver.accountDomainNameShort', null);
+$container->setParameter('fr3d_ldap.user.enabled', false);
 $container->setParameter('fr3d_ldap.user.baseDn', 'dc=blabla,dc=com');
 $container->setParameter('fr3d_ldap.user.filter', null);
 $container->setParameter('fr3d_ldap.user.attribute.username', null);
diff --git a/app/config/security.yml b/app/config/security.yml
@@ -6,6 +6,10 @@ security:
         FOS\UserBundle\Model\UserInterface:
           algorithm: sha512
           iterations: 1
+        PartKeepr\AuthBundle\Entity\User:
+          algorithm: md5
+          iterations: 1
+          encode_as_base64: false
 
     role_hierarchy:
         ROLE_ADMIN:       ROLE_USER
@@ -14,7 +18,9 @@ security:
     providers:
         chain_provider:
             chain:
-                providers: [in_memory, fos_userbundle, fr3d_ldapbundle]
+                providers: [in_memory, fos_userbundle, fr3d_ldapbundle, legacy]
+        legacy:
+            id: partkeepr_legacy_user_provider
         in_memory:
             memory:
                 users:
@@ -33,11 +39,13 @@ security:
         main:
             stateless: true
             pattern: ^/api/.*
-            provider: fos_userbundle
+            provider: chain_provider
             fr3d_ldap_httpbasic:
-                provider: fr3d_ldapbundle
+                provider: chain_provider
             http_basic:
-                provider: fos_userbundle
+                provider: chain_provider
+            remote_user:
+                provider: chain_provider
             wsse:
                 realm: "Secured with WSSE" #identifies the set of resources to which the authentication information will apply (WWW-Authenticate)
                 profile: "UsernameToken" #WSSE profile (WWW-Authenticate)
diff --git a/composer.json b/composer.json
@@ -24,11 +24,15 @@
     {
       "type": "vcs",
       "url": "https://github.com/felicitus/EscapeWSSEAuthenticationBundle"
+    },
+    {
+      "type": "vcs",
+      "url": "https://github.com/partkeepr/FR3DLdapBundle"
     }
     ],
   "require": {
     "php": ">=5.6.0",
-    "fr3d/ldap-bundle": "2.0.*@dev",
+    "fr3d/ldap-bundle": "dev-master",
     "symfony/symfony": "~2.7",
     "incenteev/composer-parameter-handler": "~2.0",
     "doctrine/orm": "~2.5",
diff --git a/src/PartKeepr/SetupBundle/Resources/views/parameters.php.twig b/src/PartKeepr/SetupBundle/Resources/views/parameters.php.twig
@@ -19,7 +19,6 @@ $container->setParameter('locale', 'en');
 
 $container->setParameter('secret', {{ secret|raw }});
 
-$container->setParameter('fr3d_ldap.enabled', {{ ldap.enabled|raw }});
 $container->setParameter('fr3d_ldap.driver.host', {{ ldap.host|raw }});
 $container->setParameter('fr3d_ldap.driver.port', {{ ldap.port|raw }});
 $container->setParameter('fr3d_ldap.driver.username', {{ ldap.username|raw }});
@@ -33,6 +32,7 @@ $container->setParameter('fr3d_ldap.driver.useStartTls', {{ ldap.starttls|raw }}
 $container->setParameter('fr3d_ldap.driver.accountCanonicalForm', null);
 $container->setParameter('fr3d_ldap.driver.accountDomainName', null);
 $container->setParameter('fr3d_ldap.driver.accountDomainNameShort', null);
+$container->setParameter('fr3d_ldap.user.enabled', {{ ldap.enabled|raw }});
 $container->setParameter('fr3d_ldap.user.baseDn', {{ ldap.user_basedn|raw }});
 $container->setParameter('fr3d_ldap.user.filter', {{ ldap.user_filter|raw }});
 $container->setParameter('fr3d_ldap.user.attribute.username', {{ ldap.user_username|raw }});