github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2025-01-17 11:05:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

added SSL certificate verification to startTLS method

Browse source
This commit is contained in:
Thom Nichols 2010-07-07 11:33:12 -04:00
parent 85d8b9270f
commit f3cf5f6080
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sleekxmpp/xmlstream/xmlstream.py
View file

@ -171,12 +171,18 @@ class XMLStream(object):
def startTLS(self): def startTLS(self):
"Handshakes for TLS" "Handshakes for TLS"
# TODO since this is not part of the 'connectTCP' method, it does not quiesce if
# The TLS negotiation throws an SSLError. It really should. Worse yet, some
# errors might be considered fatal (like certificate verification failure) in which
# case, should we even attempt to re-connect at all?
if self.ssl_support: if self.ssl_support:
logging.info("Negotiating TLS") logging.info("Negotiating TLS")
# self.realsocket = self.socket # NOT USED # self.realsocket = self.socket # NOT USED
cert_policy = ssl.CERT_NONE if self.ca_certs is None else ssl.CERT_REQUIRED
self.socket = ssl.wrap_socket(self.socket, self.socket = ssl.wrap_socket(self.socket,
ssl_version=ssl.PROTOCOL_TLSv1, ssl_version=ssl.PROTOCOL_TLSv1,
do_handshake_on_connect=False, do_handshake_on_connect=False,
cert_reqs=cert_policy,
ca_certs=self.ca_certs) ca_certs=self.ca_certs)
self.socket.do_handshake() self.socket.do_handshake()
if sys.version_info < (3,0): if sys.version_info < (3,0):