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

Remove metrics for authorizedBy*

Browse Source
This commit is contained in:
Raul Ochoa 2015-03-27 17:57:46 +01:00
parent d210643d63
commit 1f53884722
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/metrics.md
View File

@ -25,9 +25,7 @@ Again, each inner timer may have several inner timers.
- **TemplateMaps_instance**: time to retrieve a map template instance, see *getTemplate* and *authorizedByCert* - **TemplateMaps_instance**: time to retrieve a map template instance, see *getTemplate* and *authorizedByCert*
- **affectedTables**: time to check what are the affected tables for adding the cache channel, see *addCacheChannel* - **affectedTables**: time to check what are the affected tables for adding the cache channel, see *addCacheChannel*
- **authorize**: time to authorize a request, see *authorizedByAPIKey*, *authorizedByCert*, *authorizedBySigner* - **authorize**: time to authorize a request, see *authorizedByAPIKey*, *authorizedByCert*, *authorizedBySigner*
- **authorizedByAPIKey**: time to authorize using an API KEY
- **authorizedByCert**: time to authorize a template instantiation - **authorizedByCert**: time to authorize a template instantiation
- **authorizedBySigner**: time to authorize a request with auth_token
- **findLastUpdated**: time to retrieve the last update time for a list of tables, see *affectedTables* - **findLastUpdated**: time to retrieve the last update time for a list of tables, see *affectedTables*
- **generateCacheChannel**: time to generate the headers for the cache channel based on the request, see *addCacheChannel* - **generateCacheChannel**: time to generate the headers for the cache channel based on the request, see *addCacheChannel*
- **getSignerMapKey**: time to retrieve from redis the authorized user for a template map - **getSignerMapKey**: time to retrieve from redis the authorized user for a template map

11
lib/cartodb/server_options.js
View File

@ -424,8 +424,6 @@ module.exports = function(redisPool) {
return; return;
} }
_.extend(req.params, { _authorizedByApiKey: true });
// authorized by api key, login as the given username and stop // authorized by api key, login as the given username and stop
pgConnection.setDBAuth(user, req.params, function(err) { pgConnection.setDBAuth(user, req.params, function(err) {
callback(err, true); // authorized (or error) callback(err, true); // authorized (or error)
@ -433,13 +431,6 @@ module.exports = function(redisPool) {
}, },
function checkSignAuthorized(err, signed_by){ function checkSignAuthorized(err, signed_by){
assert.ifError(err); assert.ifError(err);
if (req.profiler) {
if ( req.params._authorizedByApiKey ) {
req.profiler.done('setDBAuth');
} else {
req.profiler.done('authorizedBySigner');
}
}
if ( ! signed_by ) { if ( ! signed_by ) {
// request not authorized by signer. // request not authorized by signer.
@ -457,8 +448,6 @@ module.exports = function(redisPool) {
return; return;
} }
// Authorized by "signed_by" !
_.extend(req.params, { _authorizedBySigner: signed_by });
pgConnection.setDBAuth(signed_by, req.params, function(err) { pgConnection.setDBAuth(signed_by, req.params, function(err) {
if (req.profiler) { if (req.profiler) {
req.profiler.done('setDBAuth'); req.profiler.done('setDBAuth');