Use path-is-absolute module for absolute path detection

closes #2620

History.md

@@ -9,6 +9,7 @@ This incorporates all changes after 4.10.1 up to 4.13.1.
   * change:
     - The leading `:` character in `name` for `app.param(name, fn)` is no longer removed
     - Use `router` module for routing
+    - Use `path-is-absolute` module for absolute path detection
 
 5.0.0-alpha.1 / 2014-11-06
 ==========================

lib/response.js

@@ -16,9 +16,9 @@ var contentDisposition = require('content-disposition');
 var deprecate = require('depd')('express');
 var escapeHtml = require('escape-html');
 var http = require('http');
-var isAbsolute = require('./utils').isAbsolute;
 var onFinished = require('on-finished');
 var path = require('path');
+var pathIsAbsolute = require('path-is-absolute');
 var merge = require('utils-merge');
 var sign = require('cookie-signature').sign;
 var normalizeType = require('./utils').normalizeType;
@@ -369,7 +369,7 @@ res.sendFile = function sendFile(path, options, callback) {
     opts = {};
   }
 
-  if (!opts.root && !isAbsolute(path)) {
+  if (!opts.root && !pathIsAbsolute(path)) {
     throw new TypeError('path must be absolute or specify root to res.sendFile');
   }
 

lib/utils.js

@@ -54,20 +54,6 @@ exports.wetag = function wetag(body, encoding){
   return etag(buf, {weak: true});
 };
 
-/**
- * Check if `path` looks absolute.
- *
- * @param {String} path
- * @return {Boolean}
- * @api private
- */
-
-exports.isAbsolute = function(path){
-  if ('/' == path[0]) return true;
-  if (':' == path[1] && '\\' == path[2]) return true;
-  if ('\\\\' == path.substring(0, 2)) return true; // Microsoft Azure absolute path
-};
-
 /**
  * Normalize the given `type`, for example "html" becomes "text/html".
  *

package.json

@@ -43,6 +43,7 @@
     "methods": "~1.1.1",
     "on-finished": "~2.3.0",
     "parseurl": "~1.3.0",
+    "path-is-absolute": "1.0.0",
     "path-to-regexp": "0.1.6",
     "proxy-addr": "~1.0.8",
     "qs": "4.0.0",

test/utils.js

@@ -69,19 +69,3 @@ describe('utils.wetag(body, encoding)', function(){
     .should.eql('W/"0-1B2M2Y8AsgTpgAmY7PhCfg"');
   })
 })
-
-describe('utils.isAbsolute()', function(){
-  it('should support windows', function(){
-    assert(utils.isAbsolute('c:\\'));
-    assert(!utils.isAbsolute(':\\'));
-  })
-
-  it('should support windows unc', function(){
-    assert(utils.isAbsolute('\\\\foo\\bar'))
-  })
-
-  it('should support unices', function(){
-    assert(utils.isAbsolute('/foo/bar'));
-    assert(!utils.isAbsolute('foo/bar'));
-  })
-})