warden/rlgwebd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace the daemon module with posix.

Browse source 
The daemon module doesn't include chroot() anymore, so a replacement
is needed.  Detaching a daemon keeps getting harder to do in Node, so
some setup has been moved into a shell script.
This commit is contained in:
John "Elwin" Edwards 2013-07-20 12:23:53 -07:00
parent 95fddfb788
commit fabaea6849
2 changed files with 40 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
rlgwebd Executable file
View file

@ -0,0 +1,22 @@
#!/bin/sh
LOGFILE=/var/local/rlgwebd/log
CTLSOCKET=/var/local/rlgwebd/ctl
RLGWEBDJS=./rlgwebd.js
if [ $UID != 0 ]
then
echo "$0 needs to run as root." >&2
exit 1
fi
if [ $# -gt 0 ] && [ $1 = stop ]
then
socat "EXEC:echo quit" "$CTLSOCKET"
else
# Start
setsid node "$RLGWEBDJS" </dev/null &>>$LOGFILE &
fi
exit

32
rlgwebd.js
View file

@ -9,14 +9,13 @@ var path = require('path');
var fs = require('fs'); var fs = require('fs');
var events = require('events'); var events = require('events');
var child_process = require('child_process'); var child_process = require('child_process');
var daemon = require(path.join(localModules, "daemon")); var posix = require(path.join(localModules, "posix"));
var pty = require(path.join(localModules, "pty.js")); var pty = require(path.join(localModules, "pty.js"));
var WebSocketServer = require(path.join(localModules, "websocket")).server; var WebSocketServer = require(path.join(localModules, "websocket")).server;
/* Configuration variables */ /* Configuration variables */
// These first two files are NOT in the chroot. // The first file is NOT in the chroot.
var ctlsocket = "/var/local/rlgwebd/ctl"; var ctlsocket = "/var/local/rlgwebd/ctl";
var logfile = "/var/local/rlgwebd/log";
var httpPort = 8080; var httpPort = 8080;
var chrootDir = "/var/dgl/"; var chrootDir = "/var/dgl/";
var dropToUID = 501; var dropToUID = 501;
@ -911,7 +910,18 @@ function stopgame(res, formdata) {
return; return;
} }
var pid = parseInt(fdata.split('\n')[0], 10); var pid = parseInt(fdata.split('\n')[0], 10);
process.kill(pid, 'SIGHUP'); try {
process.kill(pid, 'SIGHUP');
}
catch (err) {
/* If the PID is invalid, the lockfile is stale. */
if (err.code == "ESRCH") {
var nodere = RegExp("^" + pname + ":node:");
if (fname.match(nodere)) {
fs.unlink(fullfile);
}
}
}
/* The response doesn't mean that the game is gone. The only way /* The response doesn't mean that the game is gone. The only way
* to make sure a dgamelaunch-supervised game is over would be to * to make sure a dgamelaunch-supervised game is over would be to
* poll fname until it disappears. */ * poll fname until it disappears. */
@ -1396,17 +1406,11 @@ var ctlServer = net.createServer(function (sock) {
sock.on('data', conHandler); sock.on('data', conHandler);
}); });
ctlServer.listen(ctlsocket, function () { ctlServer.listen(ctlsocket, function () {
/* fork off and die */ /* rlgwebd.js now assumes that it has been started by the rlgwebd shell
* script, or some other method that detaches it and sets up stdio. */
/* chroot and drop permissions. posix.chroot() does chdir() itself. */
try { try {
daemon.start(logfile); posix.chroot(chrootDir);
}
catch (err) {
tslog("Daemonization failed: %s", err);
process.exit(1);
}
/* chroot and drop permissions. daemon.chroot() does chdir() itself. */
try {
daemon.chroot(chrootDir);
} }
catch (err) { catch (err) {
tslog("chroot to %s failed: %s", chrootDir, err); tslog("chroot to %s failed: %s", chrootDir, err);