Implemented more attribute classes

app/Classes/LDAP/Attribute.php

@@ -14,7 +14,7 @@ class Attribute
 	// Attribute Name
 	protected string $name;
 
-	protected ?AttributeType $schema;
+	protected ?AttributeType $schema = NULL;
 
 	/*
 	# Source of this attribute definition
@@ -28,7 +28,7 @@ class Attribute
 	protected bool $is_deletable = FALSE;
 
 	// Is this attribute an internal attribute
-	protected bool $is_internal;
+	protected bool $is_internal = FALSE;
 
 	// Is this attribute the RDN?
 	protected bool $is_rdn = FALSE;
@@ -95,7 +95,9 @@ class Attribute
 		$this->name = $name;
 		$this->values = collect($values);
 
-		$this->schema = config('server')->schema('attributetypes',$name);
+		// No need to load our schema for internal attributes
+		if (! $this->is_internal)
+			$this->schema = config('server')->schema('attributetypes',$name);
 
 		/*
 		# Should this attribute be hidden

app/Classes/LDAP/Attribute/Binary.php

@@ -7,6 +7,6 @@ use App\Classes\LDAP\Attribute;
 /**
  * Represents an attribute whose values are binary
  */
-abstract class Binary extends Attribute
+class Binary extends Attribute
 {
 }

app/Classes/LDAP/Attribute/Binary/JpegPhoto.php

