zydronium/getnamingo-registry
1
0
Fork 0
mirror of https://github.com/getnamingo/registry.git synced 2025-07-21 10:06:05 +02:00
Code Issues Projects Releases Packages Wiki Activity

More panel fixes

Browse source
This commit is contained in:
Pinga 2023-12-15 08:49:17 +02:00
parent 9a45cdab9e
commit f9ae818a4d
2 changed files with 59 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

76
cp/app/Controllers/DomainsController.php
View file

@ -92,9 +92,9 @@ class DomainsController extends Controller
$nameserver_ipv4 = !empty($data['nameserver_ipv4']) ? $data['nameserver_ipv4'] : null; $nameserver_ipv4 = !empty($data['nameserver_ipv4']) ? $data['nameserver_ipv4'] : null;
$nameserver_ipv6 = !empty($data['nameserver_ipv6']) ? $data['nameserver_ipv6'] : null; $nameserver_ipv6 = !empty($data['nameserver_ipv6']) ? $data['nameserver_ipv6'] : null;
$dsKeyTag = $data['dsKeyTag'] ?? null; $dsKeyTag = isset($data['dsKeyTag']) ? (int)$data['dsKeyTag'] : null;
$dsAlg = $data['dsAlg'] ?? null; $dsAlg = $data['dsAlg'] ?? null;
$dsDigestType = $data['dsDigestType'] ?? null; $dsDigestType = isset($data['dsDigestType']) ? (int)$data['dsDigestType'] : null;
$dsDigest = $data['dsDigest'] ?? null; $dsDigest = $data['dsDigest'] ?? null;
$dnskeyFlags = $data['dnskeyFlags'] ?? null; $dnskeyFlags = $data['dnskeyFlags'] ?? null;
@ -466,7 +466,7 @@ class DomainsController extends Controller
2 => 64, // SHA-256 2 => 64, // SHA-256
4 => 96 // SHA-384 4 => 96 // SHA-384
]; ];
if (!empty($validDigests[$dsDigestType])) { if (empty($validDigests[$dsDigestType])) {
return view($response, 'admin/domains/createDomain.twig', [ return view($response, 'admin/domains/createDomain.twig', [
'domainName' => $domainName, 'domainName' => $domainName,
'error' => 'Unsupported digest type', 'error' => 'Unsupported digest type',
@ -527,8 +527,9 @@ class DomainsController extends Controller
]); ]);
} }
if (!empty($dsKeyTag) || !empty($dnskeyFlags)) { if (!empty($dsKeyTag)) {
$db->insert('secdns', [ // Base data for the insert
$insertData = [
'domain_id' => $domain_id, 'domain_id' => $domain_id,
'maxsiglife' => $maxSigLife, 'maxsiglife' => $maxSigLife,
'interface' => 'dsData', 'interface' => 'dsData',
@ -536,11 +537,22 @@ class DomainsController extends Controller
'alg' => $dsAlg, 'alg' => $dsAlg,
'digesttype' => $dsDigestType, 'digesttype' => $dsDigestType,
'digest' => $dsDigest, 'digest' => $dsDigest,
'flags' => $dnskeyFlags ?? null, 'flags' => null,
'protocol' => $dnskeyProtocol ?? null, 'protocol' => null,
'keydata_alg' => $dnskeyAlg ?? null, 'keydata_alg' => null,
'pubkey' => $dnskeyPubKey ?? null 'pubkey' => null
]); ];
// Check additional conditions for dnskeyFlags
if (isset($dnskeyFlags) && $dnskeyFlags !== "") {
$insertData['flags'] = $dnskeyFlags;
$insertData['protocol'] = $dnskeyProtocol;
$insertData['keydata_alg'] = $dnskeyAlg;
$insertData['pubkey'] = $dnskeyPubKey;
}
// Perform the insert
$db->insert('secdns', $insertData);
} }
$db->exec( $db->exec(
@ -764,6 +776,14 @@ class DomainsController extends Controller
'registrars' => $registrars, 'registrars' => $registrars,
'registrar' => $registrar, 'registrar' => $registrar,
]); ]);
} catch (\Pinga\Db\Throwable\IntegrityConstraintViolationException $e) {
$db->rollBack();
return view($response, 'admin/domains/createDomain.twig', [
'domainName' => $domainName,
'error' => 'Database failure: ' . $e->getMessage(),
'registrars' => $registrars,
'registrar' => $registrar,
]);
} }
$crdate = $db->selectValue( $crdate = $db->selectValue(
@ -1013,9 +1033,9 @@ class DomainsController extends Controller
$nameservers = $data['nameserver'] ?? []; $nameservers = $data['nameserver'] ?? [];
$dsKeyTag = $data['dsKeyTag'] ?? null; $dsKeyTag = isset($data['dsKeyTag']) ? (int)$data['dsKeyTag'] : null;
$dsAlg = $data['dsAlg'] ?? null; $dsAlg = $data['dsAlg'] ?? null;
$dsDigestType = $data['dsDigestType'] ?? null; $dsDigestType = isset($data['dsDigestType']) ? (int)$data['dsDigestType'] : null;
$dsDigest = $data['dsDigest'] ?? null; $dsDigest = $data['dsDigest'] ?? null;
$dnskeyFlags = $data['dnskeyFlags'] ?? null; $dnskeyFlags = $data['dnskeyFlags'] ?? null;
@ -1179,7 +1199,7 @@ class DomainsController extends Controller
2 => 64, // SHA-256 2 => 64, // SHA-256
4 => 96 // SHA-384 4 => 96 // SHA-384
]; ];
if (!empty($validDigests[$dsDigestType])) { if (empty($validDigests[$dsDigestType])) {
$this->container->get('flash')->addMessage('error', 'Unsupported digest type'); $this->container->get('flash')->addMessage('error', 'Unsupported digest type');
return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302); return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302);
} }
@ -1216,8 +1236,9 @@ class DomainsController extends Controller
return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302); return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302);
} }
if (!empty($dsKeyTag) || !empty($dnskeyFlags)) { if (!empty($dsKeyTag)) {
$db->insert('secdns', [ // Base data for the insert
$insertData = [
'domain_id' => $domain_id, 'domain_id' => $domain_id,
'maxsiglife' => $maxSigLife, 'maxsiglife' => $maxSigLife,
'interface' => 'dsData', 'interface' => 'dsData',
@ -1225,11 +1246,22 @@ class DomainsController extends Controller
'alg' => $dsAlg, 'alg' => $dsAlg,
'digesttype' => $dsDigestType, 'digesttype' => $dsDigestType,
'digest' => $dsDigest, 'digest' => $dsDigest,
'flags' => $dnskeyFlags ?? null, 'flags' => null,
'protocol' => $dnskeyProtocol ?? null, 'protocol' => null,
'keydata_alg' => $dnskeyAlg ?? null, 'keydata_alg' => null,
'pubkey' => $dnskeyPubKey ?? null 'pubkey' => null
]); ];
// Check additional conditions for dnskeyFlags
if (isset($dnskeyFlags) && $dnskeyFlags !== "") {
$insertData['flags'] = $dnskeyFlags;
$insertData['protocol'] = $dnskeyProtocol;
$insertData['keydata_alg'] = $dnskeyAlg;
$insertData['pubkey'] = $dnskeyPubKey;
}
// Perform the insert
$db->insert('secdns', $insertData);
} }
foreach ($nameservers as $index => $nameserver) { foreach ($nameservers as $index => $nameserver) {
@ -1377,6 +1409,10 @@ class DomainsController extends Controller
$db->rollBack(); $db->rollBack();
$this->container->get('flash')->addMessage('error', 'Database failure during update: ' . $e->getMessage()); $this->container->get('flash')->addMessage('error', 'Database failure during update: ' . $e->getMessage());
return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302); return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302);
} catch (\Pinga\Db\Throwable\IntegrityConstraintViolationException $e) {
$db->rollBack();
$this->container->get('flash')->addMessage('error', 'Database failure during update: ' . $e->getMessage());
return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302);
} }
$this->container->get('flash')->addMessage('success', 'Domain ' . $domainName . ' has been updated successfully on ' . $update); $this->container->get('flash')->addMessage('success', 'Domain ' . $domainName . ' has been updated successfully on ' . $update);

