From eafae02c7b44204846a309d1338c21d0a551be0b Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Wed, 12 Apr 2023 23:18:26 +1000
Subject: [PATCH] Enabled form validation

---
 app/Classes/LDAP/Schema/AttributeType.php     |  2 +
 app/Http/Controllers/HomeController.php       |  4 +-
 app/Http/Requests/EntryRequest.php            | 11 +++--
 config/ldap.php                               | 15 ++++++
 public/css/fixes.css                          |  6 ++-
 .../views/components/attribute.blade.php      |  9 +++-
 .../attribute/binary/jpegphoto.blade.php      | 48 ++++++++++++-------
 .../attribute/objectclass.blade.php           |  9 +++-
 .../components/attribute/password.blade.php   |  9 +++-
 resources/views/frames/dn.blade.php           |  2 +-
 10 files changed, 87 insertions(+), 28 deletions(-)

diff --git a/app/Classes/LDAP/Schema/AttributeType.php b/app/Classes/LDAP/Schema/AttributeType.php
index acaa319..28c79ed 100644
--- a/app/Classes/LDAP/Schema/AttributeType.php
+++ b/app/Classes/LDAP/Schema/AttributeType.php
@@ -2,6 +2,7 @@
 
 namespace App\Classes\LDAP\Schema;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 
@@ -271,6 +272,7 @@ final class AttributeType extends Base {
 			case 'type': return $this->type;
 			case 'usage': return $this->usage;
 			case 'used_in_object_classes': return $this->used_in_object_classes;
+			case 'validation': return Arr::get(config('ldap.validation'),$this->name_lc);
 
 			default: return parent::__get($key);
 		}
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 9ec4bee..e24d431 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -112,10 +112,10 @@ class HomeController extends Controller
 			];
 		});
 
-		if (Session::has('dn'))
+		if (old('dn'))
 			return view('dn')
 				->with('bases',$bases)
-				->with('o',config('server')->fetch($dn=Crypt::decryptString(Session::pull('dn'))))
+				->with('o',config('server')->fetch($dn=Crypt::decryptString(old('dn'))))
 				->with('dn',$dn);
 		else
 			return view('home')
diff --git a/app/Http/Requests/EntryRequest.php b/app/Http/Requests/EntryRequest.php
index a57b07e..5aba0c7 100644
--- a/app/Http/Requests/EntryRequest.php
+++ b/app/Http/Requests/EntryRequest.php
@@ -23,9 +23,12 @@ class EntryRequest extends FormRequest
 	 */
 	public function rules()
 	{
-		return [
-			'dn'=>'string|min:3',
-			'objectclass'=>'array|min:1',
-		];
+		return config('server')
+			->schema('attributetypes')
+			->intersectByKeys($this->request)
+			->transform(function($item) { return $item->validation; })
+			->filter()
+			->flatMap(function($item) { return $item; })
+			->toArray();
 	}
 }
\ No newline at end of file
diff --git a/config/ldap.php b/config/ldap.php
index d4b141f..4596e61 100644
--- a/config/ldap.php
+++ b/config/ldap.php
@@ -111,4 +111,19 @@ return [
 	 |
 	 */
 	'datetime_format' => 'Y-m-d H:i:s',
+
+	/*
+	 |--------------------------------------------------------------------------
+	 | Validation
+	 |--------------------------------------------------------------------------
+	 |
+	 | Default validation used for data input.
+	 |
+	 */
+	'validation' => [
+		'objectclass' => ['objectclass'=>['array','min:1']],
+		'gidnumber' => ['gidnumber'=>['sometimes','array','max:1'],'gidnumber.*'=>['integer','max:65535']],
+		'mail' => ['mail'=>['sometimes','array','min:1'],'mail.*'=>['email']],
+		'uidnumber' => ['uidnumber'=>['sometimes','array','max:1'],'uidnumber.*'=>['integer','max:65535']],
+	],
 ];
