Added Zones, authorisation on edits, validation enhancements

This commit is contained in:
Deon George
2021-06-18 23:01:41 +10:00
parent 491d3d55c3
commit 416e79164e
14 changed files with 511 additions and 107 deletions

View File

@@ -19,11 +19,13 @@ class DomainController extends Controller
public function add_edit(Request $request,Domain $o)
{
if ($request->post()) {
$this->authorize('admin',$o);
$request->validate([
'name' => 'required|max:8|unique:domains,name,'.($o->exists ? $o->id : 0),
'dnsdomain' => 'nullable|regex:/^(?!:\/\/)(?=.{1,255}$)((.{1,63}\.){1,127}(?![0-9]*$)[a-z0-9-]+\.?)$/i|unique:domains,dnsdomain,'.($o->exists ? $o->id : NULL),
'active' => 'required',
'public' => 'required',
'active' => 'required|boolean',
'public' => 'required|boolean',
]);
foreach (['name','dnsdomain','active','public','homepage','notes'] as $key)

View File

@@ -19,12 +19,15 @@ class SystemController extends Controller
public function add_edit(Request $request,System $o)
{
if ($request->post()) {
$this->authorize('admin',$o);
$request->validate([
'name' => 'required|min:3|unique:systems,name,'.($o->exists ? $o->id : 0),
'location' => 'required|min:3',
'sysop' => 'required|min:3',
'address' => 'nullable|regex:/^(?!:\/\/)(?=.{1,255}$)((.{1,63}\.){1,127}(?![0-9]*$)[a-z0-9-]+\.?)$/i',
'port' => 'nullable|digits_between:2,5',
'active' => 'required|boolean',
]);
foreach (['name','location','sysop','address','port','active','method','notes'] as $key)

View File

@@ -19,6 +19,8 @@ class UserController extends Controller
public function add_edit(Request $request,User $o)
{
if ($request->post()) {
$this->authorize('admin',$o);
$request->validate([
'email' => 'required|email|unique:users,email,'.($o ? $o->id : NULL),
]);

View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
use App\Models\Zone;
@@ -19,10 +20,28 @@ class ZoneController extends Controller
public function add_edit(Request $request,Zone $o)
{
if ($request->post()) {
foreach (['zone_id','name','active','description','notes','domain_id'] as $key)
$this->authorize('admin',$o);
$request->validate([
'domain_id' => 'required|exists:domains,id',
'zone_id' => [
'required',
'digits_between:1,5',
Rule::unique('zones')->where(function ($query) use ($request,$o) {
return $query->where('domain_id',$request->post('domain_id'))
->when($o->exists,function($query) use ($o) {
return $query->where('id','<>',$o->id);
});
})
],
'system_id' => 'required|exists:systems,id',
'ztid' => 'nullable|size:10|regex:/^([A-Fa-f0-9]){10}$/',
'active' => 'required|boolean',
]);
foreach (['zone_id','domain_id','system_id','active','notes','ztid'] as $key)
$o->{$key} = $request->post($key);
$o->active = TRUE;
$o->save();
return redirect()->action([self::class,'home']);