<!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>[13301] CalendarServer/trunk/calendarserver/tools/calverify.py</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/13301">13301</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-04-16 12:52:50 -0700 (Wed, 16 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Still need to handle http:// style cu-addresses.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolscalverifypy">CalendarServer/trunk/calendarserver/tools/calverify.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolscalverifypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/calverify.py (13300 => 13301)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/calverify.py 2014-04-16 19:52:22 UTC (rev 13300)
+++ CalendarServer/trunk/calendarserver/tools/calverify.py 2014-04-16 19:52:50 UTC (rev 13301)
</span><span class="lines">@@ -395,6 +395,7 @@
</span><span class="cx"> self.reactor = reactor
</span><span class="cx"> self.config = config
</span><span class="cx"> self._directory = store.directoryService()
</span><ins>+ self._principalCollection = self.rootResource().getChild("principals")
</ins><span class="cx">
</span><span class="cx"> self.cuaCache = {}
</span><span class="cx">
</span><span class="lines">@@ -1219,23 +1220,31 @@
</span><span class="cx"> def noPrincipalPathCUAddresses(self, component, doFix):
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def recordWithCalendarUserAddress(address):
+ principal = yield self._principalCollection.principalForCalendarUserAddress(address)
+ returnValue(principal.record)
+
+ @inlineCallbacks
</ins><span class="cx"> def lookupFunction(cuaddr, recordFunction, conf):
</span><span class="cx">
</span><del>- # Return cached results, if any.
</del><ins>+ # Return cached results, if any.add
</ins><span class="cx"> if cuaddr in self.cuaCache:
</span><span class="cx"> returnValue(self.cuaCache[cuaddr])
</span><span class="cx">
</span><span class="cx"> result = yield normalizationLookup(cuaddr, recordFunction, conf)
</span><del>- _ignore_name, guid, _ignore_cuaddrs = result
</del><ins>+ _ignore_name, guid, _ignore_cutype, _ignore_cuaddrs = result
</ins><span class="cx"> if guid is None:
</span><span class="cx"> if cuaddr.find("__uids__") != -1:
</span><span class="cx"> guid = cuaddr[cuaddr.find("__uids__/") + 9:][:36]
</span><del>- result = "", guid, set()
</del><ins>+ result = ("", guid, "", set(),)
</ins><span class="cx">
</span><span class="cx"> # Cache the result
</span><span class="cx"> self.cuaCache[cuaddr] = result
</span><span class="cx"> returnValue(result)
</span><span class="cx">
</span><ins>+ x = component.resourceUID()
+ if x == "BAD10":
+ x = None
</ins><span class="cx"> for subcomponent in component.subcomponents():
</span><span class="cx"> if subcomponent.name() in ignoredComponents:
</span><span class="cx"> continue
</span><span class="lines">@@ -1246,13 +1255,13 @@
</span><span class="cx"> # http(s) principals need to be converted to urn:uuid
</span><span class="cx"> if cuaddr.startswith("http"):
</span><span class="cx"> if doFix:
</span><del>- yield component.normalizeCalendarUserAddresses(lookupFunction, self.directoryService().recordWithCalendarUserAddress)
</del><ins>+ yield component.normalizeCalendarUserAddresses(lookupFunction, recordWithCalendarUserAddress)
</ins><span class="cx"> else:
</span><span class="cx"> raise InvalidICalendarDataError("iCalendar ORGANIZER starts with 'http(s)'")
</span><span class="cx"> elif cuaddr.startswith("mailto:"):
</span><del>- if (yield lookupFunction(cuaddr, self.directoryService().recordWithCalendarUserAddress, self.config))[1] is not None:
</del><ins>+ if (yield lookupFunction(cuaddr, recordWithCalendarUserAddress, self.config))[1] is not None:
</ins><span class="cx"> if doFix:
</span><del>- yield component.normalizeCalendarUserAddresses(lookupFunction, self.directoryService().recordWithCalendarUserAddress)
</del><ins>+ yield component.normalizeCalendarUserAddresses(lookupFunction, recordWithCalendarUserAddress)
</ins><span class="cx"> else:
</span><span class="cx"> raise InvalidICalendarDataError("iCalendar ORGANIZER starts with 'mailto:' and record exists")
</span><span class="cx"> else:
</span><span class="lines">@@ -1260,7 +1269,7 @@
</span><span class="cx"> if doFix:
</span><span class="cx"> # Add back in mailto: then re-normalize to urn:uuid if possible
</span><span class="cx"> organizer.setValue("mailto:%s" % (cuaddr,))
</span><del>- yield component.normalizeCalendarUserAddresses(lookupFunction, self.directoryService().recordWithCalendarUserAddress)
</del><ins>+ yield component.normalizeCalendarUserAddresses(lookupFunction, recordWithCalendarUserAddress)
</ins><span class="cx">
</span><span class="cx"> # Remove any SCHEDULE-AGENT=NONE
</span><span class="cx"> if organizer.parameterValue("SCHEDULE-AGENT", "SERVER") == "NONE":
</span><span class="lines">@@ -1283,13 +1292,13 @@
</span><span class="cx"> # http(s) principals need to be converted to urn:uuid
</span><span class="cx"> if cuaddr.startswith("http"):
</span><span class="cx"> if doFix:
</span><del>- yield component.normalizeCalendarUserAddresses(lookupFunction, self.directoryService().recordWithCalendarUserAddress)
</del><ins>+ yield component.normalizeCalendarUserAddresses(lookupFunction, recordWithCalendarUserAddress)
</ins><span class="cx"> else:
</span><span class="cx"> raise InvalidICalendarDataError("iCalendar ATTENDEE starts with 'http(s)'")
</span><span class="cx"> elif cuaddr.startswith("mailto:"):
</span><del>- if (yield lookupFunction(cuaddr, self.directoryService().recordWithCalendarUserAddress, self.config))[1] is not None:
</del><ins>+ if (yield lookupFunction(cuaddr, recordWithCalendarUserAddress, self.config))[1] is not None:
</ins><span class="cx"> if doFix:
</span><del>- yield component.normalizeCalendarUserAddresses(lookupFunction, self.directoryService().recordWithCalendarUserAddress)
</del><ins>+ yield component.normalizeCalendarUserAddresses(lookupFunction, recordWithCalendarUserAddress)
</ins><span class="cx"> else:
</span><span class="cx"> raise InvalidICalendarDataError("iCalendar ATTENDEE starts with 'mailto:' and record exists")
</span><span class="cx"> else:
</span><span class="lines">@@ -1297,7 +1306,7 @@
</span><span class="cx"> if doFix:
</span><span class="cx"> # Add back in mailto: then re-normalize to urn:uuid if possible
</span><span class="cx"> attendee.setValue("mailto:%s" % (cuaddr,))
</span><del>- yield component.normalizeCalendarUserAddresses(lookupFunction, self.directoryService().recordWithCalendarUserAddress)
</del><ins>+ yield component.normalizeCalendarUserAddresses(lookupFunction, recordWithCalendarUserAddress)
</ins><span class="cx"> else:
</span><span class="cx"> raise InvalidICalendarDataError("iCalendar ATTENDEE missing mailto:")
</span><span class="cx">
</span><span class="lines">@@ -1310,7 +1319,10 @@
</span><span class="cx"> else:
</span><span class="cx"> raise InvalidICalendarDataError("iCalendar ATTENDEE CALENDARSERVER-OLD-CUA not base64")
</span><span class="cx">
</span><ins>+ if component.resourceUID() == "BAD10":
+ x = "bad"
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def attendeesWithoutOrganizer(self, component, doFix):
</span><span class="cx"> """
</span><span class="cx"> Look for events with ATTENDEE properties and no ORGANIZER property.
</span></span></pre>
</div>
</div>
</body>
</html>