<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14137] CalDAVTester/trunk/src/httpshandler.py</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14137">14137</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-11-06 13:47:35 -0800 (Thu, 06 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Better TLS version handling.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunksrchttpshandlerpy">CalDAVTester/trunk/src/httpshandler.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunksrchttpshandlerpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/httpshandler.py (14136 => 14137)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/httpshandler.py 2014-11-06 16:28:29 UTC (rev 14136)
+++ CalDAVTester/trunk/src/httpshandler.py 2014-11-06 21:47:35 UTC (rev 14137)
</span><span class="lines">@@ -16,60 +16,52 @@
</span><span class="cx">
</span><span class="cx"> import httplib
</span><span class="cx"> import socket
</span><del>-_haveSSL = False
-try:
- import ssl as sslmodule
- _haveSSL = True
-except ImportError:
- pass
</del><ins>+import ssl as sslmodule
</ins><span class="cx">
</span><del>-if _haveSSL:
- class HTTPSConnection_SSLv3(httplib.HTTPSConnection):
- "This class allows communication via SSL."
</del><ins>+class HTTPSVersionConnection(httplib.HTTPSConnection):
+ "This class allows communication via SSL."
</ins><span class="cx">
</span><del>- def connect(self):
- "Connect to a host on a given (SSL) port."
</del><ins>+ def __init__(self, host, port, ssl_version=sslmodule.PROTOCOL_TLSv1):
+ httplib.HTTPSConnection.__init__(self, host, port)
+ self._ssl_version = ssl_version
</ins><span class="cx">
</span><del>- sock = socket.create_connection((self.host, self.port), self.timeout)
- self.sock = sslmodule.wrap_socket(sock, self.key_file, self.cert_file, ssl_version=sslmodule.PROTOCOL_SSLv3)
-else:
- HTTPSConnection_SSLv3 = httplib.HTTPSConnection
</del><span class="cx">
</span><del>-https_v23_connects = set()
-https_v3_connects = set()
</del><ins>+ def connect(self):
+ "Connect to a host on a given (SSL) port."
</ins><span class="cx">
</span><ins>+ sock = socket.create_connection((self.host, self.port), self.timeout)
+ self.sock = sslmodule.wrap_socket(sock, self.key_file, self.cert_file, ssl_version=self._ssl_version)
+
+
+cached_types = (
+ (set(), sslmodule.PROTOCOL_TLSv1),
+ (set(), sslmodule.PROTOCOL_SSLv3),
+ (set(), sslmodule.PROTOCOL_SSLv23),
+)
+
</ins><span class="cx"> def SmartHTTPConnection(host, port, ssl):
</span><span class="cx">
</span><del>- def trySSL(cls,):
- connect = cls(host, port)
</del><ins>+ def trySSL(version):
+ connect = HTTPSVersionConnection(host, port, ssl_version=version)
</ins><span class="cx"> connect.connect()
</span><span class="cx"> return connect
</span><span class="cx">
</span><span class="cx"> if ssl:
</span><del>- if (host, port) in https_v3_connects:
</del><ins>+ for cached, connection_type in cached_types:
+ if (host, port) in cached:
+ try:
+ return trySSL(connection_type)
+ except:
+ cached.remove((host, port))
+
+ for cached, connection_type in cached_types:
</ins><span class="cx"> try:
</span><del>- return trySSL(HTTPSConnection_SSLv3)
</del><ins>+ cached.add((host, port))
+ return trySSL(connection_type)
</ins><span class="cx"> except:
</span><del>- https_v3_connects.remove((host, port))
- elif (host, port) in https_v23_connects:
- try:
- return trySSL(httplib.HTTPSConnection)
- except:
- https_v23_connects.remove((host, port))
</del><ins>+ cached.remove((host, port))
</ins><span class="cx">
</span><del>- try:
- https_v3_connects.add((host, port))
- return trySSL(HTTPSConnection_SSLv3)
- except:
- https_v3_connects.remove((host, port))
-
- try:
- https_v23_connects.add((host, port))
- return trySSL(httplib.HTTPSConnection)
- except:
- https_v23_connects.remove((host, port))
-
- raise RuntimeError("Cannot connect via with SSLv23 or SSLv3")
</del><ins>+ raise RuntimeError("Cannot connect via with TLSv1, SSLv3 or SSLv23")
</ins><span class="cx"> else:
</span><span class="cx"> connect = httplib.HTTPConnection(host, port)
</span><span class="cx"> connect.connect()
</span></span></pre>
</div>
</div>
</body>
</html>