From 4df16e200fe58c1bca3a608d96cc3ba8e0e1624a Mon Sep 17 00:00:00 2001
From: Pinga <121483313+getpinga@users.noreply.github.com>
Date: Tue, 26 Dec 2023 13:44:11 +0200
Subject: [PATCH] Added compatibility with RFC8624

---
 cp/app/Controllers/DomainsController.php           |  6 ++----
 cp/resources/views/admin/domains/createDomain.twig | 13 -------------
 cp/resources/views/admin/domains/updateDomain.twig | 13 -------------
 epp/src/epp-create.php                             |  3 +--
 epp/src/epp-update.php                             |  6 ++----
 5 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/cp/app/Controllers/DomainsController.php b/cp/app/Controllers/DomainsController.php
index a8cc96f..23f957a 100644
--- a/cp/app/Controllers/DomainsController.php
+++ b/cp/app/Controllers/DomainsController.php
@@ -543,7 +543,7 @@ class DomainsController extends Controller
                 }
 
                 // 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)) {
                     return view($response, 'admin/domains/createDomain.twig', [
                         'domainName' => $domainName,
@@ -563,7 +563,6 @@ class DomainsController extends Controller
                     ]);
                 }
                 $validDigests = [
-                1 => 40,  // SHA-1
                 2 => 64,  // SHA-256
                 4 => 96   // SHA-384
                 ];
@@ -1336,7 +1335,7 @@ class DomainsController extends Controller
                 }
 
                 // 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)) {
                     $this->container->get('flash')->addMessage('error', 'Incomplete algorithm provided');
                     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);
                 }
                 $validDigests = [
-                    1 => 40,  // SHA-1
                     2 => 64,  // SHA-256
                     4 => 96   // SHA-384
                 ];
diff --git a/cp/resources/views/admin/domains/createDomain.twig b/cp/resources/views/admin/domains/createDomain.twig
index 2d729d3..9ee6dac 100644
--- a/cp/resources/views/admin/domains/createDomain.twig
+++ b/cp/resources/views/admin/domains/createDomain.twig
@@ -130,13 +130,7 @@
                                     <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="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="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>
@@ -144,7 +138,6 @@
                                     </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>
                                         <option value="4">SHA-384</option>
                                     </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 -->
                                     <select class="form-control mb-2" name="dnskeyAlg">
                                         <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="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>
diff --git a/cp/resources/views/admin/domains/updateDomain.twig b/cp/resources/views/admin/domains/updateDomain.twig
index 3c98c39..c1f4c55 100644
--- a/cp/resources/views/admin/domains/updateDomain.twig
+++ b/cp/resources/views/admin/domains/updateDomain.twig
@@ -256,13 +256,7 @@
                                 <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="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="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>
@@ -270,7 +264,6 @@
                                 </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>
                                     <option value="4">SHA-384</option>
                                 </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 -->
                                 <select class="form-control mb-2" name="dnskeyAlg">
                                     <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="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>
diff --git a/epp/src/epp-create.php b/epp/src/epp-create.php
index 24983c2..7471795 100644
--- a/epp/src/epp-create.php
+++ b/epp/src/epp-create.php
@@ -1124,7 +1124,7 @@ function processDomainCreate($conn, $db, $xml, $clid, $database_type, $trans) {
                 }
 
                 // 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)) {
                     $db->rollBack();
                     sendEppError($conn, $db, 2006, 'Invalid algorithm', $clTRID, $trans);
@@ -1138,7 +1138,6 @@ function processDomainCreate($conn, $db, $xml, $clid, $database_type, $trans) {
                     return;
                 }
                 $validDigests = [
-                1 => 40,  // SHA-1
                 2 => 64,  // SHA-256
                 4 => 96   // SHA-384
                 ];
diff --git a/epp/src/epp-update.php b/epp/src/epp-update.php
index 040af3d..d81d871 100644
--- a/epp/src/epp-update.php
+++ b/epp/src/epp-update.php
@@ -1770,7 +1770,7 @@ function processDomainUpdate($conn, $db, $xml, $clid, $database_type, $trans) {
                         }
 
                         // 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)) {
                             sendEppError($conn, $db, 2006, 'Invalid algorithm', $clTRID, $trans);
                             return;
@@ -1782,7 +1782,6 @@ function processDomainUpdate($conn, $db, $xml, $clid, $database_type, $trans) {
                             return;
                         }
                         $validDigests = [
-                        1 => 40,  // SHA-1
                         2 => 64,  // SHA-256
                         4 => 96   // SHA-384
                         ];
@@ -1887,7 +1886,7 @@ function processDomainUpdate($conn, $db, $xml, $clid, $database_type, $trans) {
                         }
 
                         // 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)) {
                             sendEppError($conn, $db, 2006, 'Invalid algorithm', $clTRID, $trans);
                             return;
@@ -1899,7 +1898,6 @@ function processDomainUpdate($conn, $db, $xml, $clid, $database_type, $trans) {
                             return;
                         }
                         $validDigests = [
-                        1 => 40,  // SHA-1
                         2 => 64,  // SHA-256
                         4 => 96   // SHA-384
                         ];