src/main/java/net/hostsharing/hsadminng/hash/HashGenerator.java

@@ -31,37 +31,22 @@ public final class HashGenerator {
 
     public enum Algorithm {
         LINUX_SHA512(LinuxEtcShadowHashGenerator::hash, "6"),
-        LINUX_YESCRYPT(LinuxEtcShadowHashGenerator::hash, "y", "j9T$") {
+        LINUX_YESCRYPT(LinuxEtcShadowHashGenerator::hash, "y"),
-            @Override
-            String enrichedSalt(final String salt) {
-                return prefix + "$" + (salt.startsWith(optionalParam) ? salt : optionalParam + salt);
-            }
-        },
         MYSQL_NATIVE(MySQLNativePasswordHashGenerator::hash, "*"),
         SCRAM_SHA256(PostgreSQLScramSHA256::hash, "SCRAM-SHA-256");
 
         final BiFunction<HashGenerator, String, String> implementation;
         final String prefix;
-        final String optionalParam;
-
-        Algorithm(BiFunction<HashGenerator, String, String> implementation, final String prefix, final String optionalParam) {
-            this.implementation = implementation;
-            this.prefix = prefix;
-            this.optionalParam = optionalParam;
-        }
 
         Algorithm(BiFunction<HashGenerator, String, String> implementation, final String prefix) {
-            this(implementation, prefix, null);
+            this.implementation = implementation;
+            this.prefix = prefix;
         }
 
         static Algorithm byPrefix(final String prefix) {
             return Arrays.stream(Algorithm.values()).filter(a -> a.prefix.equals(prefix)).findAny()
                     .orElseThrow(() -> new IllegalArgumentException("unknown hash algorithm: '" + prefix + "'"));
         }
-
-        String enrichedSalt(final String salt) {
-            return prefix + "$" + salt;
-        }
     }
 
     private final Algorithm algorithm;
@@ -75,7 +60,7 @@ public final class HashGenerator {
        this.algorithm = algorithm;
     }
 
-    public static void enableCouldBeHash(final boolean enable) {
+    public static void enableChouldBeHash(final boolean enable) {
         couldBeHashEnabled = enable;
     }
 
@@ -88,11 +73,7 @@ public final class HashGenerator {
             throw new IllegalStateException("no password given");
         }
 
-        final var hash = algorithm.implementation.apply(this, plaintextPassword);
+        return algorithm.implementation.apply(this, plaintextPassword);
-        if (hash.length() < plaintextPassword.length()) {
-            throw new AssertionError("generated hash too short: " + hash);
-        }
-        return hash;
     }
 
     public String hashIfNotYetHashed(final String plaintextPasswordOrHash) {
@@ -121,10 +102,4 @@ public final class HashGenerator {
         }
         return withSalt(stringBuilder.toString());
     }
-
-    public static void main(String[] args) {
-        System.out.println(
-            HashGenerator.using(Algorithm.LINUX_YESCRYPT).withRandomSalt().hash("my plaintext domain transfer passphrase")
-        );
-    }
 }

src/main/java/net/hostsharing/hsadminng/hash/LinuxEtcShadowHashGenerator.java

@@ -10,7 +10,7 @@ public class LinuxEtcShadowHashGenerator {
             throw new IllegalStateException("no salt given");
         }
 
