Now mailer.py can specify TCP port to connect for SMTP and SMTP_SSL (Re: svn commit: r1872398 - in /subversion/trunk/tools/hook-scripts/mailer: mailer.conf.example mailer.py)

[Yasuhito FUTATSUKI <fu...@poem.co.jp>]

I forgot inform this...

On 2020/01/07 10:10, Yasuhito FUTATSUKI wrote:
> On 2020/01/07 9:40, Daniel Shahaf wrote:
>> futatuki@apache.org wrote on Mon, Jan 06, 2020 at 23:34:17 -0000:
>>> +++ subversion/trunk/tools/hook-scripts/mailer/mailer.conf.example Mon Jan  6 23:34:17 2020
>>> @@ -23,6 +23,10 @@
>>>  # This option specifies the hostname for delivery via SMTP.
>>>  #smtp_hostname = localhost
>>>  
>>> +# This option specifies the TCP port number to connect for SMTP.
>>> +# If it is not specified, 25 is used by default.
>>> +#smtp_port = 25
>>> +
>>> +++ subversion/trunk/tools/hook-scripts/mailer/mailer.py Mon Jan  6 23:34:17 2020
>>> @@ -299,11 +299,15 @@ class SMTPOutput(MailedOutput):
>>>      (to minimize the chances of said lockout).
>>>      """
>>>  
>>> +    if self.cfg.is_set('general.smtp_port'):
>>> +       smtp_port = self.cfg.general.smtp_port
>>> +    else:
>>> +       smtp_port = smtplib.SMTP_PORT
>>>      try:
>>>        if self.cfg.is_set('general.smtp_ssl') and self.cfg.general.smtp_ssl == 'yes':
>>> -        server = smtplib.SMTP_SSL(self.cfg.general.smtp_hostname)
>>> +        server = smtplib.SMTP_SSL(self.cfg.general.smtp_hostname, smtp_port)
>>
>> This seems to be a breaking change.  The old code, «smtplib.SMTP_SSL(foo)»,
>> used port 465; the new code, «smtplib.SMTP_SSL(foo, smtplib.SMTP_PORT)», will
>> try to connect to port 25 using SMTP-over-SSL until the administrator sets
>> smtp_port=465 in the config file.
> 
> Thank you for the report. I've fixed it in r1872403.

Now we can specifiy the TCP port that mailer.py uses to connect for SMTP
and SMTP-over-SSL, to connect submission port, or non-privileged port
for testing.

Cheers,
-- 
Yasuhito FUTATSUKI <fu...@yf.bsdclub.org> / <fu...@poem.co.jp>