Use code points for string length validation

fyreplace · Oct 19, 2024 · 209150f · 209150f
1 parent cb32d92
commit 209150f
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 8 deletions.
diff --git a/src/main/java/app/fyreplace/api/data/CommentCreation.java b/src/main/java/app/fyreplace/api/data/CommentCreation.java
@@ -1,8 +1,8 @@
 package app.fyreplace.api.data;
 
+import app.fyreplace.api.data.validators.Length;
 import jakarta.validation.constraints.NotBlank;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
-import org.hibernate.validator.constraints.Length;
 
 public record CommentCreation(
         @Length(min = 1, max = Comment.TEXT_MAX_LENGTH)

diff --git a/src/main/java/app/fyreplace/api/data/EmailActivation.java b/src/main/java/app/fyreplace/api/data/EmailActivation.java
@@ -1,8 +1,8 @@
 package app.fyreplace.api.data;
 
+import app.fyreplace.api.data.validators.Length;
 import jakarta.validation.constraints.NotBlank;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
-import org.hibernate.validator.constraints.Length;
 
 public record EmailActivation(
         @NotBlank

diff --git a/src/main/java/app/fyreplace/api/data/EmailCreation.java b/src/main/java/app/fyreplace/api/data/EmailCreation.java
@@ -1,8 +1,8 @@
 package app.fyreplace.api.data;
 
+import app.fyreplace.api.data.validators.Length;
 import jakarta.validation.constraints.NotBlank;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
-import org.hibernate.validator.constraints.Length;
 
 public record EmailCreation(
         @NotBlank

diff --git a/src/main/java/app/fyreplace/api/data/NewTokenCreation.java b/src/main/java/app/fyreplace/api/data/NewTokenCreation.java
@@ -1,8 +1,8 @@
 package app.fyreplace.api.data;
 
+import app.fyreplace.api.data.validators.Length;
 import jakarta.validation.constraints.NotBlank;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
-import org.hibernate.validator.constraints.Length;
 
 public record NewTokenCreation(
         @NotBlank @Length(max = Email.EMAIL_MAX_LENGTH) @Schema(maxLength = Email.EMAIL_MAX_LENGTH)

diff --git a/src/main/java/app/fyreplace/api/data/TokenCreation.java b/src/main/java/app/fyreplace/api/data/TokenCreation.java
@@ -1,8 +1,8 @@
 package app.fyreplace.api.data;
 
+import app.fyreplace.api.data.validators.Length;
 import jakarta.validation.constraints.NotBlank;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
-import org.hibernate.validator.constraints.Length;
 
 public record TokenCreation(
         @NotBlank @Length(max = Email.EMAIL_MAX_LENGTH) @Schema(maxLength = Email.EMAIL_MAX_LENGTH) String identifier,

diff --git a/src/main/java/app/fyreplace/api/data/UserCreation.java b/src/main/java/app/fyreplace/api/data/UserCreation.java
@@ -1,9 +1,9 @@
 package app.fyreplace.api.data;
 
+import app.fyreplace.api.data.validators.Length;
 import app.fyreplace.api.data.validators.Regex;
 import jakarta.validation.constraints.NotBlank;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
-import org.hibernate.validator.constraints.Length;
 
 public record UserCreation(
         @NotBlank

diff --git a/src/main/java/app/fyreplace/api/data/validators/Length.java b/src/main/java/app/fyreplace/api/data/validators/Length.java
@@ -0,0 +1,26 @@
+package app.fyreplace.api.data.validators;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+@SuppressWarnings("unused")
+@Retention(RUNTIME)
+@Target({FIELD, PARAMETER})
+@Constraint(validatedBy = LengthValidator.class)
+public @interface Length {
+    String message() default "does not meet length requirements";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+
+    int min() default 0;
+
+    int max() default Integer.MAX_VALUE;
+}
diff --git a/src/main/java/app/fyreplace/api/data/validators/LengthValidator.java b/src/main/java/app/fyreplace/api/data/validators/LengthValidator.java
@@ -0,0 +1,21 @@
+package app.fyreplace.api.data.validators;
+
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+
+public final class LengthValidator implements ConstraintValidator<Length, String> {
+    private int min;
+    private int max;
+
+    @Override
+    public void initialize(final Length constraintAnnotation) {
+        min = constraintAnnotation.min();
+        max = constraintAnnotation.max();
+    }
+
+    @Override
+    public boolean isValid(final String value, final ConstraintValidatorContext context) {
+        final var count = value.codePointCount(0, value.length());
+        return count >= min && count <= max;
+    }
+}
diff --git a/src/main/java/app/fyreplace/api/endpoints/ChaptersEndpoint.java b/src/main/java/app/fyreplace/api/endpoints/ChaptersEndpoint.java
@@ -6,6 +6,7 @@
 import app.fyreplace.api.data.Post;
 import app.fyreplace.api.data.StoredFile;
 import app.fyreplace.api.data.User;
+import app.fyreplace.api.data.validators.Length;
 import app.fyreplace.api.exceptions.ExplainedFailure;
 import app.fyreplace.api.exceptions.ForbiddenException;
 import app.fyreplace.api.services.ImageService;
@@ -37,7 +38,6 @@
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 import org.eclipse.microprofile.openapi.annotations.parameters.RequestBody;
 import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
-import org.hibernate.validator.constraints.Length;
 
 @Path("posts/{id}/chapters")
 public final class ChaptersEndpoint {

diff --git a/src/main/java/app/fyreplace/api/endpoints/UsersEndpoint.java b/src/main/java/app/fyreplace/api/endpoints/UsersEndpoint.java
@@ -8,6 +8,7 @@
 import app.fyreplace.api.data.StoredFile;
 import app.fyreplace.api.data.User;
 import app.fyreplace.api.data.UserCreation;
+import app.fyreplace.api.data.validators.Length;
 import app.fyreplace.api.emails.UserActivationEmail;
 import app.fyreplace.api.exceptions.ConflictException;
 import app.fyreplace.api.exceptions.ExplainedFailure;
@@ -49,7 +50,6 @@
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 import org.eclipse.microprofile.openapi.annotations.parameters.RequestBody;
 import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
-import org.hibernate.validator.constraints.Length;
 
 @Path("users")
 public final class UsersEndpoint {