-        return NativeCryptLibrary.INSTANCE.crypt(payload, "$" + generator.getAlgorithm().enrichedSalt(generator.getSalt()));
+        return NativeCryptLibrary.INSTANCE.crypt(payload, "$" + generator.getAlgorithm().prefix + "$" + generator.getSalt());
     }
 
     public static void verify(final String givenHash, final String payload) {
@@ -22,8 +22,8 @@ public class LinuxEtcShadowHashGenerator {
 
         final var algorithm = HashGenerator.Algorithm.byPrefix(parts[1]);
         final var salt = parts.length == 4 ? parts[2] : parts[2] + "$" + parts[3];
-        final var calculatedHash = HashGenerator.using(algorithm).withSalt(salt).hash(payload);
+        final var calcualatedHash = HashGenerator.using(algorithm).withSalt(salt).hash(payload);
-        if (!calculatedHash.equals(givenHash)) {
+        if (!calcualatedHash.equals(givenHash)) {
             throw new IllegalArgumentException("invalid password");
         }
     }

src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsDomainSetupBookingItemValidator.java

@@ -6,8 +6,6 @@ import net.hostsharing.hsadminng.mapper.Array;
 import java.util.ArrayList;
 import java.util.List;
 
-import static net.hostsharing.hsadminng.hash.HashGenerator.Algorithm.LINUX_YESCRYPT;
-import static net.hostsharing.hsadminng.hs.validation.PasswordProperty.passwordProperty;
 import static net.hostsharing.hsadminng.hs.validation.StringProperty.stringProperty;
 
 class HsDomainSetupBookingItemValidator extends HsBookingItemEntityValidator {
@@ -27,16 +25,13 @@ class HsDomainSetupBookingItemValidator extends HsBookingItemEntityValidator {
             "(co|ne|or|go|re|pe)\\.kr"
     );
     public static final String DOMAIN_NAME_PROPERTY_NAME = "domainName";
-    public static final String VERIFICATION_PASSPHRASE_PROPERTY_NAME = "verificationPassphrase";
 
     HsDomainSetupBookingItemValidator() {
         super(
                 stringProperty(DOMAIN_NAME_PROPERTY_NAME).writeOnce()
                         .matchesRegEx(FQDN_REGEX).describedAs("is not a (non-top-level) fully qualified domain name")
                         .notMatchesRegEx(REGISTRAR_LEVEL_DOMAINS).describedAs("is a forbidden registrar-level domain name")
-                        .required(),
+                        .required()
-                passwordProperty(VERIFICATION_PASSPHRASE_PROPERTY_NAME).minLength(8).maxLength(64)
-                        .hashedUsing(LINUX_YESCRYPT).writeOnly().optional()
         );
     }
 

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

@@ -4,33 +4,26 @@ import org.apache.commons.collections4.EnumerationUtils;
 
 import javax.naming.InvalidNameException;
 import javax.naming.NameNotFoundException;
-import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.ServiceUnavailableException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.InitialDirContext;
-import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
-import java.util.Map;
 
-import static java.util.Arrays.stream;
 import static java.util.Collections.emptyList;
 
 public class Dns {
 
-    private final static Map<String, Result> fakeResults = new HashMap<>();
+    private static Result nextFakeResult = null;
 
-    public static void fakeResultForDomain(final String domainName, final Result fakeResult) {
+    public static void fakeNextResult(final Result fakeResult) {
-        fakeResults.put(domainName, fakeResult);
+        nextFakeResult = fakeResult;
-    }
-
-    static void resetFakeResults() {
-        fakeResults.clear();
     }
 
     public enum Status {
         SUCCESS,
+        RECORD_TYPE_NOT_FOUND,
         NAME_NOT_FOUND,
         INVALID_NAME,
         SERVICE_UNAVAILABLE,
@@ -38,26 +31,6 @@ public class Dns {
     }
 
     public record Result(Status status, List<String> records, NamingException exception) {
-
-        public static Result fromRecords(final NamingEnumeration<?> recordEnumeration) {
-            final List<String> records = recordEnumeration == null
-                    ? emptyList()
-                    : EnumerationUtils.toList(recordEnumeration).stream().map(Object::toString).toList();
-            return new Result(Status.SUCCESS, records, null);
-        }
-
-        public static Result fromRecords(final String... records) {
-            return new Result(Status.SUCCESS, stream(records).toList(), null);
-        }
-
-        public static Result fromException(final NamingException exception) {
-            return switch (exception) {
-                case ServiceUnavailableException exc -> new Result(Status.SERVICE_UNAVAILABLE, null, exc);
-                case NameNotFoundException exc -> new Result(Status.NAME_NOT_FOUND, null, exc);
-                case InvalidNameException exc -> new Result(Status.INVALID_NAME, null, exc);
-                case NamingException exc -> new Result(Status.UNKNOWN_FAILURE, null, exc);
-            };
-        }
     }
 
     private final String domainName;
@@ -67,25 +40,35 @@ public class Dns {
     }
 
     public Result fetchRecordsOfType(final String recordType) {
-        if (fakeResults.containsKey(domainName)) {
+        if (nextFakeResult != null) {
-            return fakeResults.get(domainName);
+            try {
+                return nextFakeResult;
+            } finally {
+                nextFakeResult = null;
+            }
         }
 
         try {
             final var env = new Hashtable<>();
             env.put("java.naming.factory.initial", "com.sun.jndi.dns.DnsContextFactory");
-            final Attribute records = new InitialDirContext(env)
+            final Attribute r = new InitialDirContext(env)
                     .getAttributes(domainName, new String[] { recordType })
                     .get(recordType);
-            return Result.fromRecords(records != null ? records.getAll() : null);
+            return new Result(
-        } catch (final NamingException exception) {
+                r == null ? Status.RECORD_TYPE_NOT_FOUND : Status.SUCCESS,
-            return Result.fromException(exception);
+                r == null
+                    ? emptyList()
+                    : EnumerationUtils.toList(r.getAll()).stream().map(Object::toString).toList(),
+                null);
+        } catch (final ServiceUnavailableException e) {
+            return new Result(Status.SERVICE_UNAVAILABLE, null, e);
+        } catch (final NameNotFoundException e) {
+            return new Result(Status.NAME_NOT_FOUND, null, e);
+        } catch (InvalidNameException e) {
+            return new Result(Status.INVALID_NAME, null, e);
+        } catch (NamingException e) {
+            return new Result(Status.UNKNOWN_FAILURE, null, e);
         }
     }
 
-    public static void main(String[] args) {
-        final var result = new Dns("example.org").fetchRecordsOfType("TXT");
-        System.out.println(result);
-    }
-
 }

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

@@ -50,24 +50,25 @@ class HsDomainSetupHostingAssetValidator extends HostingAssetEntityValidator {
         final var result = new Dns(assetEntity.getIdentifier()).fetchRecordsOfType("TXT");
         switch ( result.status() ) {
             case Dns.Status.SUCCESS:
-                final var hash = assetEntity.getBookingItem().getDirectValue("verificationPassphrase", String.class);
+                final var found = result.records().stream().filter(r -> r.contains("TXT Hostsharing-domain-setup-verification=FIXME")).findAny();
-                final var found = result.records().stream().filter(r -> r.contains("Hostsharing-domain-setup-verification-code=" + hash)).findAny();
+                if (found.isPresent()) {
-                if (found.isEmpty()) {
+                    break;
-                    violations.add("[DNS] no TXT record 'Hostsharing-domain-setup-verification=...' with valid hash found for domain name '" + assetEntity.getIdentifier() + "'");
                 }
+            case Dns.Status.RECORD_TYPE_NOT_FOUND:
+                violations.add("Domain " + assetEntity.getIdentifier() + " exists, but no record 'TXT Hostsharing-domain-setup-challenge:FIXME' found ");
                 break;
 
             case Dns.Status.NAME_NOT_FOUND:
-                // no DNS verification necessary / FIXME: at least if the superdomain is at registrar level
+                // no DNS verification necessary
                 break;
 
             case Dns.Status.INVALID_NAME:
-                violations.add("[DNS] invalid domain name '" + assetEntity.getIdentifier() + "'");
+                violations.add("Invalid domain name " + assetEntity.getIdentifier());
                 break;
 
                 case Dns.Status.SERVICE_UNAVAILABLE:
             case Dns.Status.UNKNOWN_FAILURE:
-                violations.add("[DNS] lookup failed for domain name '" + assetEntity.getIdentifier() + "': " + result.exception());
+                violations.add("DNS request for " + assetEntity.getIdentifier() + " failed: " + result.exception());
                 break;
         }
 

src/test/java/net/hostsharing/hsadminng/hash/HashGeneratorUnitTest.java

@@ -6,7 +6,6 @@ import java.nio.charset.Charset;
 import java.util.Base64;
 
 import static net.hostsharing.hsadminng.hash.HashGenerator.Algorithm.LINUX_SHA512;
-import static net.hostsharing.hsadminng.hash.HashGenerator.Algorithm.LINUX_YESCRYPT;
 import static net.hostsharing.hsadminng.hash.HashGenerator.Algorithm.MYSQL_NATIVE;
 import static net.hostsharing.hsadminng.hash.HashGenerator.Algorithm.SCRAM_SHA256;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -58,18 +57,6 @@ class HashGeneratorUnitTest {
         assertThat(throwable).hasMessage("invalid password");
     }
 
-    @Test
-    void generatesLinuxSha512PasswordHash() {
-        final var hash = HashGenerator.using(LINUX_SHA512).withSalt("ooei1HK6JXVaI7KC").hash(GIVEN_PASSWORD);
-        assertThat(hash).isEqualTo(GIVEN_LINUX_GENERATED_SHA512_HASH);
-    }
-
-    @Test
-    void generatesLinuxYescriptPasswordHash() {
-        final var hash = HashGenerator.using(LINUX_YESCRYPT).withSalt("wgYACPmBXvlMg2MzeZA0p1").hash(GIVEN_PASSWORD);
-        assertThat(hash).isEqualTo(GIVEN_LINUX_GENERATED_YESCRYPT_HASH);
-    }
-
     @Test
     void generatesMySqlNativePasswordHash() {
         final var hash = HashGenerator.using(MYSQL_NATIVE).hash("Test1234");

src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsDomainSetupBookingItemValidatorUnitTest.java

@@ -129,7 +129,6 @@ class HsDomainSetupBookingItemValidatorUnitTest {
 
         // then
         assertThat(validator.properties()).map(Map::toString).containsExactlyInAnyOrder(
-                "{type=string, propertyName=domainName, matchesRegEx=[^((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+[A-Za-z]{2,12}], matchesRegExDescription=is not a (non-top-level) fully qualified domain name, notMatchesRegEx=[(co|org|gov|ac|sch)\\.uk, (com|net|org|edu|gov|asn|id)\\.au, (co|ne|or|ac|go)\\.jp, (com|net|org|gov|edu|ac)\\.cn, (com|net|org|gov|edu|mil|art)\\.br, (co|net|org|gen|firm|ind)\\.in, (com|net|org|gob|edu)\\.mx, (gov|edu)\\.it, (co|net|org|govt|ac|school|geek|kiwi)\\.nz, (co|ne|or|go|re|pe)\\.kr], notMatchesRegExDescription=is a forbidden registrar-level domain name, required=true, writeOnce=true}",
+                "{type=string, propertyName=domainName, matchesRegEx=[^((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+[A-Za-z]{2,12}], matchesRegExDescription=is not a (non-top-level) fully qualified domain name, notMatchesRegEx=[(co|org|gov|ac|sch)\\.uk, (com|net|org|edu|gov|asn|id)\\.au, (co|ne|or|ac|go)\\.jp, (com|net|org|gov|edu|ac)\\.cn, (com|net|org|gov|edu|mil|art)\\.br, (co|net|org|gen|firm|ind)\\.in, (com|net|org|gob|edu)\\.mx, (gov|edu)\\.it, (co|net|org|govt|ac|school|geek|kiwi)\\.nz, (co|ne|or|go|re|pe)\\.kr], notMatchesRegExDescription=is a forbidden registrar-level domain name, required=true, writeOnce=true}");
-                "{type=password, propertyName=verificationPassphrase, minLength=8, maxLength=64, writeOnly=true, computed=IN_PREP, hashedUsing=LINUX_YESCRYPT, undisclosed=true}");
     }
 }

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

@@ -250,7 +250,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
         void globalAdmin_canAddTopLevelAsset() {
 
             context.define("superuser-alex@hostsharing.net");
-            Dns.fakeResultForDomain("example.com", new Dns.Result(Dns.Status.NAME_NOT_FOUND, null, null));
+            Dns.fakeNextResult(new Dns.Result(Dns.Status.NAME_NOT_FOUND, null, null));
             final var givenProject = realProjectRepo.findByCaption("D-1000111 default project").stream()
                     .findAny().orElseThrow();
             final var bookingItem = givenSomeTemporaryBookingItem(() ->

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

@@ -2,24 +2,15 @@ package net.hostsharing.hsadminng.hs.hosting.asset.validators;
 
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemRealEntity;
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType;
-import net.hostsharing.hsadminng.hs.booking.item.validators.HsBookingItemEntityValidatorRegistry;
 import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetRbacEntity;
 import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetRealEntity;
-import org.junit.jupiter.api.AfterEach;
 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 javax.naming.InvalidNameException;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-import javax.naming.ServiceUnavailableException;
-import java.util.HashMap;
 import java.util.Map;
 
-import static java.util.Map.entry;
-import static java.util.Map.ofEntries;
 import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.CLOUD_SERVER;
 import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_SETUP;
 import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.MANAGED_SERVER;
@@ -30,12 +21,10 @@ class HsDomainSetupHostingAssetValidatorUnitTest {
     static HsHostingAssetRbacEntity.HsHostingAssetRbacEntityBuilder<?, ?> validEntityBuilder(final String domainName) {
         final HsBookingItemRealEntity bookingItem = HsBookingItemRealEntity.builder()
                 .type(HsBookingItemType.DOMAIN_SETUP)
-                .resources(new HashMap<>(ofEntries(
+                .resources(Map.ofEntries(
-                        entry("domainName", domainName),
+                        Map.entry("domainName", domainName)
-                        entry("verificationPassphrase", "some secret verification passphrase")
+                ))
-                )))
                 .build();
-        HsBookingItemEntityValidatorRegistry.forType(HsBookingItemType.DOMAIN_SETUP).prepareProperties(null, bookingItem);
         return HsHostingAssetRbacEntity.builder()
                 .type(DOMAIN_SETUP)
                 .bookingItem(bookingItem)
@@ -46,11 +35,6 @@ class HsDomainSetupHostingAssetValidatorUnitTest {
         return validEntityBuilder("example.org");
     }
 
-    @AfterEach
-    void cleanup() {
-        Dns.resetFakeResults();
-    }
-
     enum InvalidDomainNameIdentifier {
         EMPTY(""),
         TOO_LONG("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz0123456890123456789.de"),
@@ -69,6 +53,7 @@ class HsDomainSetupHostingAssetValidatorUnitTest {
     @EnumSource(InvalidDomainNameIdentifier.class)
     void rejectsInvalidIdentifier(final InvalidDomainNameIdentifier testCase) {
         // given
+        Dns.fakeNextResult(new Dns.Result(Dns.Status.NAME_NOT_FOUND, null, null));
         final var givenEntity = validEntityBuilder().identifier(testCase.domainName).build();
         final var validator = HostingAssetEntityValidatorRegistry.forType(givenEntity.getType());
 
@@ -76,11 +61,12 @@ class HsDomainSetupHostingAssetValidatorUnitTest {
         final var result = validator.validateEntity(givenEntity);
 
         // then
-        assertThat(result).contains(
+        assertThat(result).containsExactly(
                 "'identifier' expected to match 'example.org', but is '"+testCase.domainName+"'"
         );
     }
 
+
     enum ValidDomainNameIdentifier {
         SIMPLE("example.org"),
         MAX_LENGTH("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz01234568901.de"),
@@ -98,7 +84,7 @@ class HsDomainSetupHostingAssetValidatorUnitTest {
     @EnumSource(ValidDomainNameIdentifier.class)
     void acceptsValidIdentifier(final ValidDomainNameIdentifier testCase) {
         // given
-        Dns.fakeResultForDomain(testCase.domainName, new Dns.Result(Dns.Status.NAME_NOT_FOUND, null, null));
+        Dns.fakeNextResult(new Dns.Result(Dns.Status.NAME_NOT_FOUND, null, null));
         final var givenEntity = validEntityBuilder(testCase.domainName).identifier(testCase.domainName).build();
         final var validator = HostingAssetEntityValidatorRegistry.forType(givenEntity.getType());
 
@@ -121,6 +107,7 @@ class HsDomainSetupHostingAssetValidatorUnitTest {
     @Test
     void validatesReferencedEntities() {
         // given
+        Dns.fakeNextResult(new Dns.Result(Dns.Status.NAME_NOT_FOUND, null, null));
         final var domainSetupHostingAssetEntity = validEntityBuilder()
                 .parentAsset(HsHostingAssetRealEntity.builder().type(CLOUD_SERVER).build())
                 .assignedToAsset(HsHostingAssetRealEntity.builder().type(MANAGED_SERVER).build())
@@ -178,110 +165,8 @@ class HsDomainSetupHostingAssetValidatorUnitTest {
     void expectsEitherParentAssetOrBookingItem() {
 
         // given
+        Dns.fakeNextResult(new Dns.Result(Dns.Status.NAME_NOT_FOUND, null, null));
         final var domainSetupHostingAssetEntity = validEntityBuilder().build();
-        Dns.fakeResultForDomain(
-                domainSetupHostingAssetEntity.getIdentifier(),
-                new Dns.Result(Dns.Status.NAME_NOT_FOUND, null, null));
-        final var validator = HostingAssetEntityValidatorRegistry.forType(domainSetupHostingAssetEntity.getType());
-
-        // when
-        final var result = validator.validateEntity(domainSetupHostingAssetEntity);
-
-        // then
-        assertThat(result).isEmpty();
-    }
-
-    enum DnsLookupFailureTestCase {
-        SERVICE_UNAVAILABLE(
-                new ServiceUnavailableException("no Internet connection"),
-                "[DNS] lookup failed for domain name 'example.org': javax.naming.ServiceUnavailableException: no Internet connection"),
-        NAME_NOT_FOUND(
-                new NameNotFoundException("domain name not found"),
-                null), // no
-        INVALID_NAME(
-                new InvalidNameException("domain name too long or whatever"),
-                "[DNS] invalid domain name 'example.org'"),
-        UNKNOWN_FAILURE(
-                new NamingException("some other problem"),
-                "[DNS] lookup failed for domain name 'example.org': javax.naming.NamingException: some other problem");
-
-        public final NamingException givenException;
-        public final String expectedErrorMessage;
-
-        DnsLookupFailureTestCase(final NamingException givenException, final String expectedErrorMessage) {
-            this.givenException = givenException;
-            this.expectedErrorMessage = expectedErrorMessage;
-        }
-    }
-
-    @ParameterizedTest
-    @EnumSource(DnsLookupFailureTestCase.class)
-    void handlesDnsLookupFailures(final DnsLookupFailureTestCase testCase) {
-
-        // given
-        final var domainSetupHostingAssetEntity = validEntityBuilder().build();
-        Dns.fakeResultForDomain(
-                domainSetupHostingAssetEntity.getIdentifier(),
-                Dns.Result.fromException(testCase.givenException));
-        final var validator = HostingAssetEntityValidatorRegistry.forType(domainSetupHostingAssetEntity.getType());
-
-        // when
-        final var result = validator.validateEntity(domainSetupHostingAssetEntity);
-
-        // then
-        if (testCase.expectedErrorMessage != null) {
-            assertThat(result).containsExactly(testCase.expectedErrorMessage);
-        } else {
-            assertThat(result).isEmpty();
-        }
-    }
-
-    @Test
-    void allowSetupOfNonExistingSubdomainOfRegistrarLevelDomain() {
-
-        // given
-        final var domainSetupHostingAssetEntity = validEntityBuilder().build();
-        final var domainName = domainSetupHostingAssetEntity.getIdentifier();
-        Dns.fakeResultForDomain(
-                domainName,
-                Dns.Result.fromException(new NameNotFoundException("domain not registered")));
-        final var validator = HostingAssetEntityValidatorRegistry.forType(domainSetupHostingAssetEntity.getType());
-
-        // when
-        final var result = validator.validateEntity(domainSetupHostingAssetEntity);
-
-        // then
-        assertThat(result).isEmpty();
-    }
-
-    @Test
-    void rejectSetupOfExistingDomainWithInvalidDnsVerification() {
-
-        // given
-        final var domainSetupHostingAssetEntity = validEntityBuilder().build();
-        final var domainName = domainSetupHostingAssetEntity.getIdentifier();
-        Dns.fakeResultForDomain(
-                domainName,
-                Dns.Result.fromRecords("Hostsharing-domain-setup-verification-code=SOME-DEFINITELY-WRONG-HASH"));
-        final var validator = HostingAssetEntityValidatorRegistry.forType(domainSetupHostingAssetEntity.getType());
-
-        // when
-        final var result = validator.validateEntity(domainSetupHostingAssetEntity);
-
-        // then
-        assertThat(result).contains("[DNS] no TXT record 'Hostsharing-domain-setup-verification=...' with valid hash found for domain name 'example.org'");
-    }
-
-    @Test
-    void allowSetupOfExistingDomainWithValidDnsVerification() {
-
-        // given
-        final var domainSetupHostingAssetEntity = validEntityBuilder().build();
-        final var domainName = domainSetupHostingAssetEntity.getIdentifier();
-        final var expectedHash = domainSetupHostingAssetEntity.getBookingItem().getDirectValue("verificationPassphrase", String.class);
-        Dns.fakeResultForDomain(
-                domainName,
-                Dns.Result.fromRecords("Hostsharing-domain-setup-verification-code=" + expectedHash));
         final var validator = HostingAssetEntityValidatorRegistry.forType(domainSetupHostingAssetEntity.getType());
 
         // when
@@ -294,8 +179,8 @@ class HsDomainSetupHostingAssetValidatorUnitTest {
     private static HsHostingAssetRealEntity createValidParentDomainSetupAsset(final String parentDomainName) {
         final var bookingItem = HsBookingItemRealEntity.builder()
                 .type(HsBookingItemType.DOMAIN_SETUP)
-                .resources(ofEntries(
+                .resources(Map.ofEntries(
-                        entry("domainName", parentDomainName)
+                        Map.entry("domainName", parentDomainName)
                 ))
                 .build();
         final var parentAsset = HsHostingAssetRealEntity.builder()

src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java

@@ -1352,7 +1352,7 @@ public class ImportHostingAssets extends BaseOfficeDataImport {
     }
 
     private void importDatabaseUsers(final String[] header, final List<String[]> records) {
-        HashGenerator.enableCouldBeHash(true);
+        HashGenerator.enableChouldBeHash(true);
         final var columns = new Columns(header);
         records.stream()
                 .map(this::trimAll)