February 2014 - calendarserver-changes

[12757] CalendarServer/trunk/conf/caldavd-test.plist
by source_changes＠macosforge.org 26 Feb '14

26 Feb '14

Revision: 12757 http://trac.calendarserver.org//changeset/12757 Author: wsanchez(a)apple.com Date: 2014-02-26 14:28:09 -0800 (Wed, 26 Feb 2014) Log Message: ----------- Allow DB upgrade Modified Paths: -------------- CalendarServer/trunk/conf/caldavd-test.plist Modified: CalendarServer/trunk/conf/caldavd-test.plist =================================================================== --- CalendarServer/trunk/conf/caldavd-test.plist 2014-02-26 21:19:21 UTC (rev 12756) +++ CalendarServer/trunk/conf/caldavd-test.plist 2014-02-26 22:28:09 UTC (rev 12757) @@ -135,6 +135,9 @@ --> </array> +  + <key>FailIfUpgradeNeeded</key> + <false/> <!-- Quotas and limits

1 0

[12756] twext/trunk/twext/who/opendirectory
by source_changes＠macosforge.org 26 Feb '14

26 Feb '14

Revision: 12756 http://trac.calendarserver.org//changeset/12756 Author: sagen(a)apple.com Date: 2014-02-26 13:19:21 -0800 (Wed, 26 Feb 2014) Log Message: ----------- Adds members() to opendirectory Modified Paths: -------------- twext/trunk/twext/who/opendirectory/_constants.py twext/trunk/twext/who/opendirectory/_service.py Modified: twext/trunk/twext/who/opendirectory/_constants.py =================================================================== --- twext/trunk/twext/who/opendirectory/_constants.py 2014-02-26 21:17:32 UTC (rev 12755) +++ twext/trunk/twext/who/opendirectory/_constants.py 2014-02-26 21:19:21 UTC (rev 12756) @@ -45,8 +45,15 @@ metaRecordName.description = u"meta record name" metaRecordName.multiValue = False + memberUIDs = NamedConstant() + memberUIDs.description = u"member UIDs (excluding groups)" + memberUIDs.multiValue = True + nestedGroupsUIDs = NamedConstant() + nestedGroupsUIDs.description = u"nested group member UIDs" + nestedGroupsUIDs.multiValue = True + # # OD constants # @@ -159,6 +166,12 @@ metaRecordName = ValueConstant(u"dsAttrTypeStandard:AppleMetaRecordName") metaRecordName.fieldName = FieldName.metaRecordName + groupMembers = ValueConstant(u"dsAttrTypeStandard:GroupMembers") + groupMembers.fieldName = FieldName.memberUIDs + + nestedGroups = ValueConstant(u"dsAttrTypeStandard:NestedGroups") + nestedGroups.fieldName = FieldName.nestedGroupsUIDs + # # Single value fields # AdminLimits = ValueConstant(u"dsAttrTypeStandard:AdminLimits") # AppleAliasData = ValueConstant(u"dsAttrTypeStandard:AppleAliasData") Modified: twext/trunk/twext/who/opendirectory/_service.py =================================================================== --- twext/trunk/twext/who/opendirectory/_service.py 2014-02-26 21:17:32 UTC (rev 12755) +++ twext/trunk/twext/who/opendirectory/_service.py 2014-02-26 21:19:21 UTC (rev 12756) @@ -634,7 +634,7 @@ "GUID field is required.", fields ) - fields[service.fieldName.uid] = unicode(guid) + fields[service.fieldName.uid] = unicode(guid).upper() super(DirectoryRecord, self).__init__(service, fields) self._odRecord = odRecord @@ -720,6 +720,17 @@ + @inlineCallbacks + def members(self): + members = set() + for uid in getattr(self, "memberUIDs", ()): + members.add((yield self.service.recordWithUID(uid))) + for uid in getattr(self, "nestedGroupsUIDs", ()): + members.add((yield self.service.recordWithUID(uid))) + returnValue(members) + + + class NoQOPDigestCredentialFactory(DigestCredentialFactory): """ DigestCredentialFactory without qop, to interop with OD.

