Release 2.18.0

Upgrade mapnik

HOWTO_RELEASE

@@ -1,12 +1,11 @@
 1. Test (make clean all check), fix if broken before proceeding
 2. Ensure proper version in package.json 
 3. Ensure NEWS section exists for the new version, review it, add release date
-4. Drop npm-shrinkwrap.json
-5. Run npm shrinkwrap to recreate npm-shrinkwrap.json
-6. Commit package.json, npm-shrinwrap.json, NEWS
-7. git tag -a Major.Minor.Patch # use NEWS section as content
-8. Announce on cartodb@googlegroups.com
-9. Stub NEWS/package for next version
+4. Recreate npm-shrinkwrap.json with: `npm install --no-shrinkwrap && npm shrinkwrap`
+5. Commit package.json, npm-shrinwrap.json, NEWS
+6. git tag -a Major.Minor.Patch # use NEWS section as content
+7. Announce on cartodb@googlegroups.com
+8. Stub NEWS/package for next version
 
 Versions:
 

NEWS.md

@@ -1,5 +1,61 @@
 # Changelog
 
+## 2.18.0
+
+Released 2015-11-02
+
+Announcements:
+ - Upgrades windshaft to [1.5.0](https://github.com/CartoDB/Windshaft/releases/tag/1.5.0)
+
+
+## 2.17.0
+
+Released 2015-10-28
+
+Announcements:
+ - Upgrades windshaft to [1.4.0](https://github.com/CartoDB/Windshaft/releases/tag/1.4.0)
+
+
+## 2.16.0
+
+Released 2015-10-22
+
+Announcements:
+ - Upgrades windshaft to [1.2.0](https://github.com/CartoDB/Windshaft/releases/tag/1.2.0)
+
+
+## 2.15.1
+
+Released 2015-10-21
+
+Announcements:
+ - Upgrades windshaft to [1.1.1](https://github.com/CartoDB/Windshaft/releases/tag/1.1.1)
+
+
+## 2.15.0
+
+Released 2015-10-13
+
+Announcements:
+ - Fastly purging no longer uses soft-purge option
+ - Upgrades windshaft to [1.1.0](https://github.com/CartoDB/Windshaft/releases/tag/1.1.0)
+ - Upgrades fastly-purge to [1.0.1](https://github.com/CartoDB/node-fastly-purge/releases/tag/1.0.1)
+
+
+## 2.14.1
+
+Released 2015-09-30
+
+Enhancements:
+ - Remove app dependency from controllers
+
+Announcements:
+ - Upgrades windshaft to [1.0.1](https://github.com/CartoDB/Windshaft/releases/tag/1.0.1)
+
+Improvements:
+ - Safer user extraction from request Host header
+
+
 ## 2.14.0
 
 Released 2015-09-30

lib/cartodb/cache/backend/fastly.js

@@ -1,8 +1,8 @@
 var FastlyPurge = require('fastly-purge');
 
-function FastlyCacheBackend(apiKey, serviceId, softPurge) {
+function FastlyCacheBackend(apiKey, serviceId) {
     this.serviceId = serviceId;
-    this.fastlyPurge = new FastlyPurge(apiKey, { softPurge: softPurge || true });
+    this.fastlyPurge = new FastlyPurge(apiKey, { softPurge: false });
 }
 
 module.exports = FastlyCacheBackend;

lib/cartodb/controllers/layergroup.js

@@ -5,12 +5,12 @@ var util = require('util');
 var BaseController = require('./base');
 
 var cors = require('../middleware/cors');
+var userMiddleware = require('../middleware/user');
 
 var MapStoreMapConfigProvider = require('../models/mapconfig/map_store_provider');
 var TablesCacheEntry = require('../cache/model/database_tables_entry');
 
 /**
- * @param app
  * @param {AuthApi} authApi
  * @param {PgConnection} pgConnection
  * @param {MapStore} mapStore
@@ -23,11 +23,10 @@ var TablesCacheEntry = require('../cache/model/database_tables_entry');
  * @param {LayergroupAffectedTables} layergroupAffectedTables
  * @constructor
  */
-function LayergroupController(app, authApi, pgConnection, mapStore, tileBackend, previewBackend, attributesBackend,
+function LayergroupController(authApi, pgConnection, mapStore, tileBackend, previewBackend, attributesBackend,
                               surrogateKeysCache, userLimitsApi, queryTablesApi, layergroupAffectedTables) {
     BaseController.call(this, authApi, pgConnection);
 
-    this.app = app;
     this.mapStore = mapStore;
     this.tileBackend = tileBackend;
     this.previewBackend = previewBackend;
@@ -44,13 +43,28 @@ module.exports = LayergroupController;
 
 
 LayergroupController.prototype.register = function(app) {
-    app.get(app.base_url_mapconfig + '/:token/:z/:x/:y@:scale_factor?x.:format', cors(), this.tile.bind(this));
-    app.get(app.base_url_mapconfig + '/:token/:z/:x/:y.:format', cors(), this.tile.bind(this));
-    app.get(app.base_url_mapconfig + '/:token/:layer/:z/:x/:y.(:format)', cors(), this.layer.bind(this));
-    app.get(app.base_url_mapconfig + '/:token/:layer/attributes/:fid', cors(), this.attributes.bind(this));
-    app.get(app.base_url_mapconfig + '/static/center/:token/:z/:lat/:lng/:width/:height.:format', cors(),
+    app.get(app.base_url_mapconfig +
+        '/:token/:z/:x/:y@:scale_factor?x.:format', cors(), userMiddleware,
+        this.tile.bind(this));
+
+    app.get(app.base_url_mapconfig +
+        '/:token/:z/:x/:y.:format', cors(), userMiddleware,
+        this.tile.bind(this));
+
+    app.get(app.base_url_mapconfig +
+        '/:token/:layer/:z/:x/:y.(:format)', cors(), userMiddleware,
+        this.layer.bind(this));
+
+    app.get(app.base_url_mapconfig +
+        '/:token/:layer/attributes/:fid', cors(), userMiddleware,
+        this.attributes.bind(this));
+
+    app.get(app.base_url_mapconfig +
+        '/static/center/:token/:z/:lat/:lng/:width/:height.:format', cors(), userMiddleware,
         this.center.bind(this));
-    app.get(app.base_url_mapconfig + '/static/bbox/:token/:west,:south,:east,:north/:width/:height.:format', cors(),
+
+    app.get(app.base_url_mapconfig +
+        '/static/bbox/:token/:west,:south,:east,:north/:width/:height.:format', cors(), userMiddleware,
         this.bbox.bind(this));
 };
 

lib/cartodb/controllers/map.js

@@ -7,6 +7,7 @@ var util = require('util');
 var BaseController = require('./base');
 
 var cors = require('../middleware/cors');
+var userMiddleware = require('../middleware/user');
 
 var MapConfig = windshaft.model.MapConfig;
 var Datasource = windshaft.model.Datasource;
@@ -19,7 +20,6 @@ var NamedMapMapConfigProvider = require('../models/mapconfig/named_map_provider'
 var CreateLayergroupMapConfigProvider = require('../models/mapconfig/create_layergroup_provider');
 
 /**
- * @param app
  * @param {AuthApi} authApi
  * @param {PgConnection} pgConnection
  * @param {TemplateMaps} templateMaps
@@ -31,12 +31,11 @@ var CreateLayergroupMapConfigProvider = require('../models/mapconfig/create_laye
  * @param {LayergroupAffectedTables} layergroupAffectedTables
  * @constructor
  */
-function MapController(app, authApi, pgConnection, templateMaps, mapBackend, metadataBackend, queryTablesApi,
+function MapController(authApi, pgConnection, templateMaps, mapBackend, metadataBackend, queryTablesApi,
                        surrogateKeysCache, userLimitsApi, layergroupAffectedTables) {
 
     BaseController.call(this, authApi, pgConnection);
 
-    this.app = app;
     this.pgConnection = pgConnection;
     this.templateMaps = templateMaps;
     this.mapBackend = mapBackend;
@@ -55,10 +54,10 @@ module.exports = MapController;
 
 
 MapController.prototype.register = function(app) {
-    app.get(app.base_url_mapconfig, cors(), this.createGet.bind(this));
-    app.post(app.base_url_mapconfig, cors(), this.createPost.bind(this));
-    app.get(app.base_url_templated + '/:template_id/jsonp', cors(), this.jsonp.bind(this));
-    app.post(app.base_url_templated + '/:template_id', cors(), this.instantiate.bind(this));
+    app.get(app.base_url_mapconfig, cors(), userMiddleware, this.createGet.bind(this));
+    app.post(app.base_url_mapconfig, cors(), userMiddleware, this.createPost.bind(this));
+    app.get(app.base_url_templated + '/:template_id/jsonp', cors(), userMiddleware, this.jsonp.bind(this));
+    app.post(app.base_url_templated + '/:template_id', cors(), userMiddleware, this.instantiate.bind(this));
     app.options(app.base_url_mapconfig, cors('Content-Type'));
 };
 

lib/cartodb/controllers/named_maps.js

@@ -7,14 +7,14 @@ var util = require('util');
 var BaseController = require('./base');
 
 var cors = require('../middleware/cors');
+var userMiddleware = require('../middleware/user');
 
 var TablesCacheEntry = require('../cache/model/database_tables_entry');
 
-function NamedMapsController(app, authApi, pgConnection, namedMapProviderCache, tileBackend, previewBackend,
+function NamedMapsController(authApi, pgConnection, namedMapProviderCache, tileBackend, previewBackend,
                              surrogateKeysCache, tablesExtentApi, metadataBackend) {
     BaseController.call(this, authApi, pgConnection);
 
-    this.app = app;
     this.namedMapProviderCache = namedMapProviderCache;
     this.tileBackend = tileBackend;
     this.previewBackend = previewBackend;
@@ -28,10 +28,13 @@ util.inherits(NamedMapsController, BaseController);
 module.exports = NamedMapsController;
 
 NamedMapsController.prototype.register = function(app) {
-    app.get(app.base_url_templated + '/:template_id/:layer/:z/:x/:y.(:format)', cors(), this.tile.bind(this));
-    app.get(
-        app.base_url_mapconfig + '/static/named/:template_id/:width/:height.:format', cors(), this.staticMap.bind(this)
-    );
+    app.get(app.base_url_templated +
+        '/:template_id/:layer/:z/:x/:y.(:format)', cors(), userMiddleware,
+        this.tile.bind(this));
+
+    app.get(app.base_url_mapconfig +
+        '/static/named/:template_id/:width/:height.:format', cors(), userMiddleware,
+        this.staticMap.bind(this));
 };
 
 NamedMapsController.prototype.sendResponse = function(req, res, resource, headers, namedMapProvider) {

lib/cartodb/controllers/named_maps_admin.js

@@ -6,19 +6,20 @@ var util = require('util');
 var BaseController = require('./base');
 
 var cors = require('../middleware/cors');
+var userMiddleware = require('../middleware/user');
 
 
 /**
- * @param {TemplateMaps} templateMaps
  * @param {AuthApi} authApi
  * @param {PgConnection} pgConnection
+ * @param {TemplateMaps} templateMaps
  * @constructor
  */
-function NamedMapsAdminController(templateMaps, authApi, pgConnection) {
+function NamedMapsAdminController(authApi, pgConnection, templateMaps) {
     BaseController.call(this, authApi, pgConnection);
 
-    this.templateMaps = templateMaps;
     this.authApi = authApi;
+    this.templateMaps = templateMaps;
 }
 
 util.inherits(NamedMapsAdminController, BaseController);
@@ -26,11 +27,11 @@ util.inherits(NamedMapsAdminController, BaseController);
 module.exports = NamedMapsAdminController;
 
 NamedMapsAdminController.prototype.register = function(app) {
-    app.post(app.base_url_templated, cors(), this.create.bind(this));
-    app.put(app.base_url_templated + '/:template_id', cors(), this.update.bind(this));
-    app.get(app.base_url_templated + '/:template_id', cors(), this.retrieve.bind(this));
-    app.delete(app.base_url_templated + '/:template_id', cors(), this.destroy.bind(this));
-    app.get(app.base_url_templated, cors(), this.list.bind(this));
+    app.post(app.base_url_templated, cors(), userMiddleware, this.create.bind(this));
+    app.put(app.base_url_templated + '/:template_id', cors(), userMiddleware, this.update.bind(this));
+    app.get(app.base_url_templated + '/:template_id', cors(), userMiddleware, this.retrieve.bind(this));
+    app.delete(app.base_url_templated + '/:template_id', cors(), userMiddleware, this.destroy.bind(this));
+    app.get(app.base_url_templated, cors(), userMiddleware, this.list.bind(this));
     app.options(app.base_url_templated + '/:template_id', cors('Content-Type'));
 };
 

lib/cartodb/middleware/user.js

@@ -0,0 +1,7 @@
+var CdbRequest = require('../models/cdb_request');
+var cdbRequest = new CdbRequest();
+
+module.exports = function userMiddleware(req, res, next) {
+    req.context.user = cdbRequest.userByReq(req);
+    next();
+};

lib/cartodb/models/cdb_request.js

@@ -8,7 +8,7 @@ module.exports = CdbRequest;
 
 
 CdbRequest.prototype.userByReq = function(req) {
-    var host = req.headers.host;
+    var host = req.headers.host || '';
     if (req.params.user) {
         return req.params.user;
     }

lib/cartodb/server.js

@@ -27,9 +27,6 @@ var NamedMapProviderCache = require('./cache/named_map_provider_cache');
 var PgQueryRunner = require('./backends/pg_query_runner');
 var PgConnection = require('./backends/pg_connection');
 
-var CdbRequest = require('./models/cdb_request');
-var cdbRequest = new CdbRequest();
-
 var timeoutErrorTilePath = __dirname + '/../../assets/render-timeout-fallback.png';
 var timeoutErrorTile = require('fs').readFileSync(timeoutErrorTilePath, {encoding: null});
 
@@ -157,13 +154,7 @@ module.exports = function(serverOptions) {
      * Routing
      ******************************************************************************************************************/
 
-    app.all('*', function(req, res, next) {
-        req.context.user = cdbRequest.userByReq(req);
-        next();
-    });
-
     new controller.Layergroup(
-        app,
         authApi,
         pgConnection,
         mapStore,
@@ -177,7 +168,6 @@ module.exports = function(serverOptions) {
     ).register(app);
 
     new controller.Map(
-        app,
         authApi,
         pgConnection,
         templateMaps,
@@ -190,7 +180,6 @@ module.exports = function(serverOptions) {
     ).register(app);
 
     new controller.NamedMaps(
-        app,
         authApi,
         pgConnection,
         namedMapProviderCache,
@@ -201,7 +190,7 @@ module.exports = function(serverOptions) {
         metadataBackend
     ).register(app);
 
-    new controller.NamedMapsAdmin(templateMaps, authApi, pgConnection).register(app);
+    new controller.NamedMapsAdmin(authApi, pgConnection, templateMaps).register(app);
 
     new controller.ServerInfo().register(app);
 

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.14.0",
+  "version": "2.18.0",
   "dependencies": {
     "body-parser": {
       "version": "1.14.1",
@@ -406,8 +406,8 @@
       }
     },
     "fastly-purge": {
-      "version": "1.0.0",
-      "from": "fastly-purge@~1.0.0"
+      "version": "1.0.1",
+      "from": "fastly-purge@~1.0.1"
     },
     "log4js": {
       "version": "0.6.25",
@@ -522,9 +522,9 @@
           "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "2.0.2",
+              "version": "2.0.3",
               "from": "readable-stream@~2.0.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.3.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
@@ -533,7 +533,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2",
+                  "from": "inherits@~2.0.1",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "isarray": {
@@ -552,9 +552,9 @@
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "util-deprecate": {
-                  "version": "1.0.1",
+                  "version": "1.0.2",
                   "from": "util-deprecate@~1.0.1",
-                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
+                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
                 }
               }
             }
@@ -581,9 +581,9 @@
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
           "dependencies": {
             "async": {
-              "version": "1.4.2",
+              "version": "1.5.0",
               "from": "async@^1.4.0",
-              "resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz"
+              "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
             }
           }
         },
@@ -620,9 +620,9 @@
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
         },
         "tough-cookie": {
-          "version": "2.0.0",
+          "version": "2.2.0",
           "from": "tough-cookie@>=0.12.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
         },
         "http-signature": {
           "version": "0.11.0",
@@ -662,9 +662,9 @@
               "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
             },
             "boom": {
-              "version": "2.9.0",
+              "version": "2.10.0",
               "from": "boom@^2.8.x",
-              "resolved": "https://registry.npmjs.org/boom/-/boom-2.9.0.tgz"
+              "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.0.tgz"
             },
             "cryptiles": {
               "version": "2.0.5",
@@ -684,9 +684,9 @@
           "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
         },
         "stringstream": {
-          "version": "0.0.4",
+          "version": "0.0.5",
           "from": "stringstream@~0.0.4",
-          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
         },
         "combined-stream": {
           "version": "1.0.5",
@@ -711,9 +711,9 @@
           "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
           "dependencies": {
             "bluebird": {
-              "version": "2.10.1",
+              "version": "2.10.2",
               "from": "bluebird@^2.9.30",
-              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.1.tgz"
+              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz"
             },
             "chalk": {
               "version": "1.1.1",
@@ -762,9 +762,9 @@
               }
             },
             "commander": {
-              "version": "2.8.1",
+              "version": "2.9.0",
               "from": "commander@^2.8.1",
-              "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+              "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
               "dependencies": {
                 "graceful-readlink": {
                   "version": "1.0.1",
@@ -827,13 +827,13 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "1.0.0",
-      "from": "windshaft@~1.0.0",
+      "version": "1.5.0",
+      "from": "windshaft@~1.5.0",
       "dependencies": {
         "mapnik": {
-          "version": "1.4.15-cdb2",
-          "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb2",
-          "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb2",
+          "version": "1.4.15-cdb5",
+          "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb5",
+          "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb5",
           "dependencies": {
             "nan": {
               "version": "1.2.0",
@@ -1216,8 +1216,8 @@
           }
         },
         "grainstore": {
-          "version": "1.0.0",
-          "from": "grainstore@~1.0.0",
+          "version": "1.1.0",
+          "from": "grainstore@~1.1.0",
           "dependencies": {
             "carto": {
               "version": "0.9.5-cdb2",
@@ -1301,9 +1301,9 @@
                       "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
                     },
                     "tough-cookie": {
-                      "version": "2.0.0",
+                      "version": "2.2.0",
                       "from": "tough-cookie@>=0.12.0",
-                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"
+                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
                     },
                     "form-data": {
                       "version": "0.1.4",
@@ -2966,6 +2966,11 @@
                   }
                 }
               }
+            },
+            "semver": {
+              "version": "5.0.3",
+              "from": "semver@~5.0.3",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
             }
           }
         },
@@ -2994,9 +2999,9 @@
           }
         },
         "tilelive-mapnik": {
-          "version": "0.6.15",
-          "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.x-cdb1",
-          "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.x-cdb1",
+          "version": "0.6.15-cdb3",
+          "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb3",
+          "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb3",
           "dependencies": {
             "generic-pool": {
               "version": "2.1.1",
@@ -3011,14 +3016,14 @@
           }
         },
         "tilelive-bridge": {
-          "version": "1.3.0",
-          "from": "https://github.com/CartoDB/tilelive-bridge/tarball/gzip-option",
-          "resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/gzip-option",
+          "version": "1.3.0-cdb3",
+          "from": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb3",
+          "resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb3",
           "dependencies": {
             "mapnik-pool": {
-              "version": "0.1.1",
-              "from": "https://github.com/CartoDB/mapnik-pool/tarball/cdb",
-              "resolved": "https://github.com/CartoDB/mapnik-pool/tarball/cdb",
+              "version": "0.1.1-cdb3",
+              "from": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb3",
+              "resolved": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb3",
               "dependencies": {
                 "generic-pool": {
                   "version": "2.1.1",
@@ -3104,9 +3109,9 @@
           "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.11.0.tgz"
         },
         "abaculus": {
-          "version": "1.1.0",
-          "from": "https://github.com/CartoDB/abaculus/tarball/cdb",
-          "resolved": "https://github.com/CartoDB/abaculus/tarball/cdb"
+          "version": "1.1.0-cdb3",
+          "from": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb3",
+          "resolved": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb3"
         },
         "sphericalmercator": {
           "version": "1.0.3",

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.14.0",
+    "version": "2.18.0",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"
@@ -29,13 +29,13 @@
         "node-statsd": "~0.0.7",
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "~1.0.0",
+        "windshaft": "~1.5.0",
         "step": "~0.0.6",
         "queue-async": "~1.0.7",
         "request": "~2.62.0",
         "cartodb-redis": "~0.13.0",
         "cartodb-psql": "~0.4.0",
-        "fastly-purge": "~1.0.0",
+        "fastly-purge": "~1.0.1",
         "redis-mpool": "~0.4.0",
         "lru-cache": "2.6.5",
         "lzma": "~1.3.7",

test/acceptance/cache/surrogate_keys_invalidation.js

@@ -68,7 +68,7 @@ describe('templates surrogate keys', function() {
 
     var cacheEntryKey = new NamedMapsCacheEntry(templateOwner, templateName).key();
     var invalidationMatchHeader = '\\b' + cacheEntryKey + '\\b';
-    var fastlyPurgePath = '/service/' + FAKE_FASTLY_SERVICE_ID + '/purge/' + encodeURIComponent(cacheEntryKey);
+    var fastlyPurgePath = '/service/' + FAKE_FASTLY_SERVICE_ID + '/purge/' + cacheEntryKey;
 
     var nock = require('nock');
     nock.enableNetConnect(/(127.0.0.1:5555|cartocdn.com)/);
@@ -132,7 +132,6 @@ describe('templates surrogate keys', function() {
         var fastlyScope = nock(FastlyPurge.FASTLY_API_ENDPOINT)
             .post(fastlyPurgePath)
             .matchHeader('Fastly-Key', FAKE_FASTLY_API_KEY)
-            .matchHeader('Fastly-Soft-Purge', 1)
             .matchHeader('Accept', 'application/json')
             .reply(200, {
                 status:'ok'
@@ -199,7 +198,6 @@ describe('templates surrogate keys', function() {
         var fastlyScope = nock(FastlyPurge.FASTLY_API_ENDPOINT)
             .post(fastlyPurgePath)
             .matchHeader('Fastly-Key', FAKE_FASTLY_API_KEY)
-            .matchHeader('Fastly-Soft-Purge', 1)
             .matchHeader('Accept', 'application/json')
             .reply(200, {
                 status:'ok'
@@ -260,7 +258,6 @@ describe('templates surrogate keys', function() {
         var fastlyScope = nock(FastlyPurge.FASTLY_API_ENDPOINT)
             .post(fastlyPurgePath)
             .matchHeader('Fastly-Key', FAKE_FASTLY_API_KEY)
-            .matchHeader('Fastly-Soft-Purge', 1)
             .matchHeader('Accept', 'application/json')
             .reply(200, {
                 status:'ok'

test/acceptance/multilayer_server.js

@@ -333,7 +333,7 @@ describe('tests from old api translated to multilayer', function() {
                 assert.ok(!res.headers.hasOwnProperty('x-cache-channel'));
 
                 // TODO when affected tables query makes the request to fail layergroup should be removed
-                keysToDelete['map_cfg|f14693f2d7b6dcf4629724b3d1efe22d'] = 0;
+                keysToDelete['map_cfg|4fb7bd7008322ce66f22d20aebba1ab0'] = 0;
                 keysToDelete['user:localhost:mapviews:global'] = 5;
 
                 var parsed = JSON.parse(res.body);

test/unit/cartodb/cdb_request.test.js

@@ -57,4 +57,28 @@ describe('req2params', function() {
 
         assert.equal(user, undefined);
     });
+
+    it('should not fail for undefined host header', function() {
+        var userFromHostConfig = global.environment.user_from_host;
+        global.environment.user_from_host = null;
+
+        var cdbRequest = new CdbRequest();
+        var user = cdbRequest.userByReq(createRequest(undefined));
+
+        global.environment.user_from_host = userFromHostConfig;
+
+        assert.equal(user, undefined);
+    });
+
+    it('should not fail for null host header', function() {
+        var userFromHostConfig = global.environment.user_from_host;
+        global.environment.user_from_host = null;
+
+        var cdbRequest = new CdbRequest();
+        var user = cdbRequest.userByReq(createRequest(null));
+
+        global.environment.user_from_host = userFromHostConfig;
+
+        assert.equal(user, undefined);
+    });
 });

test/unit/cartodb/ported/tile_stats.test.js

@@ -1,18 +1,13 @@
 require('../../../support/test_helper.js');
 
 var assert = require('assert');
-var cartodbServer = require('../../../../lib/cartodb/server');
-var serverOptions = require('../../../../lib/cartodb/server_options');
-var StatsClient = require('../../../../lib/cartodb/stats/client');
 
 var LayergroupController = require('../../../../lib/cartodb/controllers/layergroup');
 
 describe('tile stats', function() {
 
-    var statsClientGetInstanceFn = StatsClient.getInstance;
-
     after(function() {
-        StatsClient.getInstance = statsClientGetInstanceFn;
+        global.statsClient = null;
     });
 
 
@@ -28,7 +23,7 @@ describe('tile stats', function() {
             }
         });
 
-        var layergroupController = new LayergroupController(cartodbServer(serverOptions));
+        var layergroupController = new LayergroupController();
 
         var reqMock = {
             params: {
@@ -70,7 +65,7 @@ describe('tile stats', function() {
             send: function() {}
         };
 
-        var layergroupController = new LayergroupController(cartodbServer(serverOptions));
+        var layergroupController = new LayergroupController();
 
         layergroupController.finalizeGetTileOrGrid('Another error happened', reqMock, resMock, null, null);
 
@@ -79,9 +74,7 @@ describe('tile stats', function() {
     });
 
     function mockStatsClientGetInstance(instance) {
-        StatsClient.getInstance = function() {
-            return instance;
-        };
+        global.statsClient = instance;
     }
 
 });