API Remove SAML module code and update namespaces for SilverStripe\LDAP

silverstripe · Sep 27, 2017 · 2857c2d · 2857c2d
1 parent 3c190cc
commit 2857c2d
Show file tree

Hide file tree

Showing 41 changed files with 108 additions and 983 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: php
 
 env:
   global:
-    - COMPOSER_ROOT_VERSION="4.0.x-dev"
+    - COMPOSER_ROOT_VERSION="1.0.x-dev"
 
 matrix:
   include:
@@ -26,7 +26,7 @@ before_script:
   - composer update
 
 script:
-  - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit tests/; fi
+  - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
   - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi
   - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs --standard=framework/phpcs.xml.dist src/ tests/ ; fi
 

diff --git a/.upgrade.yml b/.upgrade.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -1,20 +1,19 @@
-# SilverStripe Active Directory module
+# SilverStripe LDAP module
 
-[![Build Status](https://secure.travis-ci.org/silverstripe/silverstripe-activedirectory.svg)](https://travis-ci.org/silverstripe/silverstripe-activedirectory)
+[![Build Status](https://secure.travis-ci.org/silverstripe/silverstripe-ldap.svg)](https://travis-ci.org/silverstripe/silverstripe-ldap)
 
 ## Introduction
 
-This SilverStripe module provides Active Directory integration. It comes with three major components:
+This SilverStripe module provides LDAP integration. It comes with two major components:
 
-* Single sign-on authentication with SAML
 * Synchronisation of Active Directory users and group memberships via LDAP
 * Active Directory authentication via LDAP binding
 
 These components may be used in any combination, also alongside the default SilverStripe authentication scheme.
 
 ## Requirements
 
- * PHP 5.5+ with extensions: ldap, openssl, dom, and mcrypt
+ * PHP 5.6+ with extensions: ldap, openssl, dom, and mcrypt
  * SilverStripe 4.0+
  * Active Directory on Windows Server 2008 R2 or greater (AD)
  * Active Directory Federation Services 2.0 or greater (ADFS)
@@ -65,4 +64,4 @@ AD user synchronisation and authentication is hidden behind the backend (server
 
 ## Changelog
 
-The changelog can be found at [CHANGELOG.MD](CHANGELOG.MD).
+Please see the GitHub releases for changes.
diff --git a/_config/ldap.yml b/_config/ldap.yml
@@ -3,19 +3,19 @@ Name: ldapconfig
 ---
 SilverStripe\Control\Director:
   rules:
-    'LDAPDebug': SilverStripe\ActiveDirectory\Control\LDAPDebugController
+    'LDAPDebug': SilverStripe\LDAP\Control\LDAPDebugController
 
 SilverStripe\Security\Group:
   extensions:
-    - SilverStripe\ActiveDirectory\Extensions\LDAPGroupExtension
+    - SilverStripe\LDAP\Extensions\LDAPGroupExtension
 SilverStripe\Security\Member:
   extensions:
-    - SilverStripe\ActiveDirectory\Extensions\LDAPMemberExtension
+    - SilverStripe\LDAP\Extensions\LDAPMemberExtension
 
-SilverStripe\ActiveDirectory\Authenticators\LDAPAuthenticator:
+SilverStripe\LDAP\Authenticators\LDAPAuthenticator:
   name: "LDAP"
 
-SilverStripe\ActiveDirectory\Services\LDAPService:
+SilverStripe\LDAP\Services\LDAPService:
   allow_password_change: false
 
 SilverStripe\Core\Injector\Injector:
@@ -28,20 +28,20 @@ SilverStripe\Core\Injector\Injector:
 SilverStripe\Dev\Backtrace:
   ignore_function_args:
     -
-      - 'SilverStripe\\ActiveDirectory\\Model\\LDAPGateway'
+      - 'SilverStripe\\LDAP\\Model\\LDAPGateway'
       - 'authenticate'
     -
-      - 'SilverStripe\\ActiveDirectory\\Model\\LDAPGateway'
+      - 'SilverStripe\\LDAP\\Model\\LDAPGateway'
       - 'changePassword'
     -
-      - 'SilverStripe\\ActiveDirectory\\Model\\LDAPGateway'
+      - 'SilverStripe\\LDAP\\Model\\LDAPGateway'
       - 'resetPassword'
     -
-      - 'SilverStripe\\ActiveDirectory\\Services\\LDAPService'
+      - 'SilverStripe\\LDAP\\Services\\LDAPService'
       - 'authenticate'
     -
-      - 'SilverStripe\\ActiveDirectory\\Services\\LDAPService'
+      - 'SilverStripe\\LDAP\\Services\\LDAPService'
       - 'setPassword'
     -
-      - 'SilverStripe\\ActiveDirectory\\Services\\LDAPService'
+      - 'SilverStripe\\LDAP\\Services\\LDAPService'
       - 'passwordHistoryWorkaround'
diff --git a/_config/legacy.yml b/_config/legacy.yml
diff --git a/_config/saml.yml b/_config/saml.yml
diff --git a/composer.json b/composer.json
@@ -1,8 +1,8 @@
 {
-    "name": "silverstripe/activedirectory",
-    "description": "Adds Active Directory support to SilverStripe including user synchronisation and SSO/LDAP authentication",
+    "name": "silverstripe/ldap",
+    "description": "Adds LDAP support to SilverStripe including user synchronisation and authentication",
     "type": "silverstripe-module",
-    "keywords": ["silverstripe", "ad", "active", "directory", "ldap", "sso", "saml"],
+    "keywords": ["silverstripe", "ad", "active", "directory", "ldap"],
     "license": "BSD-3-Clause",
     "authors": [
         {
@@ -21,22 +21,21 @@
         "symbiote/silverstripe-queuedjobs": "^4@dev",
         "zendframework/zend-ldap": "^2.5.1",
         "zendframework/zend-authentication": "^2.5.1",
-        "zendframework/zend-session": "^2.5.1",
-        "onelogin/php-saml": "^2.10.7"
+        "zendframework/zend-session": "^2.5.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7",
         "squizlabs/php_codesniffer": "^3.0"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "4.x-dev"
+            "dev-master": "1.0.x-dev"
         }
     },
     "autoload": {
         "psr-4": {
-            "SilverStripe\\ActiveDirectory\\": "src/",
-            "SilverStripe\\ActiveDirectory\\Tests\\": "tests/"
+            "SilverStripe\\LDAP\\": "src/",
+            "SilverStripe\\LDAP\\Tests\\": "tests/"
         }
     },
     "minimum-stability": "dev",

diff --git a/license.md b/license.md
@@ -1,4 +1,4 @@
-Copyright (c) 2016, SilverStripe Limited
+Copyright (c) 2017, SilverStripe Limited
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,16 +1,14 @@
 <phpunit bootstrap="framework/tests/bootstrap.php" colors="true">
-
     <testsuite name="Default">
-        <directory>tests</directory>
+        <directory>tests/</directory>
     </testsuite>
 
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src/.</directory>
+            <directory suffix=".php">src/</directory>
             <exclude>
                 <directory suffix=".php">tests/</directory>
             </exclude>
         </whitelist>
     </filter>
-
 </phpunit>
diff --git a/src/Authenticators/LDAPAuthenticator.php b/src/Authenticators/LDAPAuthenticator.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace SilverStripe\ActiveDirectory\Authenticators;
+namespace SilverStripe\LDAP\Authenticators;
 
-use SilverStripe\ActiveDirectory\Forms\LDAPLoginForm;
-use SilverStripe\ActiveDirectory\Services\LDAPService;
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\Email\Email;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Injector\Injector;
+use SilverStripe\LDAP\Forms\LDAPLoginForm;
+use SilverStripe\LDAP\Services\LDAPService;
 use SilverStripe\ORM\ValidationResult;
 use SilverStripe\Security\Authenticator;
 use SilverStripe\Security\Member;
@@ -19,10 +19,6 @@
  * Class LDAPAuthenticator
  *
  * Authenticate a user against LDAP, without the single sign-on component.
- *
- * See SAMLAuthenticator for further information.
- *
- * @package activedirectory
  */
 class LDAPAuthenticator extends MemberAuthenticator
 {

diff --git a/src/Authenticators/LDAPChangePasswordHandler.php b/src/Authenticators/LDAPChangePasswordHandler.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace SilverStripe\ActiveDirectory\Authenticators;
+namespace SilverStripe\LDAP\Authenticators;
 
 use Exception;
 use Psr\Log\LoggerInterface;
-use SilverStripe\ActiveDirectory\Forms\LDAPChangePasswordForm;
-use SilverStripe\ActiveDirectory\Services\LDAPService;
 use SilverStripe\Control\Director;
 use SilverStripe\Control\HTTP;
 use SilverStripe\Control\HTTPResponse;
 use SilverStripe\Core\Injector\Injector;
+use SilverStripe\LDAP\Forms\LDAPChangePasswordForm;
+use SilverStripe\LDAP\Services\LDAPService;
 use SilverStripe\ORM\ValidationResult;
 use SilverStripe\Security\Member;
 use SilverStripe\Security\MemberAuthenticator\ChangePasswordHandler;

diff --git a/src/Authenticators/LDAPLoginHandler.php b/src/Authenticators/LDAPLoginHandler.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace SilverStripe\ActiveDirectory\Authenticators;
+namespace SilverStripe\LDAP\Authenticators;
 
-use SilverStripe\ActiveDirectory\Forms\LDAPLoginForm;
+use SilverStripe\LDAP\Forms\LDAPLoginForm;
 use SilverStripe\Security\MemberAuthenticator\LoginHandler;
 
 class LDAPLoginHandler extends LoginHandler