From e5c6ab04e97a91f9b25237938d0e2e7a66612c6f Mon Sep 17 00:00:00 2001 From: arnydo Date: Mon, 19 Nov 2018 16:16:20 -0500 Subject: [PATCH 1/3] Add option for smtp_port --- responders/Mailer/Mailer.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/responders/Mailer/Mailer.json b/responders/Mailer/Mailer.json index 4f0a3dd01..50a0a78ba 100644 --- a/responders/Mailer/Mailer.json +++ b/responders/Mailer/Mailer.json @@ -23,6 +23,14 @@ "multi": false, "required": true, "defaultValue": "localhost" + }, + { + "name": "smtp_port", + "description": "SMTP server port", + "type": "number", + "multi": false, + "required": true, + "defaultValue": "26" } ] -} \ No newline at end of file +} From 2eebf5ed141926765e6cb79ff839c10d2e0aeb44 Mon Sep 17 00:00:00 2001 From: arnydo Date: Mon, 19 Nov 2018 16:16:31 -0500 Subject: [PATCH 2/3] Update Mailer.json --- responders/Mailer/Mailer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/responders/Mailer/Mailer.json b/responders/Mailer/Mailer.json index 50a0a78ba..459adff51 100644 --- a/responders/Mailer/Mailer.json +++ b/responders/Mailer/Mailer.json @@ -30,7 +30,7 @@ "type": "number", "multi": false, "required": true, - "defaultValue": "26" + "defaultValue": "25" } ] } From 1be74017287c7122a6ed5974ebdf3108565619df Mon Sep 17 00:00:00 2001 From: arnydo Date: Mon, 19 Nov 2018 16:18:23 -0500 Subject: [PATCH 3/3] Add smtp_port option --- responders/Mailer/mailer.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/responders/Mailer/mailer.py b/responders/Mailer/mailer.py index 33eba388a..3c1627111 100755 --- a/responders/Mailer/mailer.py +++ b/responders/Mailer/mailer.py @@ -12,6 +12,8 @@ def __init__(self): Responder.__init__(self) self.smtp_host = self.get_param( 'config.smtp_host', 'localhost') + self.smtp_port = self.get_param( + 'config.smtp_port', '25') self.mail_from = self.get_param( 'config.from', None, 'Missing sender email address') @@ -46,7 +48,7 @@ def run(self): msg['To'] = mail_to msg.attach(MIMEText(description, 'plain')) - s = smtplib.SMTP(self.smtp_host) + s = smtplib.SMTP(self.smtp_host, self.smtp_port) s.sendmail(self.mail_from, [mail_to], msg.as_string()) s.quit() self.report({'message': 'message sent'})