SPF and DKIM checks

bot/command.go

@@ -173,6 +173,18 @@ func (b *Bot) initCommands() commandList {
 			sanitizer:   utils.SanitizeBoolString,
 			allowed:     b.allowOwner,
 		},
+		{
+			key:         roomOptionSpamcheckSPF,
+			description: "only accept email from senders which authorized to send it (those matching SPF records) (`true` - enable, `false` - disable)",
+			sanitizer:   utils.SanitizeBoolString,
+			allowed:     b.allowOwner,
+		},
+		{
+			key:         roomOptionSpamcheckDKIM,
+			description: "only accept correctly authorized emails (without DKIM signature at all or with valid DKIM signature) (`true` - enable, `false` - disable)",
+			sanitizer:   utils.SanitizeBoolString,
+			allowed:     b.allowOwner,
+		},
 		{
 			key:         roomOptionSpamcheckSMTP,
 			description: "only accept email from servers which seem prepared to receive it (those listening on an SMTP port) (`true` - enable, `false` - disable)",

bot/settings_room.go

@@ -27,7 +27,9 @@ const (
 	roomOptionNoThreads     = "nothreads"
 	roomOptionNoFiles       = "nofiles"
 	roomOptionPassword      = "password"
+	roomOptionSpamcheckDKIM = "spamcheck:dkim"
 	roomOptionSpamcheckSMTP = "spamcheck:smtp"
+	roomOptionSpamcheckSPF  = "spamcheck:spf"
 	roomOptionSpamcheckMX   = "spamcheck:mx"
 	roomOptionSpamlist      = "spamlist"
 )
@@ -96,10 +98,18 @@ func (s roomSettings) NoFiles() bool {
 	return utils.Bool(s.Get(roomOptionNoFiles))
 }
 
+func (s roomSettings) SpamcheckDKIM() bool {
+	return utils.Bool(s.Get(roomOptionSpamcheckDKIM))
+}
+
 func (s roomSettings) SpamcheckSMTP() bool {
 	return utils.Bool(s.Get(roomOptionSpamcheckSMTP))
 }
 
+func (s roomSettings) SpamcheckSPF() bool {
+	return utils.Bool(s.Get(roomOptionSpamcheckSPF))
+}
+
 func (s roomSettings) SpamcheckMX() bool {
 	return utils.Bool(s.Get(roomOptionSpamcheckMX))
 }