1 0

[12755] twext/trunk/twext/who
by source_changes＠macosforge.org 26 Feb '14

26 Feb '14

Revision: 12755 http://trac.calendarserver.org//changeset/12755 Author: sagen(a)apple.com Date: 2014-02-26 13:17:32 -0800 (Wed, 26 Feb 2014) Log Message: ----------- None is a legal value Modified Paths: -------------- twext/trunk/twext/who/directory.py twext/trunk/twext/who/test/test_directory.py Modified: twext/trunk/twext/who/directory.py =================================================================== --- twext/trunk/twext/who/directory.py 2014-02-26 02:23:34 UTC (rev 12754) +++ twext/trunk/twext/who/directory.py 2014-02-26 21:17:32 UTC (rev 12755) @@ -365,7 +365,7 @@ elif issubclass(expectedType, Names): expectedType = NamedConstant - if not isinstance(value, expectedType): + if value is not None and not isinstance(value, expectedType): raise InvalidDirectoryRecordError( "Value {0!r} for field {1} is not of type {2}".format( value, name, expectedType Modified: twext/trunk/twext/who/test/test_directory.py =================================================================== --- twext/trunk/twext/who/test/test_directory.py 2014-02-26 02:23:34 UTC (rev 12754) +++ twext/trunk/twext/who/test/test_directory.py 2014-02-26 21:17:32 UTC (rev 12755) @@ -588,6 +588,13 @@ FieldName.shortNames: (u"nobody",), } + fields_none_password = { + FieldName.uid: u"UID:nobody", + FieldName.recordType: RecordType.user, + FieldName.shortNames: (u"nobody",), + FieldName.password: None, + } + fields_staff = { FieldName.uid: u"UID:staff", FieldName.recordType: RecordType.group, @@ -732,6 +739,16 @@ ) + def test_noneIsAllowed(self): + """ + Verify a value of None is allowed + """ + service = self.service() + record = self.makeRecord(self.fields_none_password, service=service) + + self.assertEquals(record.password, None) + + def _test_containerClassFieldType(self, callback): """ Scaffold for test_initWithContainerClassFieldType_*.

1 0

[12754] CalendarServer/trunk/calendarserver/webadmin/work.xhtml
by source_changes＠macosforge.org 26 Feb '14

26 Feb '14

