<!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>[14131] twext/trunk/twext/internet/ssl.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/14131">14131</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-11-03 13:16:26 -0800 (Mon, 03 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Client certificate verification support.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextinternetsslpy">twext/trunk/twext/internet/ssl.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextinternetsslpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/internet/ssl.py (14130 => 14131)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/internet/ssl.py 2014-11-02 17:10:06 UTC (rev 14130)
+++ twext/trunk/twext/internet/ssl.py 2014-11-03 21:16:26 UTC (rev 14131)
</span><span class="lines">@@ -23,21 +23,33 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> from OpenSSL.SSL import Context as SSLContext, SSLv23_METHOD, OP_NO_SSLv2, \
</span><del>- OP_CIPHER_SERVER_PREFERENCE, OP_NO_SSLv3
</del><ins>+ OP_CIPHER_SERVER_PREFERENCE, OP_NO_SSLv3, VERIFY_NONE, VERIFY_PEER, \
+ VERIFY_FAIL_IF_NO_PEER_CERT, VERIFY_CLIENT_ONCE
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.ssl import DefaultOpenSSLContextFactory
</span><ins>+from twisted.internet._sslverify import Certificate
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class ChainingOpenSSLContextFactory (DefaultOpenSSLContextFactory):
</span><span class="cx"> def __init__(
</span><span class="cx"> self, privateKeyFileName, certificateFileName,
</span><span class="cx"> sslmethod=SSLv23_METHOD, certificateChainFile=None,
</span><del>- passwdCallback=None, ciphers=None
</del><ins>+ passwdCallback=None, ciphers=None,
+ verifyClient=False, requireClientCertificate=False,
+ verifyClientOnce=True, verifyClientDepth=9,
+ clientCACertFileNames=[], sendCAsToClient=True
</ins><span class="cx"> ):
</span><span class="cx"> self.certificateChainFile = certificateChainFile
</span><span class="cx"> self.passwdCallback = passwdCallback
</span><span class="cx"> self.ciphers = ciphers
</span><span class="cx">
</span><ins>+ self.verifyClient = verifyClient
+ self.requireClientCertificate = requireClientCertificate
+ self.verifyClientOnce = verifyClientOnce
+ self.verifyClientDepth = verifyClientDepth
+ self.clientCACertFileNames = clientCACertFileNames
+ self.sendCAsToClient = sendCAsToClient
+
</ins><span class="cx"> DefaultOpenSSLContextFactory.__init__(
</span><span class="cx"> self,
</span><span class="cx"> privateKeyFileName,
</span><span class="lines">@@ -67,4 +79,31 @@
</span><span class="cx"> if self.certificateChainFile != "":
</span><span class="cx"> ctx.use_certificate_chain_file(self.certificateChainFile)
</span><span class="cx">
</span><ins>+ verifyFlags = VERIFY_NONE
+ if self.verifyClient:
+ verifyFlags = VERIFY_PEER
+ if self.requireClientCertificate:
+ verifyFlags |= VERIFY_FAIL_IF_NO_PEER_CERT
+ if self.verifyClientOnce:
+ verifyFlags |= VERIFY_CLIENT_ONCE
+ if self.clientCACertFileNames:
+ store = ctx.get_cert_store()
+ for cert in self.clientCACertFileNames:
+ with open(cert) as f:
+ certpem = f.read()
+ cert = Certificate.loadPEM(certpem)
+ store.add_cert(cert.original)
+ if self.sendCAsToClient:
+ ctx.add_client_ca(cert.original)
+
+ # It'd be nice if pyOpenSSL let us pass None here for this behavior (as
+ # the underlying OpenSSL API call allows NULL to be passed). It
+ # doesn't, so we'll supply a function which does the same thing.
+ def _verifyCallback(conn, cert, errno, depth, preverify_ok):
+ return preverify_ok
+ ctx.set_verify(verifyFlags, _verifyCallback)
+
+ if self.verifyClientDepth is not None:
+ ctx.set_verify_depth(self.verifyClientDepth)
+
</ins><span class="cx"> self._context = ctx
</span></span></pre>
</div>
</div>
</body>
</html>