diff --git a/public/css/fixes.css b/public/css/fixes.css
index 8430e33..2918683 100644
--- a/public/css/fixes.css
+++ b/public/css/fixes.css
@@ -229,7 +229,11 @@ p {
 }
 
 /** Make our placeholder text on forms lighter **/
-
 .form-control::placeholder {
 	color: #a0aec0;
+}
+
+/** Force our validation color to have a higher priority than any specified border **/
+.was-validated .form-control:invalid, .form-control.is-invalid {
+	border-color: #d92550 !important;
 }
\ No newline at end of file
diff --git a/resources/views/components/attribute.blade.php b/resources/views/components/attribute.blade.php
index d1b3043..65f4163 100644
--- a/resources/views/components/attribute.blade.php
+++ b/resources/views/components/attribute.blade.php
@@ -4,7 +4,14 @@
 		<div id="{{ $o->name_lc }}">
 			@foreach (old($o->name_lc,$o->values) as $value)
 				@if ($edit && ! $o->is_rdn)
-					<input class="form-control mb-1 @if($x=($o->values->search($value) === FALSE)) border-focus @endif" type="text" name="{{ $o->name_lc }}[]" value="{{ $value }}" placeholder="{{ Arr::get($o->values,$loop->index) ?: '['.__('NEW').']' }}" readonly="true">
+					<div class="input-group has-validation">
+						<input type="text" class="form-control @if($e=$errors->get($o->name_lc.'.'.$loop->index))is-invalid @endif mb-1 @if($o->values->search($value) === FALSE) border-focus @endif" name="{{ $o->name_lc }}[]" value="{{ $value }}" placeholder="{{ ! is_null($x=Arr::get($o->values,$loop->index)) ? $x : '['.__('NEW').']' }}" readonly="true">
+						<div class="invalid-feedback pb-2">
+							@if($e)
+								{{ join('|',$e) }}
+							@endif
+						</div>
+					</div>
 				@else
 					{{ $value }}<br>
 				@endif
diff --git a/resources/views/components/attribute/binary/jpegphoto.blade.php b/resources/views/components/attribute/binary/jpegphoto.blade.php
index c62128c..06d35e8 100644
--- a/resources/views/components/attribute/binary/jpegphoto.blade.php
+++ b/resources/views/components/attribute/binary/jpegphoto.blade.php
@@ -1,19 +1,33 @@
 <!-- $o=Binary\JpegPhoto::class -->
-<table class="table table-borderless p-0 m-0">
-	<tr>
-		@foreach ($o->values as $value)
-			@switch ($x=$f->buffer($value,FILEINFO_MIME_TYPE))
-				@case('image/jpeg')
-				@default
-					<td>
-						<input type="hidden" name="{{ $o->name_lc }}[]" value="{{ md5($value) }}">
-						<img class="jpegphoto" src="data:{{ $x }};base64, {{ base64_encode($value) }}" />
+@if($edit)
+	<div class="input-group has-validation @if($e=$errors->get($o->name_lc))is-invalid @endif">
+@endif
 
