<!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>[14175] CalendarServer/trunk/txweb2</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/14175">14175</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-11-15 08:09:33 -0800 (Sat, 15 Nov 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Support ssl reverse proxy client cert auth mode.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxweb2authtlspy">CalendarServer/trunk/txweb2/auth/tls.py</a></li>
<li><a href="#CalendarServertrunktxweb2davresourcepy">CalendarServer/trunk/txweb2/dav/resource.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxweb2authtlspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/auth/tls.py (14174 => 14175)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txweb2/auth/tls.py        2014-11-14 21:08:05 UTC (rev 14174)
+++ CalendarServer/trunk/txweb2/auth/tls.py        2014-11-15 16:09:33 UTC (rev 14175)
</span><span class="lines">@@ -38,14 +38,20 @@
</span><span class="cx"> 
</span><span class="cx">     implements(credentials.ICredentials)
</span><span class="cx"> 
</span><del>-    def __init__(self, certificate):
</del><ins>+    CERTIFICATE_HEADER = &quot;X-TLS-Client-Certificate&quot;
+    USERNAME_HEADER = &quot;X-TLS-Client-User-Name&quot;
</ins><span class="cx"> 
</span><ins>+    def __init__(self, certificate, username=None):
+
</ins><span class="cx">         self.certificate = certificate
</span><span class="cx"> 
</span><del>-        try:
-            self.username = self.getSubject().emailAddress.split(&quot;@&quot;)[0]
-        except KeyError:
-            self.username = None
</del><ins>+        if certificate is not None:
+            try:
+                self.username = self.getSubject().emailAddress.split(&quot;@&quot;)[0]
+            except KeyError:
+                self.username = None
+        else:
+            self.username = username
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def getSubject(self):
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/resource.py (14174 => 14175)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txweb2/dav/resource.py        2014-11-14 21:08:05 UTC (rev 14174)
+++ CalendarServer/trunk/txweb2/dav/resource.py        2014-11-15 16:09:33 UTC (rev 14175)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx">     Deferred, maybeDeferred, succeed, inlineCallbacks, returnValue
</span><span class="cx"> )
</span><span class="cx"> from twisted.internet import reactor
</span><ins>+from twisted.internet._sslverify import Certificate
</ins><span class="cx"> 
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from txdav.xml import element
</span><span class="lines">@@ -65,7 +66,7 @@
</span><span class="cx"> from txdav.xml.element import twisted_dav_namespace, twisted_private_namespace
</span><span class="cx"> from txdav.xml.element import registerElement, lookupElement
</span><span class="cx"> from txweb2 import responsecode
</span><del>-from txweb2.auth.tls import TLSCredentialsFactory
</del><ins>+from txweb2.auth.tls import TLSCredentialsFactory, TLSCredentials
</ins><span class="cx"> from txweb2.http import HTTPError, RedirectResponse, StatusResponse
</span><span class="cx"> from txweb2.http_headers import generateContentType
</span><span class="cx"> from txweb2.iweb import IResponse
</span><span class="lines">@@ -1020,8 +1021,29 @@
</span><span class="cx">         if request.clientCredentials() is not None:
</span><span class="cx">             # Make this look as if it is done via the usual HTTP auth header approach
</span><span class="cx">             authHeader = (TLSCredentialsFactory.scheme, request.clientCredentials())
</span><ins>+
</ins><span class="cx">         else:
</span><del>-            authHeader = request.headers.getHeader(&quot;authorization&quot;)
</del><ins>+            # Check for reverse proxy TLS client auth
+            rproxy_cert = request.headers.getRawHeaders(TLSCredentials.CERTIFICATE_HEADER, [&quot;*&quot;])[0]
+            rproxy_user = request.headers.getRawHeaders(TLSCredentials.USERNAME_HEADER, [&quot;*&quot;])[0]
+            if rproxy_cert != &quot;*&quot;:
+                # Make this look as if it is done via the usual HTTP auth header approach
+                try:
+                    cert = Certificate.loadPEM(rproxy_cert.replace(&quot;\\r&quot;, &quot;\r&quot;).replace(&quot;\\n&quot;, &quot;\n&quot;))
+                except:
+                    raise HTTPError(responsecode.BAD_REQUEST)
+                authHeader = (
+                    TLSCredentialsFactory.scheme,
+                    TLSCredentials(cert)
+                )
+            elif rproxy_user != &quot;*&quot;:
+                # Make this look as if it is done via the usual HTTP auth header approach
+                authHeader = (
+                    TLSCredentialsFactory.scheme,
+                    TLSCredentials(None, username=rproxy_user)
+                )
+            else:
+                authHeader = request.headers.getHeader(&quot;authorization&quot;)
</ins><span class="cx"> 
</span><span class="cx">         if authHeader is not None:
</span><span class="cx">             if authHeader[0] not in request.credentialFactories:
</span></span></pre>
</div>
</div>

</body>
</html>