From 0e59e02ef0f50101657be724c16a6d38491731de Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Wed, 21 Jun 2017 17:48:25 +0200
Subject: [PATCH] rename subdomains column

---
 hsarback/database/database_update.sql                |  4 ++--
 hsarback/src/de/hsadmin/mods/dom/Domain.java         | 12 ++++++------
 .../src/de/hsadmin/mods/dom/DomainModuleImpl.java    |  4 ++--
 hsarback/src/de/hsadmin/remote/DomainRemote.java     |  6 ++++++
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/hsarback/database/database_update.sql b/hsarback/database/database_update.sql
index 7c9452b..a125e3b 100644
--- a/hsarback/database/database_update.sql
+++ b/hsarback/database/database_update.sql
@@ -2,10 +2,10 @@ INSERT INTO domain_option (domain_option_name)
 	VALUES ('letsencrypt');
 
 ALTER TABLE domain 
-	ADD COLUMN cert_dns_alt_names CHARACTER VARYING(512);
+	ADD COLUMN valid_subdomain_names CHARACTER VARYING(512);
 
 UPDATE domain 
-	SET cert_dns_alt_names = domain_name || ',www.' || domain_name ;
+	SET valid_subdomain_names = '*' ;
 
 INSERT INTO contactrole_ref (contact_id, role) 
 	( SELECT contact_id, 'voting-right' FROM contact );
diff --git a/hsarback/src/de/hsadmin/mods/dom/Domain.java b/hsarback/src/de/hsadmin/mods/dom/Domain.java
index 603f29d..19aa226 100644
--- a/hsarback/src/de/hsadmin/mods/dom/Domain.java
+++ b/hsarback/src/de/hsadmin/mods/dom/Domain.java
@@ -62,8 +62,8 @@ public class Domain extends AbstractEntity {
 		inverseJoinColumns={@JoinColumn(name="domain_option_id", referencedColumnName="domain_option_id")})
 	private Set<DomainOption> domainoptions;
 
-	@Column(name = "cert_dns_alt_names", columnDefinition = "character varying(512)")
-	private String certDNSAltNames;
+	@Column(name = "valid_subdomain_names", columnDefinition = "character varying(512)")
+	private String validSubdomainNames;
 	
 	public Domain() {
 	}
@@ -182,12 +182,12 @@ public class Domain extends AbstractEntity {
 		this.domainoptions = domainOptions;
 	}
 
-	public String getCertDNSAltNames() {
-		return certDNSAltNames;
+	public String getValidSubdomainNames() {
+		return validSubdomainNames;
 	}
 
-	public void setCertDNSAltNames(String certDNSAltNames) {
-		this.certDNSAltNames = certDNSAltNames;
+	public void setValidSubdomainNames(String validSubdomainNames) {
+		this.validSubdomainNames = validSubdomainNames;
 	}
 
 }
diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java b/hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java
index f6398e5..16788dd 100644
--- a/hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java
+++ b/hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java
@@ -181,8 +181,8 @@ public class DomainModuleImpl extends AbstractModuleImpl {
 			}
 			dom.setDomainoptions(domainOptions);
 		}
-		if (dom.getCertDNSAltNames() == null) {
-			dom.setCertDNSAltNames(domName + ",www." + domName);
+		if (dom.getValidSubdomainNames() == null) {
+			dom.setValidSubdomainNames("www");
 		}
 		if (dom.isPacDomain()) {
 			em.persist(new EMailAddress("owner", "", dom, dom.getUser().getPac().getCustomer().getName().substring(6) + "@hostsharing.net"));
diff --git a/hsarback/src/de/hsadmin/remote/DomainRemote.java b/hsarback/src/de/hsadmin/remote/DomainRemote.java
index 1b79ace..be2b215 100644
--- a/hsarback/src/de/hsadmin/remote/DomainRemote.java
+++ b/hsarback/src/de/hsadmin/remote/DomainRemote.java
@@ -47,6 +47,8 @@ public class DomainRemote extends AbstractRemote {
 				domainOptionsList.add(opt.getName());
 			}
 		}
+		final String validsubdomains = dom.getValidSubdomainNames();
+		resultMap.put("validsubdomains", validsubdomains);
 	}
 
 	@Override
@@ -73,6 +75,10 @@ public class DomainRemote extends AbstractRemote {
 			}
 			dom.setDomainoptions(domainOptionsSet);
 		}
+		final Object validsubdomains = setParams.get("validsubdomains");
+		if (validsubdomains != null && validsubdomains instanceof String) {
+			dom.setValidSubdomainNames((String) validsubdomains);
+		}
 	}
 
 	@Override