Some extra debug logging to help with fixes testing

Author: leenooks

app/Classes/LDAP/Import.php

@@ -3,6 +3,7 @@
 namespace App\Classes\LDAP;
 
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 use LdapRecord\LdapRecordException;
 
 use App\Exceptions\Import\GeneralException;
@@ -16,6 +17,8 @@
  */
 abstract class Import
 {
+	private const LOGKEY = 'aI-';
+
 	// Valid LDIF commands
 	protected const LDAP_IMPORT_ADD = 1;
 	protected const LDAP_IMPORT_DELETE = 2;
@@ -57,6 +60,8 @@ final protected function commit(Entry $o,int $action): Collection
 					$o->save();
 
 				} catch (LdapRecordException $e) {
+					Log::error(sprintf('%s:Import Commit Error',self::LOGKEY),['e'=>$e->getMessage(),'detailed'=>$e->getDetailedError()]);
+
 					if ($e->getDetailedError())
 						return collect([
 							'dn'=>$o->getDN(),
@@ -76,6 +81,8 @@ final protected function commit(Entry $o,int $action): Collection
 						]);
 				}
 
+				Log::debug(sprintf('%s:Import Commited',self::LOGKEY));
+
 				return collect(['dn'=>$o->getDN(),'result'=>__('Created')]);
 
 			default:

app/Classes/LDAP/Import/LDIF.php

@@ -35,7 +35,7 @@ public function process(): Collection
 		// @todo When renaming DNs, the hotlink should point to the new entry on success, or the old entry on failure.
 		foreach (preg_split('/(\r?\n|\r)/',$this->input) as $line) {
 			$c++;
-			Log::debug(sprintf('%s: LDIF Line [%s]',self::LOGKEY,$line));
+			Log::debug(sprintf('%s:LDIF Line [%s]',self::LOGKEY,$line));
 			$line = trim($line);
 
 			// If the line starts with a comment, ignore it
@@ -48,7 +48,7 @@ public function process(): Collection
 					// Add the last attribute;
 					$o->addAttributeItem($attribute,$base64encoded ? base64_decode($value) : $value);
 
-					Log::debug(sprintf('%s: Committing Entry [%s]',self::LOGKEY,$o->getDN()));
+					Log::debug(sprintf('%s:- Committing Entry [%s]',self::LOGKEY,$o->getDN()));
 
 					// Commit
 					$result->push($this->commit($o,$action));
@@ -95,7 +95,7 @@ public function process(): Collection
 					// If $m is NULL, then this is the 2nd (or more) line of a base64 encoded value
 					if (! $m) {
 						$value .= $line;
-						Log::debug(sprintf('%s: Attribute [%s] adding [%s] (%d)',self::LOGKEY,$attribute,$line,$c));
+						Log::debug(sprintf('%s:- Attribute [%s] adding [%s] (%d)',self::LOGKEY,$attribute,$line,$c));
 
 						// add to last attr value
 						continue 2;
@@ -108,7 +108,7 @@ public function process(): Collection
 								throw new GeneralException(sprintf('Previous Entry not complete? (line %d)',$c));
 
 							$dn = $base64encoded ? base64_decode($value) : $value;
-							Log::debug(sprintf('%s: Creating new entry:',self::LOGKEY,$dn));
+							Log::debug(sprintf('%s:Creating new entry:',self::LOGKEY,$dn));
 							//$o = Entry::find($dn);
 
 							// If it doesnt exist, we'll create it
@@ -120,7 +120,7 @@ public function process(): Collection
 							$action = self::LDAP_IMPORT_ADD;
 
 						} else {
-							Log::debug(sprintf('%s: Adding Attribute [%s] value [%s] (%d)',self::LOGKEY,$attribute,$value,$c));
+							Log::debug(sprintf('%s:Adding Attribute [%s] value [%s] (%d)',self::LOGKEY,$attribute,$value,$c));
 
 							if ($value)
 								$o->addAttributeItem($attribute,$base64encoded ? base64_decode($value) : $value);
@@ -134,7 +134,7 @@ public function process(): Collection
 					$attribute = $m[1];
 					$value = $m[3];
 
-					Log::debug(sprintf('%s: New Attribute [%s] with [%s] (%d)',self::LOGKEY,$attribute,$value,$c));
+					Log::debug(sprintf('%s:- New Attribute [%s] with [%s] (%d)',self::LOGKEY,$attribute,$value,$c));
 			}
 
 			if ($version !== 1)
@@ -146,7 +146,7 @@ public function process(): Collection
 			// Add the last attribute;
 			$o->addAttributeItem($attribute,$base64encoded ? base64_decode($value) : $value);
 
-			Log::debug(sprintf('%s: Committing Entry [%s]',self::LOGKEY,$o->getDN()));
+			Log::debug(sprintf('%s:- Committing Entry [%s]',self::LOGKEY,$o->getDN()));
 
 			// Commit
 			$result->push($this->commit($o,$action));

app/Classes/LDAP/Server.php

@@ -204,7 +204,7 @@ private static function cacheflush(string $dn): bool
 				default => TRUE,
 			};
 
-		Log::debug(sprintf('%s:%s - %s',self::LOGKEY,$cache ? 'Caching' : 'Not Cached',$dn));
+		Log::debug(sprintf('%s:%s - %s',self::LOGKEY,$cache ? 'DN CACHEABLE' : 'DN NOT cacheable',$dn));
 		return $cache;
 	}
 
@@ -216,7 +216,7 @@ private static function cacheflush(string $dn): bool
 	private static function cachetime(): Carbon
 	{
 		return Carbon::now()
-			->addSeconds(Config::get('ldap.cache.time'));
+			->addSeconds(Config::get('ldap.cache.time') ?: 0);
 	}
 
 	/**
@@ -232,7 +232,8 @@ private static function get(string $dn,array $attrs=['*','+']): Builder
 			->setDN($dn)
 			->cache(
 				until: self::cachetime(),
-				flush: self::cacheflush($dn))
+				flush: self::cacheflush($dn)
+			)
 			->select($attrs);
 	}
 

app/Http/Controllers/HomeController.php

@@ -8,6 +8,7 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Redirect;
 use LdapRecord\Exceptions\InsufficientAccessException;
 use LdapRecord\LdapRecordException;
@@ -435,6 +436,7 @@ public function import(ImportRequest $request,string $type): \Illuminate\View\Vi
 		switch ($type) {
 			case 'ldif':
 				$import = new LDIFImport($x=($request->text ?: $request->file->get()));
+				Log::debug('Processing LDIF import',['data'=>$x,'import'=>$import]);
 				break;
 
 			default:

app/Ldap/Entry.php

@@ -6,7 +6,6 @@
 use Illuminate\Support\Facades\Crypt;
 use LdapRecord\Support\Arr;
 use LdapRecord\Models\Model;
-use LdapRecord\Query\Model\Builder;
 
 use App\Classes\LDAP\Attribute;
 use App\Classes\LDAP\Attribute\Factory;