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
2736b93c69
test to validate it's not possible to override authorization
...
with a crafted layergroup
2015-02-05 16:47:37 +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
fbecc11aa5
Do not use the SQL API Emulator for testing named layers as it hides
...
an integration issue with cdb_querytables
2015-02-04 19:01:14 +01:00
Raul Ochoa
8cacc3bb9e
Merge branch 'master' into 239-mapconfig-named-maps-extension
2015-02-04 18:59:07 +01:00
Raul Ochoa
a82af16347
Adds a template test with http layer
2015-02-04 18:57:46 +01:00
Raul Ochoa
5018d32af6
Add querytables and cdb_tablemetadata for proper testing its integration
2015-02-04 18:52:37 +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
58f9f5f7a8
Remove unused object, rename suite
2015-02-03 14:16:55 +01:00
Raul Ochoa
e4e633cf86
Fix next reference
2015-02-02 17:44:15 +01:00
Raul Ochoa
1bb0d8738e
Add test case for layers with private tables
2015-02-02 14:38:26 +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
12c5d835c5
Fix integration tests as I messed with the filename
2015-01-30 19:11:54 +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
358b296750
Remove beforeEach and afterEach, in combination with suite they are
...
triggered for every single test even outside of the suite they were
invoked in.
2015-01-30 16:50:06 +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
81f1b0dcf8
Adds tests for named maps surrogate keys and for invalidation
2015-01-26 15:02:28 +01:00
Raul Ochoa
11d9f5dd76
Basic layergroup validation on named map creation/update
2015-01-23 18:24:25 +01:00
Raul Ochoa
0abd6a2293
Adds check for surrogate key headers in template instances
...
p.s. it fixes instantiate template with params test
2015-01-23 17:02:13 +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
981be0edd5
Replace signed maps auth tests with template maps tests
2015-01-22 17:55:47 +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
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
6c4bb59f06
First tests, not all ready. WIP
2014-11-05 15:42:28 +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
b4bee864d2
Lock now considers the creation time and compares against a ttl so
...
a lock is not keep forever in case of failure.
Pending: lazy removal of expired locks.
2014-09-25 19:00:35 +02:00
Raul Ochoa
3b96f0d535
Starts using mapnik 2.3.x via windshaft upgrade
2014-09-24 15:54:13 +02:00
Raul Ochoa
9d36ae293c
Run check before any assert so server is stopped
2014-09-18 19:07:15 +02:00
Raul Ochoa
7afa869833
Use double quote to be consistent
2014-08-29 16:48:28 +02:00
Raul Ochoa
965e1cd0c4
Supports !scale_denominator! dynamic param in SQL queries
2014-08-22 10:16:39 +02:00
Raul Ochoa
50c8a2dc69
Defaults mapnik version for test
2014-08-18 14:48:45 +02:00
Raul Ochoa
a3a5964926
Upgrades dependencies
2014-08-14 19:54:45 +02:00
Raul Ochoa
6a8cff6fcd
Merge branch 'remove-mapnik-dependency'
...
Conflicts:
NEWS.md
2014-08-14 19:26:52 +02:00
Raul Ochoa
23a7684208
Removes mapnik dependency as it now relies on Windshaft to check mapnik version
2014-08-14 18:27:54 +02:00
Raul Ochoa
5cf79c82bb
Configurable QueryTablesAPI to call directly postgresql using cartodb-psql
...
or to keep using a request to the SQL API
2014-08-06 21:48:08 +02:00
Raul Ochoa
d1373bec66
Improves SQL query for affected tables and last updated time
2014-08-04 17:48:59 +02:00
Raul Ochoa
73d1db3bd2
CDB-3686 Adds support for per mil tolerance when comparing images as in Mac OS X some results from ImageMagick are a bit odd
2014-08-04 01:30:24 +02:00
Raul Ochoa
9b5921e8e1
CDB-3686 Fixes expected queries based on changes to request table names and last updated time in one request
2014-08-04 01:29:23 +02:00
Raul Ochoa
799a999148
CDB-3686 Makes SQL API emulator to handle new query with both names and updated time for affected tables.
2014-08-04 01:28:30 +02:00
Raul Ochoa
0dfd51f81a
Adds host to redis setup as it does not make sense to continue if there is no host in redis.
2014-07-04 11:47:44 +02:00
Raul Ochoa
8a91b5cfb5
CDB-3256 Fixes test related to cache in templated layergroup creation
2014-06-24 16:05:54 +02:00
Raul Ochoa
2dd03e21e1
CDB-3256 fix test and adds a couple more of tests for testing the no-cache scenarios
2014-06-24 13:13:00 +02:00
Sandro Santilli
882ec65ba0
Use signer's map_key when contacting sql-api
...
Includes testcase.
Fixes #188
2014-04-08 09:44:49 +02:00
Sandro Santilli
312194228a
Stop duplicating global.environment as global.settings
2014-03-28 18:47:59 +01:00
Sandro Santilli
9e495b42ee
Do not cache non-success jsonp responses
...
Closes #186
Includes testcase
2014-03-21 13:58:20 +01:00
Sandro Santilli
9c4feac19b
Ensure make check fails if database preparation fails
2014-03-19 17:04:06 +01:00
