Merge branch 'vNext_aaladev_4' of github.com:thaliproject/salti into …

…vNext_aaladev_10

lib/index.js

@@ -115,12 +115,13 @@ Salti.prototype.handler = function (request, response, nextHandler) {
 
   // Next section deals with
   // /{:db}/{:id}, /{:db}/_local/{:id} and /{:db}/{:id}/attachment stuff.
-  if (!this.cutDBPrefix()) {
+  var cuttedPath = this.getPathWithoutPrefix();
+  if (!cuttedPath) {
     // Required DB Prefix is not valid.
     return this.unauthorized(3);
   }
 
-  var pathParts = this.path.split('/');
+  var pathParts = cuttedPath.split('/');
   if (pathParts[0] !== '') {
     // Sanity check, the first element should always be empty.
     return this.unauthorized(4);
@@ -140,7 +141,7 @@ Salti.prototype.handler = function (request, response, nextHandler) {
 
   else if (pathParts.length === 3 && pathParts[1] === '_local') {
     // Is this a thali {:id}?
-    var isThaliPrefix = this.path.startsWith(Salti.THALI_PREFIX);
+    var isThaliPrefix = cuttedPath.startsWith(Salti.THALI_PREFIX);
     if (isThaliPrefix) {
       // Is /_local/thali_{:id} authorized?
       lookupPath = this.dbPrefix + Salti.THALI_PREFIX +
@@ -149,7 +150,7 @@ Salti.prototype.handler = function (request, response, nextHandler) {
         debug('unauthorized thali prefix');
         return this.unauthorized(6);
       }
-      var thaliId = this.path.substring(Salti.THALI_PREFIX.length);
+      var thaliId = cuttedPath.substring(Salti.THALI_PREFIX.length);
       if (!this.resolveThaliId(thaliId)) {
         debug('unauthorized thali id');
         return this.unauthorized(7);
@@ -229,13 +230,12 @@ Salti.stripTrailingSlash = function (path) {
   return path;
 };
 
-Salti.prototype.cutDBPrefix = function () {
+Salti.prototype.getPathWithoutPrefix = function () {
   var isDbPath = this.path.startsWith(this.dbPrefix);
   if (!isDbPath) {
-    return false;
+    return null;
   }
-  this.path = this.path.substring(this.dbPrefix.length);
-  return true;
+  return this.path.substring(this.dbPrefix.length);
 };
 
 Salti.prototype.authorized = function () {