← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smtp_connection.py

  • Committer: Martin Pool
  • Date: 2007-07-05 00:29:29 UTC
  • mto: This revision was merged to the branch mainline in revision 2588.
  • Revision ID: mbp@sourcefrog.net-20070705002929-sj9snyfyp6mygxvq
fix up more run_bzr callers

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smtp_connection.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""A convenience class around smtplib."""
18
18
 
19
19
from email import Utils
20
 
import errno
21
20
import smtplib
22
 
import socket
23
21
 
24
 
from bzrlib import (
25
 
    config,
26
 
    osutils,
27
 
    )
28
 
from bzrlib.errors import (
29
 
    NoDestinationAddress,
30
 
    SMTPError,
31
 
    DefaultSMTPConnectionRefused,
32
 
    SMTPConnectionRefused,
33
 
    )
 
22
from bzrlib import ui
 
23
from bzrlib.errors import NoDestinationAddress, SMTPError
34
24
 
35
25
 
36
26
class SMTPConnection(object):
43
33
 
44
34
    _default_smtp_server = 'localhost'
45
35
 
46
 
    def __init__(self, config, _smtp_factory=None):
47
 
        self._smtp_factory = _smtp_factory
48
 
        if self._smtp_factory is None:
49
 
            self._smtp_factory = smtplib.SMTP
 
36
    def __init__(self, config):
50
37
        self._config = config
51
 
        self._config_smtp_server = config.get_user_option('smtp_server')
52
 
        self._smtp_server = self._config_smtp_server
 
38
        self._smtp_server = config.get_user_option('smtp_server')
53
39
        if self._smtp_server is None:
54
40
            self._smtp_server = self._default_smtp_server
55
41
 
68
54
 
69
55
    def _create_connection(self):
70
56
        """Create an SMTP connection."""
71
 
        self._connection = self._smtp_factory()
72
 
        try:
73
 
            self._connection.connect(self._smtp_server)
74
 
        except socket.error, e:
75
 
            if e.args[0] == errno.ECONNREFUSED:
76
 
                if self._config_smtp_server is None:
77
 
                    raise DefaultSMTPConnectionRefused(socket.error,
78
 
                                                       self._smtp_server)
79
 
                else:
80
 
                    raise SMTPConnectionRefused(socket.error,
81
 
                                                self._smtp_server)
82
 
            else:
83
 
                raise
84
 
 
85
 
        # Say EHLO (falling back to HELO) to query the server's features.
86
 
        code, resp = self._connection.ehlo()
87
 
        if not (200 <= code <= 299):
88
 
            code, resp = self._connection.helo()
89
 
            if not (200 <= code <= 299):
90
 
                raise SMTPError("server refused HELO: %d %s" % (code, resp))
91
 
 
92
 
        # Use TLS if the server advertised it:
93
 
        if self._connection.has_extn("starttls"):
94
 
            code, resp = self._connection.starttls()
95
 
            if not (200 <= code <= 299):
96
 
                raise SMTPError("server refused STARTTLS: %d %s" % (code, resp))
97
 
            # Say EHLO again, to check for newly revealed features
98
 
            code, resp = self._connection.ehlo()
99
 
            if not (200 <= code <= 299):
100
 
                raise SMTPError("server refused EHLO: %d %s" % (code, resp))
 
57
        self._connection = smtplib.SMTP()
 
58
        self._connection.connect(self._smtp_server)
 
59
 
 
60
        # If this fails, it just returns an error, but it shouldn't raise an
 
61
        # exception unless something goes really wrong (in which case we want
 
62
        # to fail anyway).
 
63
        self._connection.starttls()
101
64
 
102
65
    def _authenticate(self):
103
66
        """If necessary authenticate yourself to the server."""
104
 
        auth = config.AuthenticationConfig()
105
67
        if self._smtp_username is None:
106
 
            self._smtp_username = auth.get_user('smtp', self._smtp_server)
107
 
            if self._smtp_username is None:
108
 
                return
 
68
            return
109
69
 
110
70
        if self._smtp_password is None:
111
 
            self._smtp_password = auth.get_password(
112
 
                'smtp', self._smtp_server, self._smtp_username)
113
 
 
114
 
        # smtplib requires that the username and password be byte
115
 
        # strings.  The CRAM-MD5 spec doesn't give any guidance on
116
 
        # encodings, but the SASL PLAIN spec says UTF-8, so that's
117
 
        # what we'll use.
118
 
        username = osutils.safe_utf8(self._smtp_username)
119
 
        password = osutils.safe_utf8(self._smtp_password)
120
 
 
121
 
        self._connection.login(username, password)
 
71
            self._smtp_password = ui.ui_factory.get_password(
 
72
                'Please enter the SMTP password: %(user)s@%(host)s',
 
73
                user=self._smtp_username,
 
74
                host=self._smtp_server)
 
75
 
 
76
        self._connection.login(self._smtp_username, self._smtp_password)
122
77
 
123
78
    @staticmethod
124
79
    def get_message_addresses(message):
125
80
        """Get the origin and destination addresses of a message.
126
81
 
127
 
        :param message: A message object supporting get() to access its
128
 
            headers, like email.Message or bzrlib.email_message.EmailMessage.
 
82
        :param message: An email.Message or email.MIMEMultipart object.
129
83
        :return: A pair (from_email, to_emails), where from_email is the email
130
84
            address in the From header, and to_emails a list of all the
131
85
            addresses in the To, Cc, and Bcc headers.
132
86
        """
133
 
        from_email = Utils.parseaddr(message.get('From', None))[1]
 
87
        from_email = Utils.parseaddr(message['From'])[1]
134
88
        to_full_addresses = []
135
89
        for header in ['To', 'Cc', 'Bcc']:
136
 
            value = message.get(header, None)
137
 
            if value:
138
 
                to_full_addresses.append(value)
 
90
            to_full_addresses += message.get_all(header, [])
139
91
        to_emails = [ pair[1] for pair in
140
92
                Utils.getaddresses(to_full_addresses) ]
141
93