zydronium/getnamingo-registry
1
0
Fork 0
mirror of https://github.com/getnamingo/registry.git synced 2025-05-14 16:46:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

Added compatibility with RFC8624

Browse source
This commit is contained in:
Pinga 2023-12-26 13:44:11 +02:00
parent 39271dc1db
commit 4df16e200f
5 changed files with 5 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -543,7 +543,7 @@ class DomainsController extends Controller
} }
// Validate alg // Validate alg
$validAlgorithms = [2, 3, 5, 6, 7, 8, 10, 13, 14, 15, 16]; $validAlgorithms = [8, 13, 14, 15, 16];
if (!empty($dsAlg) && !in_array($dsAlg, $validAlgorithms)) { if (!empty($dsAlg) && !in_array($dsAlg, $validAlgorithms)) {
return view($response, 'admin/domains/createDomain.twig', [ return view($response, 'admin/domains/createDomain.twig', [
'domainName' => $domainName, 'domainName' => $domainName,
@ -563,7 +563,6 @@ class DomainsController extends Controller
]); ]);
} }
$validDigests = [ $validDigests = [
1 => 40, // SHA-1
2 => 64, // SHA-256 2 => 64, // SHA-256
4 => 96 // SHA-384 4 => 96 // SHA-384
]; ];
@ -1336,7 +1335,7 @@ class DomainsController extends Controller
} }
// Validate alg // Validate alg
$validAlgorithms = [2, 3, 5, 6, 7, 8, 10, 13, 14, 15, 16]; $validAlgorithms = [8, 13, 14, 15, 16];
if (!empty($dsAlg) && !in_array($dsAlg, $validAlgorithms)) { if (!empty($dsAlg) && !in_array($dsAlg, $validAlgorithms)) {
$this->container->get('flash')->addMessage('error', 'Incomplete algorithm provided'); $this->container->get('flash')->addMessage('error', 'Incomplete algorithm provided');
return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302); return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302);
@ -1348,7 +1347,6 @@ class DomainsController extends Controller
return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302); return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302);
} }
$validDigests = [ $validDigests = [
1 => 40, // SHA-1
2 => 64, // SHA-256 2 => 64, // SHA-256
4 => 96 // SHA-384 4 => 96 // SHA-384
]; ];

13
cp/resources/views/admin/domains/createDomain.twig
View file

@ -130,13 +130,7 @@
<input type="text" class="form-control mb-2" placeholder="{{ __('Key Tag') }}" name="dsKeyTag" id="dsKeyTag"> <input type="text" class="form-control mb-2" placeholder="{{ __('Key Tag') }}" name="dsKeyTag" id="dsKeyTag">
<select class="form-control mb-2" name="dsAlg"> <select class="form-control mb-2" name="dsAlg">
<option value="" disabled selected>{{ __('Select Algorithm') }}</option> <option value="" disabled selected>{{ __('Select Algorithm') }}</option>
<option value="2">Diffie-Hellman</option>
<option value="3">DSA/SHA1</option>
<option value="5">RSA/SHA-1</option>
<option value="6">DSA-NSEC3-SHA1</option>
<option value="7">RSASHA1-NSEC3-SHA1</option>
<option value="8">RSA/SHA-256</option> <option value="8">RSA/SHA-256</option>
<option value="10">RSA/SHA-512</option>
<option value="13">ECDSA Curve P-256 with SHA-256</option> <option value="13">ECDSA Curve P-256 with SHA-256</option>
<option value="14">ECDSA Curve P-384 with SHA-384</option> <option value="14">ECDSA Curve P-384 with SHA-384</option>
<option value="15">Ed25519</option> <option value="15">Ed25519</option>
@ -144,7 +138,6 @@
</select> </select>
<select class="form-control mb-2" name="dsDigestType"> <select class="form-control mb-2" name="dsDigestType">
<option value="" disabled selected>{{ __('Select Digest Type') }}</option> <option value="" disabled selected>{{ __('Select Digest Type') }}</option>
<option value="1">SHA-1</option>
<option value="2">SHA-256</option> <option value="2">SHA-256</option>
<option value="4">SHA-384</option> <option value="4">SHA-384</option>
</select> </select>
@ -157,13 +150,7 @@
<input type="number" class="form-control mb-2" placeholder="{{ __('Protocol') }}" name="dnskeyProtocol" value="3" readonly> <!-- Protocol is typically set to 3 --> <input type="number" class="form-control mb-2" placeholder="{{ __('Protocol') }}" name="dnskeyProtocol" value="3" readonly> <!-- Protocol is typically set to 3 -->
<select class="form-control mb-2" name="dnskeyAlg"> <select class="form-control mb-2" name="dnskeyAlg">
<option value="" disabled selected>{{ __('Select Algorithm') }}</option> <option value="" disabled selected>{{ __('Select Algorithm') }}</option>
<option value="2">Diffie-Hellman</option>
<option value="3">DSA/SHA1</option>
<option value="5">RSA/SHA-1</option>
<option value="6">DSA-NSEC3-SHA1</option>
<option value="7">RSASHA1-NSEC3-SHA1</option>
<option value="8">RSA/SHA-256</option> <option value="8">RSA/SHA-256</option>
<option value="10">RSA/SHA-512</option>
<option value="13">ECDSA Curve P-256 with SHA-256</option> <option value="13">ECDSA Curve P-256 with SHA-256</option>
<option value="14">ECDSA Curve P-384 with SHA-384</option> <option value="14">ECDSA Curve P-384 with SHA-384</option>
<option value="15">Ed25519</option> <option value="15">Ed25519</option>

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

