comparison tests/dummysmtpd.py @ 29556:1b8b6adb2365

tests: use sslutil.wrapserversocket()

Like the built-in HTTPS server, this code was using the ssl module
directly and only using TLS 1.0. Like the built-in HTTPS server,
we switch it to use sslutil.wrapserversocket() so it can follow better
practices.

29555:121d11814c62

import ssl
import sys

from mercurial import (
    cmdutil,
)

def log(msg):
    sys.stdout.write(msg)
    sys.stdout.flush()

    def handle_accept(self):
        pair = self.accept()
        if not pair:
            return
        conn, addr = pair
        try:
            # wrap_socket() would block, but we don't care
            conn = ssl.wrap_socket(conn, server_side=True,
                                   certfile=self._certfile,
                                   ssl_version=ssl.PROTOCOL_TLSv1)
        except ssl.SSLError:
            log('%s ssl error\n' % addr[0])
            conn.close()
            return
        smtpd.SMTPChannel(self, conn, addr)

29556:1b8b6adb2365

import ssl
import sys

from mercurial import (
    cmdutil,
    sslutil,
    ui as uimod,
)

def log(msg):
    sys.stdout.write(msg)
    sys.stdout.flush()

    def handle_accept(self):
        pair = self.accept()
        if not pair:
            return
        conn, addr = pair
        ui = uimod.ui()
        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)