heimoshuiyu/postmoogle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feedback, typos, renaming

Browse Source
This commit is contained in:
Aine
2022-10-10 09:41:22 +03:00
parent d575552237
commit 6f4da59387
8 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
smtp/msasession.go
View File

@@ -58,7 +58,7 @@ func (s *msasession) Rcpt(to string) error {
return smtp.ErrAuthRequired
}
validations := s.bot.GetOptions(roomID)
validations := s.bot.GetIFOptions(roomID)
if !s.validate(validations) {
return smtp.ErrAuthRequired
}
@@ -81,15 +81,15 @@ func (s *msasession) parseAttachments(parts []*enmime.Part) []*utils.File {
return files
}
func (s *msasession) validate(options utils.ValidationOptions) bool {
func (s *msasession) validate(options utils.IncomingFilteringOptions) bool {
spam := validator.Spam{
Emails: options.SpamEmails(),
Hosts: options.SpamHosts(),
Localparts: options.SpamLocalparts(),
Emails: options.SpamlistEmails(),
Hosts: options.SpamlistHosts(),
Localparts: options.SpamlistLocalparts(),
}
enforce := validator.Enforce{
MX: options.SecurityMX(),
SMTP: options.SecuritySMTP(),
MX: options.SpamcheckMX(),
SMTP: options.SpamcheckMX(),
}
v := validator.New(spam, enforce, s.to, s.log)