@@ -5,7 +5,7 @@ namespace App\Classes\LDAP\Attribute\Binary;
 use App\Classes\LDAP\Attribute\Binary;
 
 /**
- * Represents an attribute whose values are jpeg pictures
+ * Represents an JpegPhoto Attribute
  */
 final class JpegPhoto extends Binary
 {

app/Classes/LDAP/Attribute/Factory.php

@@ -20,13 +20,24 @@ class Factory
 	 * Map of attributes to appropriate class
 	 */
 	public const map = [
+		'createtimestamp' => Internal\Timestamp::class,
+		'creatorsname' => Internal\EntryDN::class,
+		'entrycsn' => Internal\EntryCSN::class,
+		'entrydn' => Internal\EntryDN::class,
 		'entryuuid' => Internal\EntryUUID::class,
+		'gidnumber' => GidNumber::class,
+		'hassubordinates' => Internal\HasSubordinates::class,
 		'jpegphoto' => Binary\JpegPhoto::class,
+		'modifytimestamp' => Internal\Timestamp::class,
+		'modifiersname' => Internal\EntryDN::class,
 		'objectclass' => ObjectClass::class,
+		'structuralobjectclass' => Internal\StructuralObjectClass::class,
+		'subschemasubentry' => Internal\SubschemaSubentry::class,
 		'supportedcontrol' => Schema\OID::class,
 		'supportedextension' => Schema\OID::class,
 		'supportedfeatures' => Schema\OID::class,
 		'supportedsaslmechanisms' => Schema\Mechanisms::class,
+		'userpassword' => Password::class,
 	];
 
 	/**

app/Classes/LDAP/Attribute/GidNumber.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Classes\LDAP\Attribute;
+
+use App\Classes\LDAP\Attribute;
+
+/**
+ * Represents an GidNumber Attribute
+ */
+final class GidNumber extends Attribute
+{
+}

app/Classes/LDAP/Attribute/Internal/EntryCSN.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Classes\LDAP\Attribute\Internal;
+
+use App\Classes\LDAP\Attribute\Internal;
+
+/**
+ * Represents an EntryCSN Attribute
+ */
+final class EntryCSN extends Internal
+{
+}

app/Classes/LDAP/Attribute/Internal/EntryDN.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Classes\LDAP\Attribute\Internal;
+
+use App\Classes\LDAP\Attribute\Internal;
+
+/**
+ * Represents an EntryDN Attribute
+ */
+final class EntryDN extends Internal
+{
+}

app/Classes/LDAP/Attribute/Internal/EntryUUID.php

@@ -5,7 +5,7 @@ namespace App\Classes\LDAP\Attribute\Internal;
 use App\Classes\LDAP\Attribute\Internal;
 
 /**
- * Represents an attribute whose values are binary
+ * Represents an EntryUUID Attribute
  */
 final class EntryUUID extends Internal
 {

app/Classes/LDAP/Attribute/Internal/HasSubordinates.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Classes\LDAP\Attribute\Internal;
+
+use App\Classes\LDAP\Attribute\Internal;
+
+/**
+ * Represents an HasSubordinates Attribute
+ */
+final class HasSubordinates extends Internal
+{
+}

app/Classes/LDAP/Attribute/Internal/StructuralObjectClass.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Classes\LDAP\Attribute\Internal;
+
+use App\Classes\LDAP\Attribute\Internal;
+
+/**
+ * Represents an StructuralObjectClass Attribute
+ */
+final class StructuralObjectClass extends Internal
+{
+}

app/Classes/LDAP/Attribute/Internal/SubschemaSubentry.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Classes\LDAP\Attribute\Internal;
+
+use App\Classes\LDAP\Attribute\Internal;
+
+/**
+ * Represents an SubschemaSubentry Attribute
+ */
+final class SubschemaSubentry extends Internal
+{
+}

app/Classes/LDAP/Attribute/Internal/Timestamp.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\LDAP\Attribute\Internal;
+
+use Carbon\Carbon;
+
+use App\Classes\LDAP\Attribute\Internal;
+
+/**
+ * Represents an attribute whose values are timestamps
+ */
+final class Timestamp extends Internal
+{
+	public function __toString(): string
+	{
+		return Carbon::createFromTimestamp(strtotime($this->values[0]))->format(config('ldap.datetime_format','Y-m-d H:i:s'));
+	}
+}

app/Classes/LDAP/Attribute/ObjectClass.php

@@ -5,7 +5,7 @@ namespace App\Classes\LDAP\Attribute;
 use App\Classes\LDAP\Attribute;
 
 /**
- * Represents an attribute whose values are jpeg pictures
+ * Represents an ObjectClass Attribute
  */
 final class ObjectClass extends Attribute
 {

app/Classes/LDAP/Attribute/Password.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Classes\LDAP\Attribute;
+
+use App\Classes\LDAP\Attribute;
+
+/**
+ * Represents an attribute whose values are passwords
+ */
+class Password extends Attribute
+{
+	public function __toString(): string
+	{
+		return str_repeat('*',10)
+			.sprintf('<br><span class="btn btn-sm btn-outline-dark"><i class="fas fa-user-check"></i> %s</span>',__('Check Password'));
+	}
+}

app/Classes/LDAP/Attribute/Schema/Mechanisms.php

@@ -5,7 +5,7 @@ namespace App\Classes\LDAP\Attribute\Schema;
 use App\Classes\LDAP\Attribute\Schema;
 
 /**
- * Represents an attribute whose values are binary
+ * Represents a Mechanisms Attribute
  */
 final class Mechanisms extends Schema
 {

app/Classes/LDAP/Attribute/Schema/OID.php

@@ -5,7 +5,7 @@ namespace App\Classes\LDAP\Attribute\Schema;
 use App\Classes\LDAP\Attribute\Schema;
 
 /**
- * Represents an attribute whose values are binary
+ * Represents an OID Attribute
  */
 final class OID extends Schema
 {

app/Ldap/Entry.php

@@ -6,6 +6,7 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use LdapRecord\Models\Model;
 
+use App\Classes\LDAP\Attribute;
 use App\Classes\LDAP\Attribute\Factory;
 
 class Entry extends Model
@@ -14,48 +15,54 @@ class Entry extends Model
 
 	public function getAttributes(): array
 	{
-		$result = collect();
+		static $result = NULL;
 
-		foreach (parent::getAttributes() as $attribute => $value) {
+		if (is_null($result)) {
-			$o = Factory::create($attribute,$value);
+			$result = collect();
 
-			// Set the rdn flag
+			foreach (parent::getAttributes() as $attribute => $value) {
-			if (preg_match('/^'.$attribute.'=/i',$this->dn))
+				$o = Factory::create($attribute,$value);
-				$o->setRDN();
 
-			// Set required flag
+				// Set the rdn flag
-			$o->required_by(collect($this->getAttribute('objectclass')));
+				if (preg_match('/^'.$attribute.'=/i',$this->dn))
+					$o->setRDN();
 
-			$result->put($attribute,$o);
+				// Set required flag
+				$o->required_by(collect($this->getAttribute('objectclass')));
+
+				$result->put($attribute,$o);
+			}
+
+			$sort = collect(config('ldap.attr_display_order',[]))->transform(function($item) { return strtolower($item); });
+
+			// Order the attributes
+			$result = $result->sortBy([function(Attribute $a,Attribute $b) use ($sort): int {
+				if ($a === $b)
+					return 0;
+
+				// Check if $a/$b are in the configuration to be sorted first, if so get it's key
+				$a_key = $sort->search($a->name_lc);
+				$b_key = $sort->search($b->name_lc);
+
+				// If the keys were not in the sort list, set the key to be the count of elements (ie: so it is last to be sorted)
+				if ($a_key === FALSE)
+					$a_key = $sort->count()+1;
+
+				if ($b_key === FALSE)
+					$b_key = $sort->count()+1;
+
+				// Case where neither $a, nor $b are in ldap.attr_display_order, $a_key = $b_key = one greater than num elements.
+				// So we sort them alphabetically
+				if ($a_key === $b_key)
+					return strcasecmp($a->name,$b->name);
+
+				// Case where at least one attribute or its friendly name is in $attrs_display_order
+				// return -1 if $a before $b in $attrs_display_order
+				return ($a_key < $b_key) ? -1 : 1;
+			} ])->toArray();
 		}
 
-		$sort = collect(config('ldap.attr_display_order',[]))->transform(function($item) { return strtolower($item); });
+		return $result;
-
-		// Order the attributes
-		return $result->sortBy([function($a,$b) use ($sort) {
-			if (! $sort->count() || $a === $b)
-				return 0;
-
-			// Check if $a/$b are in the configuration to be sorted first, if so get it's key
-			$a_key = $sort->search($a->name_lc);
-			$b_key = $sort->search($b->name_lc);
-
-			// If the keys were not in the sort list, set the key to be the count of elements (ie: so it is last to be sorted)
-			if ($a_key === FALSE)
-				$a_key = $sort->count()+1;
-
-			if ($b_key === FALSE)
-				$b_key = $sort->count()+1;
-
-			// Case where neither $a, nor $b are in ldap.attr_display_order, $a_key = $b_key = one greater than num elements.
-			// So we sort them alphabetically
-			if ($a_key === $b_key)
-				return strcasecmp($a->name,$b->name);
-
-			// Case where at least one attribute or its friendly name is in $attrs_display_order
-			// return -1 if $a before $b in $attrs_display_order
-			return ($a_key < $b_key) ? -1 : 1;
-		} ])->toArray();
 	}
 
 	/* ATTRIBUTES */
@@ -73,6 +80,23 @@ class Entry extends Model
 
 	/* METHODS */
 
+	/**
+	 * Return a list of LDAP internal attributes
+	 *
+	 * @return Collection
+	 */
+	public function getInternalAttributes(): Collection
+	{
+		return collect($this->getAttributes())->filter(function($item) {
+			return $item->is_internal;
+		});
+	}
+
+	/**
+	 * Return this list of user attributes
+	 *
+	 * @return Collection
+	 */
 	public function getVisibleAttributes(): Collection
 	{
 		return collect($this->getAttributes())->filter(function($item) {

config/ldap.php

@@ -102,4 +102,13 @@ return [
 	],
 	*/
 
+	/*
+	 |--------------------------------------------------------------------------
+	 | Custom Date Format
+	 |--------------------------------------------------------------------------
+	 |
+	 | Configuration to determine how date fields will be displayed.
+	 |
+	 */
+	'datetime_format' => 'Y-m-d H:i:s',
 ];

lib/AttributeFactory.php

@@ -96,18 +96,9 @@ class AttributeFactory {
 					return $this->newMultiLineAttribute($name,$values,$server_id,$source);
 			}
 
-		if (! strcasecmp($name,'objectClass')) {
+		if ($app['server']->isAttrBinary($name)) {
-			return $this->newObjectClassAttribute($name,$values,$server_id,$source);
-
-		} elseif ($app['server']->isJpegPhoto($name) || in_array($name,$app['server']->getValue('server','jpeg_attributes'))) {
-			return $this->newJpegAttribute($name,$values,$server_id,$source);
-
-		} elseif ($app['server']->isAttrBinary($name)) {
 			return $this->newBinaryAttribute($name,$values,$server_id,$source);
 
-		} elseif (! strcasecmp($name,'userPassword')) {
-			return $this->newPasswordAttribute($name,$values,$server_id,$source);
-
 		} elseif (! strcasecmp($name,'sambaLMPassword') || ! strcasecmp($name,'sambaNTPassword')) {
 			return $this->newSambaPasswordAttribute($name,$values,$server_id,$source);
 
@@ -129,26 +120,11 @@ class AttributeFactory {
 		} elseif ($app['server']->isMultiLineAttr($name)) {
 			return $this->newMultiLineAttribute($name,$values,$server_id,$source);
 
-		} elseif (! strcasecmp($name,'gidNumber')) {
-			return $this->newGidAttribute($name,$values,$server_id,$source);
-
 		} else {
 			return new Attribute($name,$values,$server_id,$source);
 		}
 	}
 
-	private function newJpegAttribute($name,$values,$server_id,$source) {
-		return new JpegAttribute($name,$values,$server_id,$source);
-	}
-
-	private function newBinaryAttribute($name,$values,$server_id,$source) {
-		return new BinaryAttribute($name,$values,$server_id,$source);
-	}
-
-	private function newPasswordAttribute($name,$values,$server_id,$source) {
-		return new PasswordAttribute($name,$values,$server_id,$source);
-	}
-
 	private function newSambaPasswordAttribute($name,$values,$server_id,$source) {
 		return new SambaPasswordAttribute($name,$values,$server_id,$source);
 	}
@@ -168,21 +144,5 @@ class AttributeFactory {
 	private function newMultiLineAttribute($name,$values,$server_id,$source) {
 		return new MultiLineAttribute($name,$values,$server_id,$source);
 	}
-
-	private function newDateAttribute($name,$values,$server_id,$source) {
-		return new DateAttribute($name,$values,$server_id,$source);
-	}
-
-	private function newObjectClassAttribute($name,$values,$server_id,$source) {
-		return new ObjectClassAttribute($name,$values,$server_id,$source);
-	}
-
-	private function newDnAttribute($name,$values,$server_id,$source) {
-		return new DnAttribute($name,$values,$server_id,$source);
-	}
-
-	private function newGidAttribute($name,$values,$server_id,$source) {
-		return new GidAttribute($name,$values,$server_id,$source);
-	}
 }
 ?>

lib/DateAttribute.php

@@ -1,17 +0,0 @@
-<?php
-/**
- * Classes and functions for the template engine.
- *
- * @author The phpLDAPadmin development team
- * @package phpLDAPadmin
- */
-
-/**
- * Represents an attribute whose values are dates
- *
- * @package phpLDAPadmin
- * @subpackage Templates
- */
-class DateAttribute extends Attribute {
-}
-?>

lib/DnAttribute.php

@@ -1,17 +0,0 @@
-<?php
-/**
- * Classes and functions for the template engine.
- *
- * @author The phpLDAPadmin development team
- * @package phpLDAPadmin
- */
-
-/**
- * Represents an attribute whose values are DNs
- *
- * @package phpLDAPadmin
- * @subpackage Templates
- */
-class DnAttribute extends Attribute {
-}
-?>

lib/GidAttribute.php

@@ -1,17 +0,0 @@
-<?php
-/**
- * Classes and functions for the template engine.
- *
- * @author The phpLDAPadmin development team
- * @package phpLDAPadmin
- */
-
-/**
- * Represents a 'gidNumber' attribute
- *
- * @package phpLDAPadmin
- * @subpackage Templates
- */
-class GidAttribute extends Attribute {
-}
-?>

lib/ObjectClassAttribute.php

@@ -1,17 +0,0 @@
-<?php
-/**
- * Classes and functions for the template engine.
- *
- * @author The phpLDAPadmin development team
- * @package phpLDAPadmin
- */
-
-/**
- * Represents an 'objectClass' attribute
- *
- * @package phpLDAPadmin
- * @subpackage Templates
- */
-class ObjectClassAttribute extends Attribute {
-}
-?>

lib/PasswordAttribute.php

@@ -1,17 +0,0 @@
-<?php
-/**
- * Classes and functions for the template engine.
- *
- * @author The phpLDAPadmin development team
- * @package phpLDAPadmin
- */
-
-/**
- * Represents an attribute whose values are passwords
- *
- * @package phpLDAPadmin
- * @subpackage Templates
- */
-class PasswordAttribute extends Attribute {
-}
-?>

lib/ds_ldap_pla.php

@@ -52,10 +52,6 @@ class ldap_pla extends ldap {
 			'desc'=>'Custom operational attributes to be treated as internal attributes',
 			'default'=>array('+'));
 
-		$this->default->server['jpeg_attributes'] = array(
-			'desc'=>'Additional attributes to treat as Jpeg Attributes',
-			'default'=>array());
-
 		# This was added in case the LDAP server doesnt provide them with a base +,* query.
 		$this->default->server['root_dse_attributes'] = array(
 			'desc'=>'RootDSE attributes for use when displaying server info',

resources/views/frames/dn.blade.php

@@ -3,8 +3,26 @@
 @section('page_title')
 	<table class="table table-borderless">
 		<tr>
-			<td class="{{ ($x=Arr::get($o->getAttributes(),'jpegphoto')) ? 'border' : '' }}" style="border-radius: 5px;">{!! $x ?: sprintf('<div class="page-title-icon f32"><i class="%s"></i></div>',$o->icon() ?? "fas fa-info") !!}</td>
+			<td class="{{ ($x=Arr::get($o->getAttributes(),'jpegphoto')) ? 'border' : '' }}" rowspan="2">{!! $x ?: sprintf('<div class="page-title-icon f32"><i class="%s"></i></div>',$o->icon() ?? "fas fa-info") !!}</td>
-			<td class="top text-right align-text-top p-0 {{ $x ? 'pl-5' : 'pt-2' }}"><strong>{{ $dn }}</strong><br><small>{{ $o->entryuuid[0] ?? '' }}</small></td>
+			<td class="text-right align-text-top p-0 {{ $x ? 'pl-5' : 'pt-2' }}"><strong>{{ $dn }}</strong></td>
+		</tr>
+		<tr>
+			<td class="line-height-1" style="font-size: 55%;vertical-align: bottom;" colspan="2">
+				<table>
+					<tr>
+						<td class="p-1 m-1">Created</td>
+						<th class="p-1 m-1">{{ ($x=Arr::get($o->getAttributes(),'createtimestamp')) ? $x : __('Unknown') }} [{{ ($x=Arr::get($o->getAttributes(),'creatorsname')) ? $x : __('Unknown') }}]</th>
+					</tr>
+					<tr>
+						<td class="p-1 m-1">Modified</td>
+						<th class="p-1 m-1">{{ ($x=Arr::get($o->getAttributes(),'modifytimestamp')) ? $x : __('Unknown') }} [{{ ($x=Arr::get($o->getAttributes(),'modifiersname')) ? $x : __('Unknown') }}]</th>
+					</tr>
+					<tr>
+						<td class="p-1 m-1">UUID</td>
+						<th class="p-1 m-1">{{ $o->entryuuid[0] ?? '' }}</th>
+					</tr>
+				</table>
+			</td>
 		</tr>
 	</table>
 @endsection
@@ -15,9 +33,13 @@
 			<div class="card-header-tabs">
 				<ul class="nav nav-tabs">
 					<li class="nav-item"><a data-toggle="tab" href="#attributes" class="nav-link active">{{ __('Attributes') }}</a></li>
+					{{--
 					<li class="nav-item"><a data-toggle="tab" href="#placeholder" class="nav-link">placeholder</a></li>
+					--}}
 					<li class="nav-item"><a data-toggle="tab" href="#internal" class="nav-link">{{ __('Internal') }}</a></li>
+					{{--
 					<li class="nav-item"><a data-toggle="tab" href="#addtemplate" class="nav-link">{{ __('Add Template') }}</a></li>
+					--}}
 				</ul>
 
 				<div class="tab-content">
@@ -47,9 +69,6 @@
 													<span class="btn btn-sm btn-outline-primary mt-3 mb-3"><i class="fas fa-plus"></i> {{ __('Add Value') }}</span>
 												@endif
 											</td>
-											{{--
-											<td>@dump($ao)</td>
-											--}}
 										</tr>
 									@endforeach
 								</table>
@@ -57,20 +76,41 @@
 						</div>
 					</div>
 
+					{{--
 					<!-- Templates -->
 					<div class="tab-pane" id="placeholder" role="tabpanel">
 						<div><i class="fas fa-fw fa-spinner fa-pulse"></i></div>
 					</div>
+					--}}
 
 					<!-- Internal Attributes -->
 					<div class="tab-pane" id="internal" role="tabpanel">
-						<div><i class="fas fa-fw fa-spinner fa-pulse"></i></div>
+						<div class="row">
+							<div class="offset-2 col-8">
+								<table class="table">
+									@foreach ($o->getInternalAttributes() as $ao)
+										<tr class="bg-light text-dark small">
+											<th class="w-25">
+												<abbr title="{{ $ao->description }}">{{ $ao->name }}</abbr>
+											</th>
+										</tr>
+										<tr>
+											<td class="pl-5">
+												{!! $ao !!}
+											</td>
+										</tr>
+									@endforeach
+								</table>
+							</div>
+						</div>
 					</div>
 
+					{{--
 					<!-- Add Template -->
 					<div class="tab-pane" id="addtemplate" role="tabpanel">
 						<div><i class="fas fa-fw fa-spinner fa-pulse"></i></div>
 					</div>
+					--}}
 				</div>
 			</div>
 		</div>