Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

refactor(ses): move the send-address checks into ses.address (#5689)

Kenshin Okinaka2ea6653c654f
diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.java
index 0405e2f9ae..d1badcd7d0 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.java
@@ -8,6 +8,7 @@ import io.github.hectorvent.floci.core.common.AwsQueryResponse;
import io.github.hectorvent.floci.core.common.PaginatedResult;
import io.github.hectorvent.floci.core.common.RegionResolver;
import io.github.hectorvent.floci.core.common.XmlBuilder;
+import io.github.hectorvent.floci.services.ses.address.SesAddressSyntax;
import io.github.hectorvent.floci.services.ses.model.BulkEmailEntry;
import io.github.hectorvent.floci.services.ses.model.BulkEmailEntryResult;
import io.github.hectorvent.floci.services.ses.model.CloudWatchDestination;
diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesSendController.java b/src/main/java/io/github/hectorvent/floci/services/ses/SesSendController.java
index 4d7c5e25bd..f4613348b9 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesSendController.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ses/SesSendController.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import io.github.hectorvent.floci.core.common.AwsException;
import io.github.hectorvent.floci.core.common.RegionResolver;
+import io.github.hectorvent.floci.services.ses.address.SesAddressSyntax;
import io.github.hectorvent.floci.services.ses.model.BulkEmailEntry;
import io.github.hectorvent.floci.services.ses.model.BulkEmailEntryResult;
import io.github.hectorvent.floci.services.ses.model.EmailContent;
diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesService.java b/src/main/java/io/github/hectorvent/floci/services/ses/SesService.java
index 9f245afda5..a88bbcfb7f 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ses/SesService.java
@@ -8,6 +8,8 @@ import io.github.hectorvent.floci.core.common.AwsException;
import io.github.hectorvent.floci.core.common.AwsRegions;
import io.github.hectorvent.floci.core.common.PaginatedResult;
import io.github.hectorvent.floci.core.common.RegionResolver;
+import io.github.hectorvent.floci.services.ses.address.SesAddressLength;
+import io.github.hectorvent.floci.services.ses.address.SesAddressSyntax;
import io.github.hectorvent.floci.services.ses.model.BulkEmailEntry;
import io.github.hectorvent.floci.services.ses.model.BulkEmailEntryResult;
import io.github.hectorvent.floci.services.ses.model.ConfigurationSet;
diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesAddressLength.java b/src/main/java/io/github/hectorvent/floci/services/ses/address/SesAddressLength.java
similarity index 92%
rename from src/main/java/io/github/hectorvent/floci/services/ses/SesAddressLength.java
rename to src/main/java/io/github/hectorvent/floci/services/ses/address/SesAddressLength.java
index 2d4b47e9d9..1e8a08e193 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesAddressLength.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ses/address/SesAddressLength.java
@@ -1,4 +1,4 @@
-package io.github.hectorvent.floci.services.ses;
+package io.github.hectorvent.floci.services.ses.address;
import io.github.hectorvent.floci.core.common.AwsException;
import io.github.hectorvent.floci.services.ses.model.EmailContent;
@@ -14,7 +14,7 @@ import java.util.List;
* a non-ASCII character or an RFC 822 special, an encoded-word name is measured undecoded, and the
* error echoes that form. The v2 controller remaps the code to BadRequestException.
*/
-final class SesAddressLength {
+public final class SesAddressLength {
static final int MAX_LENGTH = 320;
@@ -24,7 +24,7 @@ final class SesAddressLength {
private SesAddressLength() {
}
- static void requireEnvelope(SendEmailRequest request) {
+ public static void requireEnvelope(SendEmailRequest request) {
SesSendAddresses.forEachEnvelope(request, SesAddressLength::require);
}
@@ -33,7 +33,7 @@ final class SesAddressLength {
* encoded and escaped quotes count (probe-confirmed). Each address of a header is checked on its
* own, so a header listing several short addresses passes however long it is.
*/
- static void requireRaw(SendEmailRequest request, EmailContent.Raw raw, Message message) {
+ public static void requireRaw(SendEmailRequest request, EmailContent.Raw raw, Message message) {
SesSendAddresses.forEachRaw(request, message, RAW_RECIPIENT_HEADERS,
raw.checksFromHeader(request.hasSource()) ? SesAddressLength::require : SesSendAddresses.UNCHECKED,
SesAddressLength::require);
diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesAddressSyntax.java b/src/main/java/io/github/hectorvent/floci/services/ses/address/SesAddressSyntax.java
similarity index 96%
rename from src/main/java/io/github/hectorvent/floci/services/ses/SesAddressSyntax.java
rename to src/main/java/io/github/hectorvent/floci/services/ses/address/SesAddressSyntax.java
index 8a4e93098f..15f70ebe25 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesAddressSyntax.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ses/address/SesAddressSyntax.java
@@ -1,4 +1,4 @@
-package io.github.hectorvent.floci.services.ses;
+package io.github.hectorvent.floci.services.ses.address;
import io.github.hectorvent.floci.core.common.AwsException;
import io.github.hectorvent.floci.services.ses.model.BulkEmailEntry;
@@ -27,7 +27,7 @@ import java.util.function.Consumer;
* address but lets a missing {@code @} pass, as JavaMail's non-strict header parse does, and
* reports one only on the first address, later and in its own wording (probe-confirmed).
*/
-final class SesAddressSyntax {
+public final class SesAddressSyntax {
private static final List<String> RAW_CHECKED_HEADERS = List.of("To", "Cc", "Bcc");
private static final String MISSING_FINAL_DOMAIN = "Missing final '@domain'";
@@ -37,11 +37,11 @@ final class SesAddressSyntax {
private SesAddressSyntax() {
}
- static void requireEnvelope(SendEmailRequest request) {
+ public static void requireEnvelope(SendEmailRequest request) {
SesSendAddresses.forEachEnvelope(request, SesAddressSyntax::require);
}
- static void requireRaw(SendEmailRequest request, EmailContent.Raw raw, Message message) {
+ public static void requireRaw(SendEmailRequest request, EmailContent.Raw raw, Message message) {
SesSendAddresses.forEachRaw(request, message, RAW_CHECKED_HEADERS, fromHeaderCheck(request, raw),
SesAddressSyntax::require);
}
@@ -90,7 +90,7 @@ final class SesAddressSyntax {
* as JavaMail's "User name is missing" around that address's {@code toString()} form
* (probe-confirmed; the same place relative to the length check is assumed).
*/
- static void requireFromHeaderAt(SendEmailRequest request, EmailContent.Raw raw, Message message) {
+ public static void requireFromHeaderAt(SendEmailRequest request, EmailContent.Raw raw, Message message) {
if (readsFromHeaderAsSender(request, raw)) {
SesSendAddresses.forEachHeaderAddress(message, "From", SesAddressSyntax::requireAt);
} else if (checksFromHeaderBesideSender(request, raw)) {
@@ -184,7 +184,7 @@ final class SesAddressSyntax {
* address is assumed to be measured as on a single send). The v1 handler and the v2 controller
* call it as soon as the address is read, ahead of the template lookup they perform.
*/
- static void requireBulkAddress(String address) {
+ public static void requireBulkAddress(String address) {
if (violation(address) != null || SesAddressLength.exceedsLimit(address)) {
throw new AwsException("InvalidParameterValue", "Invalid email address<" + address + ">.", 400);
}
@@ -196,7 +196,7 @@ final class SesAddressSyntax {
* every entry, not as a request error (probe-confirmed). An address list of the wrong JSON type
* never reaches this check: the controller rejects the whole request with SerializationException.
*/
- static void requireBulkDestination(BulkEmailEntry entry, List<String> replyToAddresses) {
+ public static void requireBulkDestination(BulkEmailEntry entry, List<String> replyToAddresses) {
for (List<String> addresses : Arrays.asList(entry.toAddresses(), entry.ccAddresses(), entry.bccAddresses(),
replyToAddresses)) {
if (addresses != null) {
diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesEncodedWord.java b/src/main/java/io/github/hectorvent/floci/services/ses/address/SesEncodedWord.java
similarity index 98%
rename from src/main/java/io/github/hectorvent/floci/services/ses/SesEncodedWord.java
rename to src/main/java/io/github/hectorvent/floci/services/ses/address/SesEncodedWord.java
index d69a85d537..bbf7440a14 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesEncodedWord.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ses/address/SesEncodedWord.java
@@ -1,4 +1,4 @@
-package io.github.hectorvent.floci.services.ses;
+package io.github.hectorvent.floci.services.ses.address;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesSendAddresses.java b/src/main/java/io/github/hectorvent/floci/services/ses/address/SesSendAddresses.java
similarity index 99%
rename from src/main/java/io/github/hectorvent/floci/services/ses/SesSendAddresses.java
rename to src/main/java/io/github/hectorvent/floci/services/ses/address/SesSendAddresses.java
index 701ce9a993..8a4c2474f3 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesSendAddresses.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ses/address/SesSendAddresses.java
@@ -1,4 +1,4 @@
-package io.github.hectorvent.floci.services.ses;
+package io.github.hectorvent.floci.services.ses.address;
import io.github.hectorvent.floci.services.ses.model.SendEmailRequest;
import org.apache.james.mime4j.dom.Header;
diff --git a/src/test/java/io/github/hectorvent/floci/services/ses/SesAddressLengthTest.java b/src/test/java/io/github/hectorvent/floci/services/ses/address/SesAddressLengthTest.java
similarity index 98%
rename from src/test/java/io/github/hectorvent/floci/services/ses/SesAddressLengthTest.java
rename to src/test/java/io/github/hectorvent/floci/services/ses/address/SesAddressLengthTest.java
index 552d810ad1..d0d892da21 100644
--- a/src/test/java/io/github/hectorvent/floci/services/ses/SesAddressLengthTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/ses/address/SesAddressLengthTest.java
@@ -1,4 +1,4 @@
-package io.github.hectorvent.floci.services.ses;
+package io.github.hectorvent.floci.services.ses.address;
import io.github.hectorvent.floci.core.common.AwsException;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/io/github/hectorvent/floci/services/ses/SesAddressSyntaxTest.java b/src/test/java/io/github/hectorvent/floci/services/ses/address/SesAddressSyntaxTest.java
similarity index 99%
rename from src/test/java/io/github/hectorvent/floci/services/ses/SesAddressSyntaxTest.java
rename to src/test/java/io/github/hectorvent/floci/services/ses/address/SesAddressSyntaxTest.java
index f1a3481782..2473fdfa44 100644
--- a/src/test/java/io/github/hectorvent/floci/services/ses/SesAddressSyntaxTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/ses/address/SesAddressSyntaxTest.java
@@ -1,4 +1,4 @@
-package io.github.hectorvent.floci.services.ses;
+package io.github.hectorvent.floci.services.ses.address;
import io.github.hectorvent.floci.core.common.AwsException;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/io/github/hectorvent/floci/services/ses/SesEncodedWordTest.java b/src/test/java/io/github/hectorvent/floci/services/ses/address/SesEncodedWordTest.java
similarity index 96%
rename from src/test/java/io/github/hectorvent/floci/services/ses/SesEncodedWordTest.java
rename to src/test/java/io/github/hectorvent/floci/services/ses/address/SesEncodedWordTest.java
index d65c9a9c11..fc6a0d73cb 100644
--- a/src/test/java/io/github/hectorvent/floci/services/ses/SesEncodedWordTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/ses/address/SesEncodedWordTest.java
@@ -1,4 +1,4 @@
-package io.github.hectorvent.floci.services.ses;
+package io.github.hectorvent.floci.services.ses.address;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/io/github/hectorvent/floci/services/ses/SesSendAddressesTest.java b/src/test/java/io/github/hectorvent/floci/services/ses/address/SesSendAddressesTest.java
similarity index 97%
rename from src/test/java/io/github/hectorvent/floci/services/ses/SesSendAddressesTest.java
rename to src/test/java/io/github/hectorvent/floci/services/ses/address/SesSendAddressesTest.java
index d54589c121..69a20240bd 100644
--- a/src/test/java/io/github/hectorvent/floci/services/ses/SesSendAddressesTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/ses/address/SesSendAddressesTest.java
@@ -1,4 +1,4 @@
-package io.github.hectorvent.floci.services.ses;
+package io.github.hectorvent.floci.services.ses.address;
import org.junit.jupiter.api.Test;