difficulty map start count at one, captcharequest added createdat and improved indices

Author: tobiasholler

captchaservice-backend/src/main/java/de/muenchen/captchaservice/entity/CaptchaRequest.java

@@ -8,14 +8,15 @@
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.*;
+import org.hibernate.annotations.CreationTimestamp;
 
 import java.time.Instant;
 
 @Entity
 @Table(
         indexes = {
                 @Index(name = "idx_captcha_request_source_address_hash", columnList = "sourceAddressHash"),
-                @Index(name = "idx_captcha_request_expires_at", columnList = "expiresAt")
+                @Index(name = "idx_captcha_request_source_address_hash_expires_at", columnList = "sourceAddressHash, expiresAt")
         }
 )
 
@@ -25,7 +26,6 @@
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
-@AllArgsConstructor
 public class CaptchaRequest extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -34,6 +34,10 @@ public class CaptchaRequest extends BaseEntity {
     // Variables //
     // ========= //
 
+    @CreationTimestamp
+    @Column(updatable = false)
+    private Instant requestAt;
+
     @Column(nullable = false, length = 64)
     @NotNull
     @Size(min = 64, max = 64)
@@ -42,4 +46,9 @@ public class CaptchaRequest extends BaseEntity {
     @NotNull
     private Instant expiresAt;
 
+    public CaptchaRequest(String sourceAddressHash, Instant expiresAt) {
+        this.sourceAddressHash = sourceAddressHash;
+        this.expiresAt = expiresAt;
+    }
+
 }

captchaservice-backend/src/main/java/de/muenchen/captchaservice/entity/InvalidatedPayload.java

@@ -15,7 +15,7 @@
 @Table(
         indexes = {
                 @Index(name = "idx_invalidated_payload_payload_hash", columnList = "payloadHash"),
-                @Index(name = "idx_invalidated_payload_expires_at", columnList = "expiresAt")
+                @Index(name = "idx_invalidated_payload_payload_hash_expires_at", columnList = "payloadHash, expiresAt")
         }
 )
 // Definition of getter, setter, ...

captchaservice-backend/src/main/java/de/muenchen/captchaservice/service/difficulty/DifficultyService.java

@@ -47,7 +47,7 @@ public long getDifficultyForSourceAddress(final String siteKey, final SourceAddr
                 .difficultyMap()
                 .stream()
                 .sorted((o1, o2) -> Math.toIntExact(o2.minVisits() - o1.minVisits()))
-                .filter(di -> di.minVisits() <= sourceVisitCount)
+                .filter(di -> di.minVisits() - 1 <= sourceVisitCount)
                 .findFirst();
         if (difficultyItem.isEmpty()) {
             log.error("No difficulty found site {} with {} visits", siteKey, sourceVisitCount);

captchaservice-backend/src/main/resources/application-local.yml

@@ -39,8 +39,13 @@ security:
 captcha:
   hmac-key: secret
   sites:
+    loadtest:
+      secret: loadtest
+      difficulty-map:
+        - min-visits: 1
+          max-number: 1
     test:
       secret: test
       difficulty-map:
-        - min-visits: 0
+        - min-visits: 1
           max-number: 1000

captchaservice-backend/src/main/resources/db/migration/schema/V001__Init.sql

@@ -1,6 +1,7 @@
 CREATE TABLE captcha_request
 (
     id                  UUID                     NOT NULL,
+    request_at          TIMESTAMP WITH TIME ZONE,
     source_address_hash VARCHAR(64)              NOT NULL,
     expires_at          TIMESTAMP WITH TIME ZONE NOT NULL,
     CONSTRAINT pk_captcharequest PRIMARY KEY (id)
@@ -14,10 +15,10 @@ CREATE TABLE invalidated_payload
     CONSTRAINT pk_invalidatedpayload PRIMARY KEY (id)
 );
 
-CREATE INDEX idx_captcha_request_expires_at ON captcha_request (expires_at);
-
 CREATE INDEX idx_captcha_request_source_address_hash ON captcha_request (source_address_hash);
 
-CREATE INDEX idx_invalidated_payload_expires_at ON invalidated_payload (expires_at);
+CREATE INDEX idx_captcha_request_source_address_hash_expires_at ON captcha_request (source_address_hash, expires_at);
+
+CREATE INDEX idx_invalidated_payload_payload_hash ON invalidated_payload (payload_hash);
 
-CREATE INDEX idx_invalidated_payload_payload_hash ON invalidated_payload (payload_hash);
+CREATE INDEX idx_invalidated_payload_payload_hash_expires_at ON invalidated_payload (payload_hash, expires_at);

captchaservice-backend/src/test/resources/application-test.yml

@@ -26,9 +26,9 @@ captcha:
       secret: test_secret
       source-address-ipv6-cidr: 64
       difficulty-map:
-        - minVisits: 0
+        - minVisits: 1
           maxNumber: 1000
-        - minVisits: 2
-          maxNumber: 2000
         - minVisits: 3
+          maxNumber: 2000
+        - minVisits: 4
           maxNumber: 3000