Revision: 12754 http://trac.calendarserver.org//changeset/12754 Author: wsanchez(a)apple.com Date: 2014-02-25 18:23:34 -0800 (Tue, 25 Feb 2014) Log Message: ----------- SVG Modified Paths: -------------- CalendarServer/trunk/calendarserver/webadmin/work.xhtml Modified: CalendarServer/trunk/calendarserver/webadmin/work.xhtml =================================================================== --- CalendarServer/trunk/calendarserver/webadmin/work.xhtml 2014-02-26 02:23:01 UTC (rev 12753) +++ CalendarServer/trunk/calendarserver/webadmin/work.xhtml 2014-02-26 02:23:34 UTC (rev 12754) @@ -1,60 +1,67 @@ <!DOCTYPE html> -<html xmlns:t="http://twistedmatrix.com/ns/twisted.web.template/0.1" t:render="main"> +<html + xmlns:t="http://twistedmatrix.com/ns/twisted.web.template/0.1" + t:render="main" +> <head> + <title><t:slot name="title" /></title> -  + <link t:render="stylesheet" /> <style> - #work_queues_chart div { - font-size: 0.5em; - font-family: sans-serif; - color: white; - background-color: steelblue; + #work_queues_chart rect { + fill: steelblue; + } - text-align: right; - padding: 0.5em; - margin: 0.2em; - } + #work_queues_chart text { + fill: white; + font: 10px sans-serif; + text-anchor: end; + } + </style> - <script src="http://d3js.org/d3.v3.min.js" charset="utf-8" /> - <script type="text/javascript"> + <script src="http://d3js.org/d3.v3.min.js"></script> + <script> function init() { - var data = [0, 0, 0, 0, 0, 0]; + var data = [4, 8, 15, 16, 23, 42]; - /* scale is a function that normalizes a value in data into the range 0-98 */ - var scale = d3.scale.linear() - .domain([0, 200]) - .range([0, 98]); + var width = 600; + var barHeight = 20; - var chart = d3.select("#work_queues_chart") - .selectAll("div") - .data(data); + var scaledWidth = + d3.scale.linear() + .domain([0, d3.max(data)]) + .range([0, width]); - var bars = chart.enter().append("div"); + var chart = + d3.select("#work_queues_chart") + .attr("width", width) + .attr("height", barHeight * data.length); - bars.style("width", function(d) { return scale(d) + "%"; }) - bars.text(function(d) { return d; }); + var bar = + chart.selectAll("g") + .data(data) + .enter().append("g") + .attr( + "transform", + function(d, i) { return "translate(0," + i * barHeight + ")"; } + ); - } + bar.append("rect") + .attr("width", scaledWidth) + .attr("height", barHeight - 1); - function update() { + bar.append("text") + .attr("x", function(d) { return scaledWidth(d) - 3; }) + .attr("y", barHeight / 2) + .attr("dy", "0.35em") + .text(function(d) { return d; }); - var data = [4, 8, 15, 16, 23, 42]; - - var chart = d3.select("#work_queues_chart") - .selectAll("div") - .data(data); - - chart.enter(); - chart.exit().remove(); - - /* http://stackoverflow.com/questions/14958825/dynamically-update-chart-data-i… */ - } window.onload = init; @@ -67,10 +74,9 @@ <h1><t:slot name="title" /></h1> - <div id="work_queues_chart" /> + <svg id="work_queues_chart" /> - <button onclick="update()">Update</button> - </body> + </html>

1 0

[12753] CalendarServer/trunk/calendarserver/webadmin
by source_changes＠macosforge.org 26 Feb '14

26 Feb '14

Revision: 12753 http://trac.calendarserver.org//changeset/12753 Author: wsanchez(a)apple.com Date: 2014-02-25 18:23:01 -0800 (Tue, 25 Feb 2014) Log Message: ----------- wrap to 80 Modified Paths: -------------- CalendarServer/trunk/calendarserver/webadmin/logs.xhtml CalendarServer/trunk/calendarserver/webadmin/principals.xhtml Modified: CalendarServer/trunk/calendarserver/webadmin/logs.xhtml =================================================================== --- CalendarServer/trunk/calendarserver/webadmin/logs.xhtml 2014-02-25 22:29:11 UTC (rev 12752) +++ CalendarServer/trunk/calendarserver/webadmin/logs.xhtml 2014-02-26 02:23:01 UTC (rev 12753) @@ -1,5 +1,8 @@ <!DOCTYPE html> -<html xmlns:t="http://twistedmatrix.com/ns/twisted.web.template/0.1" t:render="main"> +<html + xmlns:t="http://twistedmatrix.com/ns/twisted.web.template/0.1" + t:render="main" +> <head> <title><t:slot name="title" /></title> @@ -29,7 +32,9 @@ window.onload = function() { - var registerForEvents = function(eventSource, eventClass, statusElement, logViewElement) { + var registerForEvents = function( + eventSource, eventClass, statusElement, logViewElement + ) { statusElement.innerHTML = "Connecting..."; eventSource.addEventListener( Modified: CalendarServer/trunk/calendarserver/webadmin/principals.xhtml =================================================================== --- CalendarServer/trunk/calendarserver/webadmin/principals.xhtml 2014-02-25 22:29:11 UTC (rev 12752) +++ CalendarServer/trunk/calendarserver/webadmin/principals.xhtml 2014-02-26 02:23:01 UTC (rev 12753) @@ -1,5 +1,8 @@ <!DOCTYPE html> -<html xmlns:t="http://twistedmatrix.com/ns/twisted.web.template/0.1" t:render="main"> +<html + xmlns:t="http://twistedmatrix.com/ns/twisted.web.template/0.1" + t:render="main" +> <head> <title><t:slot name="title" /></title> @@ -15,7 +18,11 @@ <form id="search_form" action="" method="get"> Search: - <input id="search_field" type="search" name="search" placeholder="Search..." size="40" autofocus="true" t:render="search_terms" /> + <input + id="search_field" type="search" name="search" + placeholder="Search..." size="40" autofocus="true" + t:render="search_terms" + /> </form> <table id="records" t:render="if_search_results"> @@ -29,7 +36,8 @@ </tr> </thead> <tbody> - <tr class="record" t:render="search_results_row"><t:attr name="onclick">window.open("./<t:slot name="uid" />");</t:attr> + <tr class="record" t:render="search_results_row"> + <t:attr name="onclick">window.open("./<t:slot name="uid" />");</t:attr> <td class="record_full_name"><t:slot name="fullNames" /></td> <td class="record_type"><t:slot name="recordType" /></td> <td class="record_short_name"><t:slot name="shortNames" /></td>

