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

@@ -2,9 +2,6 @@ package net.hostsharing.hsadminng.hash;
 
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
-import java.util.PriorityQueue;
-import java.util.Queue;
-import java.util.random.RandomGenerator;
 
 import lombok.SneakyThrows;
 import org.bouncycastle.crypto.generators.OpenBSDBCrypt;
@@ -13,9 +10,7 @@ import static net.hostsharing.hsadminng.hash.HashProcessor.Algorithm.SHA512;
 
 public class HashProcessor {
 
-    private static final RandomGenerator random = new SecureRandom();
+    private static final SecureRandom secureRandom = new SecureRandom();
-    private static final Queue<String> predefinedSalts = new PriorityQueue<>();
-
     public static final int SALT_LENGTH = 16;
     public static final int COST_FACTOR = 13;
 
@@ -65,22 +60,15 @@ public class HashProcessor {
         return "$6$" + salt + "$" + hashedPassword;
     }
 
-    public static void nextSalt(final String salt) {
-        predefinedSalts.add(salt);
-    }
-
     public HashProcessor withSalt(final String salt) {
         this.salt = salt;
         return this;
     }
 
     public HashProcessor withRandomSalt() {
-        if (!predefinedSalts.isEmpty()) {
-            return withSalt(predefinedSalts.poll());
-        }
         final var stringBuilder = new StringBuilder(SALT_LENGTH);
         for (int i = 0; i < SALT_LENGTH; ++i) {
-            int randomIndex = random.nextInt(SALT_CHARACTERS.length());
+            int randomIndex = secureRandom.nextInt(SALT_CHARACTERS.length());
             stringBuilder.append(SALT_CHARACTERS.charAt(randomIndex));
         }
         return withSalt(stringBuilder.toString());

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

@@ -29,9 +29,8 @@ public class HsHostingAssetEntityProcessor {
     }
 
     /// hashing passwords etc.
-    @SuppressWarnings("unchecked")
     public  HsHostingAssetEntityProcessor prepareForSave() {
-        validator.prepareProperties(entity);
+        // FIXME: add computed properties
         return this;
     }
 

src/main/java/net/hostsharing/hsadminng/hs/validation/HsEntityValidator.java

@@ -90,20 +90,13 @@ public abstract class HsEntityValidator<E extends PropertiesProvider> {
         throw new IllegalArgumentException("Integer value (or null) expected, but got " + value);
     }
 
-    public void prepareProperties(final E entity) {
-        stream(propertyValidators).forEach(p -> {
-            if ( p.isWriteOnly() && p.isComputed()) {
-                entity.directProps().put(p.propertyName, p.compute(entity));
-            }
-        });
-    }
-
     public Map<String, Object> revampProperties(final E entity, final Map<String, Object> config) {
         final var copy = new HashMap<>(config);
         stream(propertyValidators).forEach(p -> {
+            // FIXME: maybe move to ValidatableProperty.postProcess(...)?
             if ( p.isWriteOnly()) {
                 copy.remove(p.propertyName);
-            } else if (p.isReadOnly() && p.isComputed()) {
+            } else if (p.isComputed()) {
                 copy.put(p.propertyName, p.compute(entity));
             }
         });

src/main/java/net/hostsharing/hsadminng/hs/validation/PasswordProperty.java

@@ -34,6 +34,7 @@ public class PasswordProperty extends StringProperty<PasswordProperty> {
 
     public PasswordProperty hashedUsing(final Algorithm algorithm) {
         this.hashedUsing = algorithm;
+        // FIXME: computedBy is too late, we need preprocess
         computedBy((entity)
                 -> ofNullable(entity.getDirectValue(propertyName, String.class))
                     .map(password -> hashAlgorithm(algorithm).withRandomSalt().generate(password).forLinux())

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

@@ -3,7 +3,6 @@ package net.hostsharing.hsadminng.hs.hosting.asset;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import net.hostsharing.hsadminng.HsadminNgApplication;
-import net.hostsharing.hsadminng.hash.HashProcessor;
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemEntity;
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemRepository;
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType;
@@ -524,7 +523,6 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
                             .identifier("fir01-temp")
                             .caption("some test-unix-user")
                             .build());
-            HashProcessor.nextSalt("Jr5w/Y8zo8pCkqg7");
 
             RestAssured // @formatter:off
                     .given()
@@ -577,7 +575,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
                         assertThat(asset.getCaption()).isEqualTo("some patched test-unix-user");
                         assertThat(asset.getConfig().toString()).isEqualTo("""
                                {
-                                   "password": "$6$Jr5w/Y8zo8pCkqg7$JDJ5JDEzJFFsR3pidzdYTUZudE1GL0JZMURsTHVkZUpwTmVZYlM4ZzRqeC95WUo3Y2c5OUpTdUZpbWFx",
+                                   "password": "Ein Passwort mit 4 Zeichengruppen!",
                                    "shell": "/bin/bash",
                                    "totpKey": "0x1234567890abcdef0123456789abcdef"
                                }

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

@@ -5,7 +5,6 @@ import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType;
 import org.junit.jupiter.api.Test;
 
 import java.util.Map;
-import java.util.stream.Stream;
 
 import static net.hostsharing.hsadminng.hs.booking.item.TestHsBookingItem.TEST_MANAGED_SERVER_BOOKING_ITEM;
 import static net.hostsharing.hsadminng.hs.booking.item.TestHsBookingItem.TEST_MANAGED_WEBSPACE_BOOKING_ITEM;
@@ -47,10 +46,7 @@ class HsUnixUserHostingAssetValidatorUnitTest {
         final var validator = HsHostingAssetEntityValidatorRegistry.forType(unixUserHostingAsset.getType());
 
         // when
-        final var result = Stream.concat(
+        final var result = validator.validateEntity(unixUserHostingAsset); // FIXME: validateContext
-                    validator.validateEntity(unixUserHostingAsset).stream(),
-                validator.validateContext(unixUserHostingAsset).stream()
-        ).toList();
 
         // then
         assertThat(result).isEmpty();