mirror of
https://github.com/getnamingo/registry.git
synced 2025-06-26 14:14:41 +02:00
Fixed #19
This commit is contained in:
Pinga
parent
44e7427136
commit
7c403eede4
2 changed files with 99 additions and 95 deletions
|
|
@ -93,7 +93,7 @@ class DomainsController extends Controller
|
||||||
$contactTech = $data['contactTech'] ?? null;
|
$contactTech = $data['contactTech'] ?? null;
|
||||||
$contactBilling = $data['contactBilling'] ?? null;
|
$contactBilling = $data['contactBilling'] ?? null;
|
||||||
|
|
||||||
$nameservers = $data['nameserver'] ?? [];
|
$nameservers = !empty($data['nameserver']) ? $data['nameserver'] : null;
|
||||||
|
|
||||||
$dsKeyTag = $data['dsKeyTag'] ?? null;
|
$dsKeyTag = $data['dsKeyTag'] ?? null;
|
||||||
$dsAlg = $data['dsAlg'] ?? null;
|
$dsAlg = $data['dsAlg'] ?? null;
|
||||||
|
|
@ -218,32 +218,38 @@ class DomainsController extends Controller
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (count($nameservers) !== count(array_unique($nameservers))) {
|
$nameservers = array_filter($data['nameserver'] ?? [], function($value) {
|
||||||
return view($response, 'admin/domains/createDomain.twig', [
|
return !empty($value) && $value !== null;
|
||||||
'domainName' => $domainName,
|
});
|
||||||
'error' => 'Duplicate nameservers detected. Please provide unique nameservers.',
|
|
||||||
'registrars' => $registrars,
|
|
||||||
'registrar' => $registrar,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($nameservers as $index => $nameserver) {
|
if (!empty($nameservers)) {
|
||||||
if (preg_match("/^-|^\.-|-\.$|^\.$/", $nameserver)) {
|
if (count($nameservers) !== count(array_unique($nameservers))) {
|
||||||
return view($response, 'admin/domains/createDomain.twig', [
|
return view($response, 'admin/domains/createDomain.twig', [
|
||||||
'domainName' => $domainName,
|
'domainName' => $domainName,
|
||||||
'error' => 'Invalid hostName',
|
'error' => 'Duplicate nameservers detected. Please provide unique nameservers.',
|
||||||
'registrars' => $registrars,
|
'registrars' => $registrars,
|
||||||
'registrar' => $registrar,
|
'registrar' => $registrar,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!preg_match('/^([A-Z0-9]([A-Z0-9-]{0,61}[A-Z0-9]){0,1}\.){1,125}[A-Z0-9]([A-Z0-9-]{0,61}[A-Z0-9])$/i', $nameserver) && strlen($nameserver) < 254) {
|
foreach ($nameservers as $index => $nameserver) {
|
||||||
return view($response, 'admin/domains/createDomain.twig', [
|
if (preg_match("/^-|^\.-|-\.$|^\.$/", $nameserver)) {
|
||||||
'domainName' => $domainName,
|
return view($response, 'admin/domains/createDomain.twig', [
|
||||||
'error' => 'Invalid hostName',
|
'domainName' => $domainName,
|
||||||
'registrars' => $registrars,
|
'error' => 'Invalid hostName',
|
||||||
'registrar' => $registrar,
|
'registrars' => $registrars,
|
||||||
]);
|
'registrar' => $registrar,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!preg_match('/^([A-Z0-9]([A-Z0-9-]{0,61}[A-Z0-9]){0,1}\.){1,125}[A-Z0-9]([A-Z0-9-]{0,61}[A-Z0-9])$/i', $nameserver) && strlen($nameserver) < 254) {
|
||||||
|
return view($response, 'admin/domains/createDomain.twig', [
|
||||||
|
'domainName' => $domainName,
|
||||||
|
'error' => 'Invalid hostName',
|
||||||
|
'registrars' => $registrars,
|
||||||
|
'registrar' => $registrar,
|
||||||
|
]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -568,86 +574,88 @@ class DomainsController extends Controller
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
foreach ($nameservers as $index => $nameserver) {
|
if (!empty($nameservers)) {
|
||||||
$hostName_already_exist = $db->selectValue(
|
foreach ($nameservers as $index => $nameserver) {
|
||||||
'SELECT id FROM host WHERE name = ? LIMIT 1',
|
$hostName_already_exist = $db->selectValue(
|
||||||
[$nameserver]
|
'SELECT id FROM host WHERE name = ? LIMIT 1',
|
||||||
);
|
[$nameserver]
|
||||||
|
|
||||||
if ($hostName_already_exist) {
|
|
||||||
$domain_host_map_id = $db->selectValue(
|
|
||||||
'SELECT domain_id FROM domain_host_map WHERE domain_id = ? AND host_id = ? LIMIT 1',
|
|
||||||
[$domain_id, $hostName_already_exist]
|
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!$domain_host_map_id) {
|
if ($hostName_already_exist) {
|
||||||
|
$domain_host_map_id = $db->selectValue(
|
||||||
|
'SELECT domain_id FROM domain_host_map WHERE domain_id = ? AND host_id = ? LIMIT 1',
|
||||||
|
[$domain_id, $hostName_already_exist]
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!$domain_host_map_id) {
|
||||||
|
$db->insert(
|
||||||
|
'domain_host_map',
|
||||||
|
[
|
||||||
|
'domain_id' => $domain_id,
|
||||||
|
'host_id' => $hostName_already_exist
|
||||||
|
]
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
$currentDateTime = new \DateTime();
|
||||||
|
$logdate = $currentDateTime->format('Y-m-d H:i:s.v');
|
||||||
|
$db->insert(
|
||||||
|
'error_log',
|
||||||
|
[
|
||||||
|
'registrar_id' => $clid,
|
||||||
|
'log' => "Domain : $domainName ; hostName : $nameserver - is duplicated",
|
||||||
|
'date' => $logdate
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$currentDateTime = new \DateTime();
|
||||||
|
$host_date = $currentDateTime->format('Y-m-d H:i:s.v');
|
||||||
|
$host_id = $db->insert(
|
||||||
|
'host',
|
||||||
|
[
|
||||||
|
'name' => $nameserver,
|
||||||
|
'domain_id' => $domain_id,
|
||||||
|
'clid' => $clid,
|
||||||
|
'crid' => $clid,
|
||||||
|
'crdate' => $host_date
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
$db->insert(
|
$db->insert(
|
||||||
'domain_host_map',
|
'domain_host_map',
|
||||||
[
|
[
|
||||||
'domain_id' => $domain_id,
|
'domain_id' => $domain_id,
|
||||||
'host_id' => $hostName_already_exist
|
'host_id' => $host_id
|
||||||
]
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
$currentDateTime = new \DateTime();
|
|
||||||
$logdate = $currentDateTime->format('Y-m-d H:i:s.v');
|
|
||||||
$db->insert(
|
|
||||||
'error_log',
|
|
||||||
[
|
|
||||||
'registrar_id' => $clid,
|
|
||||||
'log' => "Domain : $domainName ; hostName : $nameserver - is duplicated",
|
|
||||||
'date' => $logdate
|
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (isset($nameserver_ipv4[$index]) && !empty($nameserver_ipv4[$index])) {
|
||||||
|
$ipv4 = normalize_v4_address($nameserver_ipv4[$index]);
|
||||||
|
|
||||||
|
$db->insert(
|
||||||
|
'host_addr',
|
||||||
|
[
|
||||||
|
'host_id' => $host_id,
|
||||||
|
'addr' => $ipv4,
|
||||||
|
'ip' => 'v4'
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($nameserver_ipv6[$index]) && !empty($nameserver_ipv6[$index])) {
|
||||||
|
$ipv6 = normalize_v6_address($nameserver_ipv6[$index]);
|
||||||
|
|
||||||
|
$db->insert(
|
||||||
|
'host_addr',
|
||||||
|
[
|
||||||
|
'host_id' => $host_id,
|
||||||
|
'addr' => $ipv6,
|
||||||
|
'ip' => 'v6'
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
$currentDateTime = new \DateTime();
|
|
||||||
$host_date = $currentDateTime->format('Y-m-d H:i:s.v');
|
|
||||||
$host_id = $db->insert(
|
|
||||||
'host',
|
|
||||||
[
|
|
||||||
'name' => $nameserver,
|
|
||||||
'domain_id' => $domain_id,
|
|
||||||
'clid' => $clid,
|
|
||||||
'crid' => $clid,
|
|
||||||
'crdate' => $host_date
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
$db->insert(
|
|
||||||
'domain_host_map',
|
|
||||||
[
|
|
||||||
'domain_id' => $domain_id,
|
|
||||||
'host_id' => $host_id
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
if (isset($nameserver_ipv4[$index]) && !empty($nameserver_ipv4[$index])) {
|
|
||||||
$ipv4 = normalize_v4_address($nameserver_ipv4[$index]);
|
|
||||||
|
|
||||||
$db->insert(
|
|
||||||
'host_addr',
|
|
||||||
[
|
|
||||||
'host_id' => $host_id,
|
|
||||||
'addr' => $ipv4,
|
|
||||||
'ip' => 'v4'
|
|
||||||
]
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($nameserver_ipv6[$index]) && !empty($nameserver_ipv6[$index])) {
|
|
||||||
$ipv6 = normalize_v6_address($nameserver_ipv6[$index]);
|
|
||||||
|
|
||||||
$db->insert(
|
|
||||||
'host_addr',
|
|
||||||
[
|
|
||||||
'host_id' => $host_id,
|
|
||||||
'addr' => $ipv6,
|
|
||||||
'ip' => 'v6'
|
|
||||||
]
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -715,12 +723,8 @@ class DomainsController extends Controller
|
||||||
[$domain_id]
|
[$domain_id]
|
||||||
);
|
);
|
||||||
|
|
||||||
return view($response, 'admin/domains/createDomain.twig', [
|
$this->container->get('flash')->addMessage('success', 'Domain ' . $domainName . ' has been created successfully on ' . $crdate);
|
||||||
'domainName' => $domainName,
|
return $response->withHeader('Location', '/domains')->withStatus(302);
|
||||||
'crdate' => $crdate,
|
|
||||||
'registrars' => $registrars,
|
|
||||||
'registrar' => $registrar,
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$db = $this->container->get('db');
|
$db = $this->container->get('db');
|
||||||
|
|
|
||||||
|
|
@ -96,7 +96,7 @@
|
||||||
|
|
||||||
<div class="nameserver-group mb-1 row">
|
<div class="nameserver-group mb-1 row">
|
||||||
<div class="col-md-4">
|
<div class="col-md-4">
|
||||||
<input type="text" class="form-control mb-1" placeholder="{{ __('Nameserver') }} 1" name="nameserver[]" required autocapitalize="none">
|
<input type="text" class="form-control mb-1" placeholder="{{ __('Nameserver') }} 1" name="nameserver[]" autocapitalize="none">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-4">
|
<div class="col-md-4">
|
||||||
<input type="text" class="form-control mb-1" placeholder="{{ __('Nameserver') }} 1 - IPv4" name="nameserver_ipv4[]">
|
<input type="text" class="form-control mb-1" placeholder="{{ __('Nameserver') }} 1 - IPv4" name="nameserver_ipv4[]">
|
||||||
|
|
@ -108,7 +108,7 @@
|
||||||
|
|
||||||
<div class="nameserver-group mb-1 row">
|
<div class="nameserver-group mb-1 row">
|
||||||
<div class="col-md-4">
|
<div class="col-md-4">
|
||||||
<input type="text" class="form-control mb-1" placeholder="{{ __('Nameserver') }} 2" name="nameserver[]" required autocapitalize="none">
|
<input type="text" class="form-control mb-1" placeholder="{{ __('Nameserver') }} 2" name="nameserver[]" autocapitalize="none">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-4">
|
<div class="col-md-4">
|
||||||
<input type="text" class="form-control mb-1" placeholder="{{ __('Nameserver') }} 2 - IPv4" name="nameserver_ipv4[]">
|
<input type="text" class="form-control mb-1" placeholder="{{ __('Nameserver') }} 2 - IPv4" name="nameserver_ipv4[]">
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue