<!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>[5509] 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.macosforge.org/projects/calendarserver/changeset/5509">5509</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2010-04-22 15:19:07 -0700 (Thu, 22 Apr 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Don't return a 403 when the username is unknown, return a 401.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwextweb2davresourcepy">CalendarServer/trunk/twext/web2/dav/resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavextensionspy">CalendarServer/trunk/twistedcaldav/extensions.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwextweb2davresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/web2/dav/resource.py (5508 => 5509)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/web2/dav/resource.py        2010-04-22 22:17:18 UTC (rev 5508)
+++ CalendarServer/trunk/twext/web2/dav/resource.py        2010-04-22 22:19:07 UTC (rev 5509)
</span><span class="lines">@@ -974,6 +974,10 @@
</span><span class="cx">                 # Try to match principals in each principal collection
</span><span class="cx">                 # on the resource
</span><span class="cx">                 def gotDetails(details, creds):
</span><ins>+                    if details == (None, None):
+                        log.msg(&quot;Could not find the principal resource for user id: %s&quot; % (creds.username,))
+                        raise HTTPError(responsecode.UNAUTHORIZED)
+
</ins><span class="cx">                     authnPrincipal = IDAVPrincipalResource(details[0])
</span><span class="cx">                     authzPrincipal = IDAVPrincipalResource(details[1])
</span><span class="cx">                     return PrincipalCredentials(
</span><span class="lines">@@ -1549,9 +1553,7 @@
</span><span class="cx">         authnPrincipal = self.findPrincipalForAuthID(authid)
</span><span class="cx"> 
</span><span class="cx">         if authnPrincipal is None:
</span><del>-            log.msg(&quot;Could not find the principal resource for user id: %s&quot;
-                    % (authid,))
-            raise HTTPError(responsecode.FORBIDDEN)
</del><ins>+            return succeed((None, None))
</ins><span class="cx"> 
</span><span class="cx">         d = self.authorizationPrincipal(request, authid, authnPrincipal)
</span><span class="cx">         d.addCallback(lambda authzPrincipal: (authnPrincipal, authzPrincipal))
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavextensionspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/extensions.py (5508 => 5509)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/extensions.py        2010-04-22 22:17:18 UTC (rev 5508)
+++ CalendarServer/trunk/twistedcaldav/extensions.py        2010-04-22 22:19:07 UTC (rev 5509)
</span><span class="lines">@@ -131,6 +131,10 @@
</span><span class="cx"> 
</span><span class="cx">                 # Try to match principals in each principal collection on the resource
</span><span class="cx">                 authnPrincipal, authzPrincipal = (yield self.principalsForAuthID(request, creds))
</span><ins>+                if (authnPrincipal, authzPrincipal) == (None, None):
+                    log.info(&quot;Could not find the principal resource for user id: %s&quot; % (creds.username,))
+                    raise HTTPError(responsecode.UNAUTHORIZED)
+                    
</ins><span class="cx">                 authnPrincipal = IDAVPrincipalResource(authnPrincipal)
</span><span class="cx">                 authzPrincipal = IDAVPrincipalResource(authzPrincipal)
</span><span class="cx"> 
</span><span class="lines">@@ -169,9 +173,7 @@
</span><span class="cx">         authnPrincipal = self.findPrincipalForAuthID(creds)
</span><span class="cx"> 
</span><span class="cx">         if authnPrincipal is None:
</span><del>-            log.info(&quot;Could not find the principal resource for user id: %s&quot;
-                     % (creds.username,))
-            raise HTTPError(responsecode.FORBIDDEN)
</del><ins>+            return succeed((None, None))
</ins><span class="cx"> 
</span><span class="cx">         d = self.authorizationPrincipal(request, creds.username, authnPrincipal)
</span><span class="cx">         d.addCallback(lambda authzPrincipal: (authnPrincipal, authzPrincipal))
</span></span></pre>
</div>
</div>

</body>
</html>