localstack · bentsku · Nov 26, 2024 · Nov 26, 2024 · Nov 26, 2024 · Nov 26, 2024
diff --git a/localstack-core/localstack/config.py b/localstack-core/localstack/config.py
@@ -1122,6 +1122,8 @@ def populate_edge_configuration(
 # Whether to really publish to GCM while using SNS Platform Application (needs credentials)
 LEGACY_SNS_GCM_PUBLISHING = is_env_true("LEGACY_SNS_GCM_PUBLISHING")
 
+SNS_SES_SENDER_ADDRESS = os.environ.get("SNS_SES_SENDER_ADDRESS", "").strip()
+
 # Whether the Next Gen APIGW invocation logic is enabled (on by default)
 APIGW_NEXT_GEN_PROVIDER = os.environ.get("PROVIDER_OVERRIDE_APIGATEWAY", "") in ("next_gen", "")
 
@@ -1334,6 +1336,7 @@ def use_custom_dns():
     "SNAPSHOT_LOAD_STRATEGY",
     "SNAPSHOT_SAVE_STRATEGY",
     "SNAPSHOT_FLUSH_INTERVAL",
+    "SNS_SES_SENDER_ADDRESS",
     "SQS_DELAY_PURGE_RETRY",
     "SQS_DELAY_RECENTLY_DELETED",
     "SQS_ENABLE_MESSAGE_RETENTION_PERIOD",

diff --git a/localstack-core/localstack/services/sns/publisher.py b/localstack-core/localstack/services/sns/publisher.py
@@ -569,13 +569,16 @@ def _publish(self, context: SnsPublishContext, subscriber: SnsSubscription):
         region = extract_region_from_arn(subscriber["Endpoint"])
         ses_client = connect_to(aws_access_key_id=account_id, region_name=region).ses
         if endpoint := subscriber.get("Endpoint"):
+            # TODO: legacy value, replace by a more sane value in the future
+            #  no-reply@sns-localstack.cloud or similar
+            sender = config.SNS_SES_SENDER_ADDRESS or "admin@localstack.com"
             ses_client.verify_email_address(EmailAddress=endpoint)
-            ses_client.verify_email_address(EmailAddress="admin@localstack.com")
+            ses_client.verify_email_address(EmailAddress=sender)
             message_body = self.prepare_message(
                 context.message, subscriber, topic_attributes=context.topic_attributes
             )
             ses_client.send_email(
-                Source="admin@localstack.com",
+                Source=sender,
                 Message={
                     "Body": {"Text": {"Data": message_body}},
                     "Subject": {"Data": "SNS-Subscriber-Endpoint"},

diff --git a/tests/aws/services/sns/test_sns.py b/tests/aws/services/sns/test_sns.py
@@ -3003,6 +3003,49 @@ def check_subscription():
 
         retry(check_subscription, retries=PUBLICATION_RETRIES, sleep=PUBLICATION_TIMEOUT)
 
+    @markers.aws.only_localstack
+    def test_email_sender(
+        self,
+        sns_create_topic,
+        sns_subscription,
+        aws_client,
+        monkeypatch,
+    ):
+        # make sure to reset all received emails in SES
+        requests.delete("http://localhost:4566/_aws/ses")
+
+        topic_arn = sns_create_topic()["TopicArn"]
+        sns_subscription(
+            TopicArn=topic_arn,
+            Protocol="email",
+            Endpoint="localstack@yopmail.com",
+        )
+
+        aws_client.sns.publish(
+            Message="Test message",
+            TopicArn=topic_arn,
+        )
+
+        def _get_messages(amount: int) -> list[dict]:
+            response = requests.get("http://localhost:4566/_aws/ses").json()
+            assert len(response["messages"]) == amount
+            return response["messages"]
+
+        messages = retry(lambda: _get_messages(1), retries=PUBLICATION_RETRIES, sleep=1)
+        # legacy default value, should be replaced at some point
+        assert messages[0]["Source"] == "admin@localstack.com"
+        requests.delete("http://localhost:4566/_aws/ses")
+
+        sender_address = "no-reply@sns.localstack.cloud"
+        monkeypatch.setattr(config, "SNS_SES_SENDER_ADDRESS", sender_address)
+
+        aws_client.sns.publish(
+            Message="Test message",
+            TopicArn=topic_arn,
+        )
+        messages = retry(lambda: _get_messages(1), retries=PUBLICATION_RETRIES, sleep=1)
+        assert messages[0]["Source"] == sender_address
+
 
 class TestSNSPlatformEndpoint:
     @markers.aws.only_localstack