<!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>[13952] CalendarServer/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/13952">13952</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-09-11 13:20:50 -0700 (Thu, 11 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Handle directory-based delegation to groups which don't actually exist.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementsstabletxt">CalendarServer/trunk/requirements-stable.txt</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavdpsserverpy">CalendarServer/trunk/txdav/dps/server.py</a></li>
<li><a href="#CalendarServertrunktxdavwhogroupspy">CalendarServer/trunk/txdav/who/groups.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotesttest_groupspy">CalendarServer/trunk/txdav/who/test/test_groups.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkrequirementsstabletxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-stable.txt (13951 => 13952)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-stable.txt 2014-09-11 20:19:50 UTC (rev 13951)
+++ CalendarServer/trunk/requirements-stable.txt 2014-09-11 20:20:50 UTC (rev 13952)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> # For CalendarServer development, don't try to get these projects from PyPI; use svn.
</span><span class="cx">
</span><span class="cx"> -e .
</span><del>--e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13948#egg=twextpy
</del><ins>+-e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13951#egg=twextpy
</ins><span class="cx"> -e svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@13420#egg=kerberos
</span><span class="cx"> -e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@13802#egg=pycalendar
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (13951 => 13952)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py 2014-09-11 20:19:50 UTC (rev 13951)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2014-09-11 20:20:50 UTC (rev 13952)
</span><span class="lines">@@ -1099,6 +1099,10 @@
</span><span class="cx"> @type name: C{unicode}
</span><span class="cx"> @type membershipHash: C{str}
</span><span class="cx"> """
</span><ins>+ record = yield self.directoryService().recordWithUID(groupUID)
+ if record is None:
+ returnValue(None)
+
</ins><span class="cx"> groupID = yield self._addGroupQuery.on(
</span><span class="cx"> self,
</span><span class="cx"> name=name.encode("utf-8"),
</span><span class="lines">@@ -1106,7 +1110,6 @@
</span><span class="cx"> membershipHash=membershipHash
</span><span class="cx"> )
</span><span class="cx">
</span><del>- record = yield self.directoryService().recordWithUID(groupUID)
</del><span class="cx"> yield self.refreshGroup(
</span><span class="cx"> groupUID, record, groupID, name.encode("utf-8"), membershipHash, True
</span><span class="cx"> )
</span><span class="lines">@@ -1159,7 +1162,12 @@
</span><span class="cx"> savepoint = SavepointAction("groupByUID")
</span><span class="cx"> yield savepoint.acquire(self)
</span><span class="cx"> try:
</span><del>- yield self.addGroup(groupUID, u"", "")
</del><ins>+ groupID = yield self.addGroup(groupUID, u"", "")
+ if groupID is None:
+ # The record does not actually exist within the directory
+ yield savepoint.release(self)
+ returnValue((None, None, None, None, None))
+
</ins><span class="cx"> except Exception:
</span><span class="cx"> yield savepoint.rollback(self)
</span><span class="cx"> results = (
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpsserverpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/server.py (13951 => 13952)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/server.py 2014-09-11 20:19:50 UTC (rev 13951)
+++ CalendarServer/trunk/txdav/dps/server.py 2014-09-11 20:20:50 UTC (rev 13952)
</span><span class="lines">@@ -216,6 +216,9 @@
</span><span class="cx"> fields = {}
</span><span class="cx"> if record is not None:
</span><span class="cx"> for field, value in record.fields.iteritems():
</span><ins>+ # FIXME: need to sort out dealing with enormous groups
+ # if field.name == u"memberDNs":
+ # continue
</ins><span class="cx"> valueType = record.service.fieldName.valueType(field)
</span><span class="cx"> if valueType in (unicode, bool):
</span><span class="cx"> fields[field.name] = value
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhogroupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/groups.py (13951 => 13952)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/groups.py 2014-09-11 20:19:50 UTC (rev 13951)
+++ CalendarServer/trunk/txdav/who/groups.py 2014-09-11 20:20:50 UTC (rev 13952)
</span><span class="lines">@@ -385,6 +385,7 @@
</span><span class="cx"> uid=delegatorUID
</span><span class="cx"> )
</span><span class="cx"> readDelegateGroupID = writeDelegateGroupID = None
</span><ins>+
</ins><span class="cx"> if readDelegateUID:
</span><span class="cx"> (
</span><span class="cx"> readDelegateGroupID, _ignore_name, _ignore_hash,
</span><span class="lines">@@ -392,6 +393,10 @@
</span><span class="cx"> ) = (
</span><span class="cx"> yield txn.groupByUID(readDelegateUID)
</span><span class="cx"> )
</span><ins>+ if readDelegateGroupID is None:
+ # The group record does not actually exist
+ readDelegateUID = None
+
</ins><span class="cx"> if writeDelegateUID:
</span><span class="cx"> (
</span><span class="cx"> writeDelegateGroupID, _ignore_name, _ignore_hash,
</span><span class="lines">@@ -399,6 +404,10 @@
</span><span class="cx"> ) = (
</span><span class="cx"> yield txn.groupByUID(writeDelegateUID)
</span><span class="cx"> )
</span><ins>+ if writeDelegateGroupID is None:
+ # The group record does not actually exist
+ writeDelegateUID = None
+
</ins><span class="cx"> yield txn.assignExternalDelegates(
</span><span class="cx"> delegatorUID, readDelegateGroupID, writeDelegateGroupID,
</span><span class="cx"> readDelegateUID, writeDelegateUID
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_groupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_groups.py (13951 => 13952)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_groups.py 2014-09-11 20:19:50 UTC (rev 13951)
+++ CalendarServer/trunk/txdav/who/test/test_groups.py 2014-09-11 20:20:50 UTC (rev 13952)
</span><span class="lines">@@ -354,6 +354,32 @@
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ #
+ # Say somebody messed up and stuck a non-existent group UID in
+ # as a delegate
+ #
+ newAssignments = {
+ u"__wsanchez1__":
+ (
+ u"__sub_group_1__",
+ u"__non_existent_group__",
+ ),
+ }
+ yield self.groupCacher.scheduleExternalAssignments(
+ txn, newAssignments, immediately=True
+ )
+ oldExternalAssignments = (yield txn.externalDelegates())
+ self.assertEquals(
+ oldExternalAssignments,
+ {
+ u"__wsanchez1__":
+ (
+ u"__sub_group_1__",
+ None # <--- (not __non_existent_group__)
+ ),
+ }
+ )
+
</ins><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>