[CalendarServer-changes] [4770] CalendarServer/branches/release/CalendarServer-2.4-dev
source_changes at macosforge.org
source_changes at macosforge.org
Wed Nov 18 12:05:55 PST 2009
Revision: 4770
http://trac.macosforge.org/projects/calendarserver/changeset/4770
Author: glyph at apple.com
Date: 2009-11-18 12:05:55 -0800 (Wed, 18 Nov 2009)
Log Message:
-----------
Pulled up r4749 r4750 r4751 r4752 from trunk, and resolved import conflicts to be current with the code.
Revision Links:
--------------
http://trac.macosforge.org/projects/calendarserver/changeset/4749
http://trac.macosforge.org/projects/calendarserver/changeset/4750
http://trac.macosforge.org/projects/calendarserver/changeset/4751
http://trac.macosforge.org/projects/calendarserver/changeset/4752
Modified Paths:
--------------
CalendarServer/branches/release/CalendarServer-2.4-dev/calendarserver/tap/caldav.py
CalendarServer/branches/release/CalendarServer-2.4-dev/calendarserver/tap/test/test_caldav.py
CalendarServer/branches/release/CalendarServer-2.4-dev/twistedcaldav/test/test_upgrade.py
Property Changed:
----------------
CalendarServer/branches/release/CalendarServer-2.4-dev/
Property changes on: CalendarServer/branches/release/CalendarServer-2.4-dev
___________________________________________________________________
Modified: svn:mergeinfo
- /CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/trunk:4439-4440,4448,4450,4464,4473-4475,4602,4711-4712,4716-4717,4748,4758
+ /CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/trunk:4439-4440,4448,4450,4464,4473-4475,4602,4711-4712,4716-4717,4748-4752,4758
Modified: CalendarServer/branches/release/CalendarServer-2.4-dev/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-2.4-dev/calendarserver/tap/caldav.py 2009-11-18 19:51:02 UTC (rev 4769)
+++ CalendarServer/branches/release/CalendarServer-2.4-dev/calendarserver/tap/caldav.py 2009-11-18 20:05:55 UTC (rev 4770)
@@ -1,3 +1,4 @@
+# -*- test-case-name: calendarserver.tap.test.test_caldav -*-
##
# Copyright (c) 2005-2009 Apple Inc. All rights reserved.
#
@@ -39,7 +40,6 @@
from twisted.python.usage import Options, UsageError
from twisted.python.reflect import namedClass
from twisted.plugin import IPlugin
-from twisted.internet.defer import DeferredList, succeed, inlineCallbacks, returnValue
from twisted.internet.reactor import callLater
from twisted.internet.process import ProcessExitedAlready
from twisted.internet.protocol import Protocol, Factory
@@ -61,6 +61,7 @@
try:
from twistedcaldav.version import version
+ version # pacify pyflakes
except ImportError:
sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "support"))
from version import version as getVersion
@@ -94,6 +95,7 @@
try:
from twistedcaldav.authkerb import NegotiateCredentialFactory
+ NegotiateCredentialFactory # pacify pyflakes
except ImportError:
NegotiateCredentialFactory = None
@@ -854,10 +856,12 @@
RotatingFileAccessLoggingObserver(config.AccessLogFile)
)
if config.ControlSocket:
- loggingService = UNIXServer(config.ControlSocket, logger)
+ loggingService = UNIXServer(config.ControlSocket, logger, mode=0600)
else:
- loggingService = ControlPortTCPServer(config.ControlPort, logger,
- interface="127.0.0.1")
+ loggingService = ControlPortTCPServer(
+ config.ControlPort, logger, interface="127.0.0.1"
+ )
+ loggingService.setName("logging")
loggingService.setServiceParent(s)
monitor = DelayedStartupProcessMonitor()
@@ -1132,7 +1136,8 @@
stats = CalDAVStatisticsServer(logger)
- statsService = UNIXServer(config.GlobalStatsSocket, stats)
+ statsService = UNIXServer(config.GlobalStatsSocket, stats, mode=0600)
+ statsService.setName("stats")
statsService.setServiceParent(s)
return s
Modified: CalendarServer/branches/release/CalendarServer-2.4-dev/calendarserver/tap/test/test_caldav.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-2.4-dev/calendarserver/tap/test/test_caldav.py 2009-11-18 19:51:02 UTC (rev 4769)
+++ CalendarServer/branches/release/CalendarServer-2.4-dev/calendarserver/tap/test/test_caldav.py 2009-11-18 20:05:55 UTC (rev 4770)
@@ -245,7 +245,7 @@
"""
validServices = ["Slave", "Master", "Combined"]
- self.config["HTTPPort"] = 80
+ self.config["HTTPPort"] = 0
for service in validServices:
self.config["ProcessType"] = service
@@ -257,6 +257,29 @@
self.assertRaises(UsageError, self.makeService)
+ def test_modesOnUNIXSockets(self):
+ """
+ The logging and stats UNIX sockets that are bound as part of the
+ 'Combined' service hierarchy should have a secure mode specified: only
+ the executing user should be able to open and send to them.
+ """
+
+ self.config["HTTPPort"] = 0 # Don't conflict with the test above.
+
+ self.config["ProcessType"] = "Combined"
+ self.writeConfig()
+ svc = self.makeService()
+ for serviceName in ["logging", "stats"]:
+ socketService = svc.getServiceNamed(serviceName)
+ self.assertIsInstance(socketService, internet.UNIXServer)
+ m = socketService.kwargs.get("mode", 0666)
+ self.assertEquals(
+ m, int("600", 8),
+ "Wrong mode on %s: %s" % (serviceName, oct(m))
+ )
+
+
+
class SlaveServiceTest(BaseServiceMakerTests):
"""
Test various configurations of the Slave service
Modified: CalendarServer/branches/release/CalendarServer-2.4-dev/twistedcaldav/test/test_upgrade.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-2.4-dev/twistedcaldav/test/test_upgrade.py 2009-11-18 19:51:02 UTC (rev 4769)
+++ CalendarServer/branches/release/CalendarServer-2.4-dev/twistedcaldav/test/test_upgrade.py 2009-11-18 20:05:55 UTC (rev 4770)
@@ -15,7 +15,6 @@
##
-from twisted.python.filepath import FilePath
from twisted.web2.dav import davxml
from twistedcaldav.config import config
@@ -310,7 +309,6 @@
"""
self.setUpXMLDirectory()
- directory = getDirectory()
before = {
"calendars" :
@@ -447,7 +445,6 @@
"""
self.setUpXMLDirectory()
- directory = getDirectory()
before = {
"calendars" :
@@ -524,7 +521,6 @@
"""
self.setUpXMLDirectory()
- directory = getDirectory()
before = {
"archived" :
@@ -617,7 +613,6 @@
"""
self.setUpXMLDirectory()
- directory = getDirectory()
ignoredUIDContents = {
"64" : {
@@ -712,9 +707,7 @@
"""
self.setUpXMLDirectory()
- directory = getDirectory()
-
before = {
"calendars" :
{
@@ -817,7 +810,6 @@
"""
self.setUpXMLDirectory()
- directory = getDirectory()
before = {
"calendars" :
@@ -937,7 +929,6 @@
"""
self.setUpXMLDirectory()
- directory = getDirectory()
before = {
"calendars" :
@@ -1058,7 +1049,6 @@
"""
self.setUpXMLDirectory()
- directory = getDirectory()
before = {
"calendars" :
@@ -1317,7 +1307,7 @@
except zlib.error:
return False
try:
- doc = davxml.WebDAVDocument.fromString(value)
+ davxml.WebDAVDocument.fromString(value)
return True
except ValueError:
return False
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091118/a2e2e638/attachment.html>
More information about the calendarserver-changes
mailing list