cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add an utility authorizedByAPIKey method for reuse

Browse Source
This commit is contained in:
Sandro Santilli
2013-12-17 17:17:17 +01:00
parent 241480bb23
commit 84b7d78ea4
1 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cartodb/server_options.js
+34 -12
View File
@@ -373,6 +373,37 @@ module.exports = function(){
);
}
// Check if a request is authorized by api_key
//
// @param req express request object
// @param callback function(err, authorized)
//
me.authorizedByAPIKey = function(req, callback)
{
var user = me.userByReq(req);
Step(
function (){
cartoData.getUserMapKey(user, this);
},
function checkApiKey(err, val){
if (err) throw err;
var valid = 0;
if ( val ) {
if ( val == req.query.map_key ) valid = 1;
else if ( val == req.query.api_key ) valid = 1;
// check also in request body
else if ( req.body && req.body.map_key && val == req.body.map_key ) valid = 1;
else if ( req.body && req.body.api_key && val == req.body.api_key ) valid = 1;
}
return valid;
},
function finish(err, authorized) {
callback(err, authorized);
}
);
};
/**
* Check access authorization
*
@@ -385,22 +416,13 @@ module.exports = function(){
Step(
function (){
cartoData.getUserMapKey(user, this);
that.authorizedByAPIKey(req, this);
},
function checkApiKey(err, val){
function checkApiKey(err, authorized){
if (err) throw err;
var valid = 0;
if ( val ) {
if ( val == req.query.map_key ) valid = 1;
else if ( val == req.query.api_key ) valid = 1;
// check also in request body
else if ( req.body && req.body.map_key && val == req.body.map_key ) valid = 1;
else if ( req.body && req.body.api_key && val == req.body.api_key ) valid = 1;
}
// if not authorized by api_key, continue
if (valid !== 1) return null;
if (authorized !== 1) return null;
// authorized by api key, login as the given username and stop
that.setDBAuth(user, req.params, function(err) {