<!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>[1136] CalendarServer/branches/users/dreid/pid-removal-2</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/calendarserver/changeset/1136">1136</a></dd>
<dt>Author</dt> <dd>dreid@apple.com</dd>
<dt>Date</dt> <dd>2007-02-06 13:42:31 -0800 (Tue, 06 Feb 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge forward</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersdreidpidremoval2bincaldavd">CalendarServer/branches/users/dreid/pid-removal-2/bin/caldavd</a></li>
<li><a href="#CalendarServerbranchesusersdreidpidremoval2confcaldavdtestplist">CalendarServer/branches/users/dreid/pid-removal-2/conf/caldavd-test.plist</a></li>
<li><a href="#CalendarServerbranchesusersdreidpidremoval2confcaldavdplist">CalendarServer/branches/users/dreid/pid-removal-2/conf/caldavd.plist</a></li>
<li><a href="#CalendarServerbranchesusersdreidpidremoval2twistedcaldavclusterpy">CalendarServer/branches/users/dreid/pid-removal-2/twistedcaldav/cluster.py</a></li>
<li><a href="#CalendarServerbranchesusersdreidpidremoval2twistedcaldavconfigpy">CalendarServer/branches/users/dreid/pid-removal-2/twistedcaldav/config.py</a></li>
<li><a href="#CalendarServerbranchesusersdreidpidremoval2twistedcaldavtappy">CalendarServer/branches/users/dreid/pid-removal-2/twistedcaldav/tap.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesusersdreidpidremoval2bincaldavd"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/dreid/pid-removal-2/bin/caldavd (1135 => 1136)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/dreid/pid-removal-2/bin/caldavd 2007-02-06 21:40:01 UTC (rev 1135)
+++ CalendarServer/branches/users/dreid/pid-removal-2/bin/caldavd 2007-02-06 21:42:31 UTC (rev 1136)
</span><span class="lines">@@ -113,4 +113,4 @@
</span><span class="cx">
</span><span class="cx"> export PYTHONPATH
</span><span class="cx">
</span><del>-exec "${python}" "${twistdpath}" ${daemonize} ${username} ${groupname} "${plugin_name}" ${configfile} ${service_type};
</del><ins>+exec "${python}" "${twistdpath}" --profile=/tmp/caldavd.profile --nohotshot --savestats ${daemonize} ${username} ${groupname} "${plugin_name}" ${configfile} ${service_type};
</ins></span></pre></div>
<a id="CalendarServerbranchesusersdreidpidremoval2confcaldavdtestplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/dreid/pid-removal-2/conf/caldavd-test.plist (1135 => 1136)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/dreid/pid-removal-2/conf/caldavd-test.plist 2007-02-06 21:40:01 UTC (rev 1135)
+++ CalendarServer/branches/users/dreid/pid-removal-2/conf/caldavd-test.plist 2007-02-06 21:42:31 UTC (rev 1136)
</span><span class="lines">@@ -49,6 +49,12 @@
</span><span class="cx"> <key>SSLOnly</key>
</span><span class="cx"> <false/>
</span><span class="cx">
</span><ins>+ <key>Username</key>
+ <string></string>
+
+ <key>Groupname</key>
+ <string></string>
+
</ins><span class="cx"> <key>SSLPrivateKey</key>
</span><span class="cx"> <string>conf/server.pem</string>
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesusersdreidpidremoval2confcaldavdplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/dreid/pid-removal-2/conf/caldavd.plist (1135 => 1136)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/dreid/pid-removal-2/conf/caldavd.plist 2007-02-06 21:40:01 UTC (rev 1135)
+++ CalendarServer/branches/users/dreid/pid-removal-2/conf/caldavd.plist 2007-02-06 21:42:31 UTC (rev 1136)
</span><span class="lines">@@ -36,6 +36,12 @@
</span><span class="cx"> <key>ServerHostName</key>
</span><span class="cx"> <string>localhost</string>
</span><span class="cx">
</span><ins>+ <key>Username</key>
+ <string>calendar</string>
+
+ <key>Groupname</key>
+ <string>calendar</string>
+
</ins><span class="cx"> <key>Port</key>
</span><span class="cx"> <integer>8008</integer>
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesusersdreidpidremoval2twistedcaldavclusterpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/dreid/pid-removal-2/twistedcaldav/cluster.py (1135 => 1136)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/dreid/pid-removal-2/twistedcaldav/cluster.py 2007-02-06 21:40:01 UTC (rev 1135)
+++ CalendarServer/branches/users/dreid/pid-removal-2/twistedcaldav/cluster.py 2007-02-06 21:42:31 UTC (rev 1136)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> import tempfile
</span><span class="cx">
</span><span class="cx"> from twisted.runner import procmon
</span><del>-
</del><ins>+from twisted.scripts.mktap import getid
</ins><span class="cx"> from twistedcaldav.config import config
</span><span class="cx">
</span><span class="cx"> serviceTemplate = """
</span><span class="lines">@@ -54,10 +54,6 @@
</span><span class="cx"> self.port = port
</span><span class="cx"> self.sslPort = sslPort
</span><span class="cx">
</span><del>- self.pidFile = os.path.join(
- os.path.dirname(config.PIDFile),
- '%s.pid' % (self.getName(),))
-
</del><span class="cx"> self.interfaces = interfaces
</span><span class="cx">
</span><span class="cx"> def getName(self):
</span><span class="lines">@@ -75,7 +71,7 @@
</span><span class="cx"> '-o', 'BindAddress=%s' % (','.join(self.interfaces),),
</span><span class="cx"> '-o', 'Port=%s' % (self.port,),
</span><span class="cx"> '-o', 'SSLPort=%s' % (self.sslPort,),
</span><del>- '-o', 'PIDFile=%s' % (self.pidFile,)]
</del><ins>+ '-o', 'PIDFile=None']
</ins><span class="cx">
</span><span class="cx"> def getHostLine(self, ssl=None):
</span><span class="cx"> name = self.getName()
</span><span class="lines">@@ -106,18 +102,23 @@
</span><span class="cx"> bindAddress = config.BindAddress
</span><span class="cx">
</span><span class="cx"> for p in xrange(0, config.MultiProcess['NumProcesses']):
</span><del>- port += 1
- sslport += 1
</del><ins>+ if int(config.MultiProcess['NumProcesses']) > 1:
+ port += 1
+ sslport += 1
</ins><span class="cx">
</span><span class="cx"> process = TwistdSlaveProcess(config.twistdLocation,
</span><span class="cx"> options['config'],
</span><span class="cx"> bindAddress,
</span><span class="cx"> port, sslport)
</span><span class="cx">
</span><ins>+ uid, gid = None, None
+ if config.Username or config.Groupname:
+ uid, gid = getid(config.Username, config.Groupname)
+
</ins><span class="cx"> service.addProcess(process.getName(),
</span><span class="cx"> process.getCommandLine(),
</span><del>- uid=options.parent['uid'],
- gid=options.parent['gid'],
</del><ins>+ uid=uid,
+ gid=gid,
</ins><span class="cx"> env=parentEnv)
</span><span class="cx">
</span><span class="cx"> if not config.SSLOnly:
</span><span class="lines">@@ -126,7 +127,8 @@
</span><span class="cx"> if config.SSLEnable:
</span><span class="cx"> sslHosts.append(process.getHostLine(ssl=True))
</span><span class="cx">
</span><del>- if config.MultiProcess['LoadBalancer']['Enabled']:
</del><ins>+ if (config.MultiProcess['LoadBalancer']['Enabled'] and
+ config.MultiProcess['NumProcesses'] > 1):
</ins><span class="cx"> services = []
</span><span class="cx">
</span><span class="cx"> if not config.BindAddress:
</span></span></pre></div>
<a id="CalendarServerbranchesusersdreidpidremoval2twistedcaldavconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/dreid/pid-removal-2/twistedcaldav/config.py (1135 => 1136)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/dreid/pid-removal-2/twistedcaldav/config.py 2007-02-06 21:40:01 UTC (rev 1135)
+++ CalendarServer/branches/users/dreid/pid-removal-2/twistedcaldav/config.py 2007-02-06 21:42:31 UTC (rev 1136)
</span><span class="lines">@@ -72,6 +72,9 @@
</span><span class="cx">
</span><span class="cx"> 'ServerType': 'singleprocess',
</span><span class="cx">
</span><ins>+ 'Username': 'daemon',
+ 'Groupname': 'daemon',
+
</ins><span class="cx"> 'MultiProcess': {
</span><span class="cx"> 'NumProcesses': 10,
</span><span class="cx"> 'LoadBalancer': {
</span></span></pre></div>
<a id="CalendarServerbranchesusersdreidpidremoval2twistedcaldavtappy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/dreid/pid-removal-2/twistedcaldav/tap.py (1135 => 1136)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/dreid/pid-removal-2/twistedcaldav/tap.py 2007-02-06 21:40:01 UTC (rev 1135)
+++ CalendarServer/branches/users/dreid/pid-removal-2/twistedcaldav/tap.py 2007-02-06 21:42:31 UTC (rev 1136)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx"> from twisted.application import internet, service
</span><span class="cx"> from twisted.plugin import IPlugin
</span><span class="cx">
</span><ins>+from twisted.scripts.mktap import getid
+
</ins><span class="cx"> from twisted.cred.portal import Portal
</span><span class="cx">
</span><span class="cx"> from twisted.web2.dav import auth
</span><span class="lines">@@ -109,6 +111,9 @@
</span><span class="cx"> elif isinstance(defaultConfig[key], dict):
</span><span class="cx"> raise UsageError(
</span><span class="cx"> "We do not support dict options on the command line")
</span><ins>+
+ elif value == 'None':
+ value = None
</ins><span class="cx">
</span><span class="cx"> self.overrides[key] = value
</span><span class="cx"> else:
</span><span class="lines">@@ -124,6 +129,26 @@
</span><span class="cx">
</span><span class="cx"> config.update(self.overrides)
</span><span class="cx">
</span><ins>+ uid, gid = None, None
+
+ if self.parent['uid'] or self.parent['gid']:
+ uid, gid = getid(self.parent['uid'],
+ self.parent['gid'])
+
+ if uid:
+ if uid != os.getuid() and uid != 0:
+ import pwd
+ username = pwd.getpwuid(os.getuid())[0]
+ raise UsageError(("Only root can drop privileges "
+ "you are: %s" % (username,)))
+
+ if gid:
+ if gid != os.getgid() and gid != 0:
+ import grp
+ groupname = grp.getgrgid(os.getuid())[0]
+ raise UsageError(("Only root can drop privileges, "
+ "you are: %s" % (groupname,)))
+
</ins><span class="cx"> self.parent['logfile'] = config.ErrorLogFile
</span><span class="cx"> self.parent['pidfile'] = config.PIDFile
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>