From fcd17692eee1b0523938e4f100bfbbeead4f7415 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 9 Jan 2014 15:36:16 +0100
Subject: [PATCH] Fix username extraction in another two places. Thanks
 @demimismo.

Closes #100 (again)
---
 lib/cartodb/server_options.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js
index 7769a83e..786aac0d 100644
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -188,7 +188,7 @@ module.exports = function(){
       }
 
       var dbName     = req.params.dbname;
-      var username   = req.headers.host.split('.')[0];
+      var username   = this.userByReq(req);
 
       // strip out windshaft/mapnik inserted sql if present
       var sql = req.params.sql.match(/^\((.*)\)\sas\scdbq$/);
@@ -577,7 +577,7 @@ console.log("Checking authorization from signer " + signer + " for resource " +
           if ( tksplit.length > 1 ) req.params.cache_buster= tksplit[1];
           tksplit = req.params.token.split('@');
           if ( tksplit.length > 1 ) {
-            req.params.signer = req.headers.host.split('.')[0];
+            req.params.signer = this.userByReq(req);
             if ( tksplit[0] ) req.params.signer = tksplit[0];
             req.params.token = tksplit[1];
             //console.log("Request for token " + req.params.token + " with signature from " + req.params.signer);