From 46cebdf3c68a87f8dffd4d1e8d9cd400dc846842 Mon Sep 17 00:00:00 2001
From: Pinga <121483313+getpinga@users.noreply.github.com>
Date: Mon, 4 Dec 2023 16:02:55 +0200
Subject: [PATCH] Further domain update updates

---
 cp/app/Controllers/DomainsController.php      | 30 +++++++++----------
 .../views/admin/domains/createDomain.twig     | 24 +++++++++++----
 .../views/admin/domains/updateDomain.twig     | 24 +++++++++++----
 3 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/cp/app/Controllers/DomainsController.php b/cp/app/Controllers/DomainsController.php
index a0f6591..791ee7d 100644
--- a/cp/app/Controllers/DomainsController.php
+++ b/cp/app/Controllers/DomainsController.php
@@ -936,18 +936,6 @@ class DomainsController extends Controller
             
             $authInfo = $data['authInfo'] ?? null;
             
-            foreach ($nameservers as $index => $nameserver) {
-                if (preg_match("/^-|^\.-|-\.$|^\.$/", $nameserver)) {
-                    $this->container->get('flash')->addMessage('error', 'Invalid hostName');
-                    return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302);
-                }
-                
-                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) {
-                    $this->container->get('flash')->addMessage('error', 'Invalid hostName');
-                    return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302);
-                }
-            }
-            
             if ($contactRegistrant) {
                 $validRegistrant = validate_identifier($contactRegistrant);
                 $row = $db->selectRow('SELECT id, clid FROM contact WHERE identifier = ?', [$contactRegistrant]);
@@ -1098,9 +1086,9 @@ class DomainsController extends Controller
                     return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302);
                 }
                 $validDigests = [
-                1 => 40,  // SHA-1
-                2 => 64,  // SHA-256
-                4 => 96   // SHA-384
+                    1 => 40,  // SHA-1
+                    2 => 64,  // SHA-256
+                    4 => 96   // SHA-384
                 ];
                 if (!empty($validDigests[$dsDigestType])) {
                     $this->container->get('flash')->addMessage('error', 'Unsupported digest type');
@@ -1154,8 +1142,18 @@ class DomainsController extends Controller
                         'pubkey' => $dnskeyPubKey ?? null
                     ]);
                 }
