1 files changed, 5 insertions, 0 deletions
diff --git a/src/cmd_settings.c b/src/cmd_settings.c
index 28167de..f41f904 100644
--- a/src/cmd_settings.c
+++ b/src/cmd_settings.c
@@ -8,6 +8,7 @@
 #include "audit.h"
 #include "config.h"
 #include "db.h"
+#include "mail.h"
 #include "secret.h"
 #include "util.h"
 
@@ -217,6 +218,10 @@ static yyjson_mut_val *h_settings_set(struct req *r)
         strcmp(value, "tls") != 0 && strcmp(value, "plain") != 0)
         return failf(r, "INVALID_ARGS", "%s must be starttls, tls or plain",
                      key);
+    if ((strcmp(key, "smtp_from") == 0 ||
+         strcmp(key, "smtp_reply_to") == 0) &&
+        !mail_addr_valid(value))
+        return failf(r, "INVALID_ARGS", "%s must be an email address", key);
     if (r->dry_run)
         return settings_result(r, key, value, 1);
     sqlite3_stmt *st = NULL;