@ -256,13 +256,7 @@
<input type="text" class="form-control mb-2" placeholder="{{ __('Key Tag') }}" name="dsKeyTag" id="dsKeyTag"> <input type="text" class="form-control mb-2" placeholder="{{ __('Key Tag') }}" name="dsKeyTag" id="dsKeyTag">
<select class="form-control mb-2" name="dsAlg"> <select class="form-control mb-2" name="dsAlg">
<option value="" disabled selected>{{ __('Select Algorithm') }}</option> <option value="" disabled selected>{{ __('Select Algorithm') }}</option>
<option value="2">Diffie-Hellman</option>
<option value="3">DSA/SHA1</option>
<option value="5">RSA/SHA-1</option>
<option value="6">DSA-NSEC3-SHA1</option>
<option value="7">RSASHA1-NSEC3-SHA1</option>
<option value="8">RSA/SHA-256</option> <option value="8">RSA/SHA-256</option>
<option value="10">RSA/SHA-512</option>
<option value="13">ECDSA Curve P-256 with SHA-256</option> <option value="13">ECDSA Curve P-256 with SHA-256</option>
<option value="14">ECDSA Curve P-384 with SHA-384</option> <option value="14">ECDSA Curve P-384 with SHA-384</option>
<option value="15">Ed25519</option> <option value="15">Ed25519</option>
@ -270,7 +264,6 @@
</select> </select>
<select class="form-control mb-2" name="dsDigestType"> <select class="form-control mb-2" name="dsDigestType">
<option value="" disabled selected>{{ __('Select Digest Type') }}</option> <option value="" disabled selected>{{ __('Select Digest Type') }}</option>
<option value="1">SHA-1</option>
<option value="2">SHA-256</option> <option value="2">SHA-256</option>
<option value="4">SHA-384</option> <option value="4">SHA-384</option>
</select> </select>
@ -283,13 +276,7 @@
<input type="number" class="form-control mb-2" placeholder="{{ __('Protocol') }}" name="dnskeyProtocol" value="3" readonly> <!-- Protocol is typically set to 3 --> <input type="number" class="form-control mb-2" placeholder="{{ __('Protocol') }}" name="dnskeyProtocol" value="3" readonly> <!-- Protocol is typically set to 3 -->
<select class="form-control mb-2" name="dnskeyAlg"> <select class="form-control mb-2" name="dnskeyAlg">
<option value="" disabled selected>{{ __('Select Algorithm') }}</option> <option value="" disabled selected>{{ __('Select Algorithm') }}</option>
<option value="2">Diffie-Hellman</option>
<option value="3">DSA/SHA1</option>
<option value="5">RSA/SHA-1</option>
<option value="6">DSA-NSEC3-SHA1</option>
<option value="7">RSASHA1-NSEC3-SHA1</option>
<option value="8">RSA/SHA-256</option> <option value="8">RSA/SHA-256</option>
<option value="10">RSA/SHA-512</option>
<option value="13">ECDSA Curve P-256 with SHA-256</option> <option value="13">ECDSA Curve P-256 with SHA-256</option>
<option value="14">ECDSA Curve P-384 with SHA-384</option> <option value="14">ECDSA Curve P-384 with SHA-384</option>
<option value="15">Ed25519</option> <option value="15">Ed25519</option>

