src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainSetupHostingAssetValidator.java

@@ -2,52 +2,42 @@ package net.hostsharing.hsadminng.hs.hosting.asset.validators;
 
 import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAsset;
 
+import java.util.List;
 import java.util.regex.Pattern;
 
 import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_SETUP;
-import static net.hostsharing.hsadminng.hs.hosting.asset.validators.HsDomainHttpSetupHostingAssetValidator.SUBDOMAIN_NAME_REGEX;
 
 class HsDomainSetupHostingAssetValidator extends HostingAssetEntityValidator {
 
     public static final String FQDN_REGEX = "^((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+[A-Za-z]{2,12}";
-    public static final String DOMAIN_NAME_PROPERTY_NAME = "domainName";
+
+    private final Pattern identifierPattern;
 
     HsDomainSetupHostingAssetValidator() {
         super(  DOMAIN_SETUP,
                 AlarmContact.isOptional(),
 
                 NO_EXTRA_PROPERTIES);
+        this.identifierPattern = Pattern.compile(FQDN_REGEX);
     }
 
-//    @Override
+    @Override
-//    public List<String> validateEntity(final HsHostingAsset assetEntity) {
+    public List<String> validateEntity(final HsHostingAsset assetEntity) {
-//        // TODO.impl: for newly created entities, check the permission of setting up a domain
+        // TODO.impl: for newly created entities, check the permission of setting up a domain
-//        //
+        //
-//        // allow if
+        // allow if
-//        //  - user has Admin/Agent-role for all its sub-domains and the direct parent-Domain which are set up at at Hostsharing
+        //  - user has Admin/Agent-role for all its sub-domains and the direct parent-Domain which are set up at at Hostsharing
-//        //  - domain has DNS zone with TXT record approval
+        //  - domain has DNS zone with TXT record approval
-//        //  - parent-domain has DNS zone with TXT record approval
+        //  - parent-domain has DNS zone with TXT record approval
-//        //
+        //
-//        // TXT-Record check:
+        // TXT-Record check:
-//        // new InitialDirContext().getAttributes("dns:_netblocks.google.com", new String[] { "TXT"}).get("TXT").getAll();
+        // new InitialDirContext().getAttributes("dns:_netblocks.google.com", new String[] { "TXT"}).get("TXT").getAll();
-//        final var violations = new ArrayList<String>();
+
-//        if ( assetEntity.getBookingItem() != null ) {
+        return super.validateEntity(assetEntity);
-//            final var bookingItemDomainName = assetEntity .getDirectValue(DOMAIN_NAME_PROPERTY_NAME, String.class);
+    }
-//            if (  bookingItemDomainName ) {
-//                violations.add("'" + bookingItem.toShortString() + ".resources." + DOMAIN_NAME_PROPERTY_NAME + "' = '" + domainName + "' is a forbidden Hostsharing domain name");
-//            }
-//        }
-//        violations.addAll(super.validateEntity(assetEntity));
-//        return violations;
-//    }
 
     @Override
     protected Pattern identifierPattern(final HsHostingAsset assetEntity) {
-        if ( assetEntity.getBookingItem() != null ) {
+        return identifierPattern;
-            final var bookingItemDomainName = assetEntity.getBookingItem().getDirectValue(DOMAIN_NAME_PROPERTY_NAME, String.class);
-            return Pattern.compile(bookingItemDomainName, Pattern.CASE_INSENSITIVE|Pattern.LITERAL);
-        }
-        final var parentDomainName = assetEntity.getParentAsset().getIdentifier();
-        return Pattern.compile(SUBDOMAIN_NAME_REGEX + "\\." + parentDomainName.replace(".", "\\."), Pattern.CASE_INSENSITIVE);
     }
 }

src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerAcceptanceTest.java

@@ -257,7 +257,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
                        .type(HsBookingItemType.DOMAIN_SETUP)
                        .caption("some temp domain setup booking item")
                        .resources(Map.ofEntries(
-                               entry("domainName", "example.com")))
+                               entry("domainName", "example.org")))
                        .build()
             );
 

src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainSetupHostingAssetValidatorUnitTest.java

@@ -7,7 +7,6 @@ import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetRealEntity;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
-import org.junit.jupiter.params.provider.ValueSource;
 
 import java.util.Map;
 
