Move userByReq to its own model

lib/cartodb/controllers/template_maps.js

@@ -1,5 +1,6 @@
 var step = require('step');
 var _ = require('underscore');
+var CdbRequest = require('../models/cdb_request');
 
 function TemplateMapsController(app, serverOptions, templateMaps, metadataBackend, templateBaseUrl, surrogateKeysCache,
                                 NamedMapsCacheEntry, pgConnection) {
@@ -15,6 +16,7 @@ function TemplateMapsController(app, serverOptions, templateMaps, metadataBacken
 
 module.exports = TemplateMapsController;
 
+var cdbRequest = new CdbRequest();
 
 TemplateMapsController.prototype.register = function(app) {
     app.get(this.templateBaseUrl + '/:template_id/jsonp', this.jsonp.bind(this));
@@ -33,7 +35,7 @@ TemplateMapsController.prototype.create = function(req, res) {
 
     this.app.doCORS(res);
 
-    var cdbuser = self.serverOptions.userByReq(req);
+    var cdbuser = cdbRequest.userByReq(req);
 
     step(
         function checkPerms(){
@@ -80,7 +82,7 @@ TemplateMapsController.prototype.update = function(req, res) {
 
     this.app.doCORS(res);
 
-    var cdbuser = this.serverOptions.userByReq(req);
+    var cdbuser = cdbRequest.userByReq(req);
     var template;
     var tpl_id;
     step(
@@ -140,7 +142,7 @@ TemplateMapsController.prototype.retrieve = function(req, res) {
 
     this.app.doCORS(res);
 
-    var cdbuser = this.serverOptions.userByReq(req);
+    var cdbuser = cdbRequest.userByReq(req);
     var tpl_id;
     step(
         function checkPerms(){
@@ -201,7 +203,7 @@ TemplateMapsController.prototype.destroy = function(req, res) {
     }
     this.app.doCORS(res);
 
-    var cdbuser = this.serverOptions.userByReq(req);
+    var cdbuser = cdbRequest.userByReq(req);
     var tpl_id;
     step(
         function checkPerms(){
@@ -254,7 +256,7 @@ TemplateMapsController.prototype.list = function(req, res) {
     }
     this.app.doCORS(res);
 
-    var cdbuser = this.serverOptions.userByReq(req);
+    var cdbuser = cdbRequest.userByReq(req);
 
     step(
         function checkPerms(){
@@ -353,7 +355,7 @@ TemplateMapsController.prototype.instantiateTemplate = function(req, res, templa
     var template;
     var layergroup;
     var fakereq; // used for call to createLayergroup
-    var cdbuser = self.serverOptions.userByReq(req);
+    var cdbuser = cdbRequest.userByReq(req);
     // Format of template_id: [<template_owner>]@<template_id>
     var tpl_id = req.params.template_id.split('@');
     if ( tpl_id.length > 1 ) {

lib/cartodb/models/cdb_request.js

@@ -0,0 +1,26 @@
+function CdbRequest() {
+}
+
+module.exports = CdbRequest;
+
+var RE_USER_FROM_HOST = new RegExp(global.environment.user_from_host ||
+        '^([^\\.]+)\\.' // would extract "strk" from "strk.cartodb.com"
+);
+
+CdbRequest.prototype.userByReq = function(req) {
+    var host = req.headers.host;
+    if (req.params.user) {
+        return req.params.user;
+    }
+    var mat = host.match(RE_USER_FROM_HOST);
+    if ( ! mat ) {
+        console.error("Pattern '" + RE_USER_FROM_HOST + "' does not match hostname '" + host + "'");
+        return;
+    }
+    // console.log("Matches: "); console.dir(mat);
+    if ( mat.length !== 2 ) {
+        console.error("Pattern '" + RE_USER_FROM_HOST + "' gave unexpected matches against '" + host + "': ", mat);
+        return;
+    }
+    return mat[1];
+};

lib/cartodb/server_options.js

@@ -6,6 +6,7 @@ var crypto = require('crypto');
 var LZMA = require('lzma').LZMA;
 var TemplateMaps = require('./template_maps.js');
 var MapConfigNamedLayersAdapter = require('./models/mapconfig_named_layers_adapter');
+var CdbRequest = require('./models/cdb_request');
 
 // Whitelist query parameters and attach format
 var REQUEST_QUERY_PARAMS_WHITELIST = [
@@ -33,7 +34,8 @@ module.exports = function(redisPool) {
     var cartoData = require('cartodb-redis')({ pool: redisPool }),
         lzmaWorker = new LZMA(),
         pgConnection = new PgConnection(cartoData),
-        queryTablesApi = new QueryTablesApi(pgConnection, cartoData);
+        queryTablesApi = new QueryTablesApi(pgConnection, cartoData),
+        cdbRequest = new CdbRequest();
 
     var rendererConfig = _.defaults(global.environment.renderer || {}, {
         cache_ttl: 60000, // milliseconds
@@ -201,7 +203,7 @@ module.exports = function(redisPool) {
             return [req.params.table];
           }
 
-          queryTablesApi.getAffectedTablesInQuery(that.userByReq(req), sql, this); // in addCacheChannel
+          queryTablesApi.getAffectedTablesInQuery(cdbRequest.userByReq(req), sql, this); // in addCacheChannel
         },
         function buildCacheChannel(err, tableNames) {
           if ( err ) throw err;
@@ -273,7 +275,7 @@ module.exports = function(redisPool) {
     };
 
     me.beforeLayergroupCreate = function(req, requestMapConfig, callback) {
-        mapConfigNamedLayersAdapter.getLayers(this.userByReq(req), requestMapConfig.layers, pgConnection,
+        mapConfigNamedLayersAdapter.getLayers(cdbRequest.userByReq(req), requestMapConfig.layers, pgConnection,
             function(err, layers, datasource) {
                 if (err) {
                     return callback(err);
@@ -288,7 +290,7 @@ module.exports = function(redisPool) {
     me.afterLayergroupCreate = function(req, mapconfig, response, callback) {
         var token = response.layergroupid;
 
-        var username = this.userByReq(req);
+        var username = cdbRequest.userByReq(req);
 
         var tasksleft = 2; // redis key and affectedTables
         var errors = [];
@@ -362,30 +364,6 @@ module.exports = function(redisPool) {
 
 /* X-Cache-Channel generation } */
 
-    me.re_userFromHost = new RegExp(
-      global.environment.user_from_host ||
-      '^([^\\.]+)\\.' // would extract "strk" from "strk.cartodb.com"
-    );
-
-    me.userByReq = function(req) {
-      var host = req.headers.host;
-      if (req.params.user) {
-        return req.params.user;
-      }
-      var mat = host.match(this.re_userFromHost);
-      if ( ! mat ) {
-        console.error("ERROR: user pattern '" + this.re_userFromHost + "' does not match hostname '" + host + "'");
-        return;
-      }
-      // console.log("Matches: "); console.dir(mat);
-      if ( mat.length !== 2 ) {
-        console.error("ERROR: pattern '" + this.re_userFromHost + "' gave unexpected matches against '" + host + "': " +
-            mat);
-        return;
-      }
-      return mat[1];
-    };
-
     // Check if a request is authorized by a signer
     //
     // @param req express request object
@@ -441,7 +419,7 @@ module.exports = function(redisPool) {
           return;
         }
         //console.log("given ApiKey: " + givenKey);
-        var user = me.userByReq(req);
+        var user = cdbRequest.userByReq(req);
         step(
           function (){
               cartoData.getUserMapKey(user, this);
@@ -464,7 +442,7 @@ module.exports = function(redisPool) {
      */
     me.authorize = function(req, callback) {
         var that = this;
-        var user = me.userByReq(req);
+        var user = cdbRequest.userByReq(req);
 
         step(
             function (){
@@ -589,7 +567,7 @@ module.exports = function(redisPool) {
         _.each(bad_query, function(key){ delete req.query[key]; });
         req.params =  _.extend({}, req.params); // shuffle things as request is a strange array/object
 
-        var user = me.userByReq(req);
+        var user = cdbRequest.userByReq(req);
 
         if ( req.params.token ) {
           //console.log("Request parameters include token " + req.params.token);