3
epp/src/epp-create.php
View file

@ -1124,7 +1124,7 @@ function processDomainCreate($conn, $db, $xml, $clid, $database_type, $trans) {
} }
// Validate alg // Validate alg
$validAlgorithms = [2, 3, 5, 6, 7, 8, 10, 13, 14, 15, 16]; $validAlgorithms = [8, 13, 14, 15, 16];
if (!isset($alg) || !in_array($alg, $validAlgorithms)) { if (!isset($alg) || !in_array($alg, $validAlgorithms)) {
$db->rollBack(); $db->rollBack();
sendEppError($conn, $db, 2006, 'Invalid algorithm', $clTRID, $trans); sendEppError($conn, $db, 2006, 'Invalid algorithm', $clTRID, $trans);
@ -1138,7 +1138,6 @@ function processDomainCreate($conn, $db, $xml, $clid, $database_type, $trans) {
return; return;
} }
$validDigests = [ $validDigests = [
1 => 40, // SHA-1
2 => 64, // SHA-256 2 => 64, // SHA-256
4 => 96 // SHA-384 4 => 96 // SHA-384
]; ];

6
epp/src/epp-update.php
View file

@ -1770,7 +1770,7 @@ function processDomainUpdate($conn, $db, $xml, $clid, $database_type, $trans) {
} }
// Validate alg // Validate alg
$validAlgorithms = [2, 3, 5, 6, 7, 8, 10, 13, 14, 15, 16]; $validAlgorithms = [8, 13, 14, 15, 16];
if (!isset($alg) || !in_array($alg, $validAlgorithms)) { if (!isset($alg) || !in_array($alg, $validAlgorithms)) {
sendEppError($conn, $db, 2006, 'Invalid algorithm', $clTRID, $trans); sendEppError($conn, $db, 2006, 'Invalid algorithm', $clTRID, $trans);
return; return;
@ -1782,7 +1782,6 @@ function processDomainUpdate($conn, $db, $xml, $clid, $database_type, $trans) {
return; return;
} }
$validDigests = [ $validDigests = [
1 => 40, // SHA-1
2 => 64, // SHA-256 2 => 64, // SHA-256
4 => 96 // SHA-384 4 => 96 // SHA-384
]; ];
@ -1887,7 +1886,7 @@ function processDomainUpdate($conn, $db, $xml, $clid, $database_type, $trans) {
} }
// Validate alg // Validate alg
$validAlgorithms = [2, 3, 5, 6, 7, 8, 10, 13, 14, 15, 16]; $validAlgorithms = [8, 13, 14, 15, 16];
if (!isset($alg) || !in_array($alg, $validAlgorithms)) { if (!isset($alg) || !in_array($alg, $validAlgorithms)) {
sendEppError($conn, $db, 2006, 'Invalid algorithm', $clTRID, $trans); sendEppError($conn, $db, 2006, 'Invalid algorithm', $clTRID, $trans);
return; return;
@ -1899,7 +1898,6 @@ function processDomainUpdate($conn, $db, $xml, $clid, $database_type, $trans) {
return; return;
} }
$validDigests = [ $validDigests = [
1 => 40, // SHA-1
2 => 64, // SHA-256 2 => 64, // SHA-256
4 => 96 // SHA-384 4 => 96 // SHA-384
]; ];