dummysmtpd: don't die on client connection errors The connection refused error in test-patchbomb-tls.t[1] is sporadic, but one of the more often seen errors on Windows. I added enough logging to a file and dumped it out at the end to make the following observations: - The listening socket is successfully created and bound to the port, and the "listening at..." message is always logged. - Generally, the following is the entire log output, with the "accepted ..." message having been added after `sslutil.wrapserversocket`: listening at localhost:$HGPORT $LOCALIP ssl error accepted connect accepted connect $LOCALIP from=quux to=foo, bar $LOCALIP ssl error - In the cases that fail, asyncore.loop() in the run() method is exiting, but not with an exception. - In the cases that fail, the following is logged right after "listening ...": Traceback (most recent call last): File "c:\\Python27\\lib\\asyncore.py", line 83, in read obj.handle_read_event() File "c:\\Python27\\lib\\asyncore.py", line 443, in handle_read_event self.handle_accept() File "../tests/dummysmtpd.py", line 80, in handle_accept conn = sslutil.wrapserversocket(conn, ui, certfile=self._certfile) File "..\\mercurial\\sslutil.py", line 570, in wrapserversocket return sslcontext.wrap_socket(sock, server_side=True) File "c:\\Python27\\lib\\ssl.py", line 363, in wrap_socket _context=self) File "c:\\Python27\\lib\\ssl.py", line 611, in __init__ self.do_handshake() File "c:\\Python27\\lib\\ssl.py", line 840, in do_handshake self._sslobj.do_handshake() error: [Errno 10054] $ECONNRESET$ - If the base class handler is overridden completely, the the first "ssl error" line is replaced by the stacktrace, but the other lines are unchanged. The client behaves no differently, whether or not the server stacktraced. In general, `./run-tests.py --local -j9 -t9000 test-patchbomb-tls.t --runs-per-test 20` would show the issue after a run or two. With this change, `./run-tests.py --local -j9 -t9000 test-patchbomb-tls.t --loop` ran 800 times without a hiccup. This makes me wonder if the other connection refused messages that bubble up on occasion are caused by a similar issue. It seems a bit drastic to kill the whole server on account of a single communication failure with a client. # no-check-commit because of handle_error() [1] https://buildbot.mercurial-scm.org/builders/Win7%20x86_64%20hg%20tests/builds/421/steps/run-tests.py%20%28python%202.7.13%29/logs/stdio

     1

#!/usr/bin/env python

     2

     3

"""dummy SMTP server for use in tests"""

     4

     5

from __future__ import absolute_import

     6

     7

import asyncore

     8

import optparse

     9

import smtpd

    10

import ssl

    11

import sys

    12

import traceback

    13

    14

from mercurial import (

    15

    server,

    16

    sslutil,

    17

    ui as uimod,

    18

)

    19

    20

def log(msg):

    21

    sys.stdout.write(msg)

    22

    sys.stdout.flush()

    23

    24

class dummysmtpserver(smtpd.SMTPServer):

    25

    def __init__(self, localaddr):

    26

        smtpd.SMTPServer.__init__(self, localaddr, remoteaddr=None)

    27

    28

    def process_message(self, peer, mailfrom, rcpttos, data):

    29

        log('%s from=%s to=%s\n' % (peer[0], mailfrom, ', '.join(rcpttos)))

    30

    31

    def handle_error(self):

    32

        # On Windows, a bad SSL connection sometimes generates a WSAECONNRESET.

    33

        # The default handler will shutdown this server, and then both the

    34

        # current connection and subsequent ones fail on the client side with

    35

        # "No connection could be made because the target machine actively

    36

        # refused it".  If we eat the error, then the client properly aborts in

    37

        # the expected way, and the server is available for subsequent requests.

    38

        traceback.print_exc()

    39

    40

class dummysmtpsecureserver(dummysmtpserver):

    41

    def __init__(self, localaddr, certfile):

    42

        dummysmtpserver.__init__(self, localaddr)

    43

        self._certfile = certfile

    44

    45

    def handle_accept(self):

    46

        pair = self.accept()

    47

        if not pair:

    48

            return

    49

        conn, addr = pair

    50

        ui = uimod.ui.load()

    51

        try:

    52

            # wrap_socket() would block, but we don't care

    53

            conn = sslutil.wrapserversocket(conn, ui, certfile=self._certfile)

    54

        except ssl.SSLError:

    55

            log('%s ssl error\n' % addr[0])

    56

            conn.close()

    57

            return

    58

        smtpd.SMTPChannel(self, conn, addr)

    59

    60

def run():

    61

    try:

    62

        asyncore.loop()

    63

    except KeyboardInterrupt:

    64

        pass

    65

    66

def main():

    67

    op = optparse.OptionParser()

    68

    op.add_option('-d', '--daemon', action='store_true')

    69

    op.add_option('--daemon-postexec', action='append')

    70

    op.add_option('-p', '--port', type=int, default=8025)

    71

    op.add_option('-a', '--address', default='localhost')

    72

    op.add_option('--pid-file', metavar='FILE')

    73

    op.add_option('--tls', choices=['none', 'smtps'], default='none')

    74

    op.add_option('--certificate', metavar='FILE')

    75

    76

    opts, args = op.parse_args()

    77

    if opts.tls == 'smtps' and not opts.certificate:

    78

        op.error('--certificate must be specified')

    79

    80

    addr = (opts.address, opts.port)

    81

    def init():

    82

        if opts.tls == 'none':

    83

            dummysmtpserver(addr)

    84

        else:

    85

            dummysmtpsecureserver(addr, opts.certificate)

    86

        log('listening at %s:%d\n' % addr)

    87

    88

    server.runservice(vars(opts), initfn=init, runfn=run,

    89

                      runargs=[sys.executable, __file__] + sys.argv[1:])

    90

    91

if __name__ == '__main__':

    92

    main()