mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-05 14:07:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

add subject

Browse source
This commit is contained in:
angelnu 2022-02-06 23:25:43 +00:00
parent e33c8d6f91
commit 7a06fa2012
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/man/maddy-imap.5.scd
View file

@ -96,8 +96,8 @@ command executable_name args... { }
Same as check.command, following placeholders are supported for command Same as check.command, following placeholders are supported for command
arguments: {source_ip}, {source_host}, {source_rdns}, {msg_id}, {auth_user}, arguments: {source_ip}, {source_host}, {source_rdns}, {msg_id}, {auth_user},
{sender}, {rcpt_to}, {original_rcpt_to}, {address}. Note: placeholders in command {sender}, {rcpt_to}, {original_rcpt_to}, {address}, {subject}. Note: placeholders
name are not processed to avoid possible command injection attacks. in command name are not processed to avoid possible command injection attacks.
Additionally, for imap.filter.command, {account_name} placeholder is replaced Additionally, for imap.filter.command, {account_name} placeholder is replaced
with effective IMAP account name. with effective IMAP account name.

6
internal/imap_filter/command/command.go
View file

@ -49,7 +49,7 @@ type Check struct {
} }
func (c *Check) IMAPFilter(accountName string, rcptTo string, msgMeta *module.MsgMetadata, hdr textproto.Header, body buffer.Buffer) (folder string, flags []string, err error) { func (c *Check) IMAPFilter(accountName string, rcptTo string, msgMeta *module.MsgMetadata, hdr textproto.Header, body buffer.Buffer) (folder string, flags []string, err error) {
cmd, args := c.expandCommand(msgMeta, accountName, rcptTo) cmd, args := c.expandCommand(msgMeta, accountName, rcptTo, hdr)
var buf bytes.Buffer var buf bytes.Buffer
_ = textproto.WriteHeader(&buf, hdr) _ = textproto.WriteHeader(&buf, hdr)
@ -95,7 +95,7 @@ func (c *Check) Init(cfg *config.Map) error {
return err return err
} }
func (c *Check) expandCommand(msgMeta *module.MsgMetadata, accountName string, rcptTo string) (string, []string) { func (c *Check) expandCommand(msgMeta *module.MsgMetadata, accountName string, rcptTo string, hdr textproto.Header) (string, []string) {
expArgs := make([]string, len(c.cmdArgs)) expArgs := make([]string, len(c.cmdArgs))
for i, arg := range c.cmdArgs { for i, arg := range c.cmdArgs {
@ -144,6 +144,8 @@ func (c *Check) expandCommand(msgMeta *module.MsgMetadata, accountName string, r
oldestOriginalRcpt = originalRcpt oldestOriginalRcpt = originalRcpt
} }
return oldestOriginalRcpt return oldestOriginalRcpt
case "{subject}":
return hdr.Get("Subject")
case "{account_name}": case "{account_name}":
return accountName return accountName
} }