Merge pull request #215 from silinternational/develop

Release 5.3.4
silinternational · Jan 5, 2021 · c31107a · c31107a
2 parents f066cd8 + b5ef3bc
commit c31107a
Show file tree

Hide file tree

Showing 14 changed files with 261 additions and 167 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,8 +6,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [5.3.4]
+### Fixed
+- Improved handling of expired session on login
+
+## [5.3.3]
+### Fixed
+- Updated dependencies
+- Rotated credentials for CI/CD
+
 ## [5.3.2]
-### Fixed 
+### Fixed
 - Changed Docker credentials
 
 ## [5.3.1]
@@ -129,7 +138,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Initial version of Password Manager Backend.
 
-[Unreleased]: https://github.com/silinternational/idp-pw-api/compare/5.3.2...HEAD
+[Unreleased]: https://github.com/silinternational/idp-pw-api/compare/5.3.4...HEAD
+[5.3.4]: https://github.com/silinternational/idp-pw-api/compare/5.3.3..5.3.4
+[5.3.3]: https://github.com/silinternational/idp-pw-api/compare/5.3.2..5.3.3
 [5.3.2]: https://github.com/silinternational/idp-pw-api/compare/5.3.1..5.3.2
 [5.3.1]: https://github.com/silinternational/idp-pw-api/compare/5.3.0..5.3.1
 [5.3.0]: https://github.com/silinternational/idp-pw-api/compare/5.2.2...5.3.0

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 SIL International
+Copyright (c) 2021 SIL International
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ composer:
 	docker-compose run --rm cli composer install
 
 composerupdate:
-	docker-compose run --rm cli composer update
+	docker-compose run --rm cli bash -c "composer update && composer show -D > versions.json"
 
 email:
 	docker-compose up -d email

diff --git a/application/common/components/passwordStore/Ldap.php b/application/common/components/passwordStore/Ldap.php
@@ -2,6 +2,7 @@
 namespace common\components\passwordStore;
 
 use Adldap\Adldap;
+use Adldap\Auth\BindException;
 use Adldap\Schemas\OpenLDAP;
 use yii\base\Component;
 
@@ -78,6 +79,7 @@ class Ldap extends Component implements PasswordStoreInterface
 
     /**
      * Connect and bind to ldap server
+     * @throws \Exception
      */
     public function connect()
     {
@@ -101,7 +103,11 @@ public function connect()
             'schema' => OpenLDAP::class,
         ]);
 
-        $this->ldapProvider = $this->ldapClient->connect();
+        try {
+            $this->ldapProvider = $this->ldapClient->connect();
+        } catch (BindException $e) {
+            throw new \Exception($e->getDetailedError());
+        }
     }
 
     /**
@@ -239,7 +245,7 @@ protected function encodeForUnicodePwdField($password)
         }
         return $encodedPassword;
     }
-    
+
     /**
      * @param \Adldap\Models\Entry $user
      * @param string $password

diff --git a/application/composer.json b/application/composer.json
@@ -25,7 +25,7 @@
     "simplesamlphp/saml2": "^3.4.2",
     "google/apiclient": "^2.0",
     "google/recaptcha": "^1.1.2",
-    "adldap2/adldap2": "^9.0",
+    "adldap2/adldap2": "^10.0",
     "fillup/fake-bower-assets": "2.0.9",
     "icawebdesign/hibp-php": "3.1.0",
     "codemix/yii2-streamlog": "^1.3"