bbs/clrghouz
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Mail routing parent/children, domain name validation, nodelist import changes and other fixes

Browse Source
This commit is contained in:
Deon George
2021-07-26 21:21:58 +10:00
parent 49bc946024
commit b179b1b3e9
15 changed files with 537 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/DomainController.php
View File

@@ -14,9 +14,10 @@ class DomainController extends Controller
public const NODE_RC = 1<<1; // Region
public const NODE_NC = 1<<2; // Host
public const NODE_HC = 1<<3; // Hub
public const NODE_PVT = 1<<4; // Pvt
public const NODE_HOLD = 1<<5; // Hold
public const NODE_DOWN = 1<<6; // Down
public const NODE_POINT = 1<<4; // Point
public const NODE_PVT = 1<<5; // Pvt
public const NODE_HOLD = 1<<6; // Hold
public const NODE_DOWN = 1<<7; // Down
// http://ftsc.org/docs/frl-1002.001
public const NUMBER_MAX = 0x7fff;
@@ -27,7 +28,7 @@ class DomainController extends Controller
}
/**
* Add or edit a node
* Add or edit a domain
*/
public function add_edit(Request $request,Domain $o)
{
@@ -35,7 +36,8 @@ class DomainController extends Controller
$this->authorize('admin',$o);
$request->validate([
'name' => 'required|max:8|unique:domains,name,'.($o->exists ? $o->id : 0),
// http://ftsc.org/docs/old/fsp-1028.002
'name' => 'required|max:8|regex:/^[a-z-_~]{1,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|boolean',
'public' => 'required|boolean',