<!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>[12411] twext/trunk/twext/who/test/auth_resource.rpy</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/12411">12411</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-20 15:53:18 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add LDAP resources</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhotestauth_resourcerpy">twext/trunk/twext/who/test/auth_resource.rpy</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwhotestauth_resourcerpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/auth_resource.rpy (12410 => 12411)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/auth_resource.rpy 2014-01-20 23:35:17 UTC (rev 12410)
+++ twext/trunk/twext/who/test/auth_resource.rpy 2014-01-20 23:53:18 UTC (rev 12411)
</span><span class="lines">@@ -37,14 +37,24 @@
</span><span class="cx"> from twisted.web.static import Data
</span><span class="cx">
</span><span class="cx"> from twext.who.directory import DirectoryRecord
</span><ins>+
</ins><span class="cx"> from twext.who.test.test_xml import xmlService as XMLDirectoryService
</span><ins>+
</ins><span class="cx"> try:
</span><ins>+ from twext.who.ldap.test.test_service import BaseTestCase as LDAPScaffold
+ LDAPDirectoryService = LDAPScaffold.service
+
+except ImportError:
+ LDAPDirectoryService = None
+
+try:
</ins><span class="cx"> from twext.who.opendirectory import (
</span><span class="cx"> DirectoryService as OpenDirectoryDirectoryService,
</span><span class="cx"> NoQOPDigestCredentialFactory,
</span><span class="cx"> )
</span><span class="cx"> except ImportError:
</span><span class="cx"> OpenDirectoryDirectoryService = None
</span><ins>+
</ins><span class="cx"> from twext.who.checker import UsernamePasswordCredentialChecker
</span><span class="cx"> from twext.who.checker import HTTPDigestCredentialChecker
</span><span class="cx">
</span><span class="lines">@@ -84,16 +94,25 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <ul>
</span><ins>+
</ins><span class="cx"> <li>XML Directory Service</li>
</span><span class="cx"> <ul>
</span><span class="cx"> <li><a href="auth_resource.rpy/XMLBasic" >Basic </a></li>
</span><span class="cx"> <li><a href="auth_resource.rpy/XMLDigest">Digest</a></li>
</span><span class="cx"> </ul>
</span><ins>+
+ <li>LDAP Directory Service</li>
+ <ul>
+ <li><a href="auth_resource.rpy/LDAPBasic" >Basic </a></li>
+ <li><a href="auth_resource.rpy/LDAPDigest">Digest</a></li>
+ </ul>
+
</ins><span class="cx"> <li>OpenDirectory Directory Service</li>
</span><span class="cx"> <ul>
</span><del>- <li><a href="auth_resource.rpy/ODBasic" >Basic </a></li>
- <li><a href="auth_resource.rpy/ODDigest">Digest</a></li>
</del><ins>+ <li><a href="auth_resource.rpy/OpenDirectoryBasic" >Basic </a></li>
+ <li><a href="auth_resource.rpy/OpenDirectoryDigest">Digest</a></li>
</ins><span class="cx"> </ul>
</span><ins>+
</ins><span class="cx"> </ul>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span><span class="lines">@@ -102,66 +121,49 @@
</span><span class="cx"> type="text/html",
</span><span class="cx"> )
</span><span class="cx">
</span><del>-xmlFileBasic = NamedTemporaryFile(delete=True)
-rootResource.putChild(
- "XMLBasic",
- HTTPAuthSessionWrapper(
- Portal(
- realm,
- [
- UsernamePasswordCredentialChecker(
- XMLDirectoryService(xmlFileBasic.name)
- )
- ]
- ),
- [BasicCredentialFactory("XML Basic Realm")]
- )
-)
</del><span class="cx">
</span><del>-xmlFileDigest = NamedTemporaryFile(delete=True)
-rootResource.putChild(
- "XMLDigest",
- HTTPAuthSessionWrapper(
- Portal(
- realm,
- [
- HTTPDigestCredentialChecker(
- XMLDirectoryService(xmlFileDigest.name)
- )
- ]
- ),
- [DigestCredentialFactory("md5", "XML Digest Realm")]
- )
-)
</del><ins>+def addChild(name, method, service, credentialFactory=None):
+ if method == "Basic":
+ checker = UsernamePasswordCredentialChecker
+ defaultCredentialFactory = BasicCredentialFactory
</ins><span class="cx">
</span><del>-if OpenDirectoryDirectoryService is not None:
</del><ins>+ elif method == "Digest":
+ checker = HTTPDigestCredentialChecker
+ defaultCredentialFactory = (
+ lambda realmName: DigestCredentialFactory("md5", realmName)
+ )
+
+ if credentialFactory is None:
+ credentialFactory = defaultCredentialFactory
+
+ resourceName = "{0}{1}".format(name, method)
+ print "Adding resource:", resourceName
+
</ins><span class="cx"> rootResource.putChild(
</span><del>- "ODBasic",
</del><ins>+ resourceName,
</ins><span class="cx"> HTTPAuthSessionWrapper(
</span><del>- Portal(
- realm,
- [
- UsernamePasswordCredentialChecker(
- OpenDirectoryDirectoryService()
- )
- ]
- ),
- [BasicCredentialFactory("OpenDirectory Basic Realm")]
</del><ins>+ Portal(realm, [checker(service)]),
+ [credentialFactory("{0} {1} Realm".format(name, method))]
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx">
</span><del>- rootResource.putChild(
- "ODDigest",
- HTTPAuthSessionWrapper(
- Portal(
- realm,
- [
- HTTPDigestCredentialChecker(
- OpenDirectoryDirectoryService()
- )
- ]
- ),
- [NoQOPDigestCredentialFactory("md5", "OpenDirectory Digest Realm")]
</del><ins>+
+xmlFileBasic = NamedTemporaryFile(delete=True)
+addChild("XML", "Basic", XMLDirectoryService(xmlFileBasic.name))
+
+xmlFileDigest = NamedTemporaryFile(delete=True)
+addChild("XML", "Digest", XMLDirectoryService(xmlFileDigest.name))
+
+if LDAPDirectoryService is not None:
+ addChild("LDAP", "Basic", LDAPDirectoryService())
+ addChild("LDAP", "Digest", LDAPDirectoryService())
+
+if OpenDirectoryDirectoryService is not None:
+ addChild("OpenDirectory", "Basic", OpenDirectoryDirectoryService())
+ addChild(
+ "OpenDirectory", "Digest", OpenDirectoryDirectoryService(),
+ credentialFactory=(
+ lambda realmName: NoQOPDigestCredentialFactory("md5", realmName)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>