-                             
+   
                 foreach ($nameservers as $index => $nameserver) {
+                    if (preg_match("/^-|^\.-|-\.$|^\.$/", $nameserver)) {
+                        $this->container->get('flash')->addMessage('error', 'Invalid hostName');
+                        return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302);
+                    }
+                    
+                    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) {
+                        $this->container->get('flash')->addMessage('error', 'Invalid hostName');
+                        return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302);
+                    }
+                
                     $hostName_already_exist = $db->selectValue(
                         'SELECT id FROM host WHERE name = ? LIMIT 1',
                         [$nameserver]
diff --git a/cp/resources/views/admin/domains/createDomain.twig b/cp/resources/views/admin/domains/createDomain.twig
index 04da63b..da40a1d 100644
--- a/cp/resources/views/admin/domains/createDomain.twig
+++ b/cp/resources/views/admin/domains/createDomain.twig
@@ -132,16 +132,23 @@
                                     <input type="text" class="form-control mb-2" placeholder="{{ __('Key Tag') }}" name="dsKeyTag" id="dsKeyTag">
                                     <select class="form-control mb-2" name="dsAlg">
                                         <option value="" disabled selected>{{ __('Select Algorithm') }}</option>
-                                        <option value="1">RSA/MD5 (deprecated)</option>
+                                        <option value="2">Diffie-Hellman</option>
                                         <option value="3">DSA/SHA1</option>
                                         <option value="5">RSA/SHA-1</option>
-                                        <!-- Add other algorithms as required -->
+                                        <option value="6">DSA-NSEC3-SHA1</option>
+                                        <option value="7">RSASHA1-NSEC3-SHA1</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="14">ECDSA Curve P-384 with SHA-384</option>
+                                        <option value="15">Ed25519</option>
+                                        <option value="16">Ed448</option>
                                     </select>
                                     <select class="form-control mb-2" name="dsDigestType">
                                         <option value="" disabled selected>{{ __('Select Digest Type') }}</option>
                                         <option value="1">SHA-1</option>
                                         <option value="2">SHA-256</option>
-                                        <!-- Add other digest types as required -->
+                                        <option value="4">SHA-384</option>
                                     </select>
                                     <input type="text" class="form-control mb-2" placeholder="{{ __('Digest') }}" name="dsDigest">
                                 </div>
@@ -152,10 +159,17 @@
                                     <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">
                                         <option value="" disabled selected>{{ __('Select Algorithm') }}</option>
-                                        <option value="1">RSA/MD5 (deprecated)</option>
+                                        <option value="2">Diffie-Hellman</option>
                                         <option value="3">DSA/SHA1</option>
                                         <option value="5">RSA/SHA-1</option>
-                                        <!-- Add other algorithms as required -->
+                                        <option value="6">DSA-NSEC3-SHA1</option>
+                                        <option value="7">RSASHA1-NSEC3-SHA1</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="14">ECDSA Curve P-384 with SHA-384</option>
+                                        <option value="15">Ed25519</option>
+                                        <option value="16">Ed448</option>
                                     </select>
                                     <input type="text" class="form-control mb-2" placeholder="{{ __('Public Key') }}" name="dnskeyPubKey">
                                 </div>
diff --git a/cp/resources/views/admin/domains/updateDomain.twig b/cp/resources/views/admin/domains/updateDomain.twig
index 424a864..7ca77ad 100644
--- a/cp/resources/views/admin/domains/updateDomain.twig
+++ b/cp/resources/views/admin/domains/updateDomain.twig
@@ -151,16 +151,23 @@
                                 <input type="text" class="form-control mb-2" placeholder="{{ __('Key Tag') }}" name="dsKeyTag" id="dsKeyTag">
                                 <select class="form-control mb-2" name="dsAlg">
                                     <option value="" disabled selected>{{ __('Select Algorithm') }}</option>
-                                    <option value="1">RSA/MD5 (deprecated)</option>
+                                    <option value="2">Diffie-Hellman</option>
                                     <option value="3">DSA/SHA1</option>
                                     <option value="5">RSA/SHA-1</option>
-                                    <!-- Add other algorithms as required -->
+                                    <option value="6">DSA-NSEC3-SHA1</option>
+                                    <option value="7">RSASHA1-NSEC3-SHA1</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="14">ECDSA Curve P-384 with SHA-384</option>
+                                    <option value="15">Ed25519</option>
+                                    <option value="16">Ed448</option>
                                 </select>
                                 <select class="form-control mb-2" name="dsDigestType">
                                     <option value="" disabled selected>{{ __('Select Digest Type') }}</option>
                                     <option value="1">SHA-1</option>
                                     <option value="2">SHA-256</option>
-                                    <!-- Add other digest types as required -->
+                                    <option value="4">SHA-384</option>
                                 </select>
                                 <input type="text" class="form-control mb-2" placeholder="{{ __('Digest') }}" name="dsDigest">
                             </div>
@@ -171,10 +178,17 @@
                                 <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">
                                     <option value="" disabled selected>{{ __('Select Algorithm') }}</option>
-                                    <option value="1">RSA/MD5 (deprecated)</option>
+                                    <option value="2">Diffie-Hellman</option>
                                     <option value="3">DSA/SHA1</option>
                                     <option value="5">RSA/SHA-1</option>
-                                    <!-- Add other algorithms as required -->
+                                    <option value="6">DSA-NSEC3-SHA1</option>
+                                    <option value="7">RSASHA1-NSEC3-SHA1</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="14">ECDSA Curve P-384 with SHA-384</option>
+                                    <option value="15">Ed25519</option>
+                                    <option value="16">Ed448</option>
                                 </select>
                                 <input type="text" class="form-control mb-2" placeholder="{{ __('Public Key') }}" name="dnskeyPubKey">
                             </div>