<!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>[15446] CalDAVTester/trunk</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/15446">15446</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-02-02 08:56:22 -0800 (Tue, 02 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for TLS client cert authentication.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkREADMEtxt">CalDAVTester/trunk/README.txt</a></li>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfodtd">CalDAVTester/trunk/scripts/server/serverinfo.dtd</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVcaldavtestdtd">CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVcaldavtestdtd">CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd</a></li>
<li><a href="#CalDAVTestertrunkscriptstestspodCalDAVcaldavtestdtd">CalDAVTester/trunk/scripts/tests-pod/CalDAV/caldavtest.dtd</a></li>
<li><a href="#CalDAVTestertrunkscriptstestspodv5_v8CalDAVv5_v8caldavtestdtd">CalDAVTester/trunk/scripts/tests-pod-v5_v8/CalDAV-v5_v8/caldavtest.dtd</a></li>
<li><a href="#CalDAVTestertrunksrccaldavtestpy">CalDAVTester/trunk/src/caldavtest.py</a></li>
<li><a href="#CalDAVTestertrunksrchttpshandlerpy">CalDAVTester/trunk/src/httpshandler.py</a></li>
<li><a href="#CalDAVTestertrunksrcmanagerpy">CalDAVTester/trunk/src/manager.py</a></li>
<li><a href="#CalDAVTestertrunksrcrequestpy">CalDAVTester/trunk/src/request.py</a></li>
<li><a href="#CalDAVTestertrunksrcserverinfopy">CalDAVTester/trunk/src/serverinfo.py</a></li>
<li><a href="#CalDAVTestertrunksrcxmlDefspy">CalDAVTester/trunk/src/xmlDefs.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkREADMEtxt"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/README.txt (15445 => 15446)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/README.txt 2016-01-29 19:49:30 UTC (rev 15445)
+++ CalDAVTester/trunk/README.txt 2016-02-02 16:56:22 UTC (rev 15446)
</span><span class="lines">@@ -110,6 +110,9 @@
</span><span class="cx"> ELEMENT <authtype>
</span><span class="cx"> HTTP authentication method to use.
</span><span class="cx">
</span><ins>+ ELEMENT <certdir>
+ Base directory for TLS client certs.
+
</ins><span class="cx"> ELEMENT <waitcount>
</span><span class="cx"> For requests that wait, defines how many iterations to wait for
</span><span class="cx"> [Default: 120].
</span><span class="lines">@@ -267,6 +270,9 @@
</span><span class="cx"> if provided this value is used as the password for HTTP
</span><span class="cx"> Basic authentication instead of the one in the serverinfo
</span><span class="cx"> file.
</span><ins>+ ATTRIBUTE cert
+ if provided this value is used as the file name for a TLS
+ client certificate to be used with the request.
</ins><span class="cx"> ATTRIBUTE end-delete
</span><span class="cx"> if set to 'yes', then the resource targeted by the request
</span><span class="cx"> is deleted after testing is complete, but before the
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptsserverserverinfodtd"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo.dtd (15445 => 15446)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo.dtd 2016-01-29 19:49:30 UTC (rev 15445)
+++ CalDAVTester/trunk/scripts/server/serverinfo.dtd 2016-02-02 16:56:22 UTC (rev 15446)
</span><span class="lines">@@ -15,31 +15,32 @@
</span><span class="cx"> -->
</span><span class="cx">
</span><span class="cx"> <!ELEMENT serverinfo (host, nonsslport, sslport, unix?,
</span><del>- host2?, nonsslport2?, sslport2?, unix2?,
- authtype?, waitcount?, waitdelay?, waitsuccess?,
- features?, substitutions,
- calendardatafilter*, addressdatafilter*)? >
</del><ins>+ host2?, nonsslport2?, sslport2?, unix2?,
+ authtype?, certdir?,
+ waitcount?, waitdelay?, waitsuccess?,
+ features?, substitutions,
+ calendardatafilter*, addressdatafilter*)? >
</ins><span class="cx">
</span><del>- <!ELEMENT host (#PCDATA)>
- <!ELEMENT nonsslport (#PCDATA)>
- <!ELEMENT sslport (#PCDATA)>
- <!ELEMENT unix (#PCDATA)>
- <!ELEMENT host2 (#PCDATA)>
- <!ELEMENT nonsslport2 (#PCDATA)>
- <!ELEMENT sslport2 (#PCDATA)>
- <!ELEMENT unix2 (#PCDATA)>
- <!ELEMENT authtype (#PCDATA)>
- <!ELEMENT waitdelay (#PCDATA)>
- <!ELEMENT waitcount (#PCDATA)>
- <!ELEMENT waitsuccess (#PCDATA)>
- <!ELEMENT features (feature*)>
- <!ELEMENT feature (#PCDATA)>
- <!ELEMENT substitutions (substitution|repeat)*>
- <!ELEMENT repeat (substitution+)>
- <!ATTLIST repeat count CDATA "1">
- <!ELEMENT substitution (key, value)>
</del><ins>+ <!ELEMENT host (#PCDATA)>
+ <!ELEMENT nonsslport (#PCDATA)>
+ <!ELEMENT sslport (#PCDATA)>
+ <!ELEMENT unix (#PCDATA)>
+ <!ELEMENT host2 (#PCDATA)>
+ <!ELEMENT nonsslport2 (#PCDATA)>
+ <!ELEMENT sslport2 (#PCDATA)>
+ <!ELEMENT unix2 (#PCDATA)>
+ <!ELEMENT authtype (#PCDATA)>
+ <!ELEMENT certdir (#PCDATA)>
+ <!ELEMENT waitdelay (#PCDATA)>
+ <!ELEMENT waitcount (#PCDATA)>
+ <!ELEMENT waitsuccess (#PCDATA)>
+ <!ELEMENT features (feature*)>
+ <!ELEMENT feature (#PCDATA)>
+ <!ELEMENT substitutions (substitution|repeat)*>
+ <!ELEMENT repeat (substitution+)>
+ <!ATTLIST repeat count CDATA "1">
+ <!ELEMENT substitution (key, value)>
</ins><span class="cx"> <!ELEMENT key (#PCDATA)>
</span><span class="cx"> <!ELEMENT value (#PCDATA)>
</span><del>- <!ELEMENT calendardatafilter (#PCDATA)>
- <!ELEMENT addressdatafilter (#PCDATA)>
-
</del><ins>+ <!ELEMENT calendardatafilter (#PCDATA)>
+ <!ELEMENT addressdatafilter (#PCDATA)>
</ins></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVcaldavtestdtd"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd (15445 => 15446)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd 2016-01-29 19:49:30 UTC (rev 15445)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd 2016-02-02 16:56:22 UTC (rev 15446)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> auth (yes|no) "yes"
</span><span class="cx"> user CDATA ""
</span><span class="cx"> pswd CDATA ""
</span><ins>+ cert CDATA ""
</ins><span class="cx"> end-delete (yes|no) "no"
</span><span class="cx"> print-response (yes|no) "no"
</span><span class="cx"> iterate-data (yes|no) "no"
</span><span class="lines">@@ -48,7 +49,7 @@
</span><span class="cx"> <!ELEMENT value (#PCDATA)>
</span><span class="cx"> <!ELEMENT data (content-type, (filepath | generator), substitute*)>
</span><span class="cx"> <!ATTLIST data substitutions (yes|no) "yes"
</span><del>- generate (yes|no) "no">
</del><ins>+ generate (yes|no) "no">
</ins><span class="cx"> <!ELEMENT content-type (#PCDATA)>
</span><span class="cx"> <!ELEMENT filepath (#PCDATA)>
</span><span class="cx"> <!ELEMENT generator (callback, arg*)>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVcaldavtestdtd"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd (15445 => 15446)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd 2016-01-29 19:49:30 UTC (rev 15445)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd 2016-02-02 16:56:22 UTC (rev 15446)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> auth (yes|no) "yes"
</span><span class="cx"> user CDATA ""
</span><span class="cx"> pswd CDATA ""
</span><ins>+ cert CDATA ""
</ins><span class="cx"> end-delete (yes|no) "no"
</span><span class="cx"> print-response (yes|no) "no"
</span><span class="cx"> iterate-data (yes|no) "no"
</span><span class="lines">@@ -48,7 +49,7 @@
</span><span class="cx"> <!ELEMENT value (#PCDATA)>
</span><span class="cx"> <!ELEMENT data (content-type, (filepath | generator), substitute*)>
</span><span class="cx"> <!ATTLIST data substitutions (yes|no) "yes"
</span><del>- generate (yes|no) "no">
</del><ins>+ generate (yes|no) "no">
</ins><span class="cx"> <!ELEMENT content-type (#PCDATA)>
</span><span class="cx"> <!ELEMENT filepath (#PCDATA)>
</span><span class="cx"> <!ELEMENT generator (callback, arg*)>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestspodCalDAVcaldavtestdtd"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/caldavtest.dtd (15445 => 15446)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/caldavtest.dtd 2016-01-29 19:49:30 UTC (rev 15445)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/caldavtest.dtd 2016-02-02 16:56:22 UTC (rev 15446)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> auth (yes|no) "yes"
</span><span class="cx"> user CDATA ""
</span><span class="cx"> pswd CDATA ""
</span><ins>+ cert CDATA ""
</ins><span class="cx"> end-delete (yes|no) "no"
</span><span class="cx"> print-response (yes|no) "no"
</span><span class="cx"> iterate-data (yes|no) "no"
</span><span class="lines">@@ -48,7 +49,7 @@
</span><span class="cx"> <!ELEMENT value (#PCDATA)>
</span><span class="cx"> <!ELEMENT data (content-type, (filepath | generator), substitute*)>
</span><span class="cx"> <!ATTLIST data substitutions (yes|no) "yes"
</span><del>- generate (yes|no) "no">
</del><ins>+ generate (yes|no) "no">
</ins><span class="cx"> <!ELEMENT content-type (#PCDATA)>
</span><span class="cx"> <!ELEMENT filepath (#PCDATA)>
</span><span class="cx"> <!ELEMENT generator (callback, arg*)>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestspodv5_v8CalDAVv5_v8caldavtestdtd"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests-pod-v5_v8/CalDAV-v5_v8/caldavtest.dtd (15445 => 15446)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests-pod-v5_v8/CalDAV-v5_v8/caldavtest.dtd 2016-01-29 19:49:30 UTC (rev 15445)
+++ CalDAVTester/trunk/scripts/tests-pod-v5_v8/CalDAV-v5_v8/caldavtest.dtd 2016-02-02 16:56:22 UTC (rev 15446)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> auth (yes|no) "yes"
</span><span class="cx"> user CDATA ""
</span><span class="cx"> pswd CDATA ""
</span><ins>+ cert CDATA ""
</ins><span class="cx"> end-delete (yes|no) "no"
</span><span class="cx"> print-response (yes|no) "no"
</span><span class="cx"> iterate-data (yes|no) "no"
</span><span class="lines">@@ -48,7 +49,7 @@
</span><span class="cx"> <!ELEMENT value (#PCDATA)>
</span><span class="cx"> <!ELEMENT data (content-type, (filepath | generator), substitute*)>
</span><span class="cx"> <!ATTLIST data substitutions (yes|no) "yes"
</span><del>- generate (yes|no) "no">
</del><ins>+ generate (yes|no) "no">
</ins><span class="cx"> <!ELEMENT content-type (#PCDATA)>
</span><span class="cx"> <!ELEMENT filepath (#PCDATA)>
</span><span class="cx"> <!ELEMENT generator (callback, arg*)>
</span></span></pre></div>
<a id="CalDAVTestertrunksrccaldavtestpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/caldavtest.py (15445 => 15446)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/caldavtest.py 2016-01-29 19:49:30 UTC (rev 15445)
+++ CalDAVTester/trunk/src/caldavtest.py 2016-02-02 16:56:22 UTC (rev 15446)
</span><span class="lines">@@ -585,17 +585,16 @@
</span><span class="cx"> if len(self.end_deletes) == 0:
</span><span class="cx"> return True
</span><span class="cx"> self.manager.message("trace", "Start: " + description)
</span><del>- for deleter in self.end_deletes:
</del><ins>+ for uri, delete_request in self.end_deletes:
</ins><span class="cx"> req = request(self.manager)
</span><span class="cx"> req.method = "DELETE"
</span><del>- req.host = deleter[3]
- req.port = deleter[4]
- req.ruris.append(deleter[0])
- req.ruri = deleter[0]
- if len(deleter[1]):
- req.user = deleter[1]
- if len(deleter[2]):
- req.pswd = deleter[2]
</del><ins>+ req.host = delete_request.host
+ req.port = delete_request.port
+ req.ruris.append(uri)
+ req.ruri = uri
+ req.user = delete_request.user
+ req.pswd = delete_request.pswd
+ req.cert = delete_request.cert
</ins><span class="cx"> self.dorequest(req, False, False, label=label)
</span><span class="cx"> self.manager.message("trace", "{name:<60}{value:>10}".format(name="End: " + description, value="[DONE]"))
</span><span class="cx">
</span><span class="lines">@@ -710,7 +709,7 @@
</span><span class="cx">
</span><span class="cx"> # Cache delayed delete
</span><span class="cx"> if req.end_delete:
</span><del>- self.end_deletes.append((uri, req.user, req.pswd, req.host, req.port,))
</del><ins>+ self.end_deletes.append((uri, req,))
</ins><span class="cx">
</span><span class="cx"> if details:
</span><span class="cx"> resulttxt += " %s: %s\n" % (method, uri)
</span><span class="lines">@@ -730,7 +729,13 @@
</span><span class="cx"> stats.startTimer()
</span><span class="cx">
</span><span class="cx"> # Do the http request
</span><del>- http = SmartHTTPConnection(req.host, req.port, self.manager.server_info.ssl, afunix=req.afunix)
</del><ins>+ http = SmartHTTPConnection(
+ req.host,
+ req.port,
+ self.manager.server_info.ssl,
+ afunix=req.afunix,
+ cert=os.path.join(self.manager.server_info.certdir, req.cert) if req.cert else None
+ )
</ins><span class="cx">
</span><span class="cx"> if 'User-Agent' not in headers and label is not None:
</span><span class="cx"> headers['User-Agent'] = label.encode("utf-8")
</span></span></pre></div>
<a id="CalDAVTestertrunksrchttpshandlerpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/httpshandler.py (15445 => 15446)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/httpshandler.py 2016-01-29 19:49:30 UTC (rev 15445)
+++ CalDAVTester/trunk/src/httpshandler.py 2016-02-02 16:56:22 UTC (rev 15446)
</span><span class="lines">@@ -38,8 +38,9 @@
</span><span class="cx"> An L{httplib.HTTPSConnection} class that allows the TLS protocol version to be set.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- def __init__(self, host, port, ssl_version=cached_types[0][1]):
- httplib.HTTPSConnection.__init__(self, host, port)
</del><ins>+ def __init__(self, host, port, ssl_version=cached_types[0][1], cert_file=None):
+
+ httplib.HTTPSConnection.__init__(self, host, port, cert_file=cert_file)
</ins><span class="cx"> self._ssl_version = ssl_version
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -70,7 +71,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def SmartHTTPConnection(host, port, ssl, afunix):
</del><ins>+def SmartHTTPConnection(host, port, ssl, afunix, cert=None):
</ins><span class="cx"> """
</span><span class="cx"> Create the appropriate L{httplib.HTTPConnection} derived class for the supplied arguments.
</span><span class="cx"> This attempts to connect to a server using the available SSL protocol types (as per
</span><span class="lines">@@ -85,10 +86,12 @@
</span><span class="cx"> @type ssl: L{bool}
</span><span class="cx"> @param afunix: unix socket to use or L{None}
</span><span class="cx"> @type afunix: L{str}
</span><ins>+ @param cert: SSL client cert path to use or L{None}
+ @type cert: L{str}
</ins><span class="cx"> """
</span><span class="cx">
</span><del>- def trySSL(version):
- connect = HTTPSVersionConnection(host, port, ssl_version=version)
</del><ins>+ def trySSL(version, cert=None):
+ connect = HTTPSVersionConnection(host, port, ssl_version=version, cert_file=cert)
</ins><span class="cx"> connect.connect()
</span><span class="cx"> return connect
</span><span class="cx">
</span><span class="lines">@@ -99,14 +102,14 @@
</span><span class="cx"> for cached, connection_type in cached_types:
</span><span class="cx"> if (host, port) in cached:
</span><span class="cx"> try:
</span><del>- return trySSL(connection_type)
</del><ins>+ return trySSL(connection_type, cert)
</ins><span class="cx"> except:
</span><span class="cx"> cached.remove((host, port))
</span><span class="cx">
</span><span class="cx"> for cached, connection_type in cached_types:
</span><span class="cx"> try:
</span><span class="cx"> cached.add((host, port))
</span><del>- return trySSL(connection_type)
</del><ins>+ return trySSL(connection_type, cert)
</ins><span class="cx"> except:
</span><span class="cx"> cached.remove((host, port))
</span><span class="cx">
</span></span></pre></div>
<a id="CalDAVTestertrunksrcmanagerpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/manager.py (15445 => 15446)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/manager.py 2016-01-29 19:49:30 UTC (rev 15445)
+++ CalDAVTester/trunk/src/manager.py 2016-02-02 16:56:22 UTC (rev 15446)
</span><span class="lines">@@ -160,6 +160,7 @@
</span><span class="cx"> self.server_info.ssl = ssl
</span><span class="cx"> self.server_info.port = self.server_info.sslport if ssl else self.server_info.nonsslport
</span><span class="cx"> self.server_info.port2 = self.server_info.sslport2 if ssl else self.server_info.nonsslport2
</span><ins>+ self.server_info.certdir = os.path.join(self.base_dir, self.server_info.certdir) if self.server_info.certdir else ""
</ins><span class="cx">
</span><span class="cx"> moresubs["$host:"] = "%s://%s" % (
</span><span class="cx"> "https" if ssl else "http", self.server_info.host,
</span></span></pre></div>
<a id="CalDAVTestertrunksrcrequestpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/request.py (15445 => 15446)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/request.py 2016-01-29 19:49:30 UTC (rev 15445)
+++ CalDAVTester/trunk/src/request.py 2016-02-02 16:56:22 UTC (rev 15446)
</span><span class="lines">@@ -152,6 +152,7 @@
</span><span class="cx"> self.auth = True
</span><span class="cx"> self.user = ""
</span><span class="cx"> self.pswd = ""
</span><ins>+ self.cert = ""
</ins><span class="cx"> self.end_delete = False
</span><span class="cx"> self.print_request = False
</span><span class="cx"> self.print_response = False
</span><span class="lines">@@ -211,10 +212,10 @@
</span><span class="cx">
</span><span class="cx"> # Auth
</span><span class="cx"> if self.auth:
</span><del>- if si.authtype.lower() == "digest":
</del><ins>+ if si.authtype.lower() == "basic":
+ hdrs["Authorization"] = self.gethttpbasicauth(si)
+ elif si.authtype.lower() == "digest":
</ins><span class="cx"> hdrs["Authorization"] = self.gethttpdigestauth(si)
</span><del>- else:
- hdrs["Authorization"] = self.gethttpbasicauth(si)
</del><span class="cx">
</span><span class="cx"> return hdrs
</span><span class="cx">
</span><span class="lines">@@ -380,6 +381,7 @@
</span><span class="cx"> self.auth = node.get(src.xmlDefs.ATTR_AUTH, src.xmlDefs.ATTR_VALUE_YES) == src.xmlDefs.ATTR_VALUE_YES
</span><span class="cx"> self.user = self.manager.server_info.subs(node.get(src.xmlDefs.ATTR_USER, "").encode("utf-8"))
</span><span class="cx"> self.pswd = self.manager.server_info.subs(node.get(src.xmlDefs.ATTR_PSWD, "").encode("utf-8"))
</span><ins>+ self.cert = self.manager.server_info.subs(node.get(src.xmlDefs.ATTR_CERT, "").encode("utf-8"))
</ins><span class="cx"> self.end_delete = getYesNoAttributeValue(node, src.xmlDefs.ATTR_END_DELETE)
</span><span class="cx"> self.print_request = self.manager.print_request or getYesNoAttributeValue(node, src.xmlDefs.ATTR_PRINT_REQUEST)
</span><span class="cx"> self.print_response = self.manager.print_response or getYesNoAttributeValue(node, src.xmlDefs.ATTR_PRINT_RESPONSE)
</span></span></pre></div>
<a id="CalDAVTestertrunksrcserverinfopy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/serverinfo.py (15445 => 15446)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/serverinfo.py 2016-01-29 19:49:30 UTC (rev 15445)
+++ CalDAVTester/trunk/src/serverinfo.py 2016-02-02 16:56:22 UTC (rev 15446)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> self.sslport2 = 443
</span><span class="cx"> self.afunix2 = None
</span><span class="cx"> self.authtype = "basic"
</span><ins>+ self.certdir = ""
</ins><span class="cx"> self.features = set()
</span><span class="cx"> self.user = ""
</span><span class="cx"> self.pswd = ""
</span><span class="lines">@@ -192,6 +193,8 @@
</span><span class="cx"> self.afunix2 = child.text
</span><span class="cx"> elif child.tag == src.xmlDefs.ELEMENT_AUTHTYPE:
</span><span class="cx"> self.authtype = child.text.encode("utf-8")
</span><ins>+ elif child.tag == src.xmlDefs.ELEMENT_CERTDIR:
+ self.certdir = child.text.encode("utf-8")
</ins><span class="cx"> elif child.tag == src.xmlDefs.ELEMENT_WAITCOUNT:
</span><span class="cx"> self.waitcount = int(child.text.encode("utf-8"))
</span><span class="cx"> elif child.tag == src.xmlDefs.ELEMENT_WAITDELAY:
</span></span></pre></div>
<a id="CalDAVTestertrunksrcxmlDefspy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/xmlDefs.py (15445 => 15446)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/xmlDefs.py 2016-01-29 19:49:30 UTC (rev 15445)
+++ CalDAVTester/trunk/src/xmlDefs.py 2016-02-02 16:56:22 UTC (rev 15446)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> ELEMENT_CALDAVTEST = "caldavtest"
</span><span class="cx"> ELEMENT_CALENDARDATAFILTER = "calendardatafilter"
</span><span class="cx"> ELEMENT_CALLBACK = "callback"
</span><ins>+ELEMENT_CERTDIR = "certdir"
</ins><span class="cx"> ELEMENT_CLIENTS = "clients"
</span><span class="cx"> ELEMENT_CONTENTTYPE = "content-type"
</span><span class="cx"> ELEMENT_DATA = "data"
</span><span class="lines">@@ -90,6 +91,7 @@
</span><span class="cx">
</span><span class="cx"> ATTR_HOST2 = "host2"
</span><span class="cx"> ATTR_AUTH = "auth"
</span><ins>+ATTR_CERT = "cert"
</ins><span class="cx"> ATTR_CHANGE_UID = "change-uid"
</span><span class="cx"> ATTR_COUNT = "count"
</span><span class="cx"> ATTR_DETAILS = "details"
</span></span></pre>
</div>
</div>
</body>
</html>