1 0

[12752] CalendarServer/trunk/calendarserver/webadmin
by source_changes＠macosforge.org 25 Feb '14

25 Feb '14

Revision: 12752 http://trac.calendarserver.org//changeset/12752 Author: wsanchez(a)apple.com Date: 2014-02-25 14:29:11 -0800 (Tue, 25 Feb 2014) Log Message: ----------- re-arrange the deck chairs Modified Paths: -------------- CalendarServer/trunk/calendarserver/webadmin/landing.py CalendarServer/trunk/calendarserver/webadmin/work.xhtml Modified: CalendarServer/trunk/calendarserver/webadmin/landing.py =================================================================== --- CalendarServer/trunk/calendarserver/webadmin/landing.py 2014-02-25 22:24:02 UTC (rev 12751) +++ CalendarServer/trunk/calendarserver/webadmin/landing.py 2014-02-25 22:29:11 UTC (rev 12752) @@ -70,7 +70,7 @@ self.putChild(u"logs", LogsResource()) self.putChild(u"principals", PrincipalsResource(directory)) - self.putChild(u"work", WorkMonitorResource(store)) + # self.putChild(u"work", WorkMonitorResource(store)) self.putChild( u"old", Modified: CalendarServer/trunk/calendarserver/webadmin/work.xhtml =================================================================== --- CalendarServer/trunk/calendarserver/webadmin/work.xhtml 2014-02-25 22:24:02 UTC (rev 12751) +++ CalendarServer/trunk/calendarserver/webadmin/work.xhtml 2014-02-25 22:29:11 UTC (rev 12752) @@ -33,7 +33,7 @@ var chart = d3.select("#work_queues_chart") .selectAll("div") - .data(data) + .data(data); var bars = chart.enter().append("div"); @@ -48,8 +48,11 @@ var chart = d3.select("#work_queues_chart") .selectAll("div") - .data(data) + .data(data); + chart.enter(); + chart.exit().remove(); + /* http://stackoverflow.com/questions/14958825/dynamically-update-chart-data-i… */ }

1 0

[12751] CalendarServer/trunk/calendarserver/webadmin/work.xhtml
by source_changes＠macosforge.org 25 Feb '14

25 Feb '14

