refactor isAccountValid, getStartDate and getEndDate functions (#68)

Author: David Coutadeur

src/Ltb/Directory.php

@@ -99,15 +99,15 @@ public function getDnAttribute() : string;
     /*
      * Is account valid? Relies on start and end validity dates
      */
-    public function isAccountValid($ldap, $dn) : bool;
+    public function isAccountValid($entry, $pwdPolicyConfiguration) : bool;
 
     /*
      * Get validity start date
      */
-    public function getStartDate($ldap, $dn) : ?DateTime;
+    public function getStartDate($entry, $pwdPolicyConfiguration) : ?DateTime;
 
     /*
      * Get validity end date
      */
-    public function getEndDate($ldap, $dn) : ?DateTime;
+    public function getEndDate($entry, $pwdPolicyConfiguration) : ?DateTime;
 }

src/Ltb/Directory/ActiveDirectory.php

@@ -305,11 +305,11 @@ public function getDnAttribute() : string {
         return "distinguishedName";
     }
 
-    public function isAccountValid($ldap, $dn) : bool {
+    public function isAccountValid($entry, $pwdPolicyConfiguration) : bool {
 
         $time = time();
-        $startdate = $this->getStartDate($ldap, $dn);
-        $enddate = $this->getEndDate($ldap, $dn);
+        $startdate = $this->getStartDate($entry, $pwdPolicyConfiguration);
+        $enddate = $this->getEndDate($entry, $pwdPolicyConfiguration);
 
         if ( isset($startdate) ) {
             if ( $time <= $startdate->getTimestamp() ) {
@@ -326,29 +326,19 @@ public function isAccountValid($ldap, $dn) : bool {
         return true;
     }
 
-    public function getStartDate($ldap, $dn) : ?DateTime {
+    public function getStartDate($entry, $pwdPolicyConfiguration) : ?DateTime {
 
         // No start date in AD
         return null;
     }
 
-    public function getEndDate($ldap, $dn) : ?DateTime {
+    public function getEndDate($entry, $pwdPolicyConfiguration) : ?DateTime {
 
-        $search = \Ltb\PhpLDAP::ldap_read($ldap, $dn, "(objectClass=*)", array('accountExpires'));
-        $errno = \Ltb\PhpLDAP::ldap_errno($ldap);
-
-        if ( $errno ) {
-            error_log("LDAP - Search error $errno  (".ldap_error($ldap).")");
-            return null;
-        } else {
-            $entry = \Ltb\PhpLDAP::ldap_get_entries($ldap, $search);
-        }
-
-        if (!isset($entry[0]['accountexpires']) or ($entry[0]['accountexpires'][0] == 0) or ($entry[0]['accountexpires'][0] == 9223372036854775807)) {
+        if (!isset($entry['accountexpires']) or ($entry['accountexpires'][0] == 0) or ($entry['accountexpires'][0] == 9223372036854775807)) {
             return null;
         }
 
-        $enddate = \Ltb\Date::adDate2phpDate($entry[0]['accountexpires'][0]);
+        $enddate = \Ltb\Date::adDate2phpDate($entry['accountexpires'][0]);
         return $enddate ? $enddate : null;
     }
 }

src/Ltb/Directory/OpenLDAP.php

@@ -343,11 +343,11 @@ public function getDnAttribute() : string {
         return "entryDn";
     }
 
-    public function isAccountValid($ldap, $dn) : bool {
+    public function isAccountValid($entry, $pwdPolicyConfiguration) : bool {
 
         $time = time();
-        $startdate = $this->getStartDate($ldap, $dn);
-        $enddate = $this->getEndDate($ldap, $dn);
+        $startdate = $this->getStartDate($entry, $pwdPolicyConfiguration);
+        $enddate = $this->getEndDate($entry, $pwdPolicyConfiguration);
 
         if ( isset($startdate) ) {
             if ( $time <= $startdate->getTimestamp() ) {
@@ -364,41 +364,23 @@ public function isAccountValid($ldap, $dn) : bool {
         return true;
     }
 
-    public function getStartDate($ldap, $dn) : ?DateTime {
+    public function getStartDate($entry, $pwdPolicyConfiguration) : ?DateTime {
 
         $startdate = null;
-        $search = \Ltb\PhpLDAP::ldap_read($ldap, $dn, "(objectClass=*)", array('pwdStartTime'));
-        $errno = \Ltb\PhpLDAP::ldap_errno($ldap);
-
-        if ( $errno ) {
-            error_log("LDAP - Search error $errno  (".ldap_error($ldap).")");
-            return null;
-        } else {
-            $entry = \Ltb\PhpLDAP::ldap_get_entries($ldap, $search);
-        }
 
-        if ( isset($entry[0]['pwdstarttime']) ) {
-            $startdate = \Ltb\Date::ldapDate2phpDate($entry[0]['pwdstarttime'][0]);
+        if ( isset($entry['pwdstarttime']) ) {
+            $startdate = \Ltb\Date::ldapDate2phpDate($entry['pwdstarttime'][0]);
         }
 
         return $startdate ? $startdate : null;
     }
 
-    public function getEndDate($ldap, $dn) : ?DateTime {
+    public function getEndDate($entry, $pwdPolicyConfiguration) : ?DateTime {
 
         $enddate = null;
-        $search = \Ltb\PhpLDAP::ldap_read($ldap, $dn, "(objectClass=*)", array('pwdEndTime'));
-        $errno = \Ltb\PhpLDAP::ldap_errno($ldap);
-
-        if ( $errno ) {
-            error_log("LDAP - Search error $errno  (".ldap_error($ldap).")");
-            return null;
-        } else {
-            $entry = \Ltb\PhpLDAP::ldap_get_entries($ldap, $search);
-        }
 
-        if ( isset($entry[0]['pwdendtime']) ) {
-            $enddate = \Ltb\Date::ldapDate2phpDate($entry[0]['pwdendtime'][0]);
+        if ( isset($entry['pwdendtime']) ) {
+            $enddate = \Ltb\Date::ldapDate2phpDate($entry['pwdendtime'][0]);
         }
 
         return $enddate ? $enddate : null;