From 64063b5d41c5ebac2835a83d9da40974da4d4820 Mon Sep 17 00:00:00 2001
From: Elliott Sprehn
Date: Thu, 21 Oct 2010 19:24:03 -0700
Subject: Fix issue where directories don't have a slash on the end and allow
specifying a different port
---
lib/nodeserver/server.js | 139 +++++++++++++++++++++++++++++++++--------------
nodeserver.sh | 2 +-
2 files changed, 99 insertions(+), 42 deletions(-)
diff --git a/lib/nodeserver/server.js b/lib/nodeserver/server.js
index f05185fa..08f13a99 100644
--- a/lib/nodeserver/server.js
+++ b/lib/nodeserver/server.js
@@ -4,13 +4,15 @@ var sys = require('sys'),
url = require('url'),
events = require('events');
-function main() {
+var DEFAULT_PORT = 8000;
+
+function main(argv) {
new HttpServer({
'GET': (function() {
var servlet = new StaticServlet();
return servlet.handleRequest.bind(servlet)
})()
- }).start(8000);
+ }).start(Number(argv[2]) || DEFAULT_PORT);
}
function escapeHtml(value) {
@@ -44,11 +46,15 @@ HttpServer.prototype.parseUrl_ = function(urlString) {
};
HttpServer.prototype.handleRequest_ = function(req, res) {
- sys.puts(req.method + ' ' + req.url);
+ var logEntry = req.method + ' ' + req.url;
+ if (req.headers['user-agent']) {
+ logEntry += ' ' + req.headers['user-agent'];
+ }
+ sys.puts(logEntry);
req.url = this.parseUrl_(req.url);
var handler = this.handlers[req.method];
if (!handler) {
- res.writeHead(501, 'Not Implemented');
+ res.writeHead(501);
res.end();
} else {
handler.call(this, req, res);
@@ -79,51 +85,79 @@ StaticServlet.prototype.handleRequest = function(req, res) {
var path = ('./' + req.url.pathname).replace('//','/');
var parts = path.split('/');
if (parts[parts.length-1].charAt(0) === '.')
- return self.sendForbidden_(res, path);
+ return self.sendForbidden_(req, res, path);
fs.stat(path, function(err, stat) {
if (err)
- return self.sendMissing_(res, path);
+ return self.sendMissing_(req, res, path);
if (stat.isDirectory())
- return self.sendDirectory_(res, path);
- return self.sendFile_(res, path);
+ return self.sendDirectory_(req, res, path);
+ return self.sendFile_(req, res, path);
});
}
-StaticServlet.prototype.sendError_ = function(res, error) {
- res.writeHead(500, 'Internal Server Error', {
+StaticServlet.prototype.sendError_ = function(req, res, error) {
+ res.writeHead(500, {
'Content-Type': 'text/html'
});
res.write('\n');
res.write('Internal Server Error\n');
- res.write('500 Internal Server Error
');
+ res.write('Internal Server Error
');
res.write('' + escapeHtml(sys.inspect(error)) + '
');
sys.puts('500 Internal Server Error');
sys.puts(sys.inspect(error));
};
-StaticServlet.prototype.sendMissing_ = function(res, path) {
- res.writeHead(404, 'Not Found', {
+StaticServlet.prototype.sendMissing_ = function(req, res, path) {
+ path = path.substring(1);
+ res.writeHead(404, {
'Content-Type': 'text/html'
});
res.write('\n');
res.write('404 Not Found\n');
- res.write('404 Not Found
');
+ res.write('Not Found
');
+ res.write(
+ 'The requested URL ' +
+ escapeHtml(path) +
+ ' was not found on this server.
'
+ );
res.end();
sys.puts('404 Not Found: ' + path);
};
-StaticServlet.prototype.sendForbidden_ = function(res, path) {
- res.writeHead(403, 'Forbidden', {
+StaticServlet.prototype.sendForbidden_ = function(req, res, path) {
+ path = path.substring(1);
+ res.writeHead(403, {
'Content-Type': 'text/html'
});
res.write('\n');
res.write('403 Forbidden\n');
- res.write('403 Forbidden
');
+ res.write('Forbidden
');
+ res.write(
+ 'You do not have permission to access ' +
+ escapeHtml(path) + ' on this server.
'
+ );
res.end();
sys.puts('403 Forbidden: ' + path);
};
-StaticServlet.prototype.sendFile_ = function(res, path) {
+StaticServlet.prototype.sendRedirect_ = function(req, res, redirectUrl) {
+ res.writeHead(301, {
+ 'Content-Type': 'text/html',
+ 'Location': redirectUrl
+ });
+ res.write('\n');
+ res.write('301 Moved Permanently\n');
+ res.write('Moved Permanently
');
+ res.write(
+ 'The document has moved here.
'
+ );
+ res.end();
+ sys.puts('401 Moved Permanently: ' + redirectUrl);
+};
+
+StaticServlet.prototype.sendFile_ = function(req, res, path) {
var self = this;
var file = fs.createReadStream(path);
res.writeHead(200, {
@@ -135,38 +169,61 @@ StaticServlet.prototype.sendFile_ = function(res, path) {
res.end();
});
file.on('error', function(error) {
- self.sendError_(res, error);
+ self.sendError_(req, res, error);
});
};
-StaticServlet.prototype.sendDirectory_ = function(res, path) {
+StaticServlet.prototype.sendDirectory_ = function(req, res, path) {
var self = this;
+ if (path.match(/[^\/]$/)) {
+ req.url.pathname += '/';
+ var redirectUrl = url.format(url.parse(url.format(req.url)));
+ return self.sendRedirect_(req, res, redirectUrl);
+ }
fs.readdir(path, function(err, files) {
if (err)
- return self.sendError_(res, error);
- res.writeHead(200, {
- 'Content-Type': 'text/html'
+ return self.sendError_(req, res, error);
+
+ if (!files.length)
+ return self.writeDirectoryIndex_(req, res, path, []);
+
+ var remaining = files.length;
+ files.forEach(function(fileName, index) {
+ fs.stat(path + '/' + fileName, function(err, stat) {
+ if (err)
+ return self.sendError_(req, res, err);
+ if (stat.isDirectory()) {
+ files[index] = fileName + '/';
+ }
+ if (!(--remaining))
+ return self.writeDirectoryIndex_(req, res, path, files);
+ });
});
- path = path.substring(2);
- res.write('\n');
- res.write('' + escapeHtml(path) + '\n');
- res.write('\n');
- res.write('Directory: ' + escapeHtml(path) + '
');
- res.write('');
- files.sort();
- for (var i=0; i < files.length; ++i) {
- if (files[i].charAt(0) !== '.') {
- res.write('- ' +
- escapeHtml(files[i]) + '
');
- }
+ });
+};
+
+StaticServlet.prototype.writeDirectoryIndex_ = function(req, res, path, files) {
+ path = path.substring(1);
+ res.writeHead(200, {
+ 'Content-Type': 'text/html'
+ });
+ res.write('\n');
+ res.write('' + escapeHtml(path) + '\n');
+ res.write('\n');
+ res.write('Directory: ' + escapeHtml(path) + '
');
+ res.write('');
+ files.forEach(function(fileName) {
+ if (fileName.charAt(0) !== '.') {
+ res.write('- ' +
+ escapeHtml(fileName) + '
');
}
- res.write('
');
- res.end();
});
+ res.write('
');
+ res.end();
};
// Must be last,
-main();
+main(process.argv);
diff --git a/nodeserver.sh b/nodeserver.sh
index a1662e12..2570ebfd 100755
--- a/nodeserver.sh
+++ b/nodeserver.sh
@@ -1 +1 @@
-node lib/nodeserver/server.js
+node lib/nodeserver/server.js $1
--
cgit v1.2.3