Revision: 12751 http://trac.calendarserver.org//changeset/12751 Author: wsanchez(a)apple.com Date: 2014-02-25 14:24:02 -0800 (Tue, 25 Feb 2014) Log Message: ----------- Try to update chart data and wonder why it doesn't. Modified Paths: -------------- CalendarServer/trunk/calendarserver/webadmin/work.xhtml Modified: CalendarServer/trunk/calendarserver/webadmin/work.xhtml =================================================================== --- CalendarServer/trunk/calendarserver/webadmin/work.xhtml 2014-02-25 22:11:07 UTC (rev 12750) +++ CalendarServer/trunk/calendarserver/webadmin/work.xhtml 2014-02-25 22:24:02 UTC (rev 12751) @@ -31,11 +31,12 @@ .domain([0, 200]) .range([0, 98]); - var bars = d3.select("#work_queues_chart") - .selectAll("div") - .data(data) - .enter().append("div"); + var chart = d3.select("#work_queues_chart") + .selectAll("div") + .data(data) + var bars = chart.enter().append("div"); + bars.style("width", function(d) { return scale(d) + "%"; }) bars.text(function(d) { return d; }); @@ -45,7 +46,12 @@ var data = [4, 8, 15, 16, 23, 42]; + var chart = d3.select("#work_queues_chart") + .selectAll("div") + .data(data) + /* http://stackoverflow.com/questions/14958825/dynamically-update-chart-data-i… */ + } window.onload = init;

1 0

[12750] CalendarServer/trunk/calendarserver/webadmin/work.xhtml
by source_changes＠macosforge.org 25 Feb '14

25 Feb '14

Revision: 12750 http://trac.calendarserver.org//changeset/12750 Author: wsanchez(a)apple.com Date: 2014-02-25 14:11:07 -0800 (Tue, 25 Feb 2014) Log Message: ----------- Start at zero Modified Paths: -------------- CalendarServer/trunk/calendarserver/webadmin/work.xhtml Modified: CalendarServer/trunk/calendarserver/webadmin/work.xhtml =================================================================== --- CalendarServer/trunk/calendarserver/webadmin/work.xhtml 2014-02-25 20:59:45 UTC (rev 12749) +++ CalendarServer/trunk/calendarserver/webadmin/work.xhtml 2014-02-25 22:11:07 UTC (rev 12750) @@ -24,17 +24,17 @@ function init() { - var data = [4, 8, 15, 16, 23, 42]; + var data = [0, 0, 0, 0, 0, 0]; /* scale is a function that normalizes a value in data into the range 0-98 */ var scale = d3.scale.linear() .domain([0, 200]) - .range([0, 98]) + .range([0, 98]); var bars = d3.select("#work_queues_chart") .selectAll("div") .data(data) - .enter().append("div") + .enter().append("div"); bars.style("width", function(d) { return scale(d) + "%"; }) bars.text(function(d) { return d; }); @@ -42,8 +42,9 @@ } function update() { - var data = [0, 0, 0, 0, 0, 0]; + var data = [4, 8, 15, 16, 23, 42]; + /* http://stackoverflow.com/questions/14958825/dynamically-update-chart-data-i… */ }

1 0

[12749] CalendarServer/trunk/calendarserver/webadmin/landing.py
by source_changes＠macosforge.org 25 Feb '14

25 Feb '14

