Commit Graph
89 Commits
Author SHA1 Message Date
Simon Martín 0e43c54214 Merge branch 'master' into rateLimits 2018-03-13 18:09:44 +01:00
Simon Martín 9bc9fc46ff using cartodb-redis for rate limit 2018-03-03 14:46:39 +01:00
Simon Martín a2bf235553 Merge branch 'master' into rateLimits 2018-03-02 21:21:10 +01:00
Simon Martín 4dd404771e refactoring user_limits_api 2018-03-02 16:07:42 +01:00
Simon Martín 136c6fa70b new redis keys 2018-03-01 15:50:40 +01:00
Daniel García Aubert 62deda6470 Improve naming 2018-02-28 19:13:49 +01:00
Simon Martín 335d91b42d separate rate limit logic from middleware and EVALSHA 2018-02-28 13:11:18 +01:00
Daniel García Aubert 603ef4044c Reduce cyclomatic complexity 2018-02-19 18:48:02 +01:00
Daniel García Aubert 2e3abfb2cd Catch "name not found" errors from metadata backend and set http code status 404 2018-02-19 18:28:58 +01:00
Eneko Lakasta 7e14247ea9 remove cause of unreachable code/dead code. Not necessary because carto redis assures at least the default api key 2018-02-19 17:06:59 +01:00
Eneko Lakasta 7b21bd26d0 Merge branch 'project-auth-api' into project-auth-api-fallback 2018-02-16 11:29:36 +01:00
Eneko Lakasta 4ac224688c in fallback mode, use default api key if api key token doesnt exist 2018-02-16 11:20:04 +01:00
Eneko Lakasta cda2616a8a get and check api key credentials from api key: username and token 2018-02-15 17:49:47 +01:00
Eneko Lakasta fc420c2c0f use for compatibility res.locals.api_key instead of res.locals.apikeyToken 2018-02-15 15:19:09 +01:00
Eneko Lakasta 5db0e9c8d8 add middleware for apikeyToken 2018-02-15 12:50:42 +01:00
Eneko Lakasta 963737d3fb create lib for getting api key token from request 2018-02-15 11:36:42 +01:00
Eneko Lakasta 890f0d1ef6 add fallback for using metadata fallback 2018-02-14 17:31:05 +01:00
Eneko Lakasta e1a2ee2381 control API access grants 2018-02-08 13:07:25 +01:00
Eneko Lakasta 6ebf51ce45 let select apikey type in setDBAuth: regular, default, master 2018-02-08 11:29:17 +01:00
Eneko Lakasta 41f3606572 return unauthorized error when api key not found 2018-02-07 19:12:14 +01:00
Eneko Lakasta ea0542dcb1 remove use of step 2018-02-07 18:48:59 +01:00
Eneko Lakasta a4dbc1bac2 remove step and check existance of proper api key 2018-02-07 18:20:56 +01:00
Eneko Lakasta 95538707c9 add parameter asMaster to setDBAuth 2018-02-07 17:14:13 +01:00
Simon Martín 9083fc2e20 fix forgotten comment 2017-10-05 12:44:03 +02:00
Simon Martín 1f03a6b181 using res.locals instead of params in AuthApi 2017-10-05 11:28:41 +02:00
Simon Martín ec8fcc7302 change param name and comments updated 2017-10-04 12:50:27 +02:00
Simon Martín 21720267cf from req.context to res.locals 2017-10-03 17:47:57 +02:00
Simon Martín 3ce10690d6 send res.locals instead of res when possible 2017-10-03 13:06:12 +02:00
Simon Martín b4d03c074a not move db params to res.locals.db 2017-09-29 11:07:11 +02:00
Simon Martín 4a2cc6a5f8 res.locals in auth_api 2017-09-28 11:55:36 +02:00
Raul Ochoa 23edf78a67 Remove unnecessary step 2017-08-10 15:58:25 +02:00
Daniel García Aubert 3574700c2d Remove tiler render limit 2017-08-02 11:07:44 +02:00
Daniel García Aubert ab879e2634 Use new version of getUserTimeoutRenderLimits 2017-08-01 19:13:55 +02:00
Daniel García Aubert 669707b26c Fix typo 2017-07-18 11:56:54 +02:00
Daniel García Aubert 0684c1b9d3 Work in progress: get timeout from redis 2017-07-05 19:08:19 +02:00
Raul Ochoa cad02bfad7 Remove all conditional branches to call req.profiler
req.profiler is created in a middleware for all requests.
2017-03-30 20:31:53 +02:00
Raul Ochoa c539d4fbbd Change camshaft naming from filters 2016-07-06 21:11:39 +02:00
Javier Goizueta 48415fb1f3 Merge branch 'master' into overviews-widgets-2 2016-05-18 13:58:55 +02:00
Javier Goizueta e1aa0bc7ae Use JSON format for EXPLAIN 2016-05-18 13:09:55 +02:00
Javier Goizueta 7f7204df6c Add filter stats information to query rewriter data 2016-05-17 15:41:31 +02:00
Raul Ochoa 8fb35571fe Adds support for mapnik substitution token at turbo-carto level
Goes green and fixes #455
2016-05-17 15:00:18 +02:00
Raul Ochoa 3e4f71d873 Nicer error message when missing sql from layer options
Fixes #446
2016-05-11 18:24:47 +02:00
Javier Goizueta 084b3e94a6 Remove unneeded variable 2016-04-20 18:01:34 +02:00
Javier Goizueta a0445b5cdd 💄 Fix indentation
2 spaces were used instead of 4 in some places
2016-04-20 17:47:43 +02:00
Javier Goizueta ecbae52abe Refactor: use reduce for collecting overviews metadata 2016-04-20 17:24:16 +02:00
Javier Goizueta 57cba3d511 Fix comment 2016-04-20 14:30:13 +02:00
Javier Goizueta 7902b276ad Support unneeded schema names in overviews queries
Fixes #420
Keep table schema of overviews base tables and use it
to support queries that use the schema name when not
strictly needed.
2016-04-19 22:50:05 +02:00
Raul Ochoa 94c7bc41be Merge branch 'master' into new_querytables_library 2016-03-03 19:30:51 +01:00
Javier Goizueta f0a1e7a0e0 Simplify error passing 2016-02-23 18:15:14 +01:00
Javier Goizueta 21f3c8a387 Change error messages when getting overviews metadata fails
Remove the detail that the error occurred trying to get overviews
metadata from the error message. This should be less confusing
to the user.
2016-02-23 11:45:26 +01:00