More bugfixes

getnamingo · Nov 23, 2024 · 439995b · 439995b
1 parent abde99e
commit 439995b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 21 deletions.
diff --git a/cp/app/Controllers/ApplicationsController.php b/cp/app/Controllers/ApplicationsController.php
@@ -69,18 +69,18 @@ public function createApplication(Request $request, Response $response)
             $nameservers = !empty($data['nameserver']) ? $data['nameserver'] : null;
             $nameserver_ipv4 = !empty($data['nameserver_ipv4']) ? $data['nameserver_ipv4'] : null;
             $nameserver_ipv6 = !empty($data['nameserver_ipv6']) ? $data['nameserver_ipv6'] : null;
-      
+
             $authInfo = $data['authInfo'] ?? null;
-
-            $parts = extractDomainAndTLD($domainName);
-            $label = $parts['domain'];
-            $domain_extension = $parts['tld'];
             $invalid_domain = validate_label($domainName, $db);
 
             if ($invalid_domain) {
                 $this->container->get('flash')->addMessage('error', 'Error creating application: Invalid domain name');
                 return $response->withHeader('Location', '/application/create')->withStatus(302);
             }
+
+            $parts = extractDomainAndTLD($domainName);
+            $label = $parts['domain'];
+            $domain_extension = $parts['tld'];
 
             $valid_tld = false;
             $result = $db->select('SELECT id, tld FROM domain_tld');

diff --git a/cp/app/Controllers/DomainsController.php b/cp/app/Controllers/DomainsController.php
@@ -157,19 +157,25 @@ public function createDomain(Request $request, Response $response)
             $nameservers = !empty($data['nameserver']) ? $data['nameserver'] : null;
             $nameserver_ipv4 = !empty($data['nameserver_ipv4']) ? $data['nameserver_ipv4'] : null;
             $nameserver_ipv6 = !empty($data['nameserver_ipv6']) ? $data['nameserver_ipv6'] : null;
-            
+
             $dsKeyTag = isset($data['dsKeyTag']) ? (int)$data['dsKeyTag'] : null;
             $dsAlg = $data['dsAlg'] ?? null;
             $dsDigestType = isset($data['dsDigestType']) ? (int)$data['dsDigestType'] : null;
             $dsDigest = $data['dsDigest'] ?? null;
-            
+
             $dnskeyFlags = $data['dnskeyFlags'] ?? null;
             $dnskeyProtocol = $data['dnskeyProtocol'] ?? null;
             $dnskeyAlg = $data['dnskeyAlg'] ?? null;
             $dnskeyPubKey = $data['dnskeyPubKey'] ?? null;
-            
+
             $authInfo = $data['authInfo'] ?? null;
-
+            $invalid_domain = validate_label($domainName, $db);
+
+            if ($invalid_domain) {
+                $this->container->get('flash')->addMessage('error', 'Error creating domain: Invalid domain name');
+                return $response->withHeader('Location', '/domain/create')->withStatus(302);
+            }
+
             try {
                 $parts = extractDomainAndTLD($domainName);
             } catch (\Exception $e) {
@@ -179,12 +185,6 @@ public function createDomain(Request $request, Response $response)
             }
             $label = $parts['domain'];
             $domain_extension = $parts['tld'];
-            $invalid_domain = validate_label($domainName, $db);
-
-            if ($invalid_domain) {
-                $this->container->get('flash')->addMessage('error', 'Error creating domain: Invalid domain name');
-                return $response->withHeader('Location', '/domain/create')->withStatus(302);
-            }
 
             $valid_tld = false;
             $result = $db->select('SELECT id, tld FROM domain_tld');
@@ -759,9 +759,9 @@ public function createDomain(Request $request, Response $response)
                         } else {
                             $currentDateTime = new \DateTime();
                             $host_date = $currentDateTime->format('Y-m-d H:i:s.v');
-                            
+
                             if ($internal_host) {
-                                if (strpos(strtolower($nameserver), strtolower($domainName)) !== false) {
+                                if (str_ends_with(strtolower(trim($nameserver)), strtolower(trim($domainName)))) {
                                     $db->insert(
                                         'host',
                                         [

diff --git a/cp/bootstrap/helper.php b/cp/bootstrap/helper.php
@@ -209,6 +209,9 @@ function validate_label($label, $db) {
     if (strlen($label) < 2) {
         return 'Total lenght of your domain must be greater then 2 characters';
     }
+    if (strpos($label, '.') === false) {
+        return 'Invalid domain name format, must contain at least one dot (.)';
+    }
     if (strpos($label, 'xn--') === false && preg_match("/(^-|^\.|-\.|\.-|--|\.\.|-$|\.$)/", $label)) {
         return 'Invalid domain name format, cannot begin or end with a hyphen (-)';
     }

diff --git a/epp/src/epp-create.php b/epp/src/epp-create.php
@@ -640,17 +640,17 @@ function processDomainCreate($conn, $db, $xml, $clid, $database_type, $trans, $m
         }
     }
 
-    $parts = extractDomainAndTLD($domainName);
-    $label = $parts['domain'];
-    $domain_extension = $parts['tld'];
-
     $invalid_domain = validate_label($domainName, $db);
 
     if ($invalid_domain) {
         sendEppError($conn, $db, 2306, 'Invalid domain:name', $clTRID, $trans);
         return;
     }
 
+    $parts = extractDomainAndTLD($domainName);
+    $label = $parts['domain'];
+    $domain_extension = $parts['tld'];
+
     $valid_tld = false;
     $stmt = $db->prepare("SELECT id, tld FROM domain_tld");
     $stmt->execute();

diff --git a/epp/src/helpers.php b/epp/src/helpers.php
@@ -191,6 +191,9 @@ function validate_label($label, $pdo) {
     if (strlen($label) < 2) {
         return 'Total length of your domain must be greater then 2 characters';
     }
+    if (strpos($label, '.') === false) {
+        return 'Invalid domain name format, must contain at least one dot (.)';
+    }
     if (strpos($label, 'xn--') === false && preg_match("/(^-|^\.|-\.|\.-|--|\.\.|-$|\.$)/", $label)) {
         return 'Invalid domain name format, cannot begin or end with a hyphen (-)';
     }