Revision: 12749 http://trac.calendarserver.org//changeset/12749 Author: wsanchez(a)apple.com Date: 2014-02-25 12:59:45 -0800 (Tue, 25 Feb 2014) Log Message: ----------- Clean up reload logic Modified Paths: -------------- CalendarServer/trunk/calendarserver/webadmin/landing.py Modified: CalendarServer/trunk/calendarserver/webadmin/landing.py =================================================================== --- CalendarServer/trunk/calendarserver/webadmin/landing.py 2014-02-25 20:08:59 UTC (rev 12748) +++ CalendarServer/trunk/calendarserver/webadmin/landing.py 2014-02-25 20:59:45 UTC (rev 12749) @@ -27,9 +27,9 @@ from .resource import PageElement, TemplateResource from .resource import WebAdminResource -# from .logs import LogsResource -# from .principals import PrincipalsResource -# from .work import WorkMonitorResource +from .logs import LogsResource +from .principals import PrincipalsResource +from .work import WorkMonitorResource from . import logs, principals, work @@ -58,6 +58,7 @@ addSlash = True + def __init__(self, path, root, directory, store, principalCollections=()): TemplateResource.__init__(self, WebAdminLandingPageElement) @@ -67,9 +68,9 @@ # self._root = root # self._principalCollections = principalCollections - # self.putChild(u"logs", LogsResource()) - # self.putChild(u"principals", PrincipalsResource(directory)) - # self.putChild(u"work", WorkMonitorResource(store)) + self.putChild(u"logs", LogsResource()) + self.putChild(u"principals", PrincipalsResource(directory)) + self.putChild(u"work", WorkMonitorResource(store)) self.putChild( u"old", @@ -80,9 +81,21 @@ def getChild(self, name): + bound = super(WebAdminLandingResource, self).getChild(name) + + if bound is not None: + return bound + + # + # Dynamically load and vend child resources not bound using putChild() + # in __init__(). This is useful for development, since it allows one + # to comment out the putChild() call above, and then code will be + # re-loaded for each request. + # + if name == u"logs": reload(logs) - resource = logs.LogsResource() + return logs.LogsResource() elif name == u"principals": reload(principals) @@ -92,4 +105,4 @@ reload(work) return work.WorkMonitorResource(self.store) - return super(WebAdminLandingResource, self).getChild(name) + return None

1 0

[12748] CalendarServer/trunk/calendarserver/webadmin/landing.py
by source_changes＠macosforge.org 25 Feb '14

25 Feb '14

Revision: 12748 http://trac.calendarserver.org//changeset/12748 Author: wsanchez(a)apple.com Date: 2014-02-25 12:08:59 -0800 (Tue, 25 Feb 2014) Log Message: ----------- Reload on each request so that changing code is easier. Modified Paths: -------------- CalendarServer/trunk/calendarserver/webadmin/landing.py Modified: CalendarServer/trunk/calendarserver/webadmin/landing.py =================================================================== --- CalendarServer/trunk/calendarserver/webadmin/landing.py 2014-02-25 02:26:17 UTC (rev 12747) +++ CalendarServer/trunk/calendarserver/webadmin/landing.py 2014-02-25 20:08:59 UTC (rev 12748) @@ -27,12 +27,14 @@ from .resource import PageElement, TemplateResource from .resource import WebAdminResource -from .logs import LogsResource -from .principals import PrincipalsResource -from .work import WorkMonitorResource +# from .logs import LogsResource +# from .principals import PrincipalsResource +# from .work import WorkMonitorResource +from . import logs, principals, work + class WebAdminLandingPageElement(PageElement): """ Web administration langing page element. @@ -59,15 +61,15 @@ def __init__(self, path, root, directory, store, principalCollections=()): TemplateResource.__init__(self, WebAdminLandingPageElement) - self._path = path - self._root = root self.directory = directory self.store = store - self._principalCollections = principalCollections + # self._path = path + # self._root = root + # self._principalCollections = principalCollections - self.putChild(u"logs", LogsResource()) - self.putChild(u"principals", PrincipalsResource(directory)) - self.putChild(u"work", WorkMonitorResource(store)) + # self.putChild(u"logs", LogsResource()) + # self.putChild(u"principals", PrincipalsResource(directory)) + # self.putChild(u"work", WorkMonitorResource(store)) self.putChild( u"old", @@ -75,3 +77,19 @@ path, root, directory, store, principalCollections ) ) + + + def getChild(self, name): + if name == u"logs": + reload(logs) + resource = logs.LogsResource() + + elif name == u"principals": + reload(principals) + return principals.PrincipalsResource(self.directory) + + elif name == u"work": + reload(work) + return work.WorkMonitorResource(self.store) + + return super(WebAdminLandingResource, self).getChild(name)

1 0