<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[1264] CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/calendarserver/changeset/1264">1264</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2007-02-24 10:32:54 -0800 (Sat, 24 Feb 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Raise an exception when an attempt to set an invalid principal as a group member occurs.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavdirectorycalendaruserproxypy">CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavdirectorycalendaruserproxypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py (1263 => 1264)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py 2007-02-24 18:11:52 UTC (rev 1263)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py 2007-02-24 18:32:54 UTC (rev 1264)
</span><span class="lines">@@ -24,8 +24,6 @@
</span><span class="cx"> "CalendarUserProxyPrincipalResource",
</span><span class="cx"> ]
</span><span class="cx">
</span><del>-from urllib import unquote
-
</del><span class="cx"> from twisted.internet.defer import succeed
</span><span class="cx"> from twisted.python import log
</span><span class="cx"> from twisted.python.failure import Failure
</span><span class="lines">@@ -33,12 +31,10 @@
</span><span class="cx"> from twisted.web2.dav import davxml
</span><span class="cx"> from twisted.web2.dav.element.base import dav_namespace
</span><span class="cx"> from twisted.web2.dav.util import joinURL
</span><del>-from twisted.web2.http import Response
-from twisted.web2.http_headers import MimeType
</del><ins>+from twisted.web2.http import HTTPError, StatusResponse
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.extensions import DAVFile, DAVPrincipalResource
</span><span class="cx"> from twistedcaldav.extensions import ReadOnlyWritePropertiesResourceMixIn
</span><del>-from twistedcaldav.resource import CalendarPrincipalResource
</del><span class="cx"> from twistedcaldav.sql import AbstractSQLDatabase
</span><span class="cx"> from twistedcaldav.static import AutoProvisioningFileMixIn
</span><span class="cx">
</span><span class="lines">@@ -137,17 +133,25 @@
</span><span class="cx"> # Really, c-u-p principals should be treated the same way as any other principal, so
</span><span class="cx"> # they should be allowed as members of groups.
</span><span class="cx"> #
</span><del>- # This implementation simply ignores any principal URIs that correspond to c-u-p principals.
</del><ins>+ # This implementation now raises an exception for any principal it cannot find.
</ins><span class="cx">
</span><span class="cx"> # Break out the list into a set of URIs.
</span><span class="cx"> members = [str(h) for h in new_members.children]
</span><span class="cx">
</span><span class="cx"> # Map the URIs to principals.
</span><del>- # NB Non-matching URIs will return None foe the principal
- principals = [self.pcollection._principalForURI(uri) for uri in members]
</del><ins>+ principals = []
+ for uri in members:
+ principal = self.pcollection._principalForURI(uri)
+ # Invalid principals MUST result in an error.
+ if principal is None:
+ raise HTTPError(StatusResponse(
+ responsecode.BAD_REQUEST,
+ "Attempt to use a non-existent principal %s as a group member of %s." % (uri, self.principalURL(),)
+ ))
+ principals.append(principal)
</ins><span class="cx">
</span><del>- # Map the principals to GUIDs, ignoring principals that are None.
- guids = [p.principalUID() for p in principals if p is not None]
</del><ins>+ # Map the principals to GUIDs.
+ guids = [p.principalUID() for p in principals]
</ins><span class="cx">
</span><span class="cx"> self._index().setGroupMembers(self.guid, guids)
</span><span class="cx"> return succeed(True)
</span></span></pre>
</div>
</div>
</body>
</html>