From 63d915804addac14a4b2cec5f8298fe278be3d3b Mon Sep 17 00:00:00 2001
From: Michael Kaufmann <d00p@froxlor.org>
Date: Wed, 11 Dec 2019 20:12:51 +0100
Subject: [PATCH] lowercase domainnames when adding new (sub)domain to avoid
 issues with certificates on filesystem

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
---
 lib/Froxlor/Api/Commands/Domains.php    | 3 ++-
 lib/Froxlor/Api/Commands/SubDomains.php | 3 ++-
 tests/Domains/DomainsTest.php           | 2 +-
 tests/SubDomains/SubDomainsTest.php     | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/Froxlor/Api/Commands/Domains.php b/lib/Froxlor/Api/Commands/Domains.php
index 5d983b5c..71607fd4 100644
--- a/lib/Froxlor/Api/Commands/Domains.php
+++ b/lib/Froxlor/Api/Commands/Domains.php
@@ -354,7 +354,8 @@ class Domains extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEn
 				}
 
 				// validation
-				if ($p_domain == Settings::Get('system.hostname')) {
+				$p_domain = strtolower($p_domain);
+				if ($p_domain == strtolower(Settings::Get('system.hostname'))) {
 					\Froxlor\UI\Response::standard_error('admin_domain_emailsystemhostname', '', true);
 				}
 
diff --git a/lib/Froxlor/Api/Commands/SubDomains.php b/lib/Froxlor/Api/Commands/SubDomains.php
index cd772bb8..73cd7772 100644
--- a/lib/Froxlor/Api/Commands/SubDomains.php
+++ b/lib/Froxlor/Api/Commands/SubDomains.php
@@ -99,6 +99,7 @@ class SubDomains extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resourc
 			$customer = $this->getCustomerData('subdomains');
 
 			// validation
+			$subdomain = strtolower($subdomain);
 			if (substr($subdomain, 0, 4) == 'xn--') {
 				\Froxlor\UI\Response::standard_error('domain_nopunycode', '', true);
 			}
@@ -118,7 +119,7 @@ class SubDomains extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resourc
 					'mydomain'
 				), '', true);
 			}
-			if ($completedomain == Settings::Get('system.hostname')) {
+			if ($completedomain == strtolower(Settings::Get('system.hostname'))) {
 				\Froxlor\UI\Response::standard_error('admin_domain_emailsystemhostname', '', true);
 			}
 
diff --git a/tests/Domains/DomainsTest.php b/tests/Domains/DomainsTest.php
index 19d84b31..b3fe32f9 100644
--- a/tests/Domains/DomainsTest.php
+++ b/tests/Domains/DomainsTest.php
@@ -26,7 +26,7 @@ class DomainsTest extends TestCase
 		))->get();
 		$customer_userdata = json_decode($json_result, true)['data'];
 		$data = [
-			'domain' => 'test.local',
+			'domain' => 'TEST.local',
 			'customerid' => $customer_userdata['customerid'],
 			'override_tls' => 1,
 			'ssl_protocols' => array(
diff --git a/tests/SubDomains/SubDomainsTest.php b/tests/SubDomains/SubDomainsTest.php
index 7a20254a..e6952555 100644
--- a/tests/SubDomains/SubDomainsTest.php
+++ b/tests/SubDomains/SubDomainsTest.php
@@ -28,7 +28,7 @@ class SubDomainsTest extends TestCase
 		$customer_userdata = json_decode($json_result, true)['data'];
 
 		$data = [
-			'subdomain' => 'mysub',
+			'subdomain' => 'mySub',
 			'domain' => 'test2.local'
 		];
 		$json_result = SubDomains::getLocal($customer_userdata, $data)->add();
@@ -47,7 +47,7 @@ class SubDomainsTest extends TestCase
 		$reseller_userdata['adminsession'] = 1;
 
 		$data = [
-			'subdomain' => 'mysub2',
+			'subdomain' => 'mySub2',
 			'domain' => 'test2.local',
 			'customerid' => 1
 		];