@@ -18,22 +17,11 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 class HsDomainSetupHostingAssetValidatorUnitTest {
 
-
+    static HsHostingAssetRbacEntity.HsHostingAssetRbacEntityBuilder<?, ?> validEntityBuilder() {
-    static HsHostingAssetRbacEntity.HsHostingAssetRbacEntityBuilder<?, ?> validEntityBuilder(final String domainName) {
-        final HsBookingItemRealEntity bookingItem = HsBookingItemRealEntity.builder()
-                .type(HsBookingItemType.DOMAIN_SETUP)
-                .resources(Map.ofEntries(
-                        Map.entry("domainName", domainName)
-                ))
-                .build();
         return HsHostingAssetRbacEntity.builder()
                 .type(DOMAIN_SETUP)
-                .bookingItem(bookingItem)
+                .bookingItem(HsBookingItemRealEntity.builder().type(HsBookingItemType.DOMAIN_SETUP).build())
-                .identifier(domainName);
+                .identifier("example.org");
-    }
-
-    static HsHostingAssetRbacEntity.HsHostingAssetRbacEntityBuilder<?, ?> validEntityBuilder() {
-        return validEntityBuilder("example.org");
     }
 
     enum InvalidDomainNameIdentifier {
@@ -62,13 +50,13 @@ class HsDomainSetupHostingAssetValidatorUnitTest {
 
         // then
         assertThat(result).containsExactly(
-                "'identifier' expected to match 'example.org', but is '"+testCase.domainName+"'"
+                "'identifier' expected to match '^((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+[A-Za-z]{2,12}', but is '"+testCase.domainName+"'"
         );
     }
 
 
     enum ValidDomainNameIdentifier {
-        SIMPLE("example.org"),
+        SIMPLE("exampe.org"),
         MAX_LENGTH("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz01234568901.de"),
         WITH_DASH("example-test.com"),
         SUBDOMAIN("test.example.com");
@@ -84,7 +72,7 @@ class HsDomainSetupHostingAssetValidatorUnitTest {
     @EnumSource(ValidDomainNameIdentifier.class)
     void acceptsValidIdentifier(final ValidDomainNameIdentifier testCase) {
         // given
-        final var givenEntity = validEntityBuilder(testCase.domainName).identifier(testCase.domainName).build();
+        final var givenEntity = validEntityBuilder().identifier(testCase.domainName).build();
         final var validator = HostingAssetEntityValidatorRegistry.forType(givenEntity.getType());
 
         // when
@@ -123,42 +111,6 @@ class HsDomainSetupHostingAssetValidatorUnitTest {
                 "'DOMAIN_SETUP:example.org.assignedToAsset' must be null but is of type MANAGED_SERVER");
     }
 
-    @Test
-    void rejectsDomainNameNotMatchingBookingItemDomainName() {
-        // given
-        final var domainSetupHostingAssetEntity = validEntityBuilder()
-                .identifier("not-matching-booking-item-domain-name.org")
-                .build();
-        final var validator = HostingAssetEntityValidatorRegistry.forType(domainSetupHostingAssetEntity.getType());
-
-        // when
-        final var result = validator.validateEntity(domainSetupHostingAssetEntity);
-
-        // then
-        assertThat(result).containsExactlyInAnyOrder(
-                "'identifier' expected to match 'example.org', but is 'not-matching-booking-item-domain-name.org'");
-    }
-
-    @ParameterizedTest
-    @ValueSource(strings = {"not-matching-booking-item-domain-name.org", "indirect.subdomain.example.org"})
-    void rejectsDomainNameWhichIsNotADirectSubdomainOfParentAsset(final String newDomainName) {
-        // given
-        final var domainSetupHostingAssetEntity = validEntityBuilder()
-                .bookingItem(null)
-                .parentAsset(createValidParentDomainSetupAsset("example.org"))
-                .identifier(newDomainName)
-                .build();
-        final var validator = HostingAssetEntityValidatorRegistry.forType(domainSetupHostingAssetEntity.getType());
-
-        // when
-        final var result = validator.validateEntity(domainSetupHostingAssetEntity);
-
-        // then
-        assertThat(result).containsExactlyInAnyOrder(
-                "'identifier' expected to match '(\\*|(?!-)[A-Za-z0-9-]{1,63}(?<!-))\\.example\\.org', " +
-                        "but is '" + newDomainName + "'");
-    }
-
     @Test
     void expectsEitherParentAssetOrBookingItem() {
         // given
@@ -171,18 +123,4 @@ class HsDomainSetupHostingAssetValidatorUnitTest {
         // then
         assertThat(result).isEmpty();
     }
-
-    private static HsHostingAssetRealEntity createValidParentDomainSetupAsset(final String parentDomainName) {
-        final var bookingItem = HsBookingItemRealEntity.builder()
-                .type(HsBookingItemType.DOMAIN_SETUP)
-                .resources(Map.ofEntries(
-                        Map.entry("domainName", parentDomainName)
-                ))
-                .build();
-        final var parentAsset = HsHostingAssetRealEntity.builder()
-                .type(DOMAIN_SETUP)
-                .bookingItem(bookingItem)
-                .identifier(parentDomainName).build();
-        return parentAsset;
-    }
 }