Raul Ochoa
6bd967e9fb
Merge branch 'master' into medusa-improvements
...
Conflicts:
lib/cartodb/server_options.js
2015-02-06 12:01:28 +01:00
Raul Ochoa
13f5fda1b8
Merge pull request #255 from CartoDB/empty-flush_cache-endpoint
...
Remove per table flush cache endpoint
2015-02-05 17:37:56 +01:00
Raul Ochoa
09527b6808
Remove no longer needed method from query_tables_api
2015-02-05 17:08:20 +01:00
Raul Ochoa
d065ace036
Remove per table flush cache endpoint
2015-02-05 17:05:50 +01:00
Raul Ochoa
fa8b27231c
Removed unused/old template lock functionality
2015-02-04 19:36:16 +01:00
Raul Ochoa
c17af23a40
A non empty datasource from MapConfigNamedLayersAdapter.getLayers
...
means the affected tables can have private tables involved.
That implies QueryTablesApi will need the proper user to use
CDB_QueryTables. So we store it in a request context to use it in
the afterLayergroupCreate call.
Tiles for these layergroups will fail to add a X-Cache-Channel
header because it won't be possible to use the proper user within
those tiles. Ok, they will fail if they are not requested through
the same tiler instance because if they are they most likely will
reuse the in memory cache.
See https://github.com/CartoDB/Windshaft-cartodb/issues/253
2015-02-04 19:31:20 +01:00
Raul Ochoa
2c7bc6adde
Datasource to give per-layer authentication in named layers
...
Make beforeLayergroupCreate to return a datasource with different
authentication for the different layers.
- Named layers will get access to private tables in case it's needed
Changes in MapConfigNamedLayersAdapter:
- It will retrieve the dbAuth params only if named layers are present so
there is no extra overhead for normal layers
- Rename queue function signature from `callback` to `done` so it is easier
to follow the code
Add several tests to validate `named` layers authentication
2015-02-04 11:30:36 +01:00
Raul Ochoa
4949616c4e
Some acceptance tests, http_status = 403 should not happen in adapter,
...
needs improvement
2015-01-30 19:29:45 +01:00
Raul Ochoa
87eaeb0074
Some integration tests for different cases in named layers type
2015-01-30 18:57:01 +01:00
Raul Ochoa
8b07156a2d
Make templateMaps available in cartodb windshaft
2015-01-30 16:51:09 +01:00
Raul Ochoa
d0ef87b0cf
Add a before layergroup creation action to allow first level named
...
maps layer type to be extended as other layers
2015-01-30 15:31:49 +01:00
Raul Ochoa
e28fe1fdc0
Initialize template maps in server options
2015-01-30 15:30:13 +01:00
Raul Ochoa
aecb07b008
Create redis pool in server options when not supplied
2015-01-30 15:28:55 +01:00
Raul Ochoa
efe090f5b0
Accept 'open' string in templated auth
as authorized
2015-01-28 17:29:50 +01:00
Raul Ochoa
6ab6fd91e4
Merge pull request #248 from CartoDB/196-validate-layergroup-in-named-maps
...
Basic layergroup validation on named map creation/update
2015-01-26 17:04:48 +01:00
Raul Ochoa
e690170689
More exhaustive layergroup validation:
...
- layers is an array and it's not empty
- layers has at least options
2015-01-26 15:51:10 +01:00
Raul Ochoa
11d9f5dd76
Basic layergroup validation on named map creation/update
2015-01-23 18:24:25 +01:00
Raul Ochoa
571a635fed
Old style, avoid merge conflicts, missing history
2015-01-23 17:46:58 +01:00
Raul Ochoa
6e70518146
Split between old cache_enabled and new purge_enabled configuration
2015-01-23 17:46:16 +01:00
Raul Ochoa
fabb438cf0
Escape \b for the regex
2015-01-23 17:22:49 +01:00
Raul Ochoa
272e8cd221
Adds Surrogate Keys to named maps
2015-01-23 16:37:38 +01:00
Raul Ochoa
885accdadf
Adds varnish http port to the default configurations
2015-01-23 16:36:45 +01:00
Raul Ochoa
f5a3b77737
Make TemplateMaps to emit messages when adding/updating/deleting templates
2015-01-23 16:35:47 +01:00
Raul Ochoa
20eb92a3b1
Remove signedmaps and locks functionality as it is no longer needed
2015-01-22 19:28:59 +01:00
Raul Ochoa
8d22ed7594
Tests to validate template instantiation returns new instances with
...
default values if they are missing.
2015-01-22 18:38:42 +01:00
Raul Ochoa
e8ab3a48c6
Removes TemplateMaps dependency on SignedMaps
...
- Token validation is done against the template
- Template is always extended with default values for auth and placeholders
- MapConfig is extended, in order to validate auth_toknes, with template info:
- template name
- template auth
- No more locks to create, update or delete templates
- Trusting in redis' hash semantics
- Some tradeoffs:
* A client having more templates than allowed by a race condition
between limit (HLEN) check and creation (HSET)
* Updating a template could happen while the deleting it, resulting in
in a new template
* Templates already instantiated will be accessible thrught their
layergroup so it is possible to continue requesting tiles/grids/etc.
- Authorization is now handled by template maps
2015-01-22 15:40:40 +01:00
Raul Ochoa
64b5a64e1b
Add templateMaps to serveroptions for the time being
2015-01-21 11:44:06 +01:00
Raul Ochoa
8bc08d75b7
Separate signed maps instantiation
2015-01-20 18:40:56 +01:00
Raul Ochoa
c14157acc2
Moves template routing
2015-01-20 18:16:09 +01:00
Raul Ochoa
595dac57a0
Moves setDBParams into controller
2015-01-20 18:14:10 +01:00
Raul Ochoa
5632b19e16
Remove unused functionality from app
2015-01-20 18:13:36 +01:00
Raul Ochoa
007196555d
Use userByReq from serverOptions
2015-01-20 18:12:24 +01:00
Raul Ochoa
62ffc05ef4
Move template map instantiation into controller
2015-01-20 17:57:53 +01:00
Raul Ochoa
5962141114
Moves template options to controller
2015-01-20 17:45:47 +01:00
Raul Ochoa
7901a05b55
List templates moved into controller
2015-01-20 17:39:33 +01:00
Raul Ochoa
4c2a0ca048
Delete moved to controller
2015-01-20 17:34:23 +01:00
Raul Ochoa
b40c8e6624
Retrieve template moved to controller
2015-01-20 17:17:06 +01:00
Raul Ochoa
97d3b1a03b
Move update template to controller
2015-01-20 17:07:55 +01:00
Raul Ochoa
fcea0c9b83
Move template creation to controller
2015-01-20 16:58:12 +01:00
Raul Ochoa
7ce8737e75
Initial split template maps endpoint into its own controller
2015-01-20 16:56:06 +01:00
Raul Ochoa
caa05e779a
Add scale_factor param as valid one
2015-01-14 18:11:13 +01:00
Raul Ochoa
845ebcac15
Merge branch 'master' into static-controllers
...
Conflicts:
npm-shrinkwrap.json
2015-01-13 12:45:37 +01:00
Raul Ochoa
3f1aa9955b
Remove query tables api dependency from health check
2015-01-13 12:09:02 +01:00
Alejandro Martínez
96bcd14bb8
Remove PostgreSQL from health checks
...
This way the health checks will only check for Redis and Mapnik
initialization.
An empty tile without layers or datasources is generated.
2015-01-13 11:29:19 +01:00
Raul Ochoa
48d60821a7
Exposes http renderer config
2014-12-01 18:43:40 +01:00
Raul Ochoa
97c55c1187
Removes console.log
2014-11-05 15:42:16 +01:00
Raul Ochoa
7c389a8010
Health check endpoint
2014-11-05 15:06:01 +01:00
Raul Ochoa
c88330f5f2
Allow a different cache-control max-age for layergroup responses
2014-10-24 16:05:41 +02:00
Raul Ochoa
cf5e34eae6
Upgrades Windshaft to start reporting redis/renderers/mapnik pool metrics
2014-10-15 16:45:49 +02:00
Raul Ochoa
9f5faf7cf8
Server options to instantiate cartodb-redis with redis configuration if pool is not provided
2014-10-14 21:19:44 +02:00