Fixes ajaxorg/cloud9infra#2766

mikedeboer · Sep 28, 2012 · 6eac748 · 6eac748
1 parent bee19ea
commit 6eac748
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/lib/DAV/tree/ftp.js b/lib/DAV/tree/ftp.js
@@ -143,12 +143,20 @@ exports.jsDAV_Tree_Ftp = jsDAV_Tree_Ftp;
      * @return {String}
      */
     this.getRealPath = function(path) {
-        var re = new RegExp("^" + this.basePath);
+        var _basePath = Util.rtrim(this.basePath);
-        if (path.match(re)) {
+        var _path = Util.trim(path).replace(/[\/]+$/, "");
+
+        var badEscape = _basePath.match(/\\+/);
+        if (badEscape && badEscape[0].length % 2 === 1) {
+            _basePath += "\\";
+        }
+
+        var re = new RegExp("^" + _basePath);
+        if (_path.match(re)) {
             return path;
         }
         else {
-            return Path.normalize(Path.join(this.basePath, path));
+            return Path.normalize(Path.join(_basePath, _path));
         }
     };
 
@@ -190,7 +198,7 @@ exports.jsDAV_Tree_Ftp = jsDAV_Tree_Ftp;
         var node = this.ftp.$cache[source];
         var ftp = this.ftp;
 
-        if (!node) 
+        if (!node)
             return next(new Error("Node not found for path " + source));
 
         node.setName(destination, function(err) {