vulcan 0.3.0 → 0.4.0

data/server/node_modules/express/node_modules/connect/lib/middleware/bodyParser.js

@@ -10,7 +10,8 @@
  * Module dependencies.
  */
 
-var qs = require('qs');
+var qs = require('qs')
+  , formidable = require('formidable');
 
 /**
  * Extract the mime type from the given request's
@@ -29,10 +30,9 @@ function mime(req) {
 /**
  * Parse request bodies.
  *
- * By default _application/json_ and _application/x-www-form-urlencoded_
- * are supported, however you may map `connect.bodyParser.parse[contentType]`
- * to a function of your choice to replace existing parsers, or implement
- * one for other content-types.
+ * By default _application/json_, _application/x-www-form-urlencoded_,
+ * and _multipart/form-data_ are supported, however you may map `connect.bodyParser.parse[contentType]`
+ * to a function receiving `(req, options, callback)`.
  *
  * Examples:
  *
@@ -43,36 +43,52 @@ function mime(req) {
  *        }
  *      );
  *
- * Since both _json_ and _x-www-form-urlencoded_ are supported by
- * default, either of the following requests would result in the response
- * of "viewing user tj".
- *
  *      $ curl -d 'user[name]=tj' http://localhost/
  *      $ curl -d '{"user":{"name":"tj"}}' -H "Content-Type: application/json" http://localhost/
  *
+ * Multipart req.files:
+ *
+ *   As a security measure files are stored in a separate object, stored
+ *   as `req.files`. This prevents attacks that may potentially alter
+ *   filenames, and depending on the application gain access to restricted files.
+ *
+ * Multipart configuration:
+ *
+ *  The `options` passed are provided to each parser function.
+ *  The _multipart/form-data_ parser merges these with formidable's
+ *  IncomingForm object, allowing you to tweak the upload directory,
+ *  size limits, etc. For example you may wish to retain the file extension
+ *  and change the upload directory:
+ *
+ *      server.use(bodyParser({ uploadDir: '/www/mysite.com/uploads' }));
+ *
+ *  View [node-formidable](https://github.com/felixge/node-formidable) for more information.
+ *
+ *  If you wish to use formidable directly within your app, and do not
+ *  desire this behaviour for multipart requests simply remove the
+ *  parser: 
+ *
+ *     delete connect.bodyParser.parse['multipart/form-data'];
+ *
+ *  Or
+ *
+ *     delete express.bodyParser.parse['multipart/form-data'];
+ *
+ * @param {Object} options
  * @return {Function}
  * @api public
  */
 
