tests: show test-patchbomb-tls.t smtp server log

Improve test coverage by exposing what the smtp server actually receives.
Make dummystmtpd redirect stderr to a log file.

tests/dummysmtpd.py

@@ -1,120 +1,122 b''
 #!/usr/bin/env python
 
 """dummy SMTP server for use in tests"""
 
 
 import asyncore
 import optparse
 import smtpd
 import ssl
 import sys
 import traceback
 
 from mercurial import (
     pycompat,
     server,
     sslutil,
     ui as uimod,
 )
 
 
 def log(msg):
     sys.stdout.write(msg)
     sys.stdout.flush()
 
 
 class dummysmtpserver(smtpd.SMTPServer):
     def __init__(self, localaddr):
         smtpd.SMTPServer.__init__(self, localaddr, remoteaddr=None)
 
     def process_message(self, peer, mailfrom, rcpttos, data, **kwargs):
         log('%s from=%s to=%s\n' % (peer[0], mailfrom, ', '.join(rcpttos)))
 
     def handle_error(self):
         # On Windows, a bad SSL connection sometimes generates a WSAECONNRESET.
         # The default handler will shutdown this server, and then both the
         # current connection and subsequent ones fail on the client side with
         # "No connection could be made because the target machine actively
         # refused it".  If we eat the error, then the client properly aborts in
         # the expected way, and the server is available for subsequent requests.
         traceback.print_exc()
 
 
 class dummysmtpsecureserver(dummysmtpserver):
     def __init__(self, localaddr, certfile):
         dummysmtpserver.__init__(self, localaddr)
         self._certfile = certfile
 
     def handle_accept(self):
         pair = self.accept()
         if not pair:
             return
         conn, addr = pair
         ui = uimod.ui.load()
         try:
             # wrap_socket() would block, but we don't care
             conn = sslutil.wrapserversocket(conn, ui, certfile=self._certfile)
         except ssl.SSLError:
             log('%s ssl error\n' % addr[0])
             conn.close()
             return
         smtpd.SMTPChannel(self, conn, addr)
 
 
 def run():
     try:
         asyncore.loop()
     except KeyboardInterrupt:
         pass
 
 
 def _encodestrsonly(v):
     if isinstance(v, type(u'')):
         return v.encode('ascii')
     return v
 
 
 def bytesvars(obj):
     unidict = vars(obj)
     bd = {k.encode('ascii'): _encodestrsonly(v) for k, v in unidict.items()}
     if bd[b'daemon_postexec'] is not None:
         bd[b'daemon_postexec'] = [
             _encodestrsonly(v) for v in bd[b'daemon_postexec']
         ]
     return bd
 
 
 def main():
     op = optparse.OptionParser()
     op.add_option('-d', '--daemon', action='store_true')
     op.add_option('--daemon-postexec', action='append')
     op.add_option('-p', '--port', type=int, default=8025)
     op.add_option('-a', '--address', default='localhost')
     op.add_option('--pid-file', metavar='FILE')
     op.add_option('--tls', choices=['none', 'smtps'], default='none')
     op.add_option('--certificate', metavar='FILE')
+    op.add_option('--logfile', metavar='FILE')
 
     opts, args = op.parse_args()
     if opts.tls == 'smtps' and not opts.certificate:
         op.error('--certificate must be specified')
 
     addr = (opts.address, opts.port)
 
     def init():
         if opts.tls == 'none':
             dummysmtpserver(addr)
         else:
             dummysmtpsecureserver(addr, opts.certificate)
         log('listening at %s:%d\n' % addr)
 
     server.runservice(
         bytesvars(opts),
         initfn=init,
         runfn=run,
         runargs=[pycompat.sysexecutable, pycompat.fsencode(__file__)]
         + pycompat.sysargv[1:],
+        logfile=opts.logfile,
     )
 
 
 if __name__ == '__main__':
     main()

tests/test-patchbomb-tls.t

@@ -1,99 +1,111 b''
 #require serve ssl
 
 Set up SMTP server:
 
   $ CERTSDIR="$TESTDIR/sslcerts"
   $ cat "$CERTSDIR/priv.pem" "$CERTSDIR/pub.pem" >> server.pem
 
-  $ "$PYTHON" "$TESTDIR/dummysmtpd.py" -p $HGPORT --pid-file a.pid -d \
+  $ "$PYTHON" "$TESTDIR/dummysmtpd.py" -p $HGPORT --pid-file a.pid --logfile log -d \
   > --tls smtps --certificate `pwd`/server.pem
   listening at localhost:$HGPORT (?)
   $ cat a.pid >> $DAEMON_PIDS
 
 Set up repository:
 
   $ hg init t
   $ cd t
   $ cat <<EOF >> .hg/hgrc
   > [extensions]
   > patchbomb =
   > [email]
   > method = smtp
   > [smtp]
   > host = localhost
   > port = $HGPORT
   > tls = smtps
   > EOF
 
   $ echo a > a
   $ hg commit -Ama -d '1 0'
   adding a
 
 Utility functions:
 
   $ DISABLECACERTS=
   $ try () {
   >   hg email $DISABLECACERTS -f quux -t foo -c bar -r tip "$@"
   > }
 
 Our test cert is not signed by a trusted CA. It should fail to verify if
 we are able to load CA certs:
 
 #if no-defaultcacertsloaded
   $ try
   this patch series consists of 1 patches.
   
   
   (an attempt was made to load CA certificates but none were loaded; see https://mercurial-scm.org/wiki/SecureConnections for how to configure Mercurial to avoid this error)
   (?i)abort: .*?certificate.verify.failed.* (re)
   [255]
 #endif
 
 #if defaultcacertsloaded
   $ try
   this patch series consists of 1 patches.
   
   
   (the full certificate chain may not be available locally; see "hg help debugssl") (windows !)
   (?i)abort: .*?certificate.verify.failed.* (re)
   [255]
 
 #endif
 
   $ DISABLECACERTS="--config devel.disableloaddefaultcerts=true"
 
 Without certificates:
 
   $ try --debug
   this patch series consists of 1 patches.
   
   
   (using smtps)
   sending mail: smtp host localhost, port * (glob)
   (verifying remote certificate)
   abort: unable to verify security of localhost (no loaded CA certificates); refusing to connect
   (see https://mercurial-scm.org/wiki/SecureConnections for how to configure Mercurial to avoid this error or set hostsecurity.localhost:fingerprints=sha256:20:de:b3:ad:b4:cd:a5:42:f0:74:41:1c:a2:70:1e:da:6e:c0:5c:16:9e:e7:22:0f:f1:b7:e5:6e:e4:92:af:7e to trust this server)
   [150]
 
+  $ cat ../log
+  * ssl error (glob)
+  $ : > ../log
+
 With global certificates:
 
   $ try --debug --config web.cacerts="$CERTSDIR/pub.pem"
   this patch series consists of 1 patches.
   
   
   (using smtps)
   sending mail: smtp host localhost, port * (glob)
   (verifying remote certificate)
   sending [PATCH] a ...
 
+  $ cat ../log
+  * from=quux to=foo, bar (glob)
+  $ : > ../log
+
 With invalid certificates:
 
   $ try --config web.cacerts="$CERTSDIR/pub-other.pem"
   this patch series consists of 1 patches.
   
   
   (the full certificate chain may not be available locally; see "hg help debugssl") (windows !)
   (?i)abort: .*?certificate.verify.failed.* (re)
   [255]
 
+  $ cat ../log
+  * ssl error (glob)
+  $ : > ../log
+
   $ cd ..