-						@if($edit)
-							<br><span class="btn btn-sm btn-danger deletable d-none"><i class="fas fa-trash-alt"></i> @lang('Delete')</span>
-						@endif
-					</td>
-			@endswitch
-		@endforeach
-	</tr>
-</table>
\ No newline at end of file
+	<table class="table table-borderless p-0 m-0">
+		<tr>
+			@foreach ($o->values as $value)
+				@switch ($x=$f->buffer($value,FILEINFO_MIME_TYPE))
+					@case('image/jpeg')
+					@default
+						<td>
+							<input type="hidden" name="{{ $o->name_lc }}[]" value="{{ md5($value) }}">
+							<img class="jpegphoto" src="data:{{ $x }};base64, {{ base64_encode($value) }}" />
+
+							@if($edit)
+								<br><span class="btn btn-sm btn-danger deletable d-none"><i class="fas fa-trash-alt"></i> @lang('Delete')</span>
+							@endif
+						</td>
+				@endswitch
+			@endforeach
+		</tr>
+	</table>
+
+	@if($edit)
+		<div class="invalid-feedback pb-2">
+			@if($e)
+				{{ join('|',$e) }}
+			@endif
+		</div>
+
+	</div>
+	@endif
\ No newline at end of file
diff --git a/resources/views/components/attribute/objectclass.blade.php b/resources/views/components/attribute/objectclass.blade.php
index 0164deb..c831b6c 100644
--- a/resources/views/components/attribute/objectclass.blade.php
+++ b/resources/views/components/attribute/objectclass.blade.php
@@ -4,7 +4,14 @@
 		<div id="{{ $o->name_lc }}">
 			@foreach (old($o->name_lc,$o->values) as $value)
 				@if ($edit && ($value === NULL || (! $o->isStructural($value))))
-					<input class="form-control mb-1 @if($o->values->search($value) === FALSE) border-focus @endif" type="text" name="{{ $o->name_lc }}[]" value="{{ $value }}" placeholder="{{ Arr::get($o->values,$loop->index) ?: '['.__('NEW').']' }}" readonly="true">
+					<div class="input-group has-validation">
+						<input type="text" class="form-control @if($e=$errors->get($o->name_lc.'.'.$loop->index))is-invalid @endif mb-1 @if($o->values->search($value) === FALSE) border-focus @endif" name="{{ $o->name_lc }}[]" value="{{ $value }}" placeholder="{{ ! is_null($x=Arr::get($o->values,$loop->index)) ? $x : '['.__('NEW').']' }}" readonly="true">
+						<div class="invalid-feedback pb-2">
+							@if($e)
+								{{ join('|',$e) }}
+							@endif
+						</div>
+					</div>
 				@else
 					{{ $value }}
 					@if ($o->isStructural($value))
diff --git a/resources/views/components/attribute/password.blade.php b/resources/views/components/attribute/password.blade.php
index 827bb68..0c2c38c 100644
--- a/resources/views/components/attribute/password.blade.php
+++ b/resources/views/components/attribute/password.blade.php
@@ -4,7 +4,14 @@
 		<div id="{{ $o->name_lc }}">
 			@foreach (old($o->name_lc,$o->values) as $value)
 				@if ($edit)
-					<input type="password" class="form-control mb-1 @if($x=($o->values->search($value) === FALSE)) border-focus @endif" type="text" name="{{ $o->name_lc }}[]" value="{{ str_repeat('*',10) }}" readonly="true">
+					<div class="input-group has-validation">
+						<input type="password" class="form-control @if($e=$errors->get($o->name_lc.'.'.$loop->index))is-invalid @endif mb-1 @if($o->values->search($value) === FALSE) border-focus @endif" name="{{ $o->name_lc }}[]" value="{{ str_repeat('*',10) }}" readonly="true">
+						<div class="invalid-feedback pb-2">
+							@if($e)
+								{{ join('|',$e) }}
+							@endif
+						</div>
+					</div>
 				@else
 					{{ $value }}<br>
 				@endif
diff --git a/resources/views/frames/dn.blade.php b/resources/views/frames/dn.blade.php
index 7d5e0d6..b17184b 100644
--- a/resources/views/frames/dn.blade.php
+++ b/resources/views/frames/dn.blade.php
@@ -75,7 +75,7 @@
 				<div class="tab-content">
 					<!-- All Attributes -->
 					<div class="tab-pane active" id="attributes" role="tabpanel">
-						<form id="form-entry" method="POST" action="{{ url('entry/update') }}">
+						<form id="form-entry" method="POST" class="needs-validation" action="{{ url('entry/update') }}" novalidate>
 							@csrf
 
 							<input type="hidden" name="dn" value="{{ $o->getDNSecure() }}">