-exports = module.exports = function bodyParser(){
+exports = module.exports = function bodyParser(options){
+  options = options || {};
   return function bodyParser(req, res, next) {
+    if (req.body) return next();
+    req.body = {};
+
     if ('GET' == req.method || 'HEAD' == req.method) return next();
     var parser = exports.parse[mime(req)];
-    if (parser && !req.body) {
-      var data = '';
-      req.setEncoding('utf8');
-      req.on('data', function(chunk) { data += chunk; });
-      req.on('end', function(){
-        req.rawBody = data;
-        try {
-          req.body = data
-            ? parser(data)
-            : {};
-        } catch (err) {
-          return next(err);
-        }
-        next();
-      });
+    if (parser) {
+      parser(req, options, next);
     } else {
       next();
     }
@@ -80,13 +96,101 @@ exports = module.exports = function bodyParser(){
 };
 
 /**
- * Supported decoders.
+ * Parsers.
+ */
+
+exports.parse = {};
+
+/**
+ * Parse application/x-www-form-urlencoded.
+ */
+
+exports.parse['application/x-www-form-urlencoded'] = function(req, options, fn){
+  var buf = '';
+  req.setEncoding('utf8');
+  req.on('data', function(chunk){ buf += chunk });
+  req.on('end', function(){
+    try {
+      req.body = buf.length
+        ? qs.parse(buf)
+        : {};
+      fn();
+    } catch (err){
+      fn(err);
+    }
+  });
+};
+
+/**
+ * Parse application/json.
+ */
+
+exports.parse['application/json'] = function(req, options, fn){
+  var buf = '';
+  req.setEncoding('utf8');
+  req.on('data', function(chunk){ buf += chunk });
+  req.on('end', function(){
+    try {
+      req.body = buf.length
+        ? JSON.parse(buf)
+        : {};
+      fn();
+    } catch (err){
+      fn(err);
+    }
+  });
+};
+
+/**
+ * Parse multipart/form-data.
  *
- *  - application/x-www-form-urlencoded
- *  - application/json
+ * TODO: make multiple support optional
+ * TODO: revisit "error" flag if it's a formidable bug
  */
 
-exports.parse = {
-    'application/x-www-form-urlencoded': qs.parse
-  , 'application/json': JSON.parse
+exports.parse['multipart/form-data'] = function(req, options, fn){
+  var form = new formidable.IncomingForm
+    , data = {}
+    , files = {}
+    , done;
+
+  Object.keys(options).forEach(function(key){
+    form[key] = options[key];
+  });
+
+  function ondata(name, val, data){
+    if (Array.isArray(data[name])) {
+      data[name].push(val);
+    } else if (data[name]) {
+      data[name] = [data[name], val];
+    } else {
+      data[name] = val;
+    }
+  }
+
+  form.on('field', function(name, val){
+    ondata(name, val, data);
+  });
+
+  form.on('file', function(name, val){
+    ondata(name, val, files);
+  });
+
+  form.on('error', function(err){
+    fn(err);
+    done = true;
+  });
+
+  form.on('end', function(){
+    if (done) return;
+    try {
+      req.body = qs.parse(data);
+      req.files = qs.parse(files);
+      fn();
+    } catch (err) {
+      fn(err);
+    }
+  });
+
+  form.parse(req);
 };

data/server/node_modules/express/node_modules/connect/lib/middleware/limit.js

@@ -43,7 +43,11 @@ module.exports = function limit(bytes){
     req._limit = true;
 
     // limit by content-length
-    if (len && len > bytes) deny();
+    if (len && len > bytes) {
+      res.statusCode = 413;
+      res.end('Request Entity Too Large');
+      return;
+    }
 
     // limit
     req.on('data', function(chunk){

data/server/node_modules/express/node_modules/connect/lib/middleware/session.js

@@ -55,10 +55,10 @@ function defaultFingerprint(req) {
 };
 
 /**
- * Paths to ignore, defaulting to `/favicon.ico`.
+ * Paths to ignore.
  */
 
-exports.ignore = ['/favicon.ico'];
+exports.ignore = [];
 
 /**
  * Setup session store with the given `options`.

data/server/node_modules/express/node_modules/connect/lib/middleware/static.js

@@ -39,6 +39,7 @@ var fs = require('fs')
  *
  *    - `maxAge`   Browser cache maxAge in milliseconds. defaults to 0
  *    - `hidden`   Allow transfer of hidden files. defaults to false
+ *    - `redirect`   Redirect to trailing "/" when the pathname is a dir
  *
  * @param {String} root
  * @param {Object} options
@@ -101,6 +102,7 @@ var send = exports.send = function(req, res, next, options){
     , head = 'HEAD' == req.method
     , get = 'GET' == req.method
     , root = options.root ? normalize(options.root) : null
+    , redirect = false === options.redirect ? false : true
     , getOnly = options.getOnly
     , fn = options.callback
     , hidden = options.hidden
@@ -132,7 +134,7 @@ var send = exports.send = function(req, res, next, options){
     : utils.forbidden(res);
 
   // index.html support
-  if ('/' == path[path.length - 1]) path += 'index.html';
+  if (normalize('/') == path[path.length - 1]) path += 'index.html';
 
   // "hidden" file
   if (!hidden && '.' == basename(path)[0]) return next();
@@ -149,13 +151,34 @@ var send = exports.send = function(req, res, next, options){
         : next(err);
     // redirect directory in case index.html is present
     } else if (stat.isDirectory()) {
+      if (!redirect) return next();
       res.statusCode = 301;
       res.setHeader('Location', url.pathname + '/');
       res.end('Redirecting to ' + url.pathname + '/');
       return;
     }
 
+    // header fields
+    if (!res.getHeader('Date')) res.setHeader('Date', new Date().toUTCString());
+    if (!res.getHeader('Cache-Control')) res.setHeader('Cache-Control', 'public, max-age=' + (maxAge / 1000));
+    if (!res.getHeader('Last-Modified')) res.setHeader('Last-Modified', stat.mtime.toUTCString());
+    if (!res.getHeader('ETag')) res.setHeader('ETag', utils.etag(stat));
+    if (!res.getHeader('content-type')) {
+      var charset = mime.charsets.lookup(type);
+      res.setHeader('Content-Type', type + (charset ? '; charset=' + charset : ''));
+    }
+    res.setHeader('Accept-Ranges', 'bytes');
+
+    // conditional GET support
+    if (utils.conditionalGET(req)) {
+      if (!utils.modified(req, res)) {
+        req.emit('static');
+        return utils.notModified(res);
+      }
+    }
+
     var opts = {};
+    var chunkSize = stat.size;
 
     // we have a Range request
     if (ranges) {
@@ -166,6 +189,7 @@ var send = exports.send = function(req, res, next, options){
         // TODO: multiple support
         opts.start = ranges[0].start;
         opts.end = ranges[0].end;
+        chunkSize = opts.end - opts.start + 1;
         res.statusCode = 206;
         res.setHeader('Content-Range', 'bytes '
           + opts.start
@@ -179,27 +203,9 @@ var send = exports.send = function(req, res, next, options){
           ? fn(new Error('Requested Range Not Satisfiable'))
           : invalidRange(res);
       }
-    // stream the entire file
-    } else {
-      res.setHeader('Content-Length', stat.size);
-      if (!res.getHeader('Cache-Control')) res.setHeader('Cache-Control', 'public, max-age=' + (maxAge / 1000));
-      if (!res.getHeader('Last-Modified')) res.setHeader('Last-Modified', stat.mtime.toUTCString());
-      if (!res.getHeader('ETag')) res.setHeader('ETag', utils.etag(stat));
-
-      // conditional GET support
-      if (utils.conditionalGET(req)) {
-        if (!utils.modified(req, res)) {
-          return utils.notModified(res);
-        }
-      }
     }
 
-    // header fields
-    if (!res.getHeader('content-type')) {
-      var charset = mime.charsets.lookup(type);
-      res.setHeader('Content-Type', type + (charset ? '; charset=' + charset : ''));
-    }
-    res.setHeader('Accept-Ranges', 'bytes');
+    res.setHeader('Content-Length', chunkSize);
 
     // transfer
     if (head) return res.end();
@@ -213,7 +219,6 @@ var send = exports.send = function(req, res, next, options){
     if (fn) {
       function callback(err) { done || fn(err); done = true }
       req.on('close', callback);
-      req.socket.on('error', callback);
       stream.on('end', callback);
     }
   });

data/server/node_modules/express/node_modules/connect/lib/middleware/staticCache.js

@@ -10,6 +10,7 @@
  */
 
 var http = require('http')
+  , utils = require('../utils')
   , Cache = require('../cache')
   , url = require('url')
   , fs = require('fs');
@@ -33,17 +34,15 @@ var http = require('http')
  *
  * Benchmarks:
  *
- *    static(): 2700 rps
- *    node-static: 5300 rps
- *    static() + staticCache(): 7500 rps
+ *     static(): 2700 rps
+ *     node-static: 5300 rps
+ *     static() + staticCache(): 7500 rps
  *
  * Options:
  *
  *   - `maxObjects`  max cache objects [128]
  *   - `maxLength`  max cache object length 256kb
  *
- * TODO: refactore to accept data stores (redis etc)
- *
  * @param {Type} name
  * @return {Type}
  * @api public
@@ -56,16 +55,82 @@ module.exports = function staticCache(options){
 
   return function staticCache(req, res, next){
     var path = url.parse(req.url).pathname
+      , ranges = req.headers.range
       , hit = cache.get(path)
-      , cc = req.headers['cache-control']
-      , header;
-
-    // cache hit
-    if (hit && hit.complete) {
-      // TODO: finish meeee... http caching... throttling etc
-      header = hit[0];
-      header.Age = (new Date - hit.createdAt) / 1000 | 0;
-      
+      , hitCC
+      , uaCC
+      , header
+      , age;
+
+    // cache static
+    req.on('static', function(stream){
+      var headers = res._headers
+        , cc = utils.parseCacheControl(headers['cache-control'] || '')
+        , contentLength = headers['content-length']
+        , hit;
+
+      // ignore larger files
+      if (!contentLength || contentLength > maxlen) return;
+
+      // dont cache items we shouldn't be
+      if ( cc['no-cache']
+        || cc['no-store']
+        || cc['private']
+        || cc['must-revalidate']) return;
+
+      // if already in cache then validate
+      if (hit = cache.get(path)){
+        if (headers.etag == hit[0].etag) {
+          hit[0].date = new Date;
+          return;
+        } else {
+          cache.remove(path);
+        }
+      }
+
+      // validation notifiactions don't contain a steam
+      if (null == stream) return;
+
+      // add the cache object
+      var arr = cache.add(path);
+      arr.push(headers);
+
+      // store the chunks
+      stream.on('data', function(chunk){
+        arr.push(chunk);
+      });
+
+      // flag it as complete
+      stream.on('end', function(){
+        arr.complete = true;
+      });
+    });
+
+    // cache hit, doesnt support range requests
+    if (hit && hit.complete && !ranges) {
+      header = utils.merge({}, hit[0]);
+      header.Age = age = (new Date - new Date(header.date)) / 1000 | 0;
+      header.date = new Date().toUTCString();
+
+      // parse cache-controls
+      hitCC = utils.parseCacheControl(header['cache-control'] || '');
+      uaCC = utils.parseCacheControl(req.headers['cache-control'] || '');
+
+      // check if we must revalidate(bypass)
+      if (hitCC['no-cache'] || uaCC['no-cache']) return next();
+
+      // check freshness of entity
+      if (isStale(hitCC, age) || isStale(uaCC, age)) return next();
+
+      // conditional GET support
+      if (utils.conditionalGET(req)) {
+        if (!utils.modified(req, res, header)) {
+          header['content-length'] = 0;
+          res.writeHead(304, header);
+          return res.end();
+        }
+      }
+
       // HEAD support
       if ('HEAD' == req.method) {
         header['content-length'] = 0;
@@ -92,31 +157,19 @@ module.exports = function staticCache(options){
       return write(1);
     }
 
-    // cache static
-    req.on('static', function(stream){
-      // ignore larger files
-      var contentLength = res._headers['content-length'];
-      if (!contentLength || contentLength > maxlen) return;
-
-      // exists
-      if (cache.get(path)) return;
-
-      // add the cache object
-      var arr = cache.add(path);
-      arr.push(res._headers);
-
-      // store the chunks
-      stream.on('data', function(chunk){
-        arr.push(chunk);
-      });
-
-      // flag it as complete
-      stream.on('end', function(){
-        arr.complete = true;
-      });
-    });
-
     next();
   }
 };
 
+/**
+ * Check if cache item is stale
+ *
+ * @param {Object} cc
+ * @param {Number} age
+ * @return {Boolean}
+ * @api private
+ */
+
+function isStale(cc, age) {
+  return cc['max-age'] && cc['max-age'] <= age;
+}

data/server/node_modules/express/node_modules/connect/lib/middleware/vhost.js

@@ -36,7 +36,7 @@ module.exports = function vhost(hostname, server){
     var host = req.headers.host.split(':')[0];
     if (req.subdomains = regexp.exec(host)) {
       req.subdomains = req.subdomains[0].split('.').slice(0, -1);
-      server.emit("request", req, res, next);
+      server.emit("request", req, res);
     } else {
       next();
     }

data/server/node_modules/express/node_modules/connect/lib/utils.js

@@ -403,14 +403,21 @@ exports.parseRange = function(size, str){
  */
 
 exports.parseCacheControl = function(str){
-  var parts = str.split('=')
-    , key = parts.shift()
-    , val = parseInt(parts.shift(), 10)
+  var directives = str.split(',')
     , obj = {};
-  obj[key] = isNaN(val) ? true : val;
+
+  for(var i = 0, len = directives.length; i < len; i++) {
+    var parts = directives[i].split('=')
+      , key = parts.shift().trim()
+      , val = parseInt(parts.shift(), 10);
+
+    obj[key] = isNaN(val) ? true : val;
+  }
+
   return obj;
 };
 
+
 /**
  * Convert array-like object to an `Array`.
  *

data/server/node_modules/express/node_modules/connect/node_modules/formidable/Makefile

@@ -0,0 +1,14 @@
+SHELL := /bin/bash
+
+test:
+	@./test/run.js
+
+build: npm test
+
+npm:
+	npm install .
+
+clean:
+	rm test/tmp/*
+
+.PHONY: test clean build