6
cp/resources/views/admin/domains/updateDomain.twig
View file

@ -122,7 +122,7 @@
{% if domainSecdns|length > 0 %} {% if domainSecdns|length > 0 %}
<!-- DNSSEC data is available, display the form directly --> <!-- DNSSEC data is available, display the form directly -->
<div id="dnssecData" class="mb-3"> <div id="dnssecTable" class="mb-3">
<label for="authInfo" class="form-label">{{ __('DNSSEC Data') }}</label> <label for="authInfo" class="form-label">{{ __('DNSSEC Data') }}</label>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-vcenter card-table table-striped"> <table class="table table-vcenter card-table table-striped">
@ -178,7 +178,7 @@
</table> </table>
</div> </div>
</div> </div>
{% else %} {% endif %}
<!-- DNSSEC Data with checkbox --> <!-- DNSSEC Data with checkbox -->
<div class="mb-3 form-check"> <div class="mb-3 form-check">
<input type="checkbox" class="form-check-input" id="addDnssec" name="addDnssec"> <input type="checkbox" class="form-check-input" id="addDnssec" name="addDnssec">
@ -232,7 +232,7 @@
<input type="text" class="form-control mb-2" placeholder="{{ __('Public Key') }}" name="dnskeyPubKey"> <input type="text" class="form-control mb-2" placeholder="{{ __('Public Key') }}" name="dnskeyPubKey">
</div> </div>
</div> </div>
{% endif %}
</div> </div>
<div class="card-footer"> <div class="card-footer">
<div class="row align-items-center"> <div class="row align-items-center">