Commit Graph

4594 Commits

Author SHA1 Message Date
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
11aa4d12bd add tests for getting api key token from requests 2018-02-15 15:27:41 +01:00
Eneko Lakasta
18dbeea003 get apikey token from request in named maps admin middleware 2018-02-15 15:20:52 +01:00
Eneko Lakasta
3e916c6054 check if req.query exist before getting req.query.api_key/map_key 2018-02-15 15:20:05 +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
140441b777 fix test 2018-02-15 12:53:01 +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
32986e3ebd Merge branch 'master' into project-auth-api 2018-02-12 12:25:46 +01:00
Eneko Lakasta
f106f27df4 Merge branch 'master' into project-auth-api 2018-02-12 12:21:09 +01:00
Raul Marin
3539b658fb Update Windshaft to 4.5.2 2018-02-12 12:19:36 +01:00
Javier Goizueta
abf33a1c68 Release 5.3.0 2018-02-12 12:03:02 +01:00
Javier Goizueta
fc6790ea1e
Merge pull request #866 from CartoDB/update-camshaft-to-0.61.2
Update camshaft to 0.61.2
2018-02-12 11:56:31 +01:00
Raul Marin
ac6f0e1c67 Update Windshaft to 4.5.1 2018-02-12 11:35:46 +01:00
Eneko Lakasta
041cd40ec2 please jshint 2018-02-09 19:26:52 +01:00
Eneko Lakasta
8721f56269 add auth test for getting tiles 2018-02-09 19:19:18 +01:00
Eneko Lakasta
1d3045c799 add tests should create/fail creating named maps and regular api key 2018-02-09 12:33:33 +01:00
Daniel García Aubert
52a1ed869c Update to development version of cartodb-redis 2018-02-08 19:28:43 +01:00
Eneko Lakasta
04f60baec5 Set the master role inheritance from regular roles as TBA 2018-02-08 19:01:58 +01:00
Eneko Lakasta
a8de436424 add test should create a layergroup with a buffer analysis using a regular apikey token AND grant privileges to master and regular roles in bootstraping sql 2018-02-08 18:54:14 +01:00
Javier Goizueta
ee7917676b Update camshaft to 0.61.2
This is to fixe a bug in the line-sequential analyses (length was incorrect)
2018-02-08 17:00:13 +01:00
Eneko Lakasta
c7780e9f42 add tests should create a layergroup with a source analysis 2018-02-08 15:20:43 +01:00
Eneko Lakasta
3edd7b8b01 add test should create a layergroup with default apikey token 2018-02-08 14:50:17 +01:00
Eneko Lakasta
455202cd1a organize prepare db api keys 2018-02-08 14:49:42 +01:00
Eneko Lakasta
8bdb82c7be add test should fail creating a layergroup with default apikey token 2018-02-08 14:48:00 +01:00
Eneko Lakasta
fa503ee66a fix test typo 2018-02-08 14:43:12 +01:00
Eneko Lakasta
e1a2ee2381 control API access grants 2018-02-08 13:07:25 +01:00
Eneko Lakasta
b82d26527a remove comment 2018-02-08 12:35:44 +01:00
Eneko Lakasta
1c50dd6b48 add first tests for auth 2018-02-08 12:34:24 +01:00
Eneko Lakasta
b0e9df1400 add pgConnection.getDatabaseParams 2018-02-08 12:04:03 +01:00
Eneko Lakasta
6ebf51ce45 let select apikey type in setDBAuth: regular, default, master 2018-02-08 11:29:17 +01:00
Eneko Lakasta
d9a34f3384 add cartodb250user api keys to redis 2018-02-08 11:13:21 +01:00
Eneko Lakasta
8136a1e136 fix test 2018-02-07 19:12:26 +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
6b5d6648de fix unit test 2018-02-07 17:14:46 +01:00
Eneko Lakasta
95538707c9 add parameter asMaster to setDBAuth 2018-02-07 17:14:13 +01:00
Eneko Lakasta
4c76a921b1 use res.locals instead of req.params 2018-02-07 16:02:13 +01:00
Eneko Lakasta
85c1c987af refactor setDBConn to not use step 2018-02-07 15:49:32 +01:00
Eneko Lakasta
bde86323fd use master api key in setDBAuth 2018-02-07 15:36:24 +01:00
Eneko Lakasta
880e3f388d remove use of _.extend calls 2018-02-07 12:46:10 +01:00
Eneko Lakasta
c1535b1a12 refactor setDBAuth to not use step 2018-02-07 12:40:36 +01:00
Eneko Lakasta
232ff1ba33 add apikeys keys to be removed after each test 2018-02-07 11:59:00 +01:00
Eneko Lakasta
1b63dcd4e5 add api keys to prepare db for testing 2018-02-07 11:10:50 +01:00
Raúl Marín
b32a0a6547
Merge pull request #864 from Algunenano/master_metrics
Add metrics option to Mapnik renderer (off by default)
2018-02-06 16:48:22 +01:00
Raul Marin
d634be0c30 Update NEWs and Windshaft to 4.5.0 2018-02-06 16:10:44 +01:00
Raul Marin
f9fe3ace37 Add mapnik metrics option 2018-02-06 16:07:22 +01:00
Simon Martín
6cd8131888 updating NEWS 2018-02-06 11:30:34 +01:00
Simon Martín
0ea76f7d15
Merge pull request #849 from CartoDB/redis4
Redis4 support
2018-02-06 11:24:02 +01:00