From 5d7cfa9053610cbe86b150992612eff75a82a99d Mon Sep 17 00:00:00 2001 From: Carla Date: Tue, 17 Nov 2015 10:19:48 +0100 Subject: [PATCH 01/10] Update 10_admin0_test.sql --- client/sql/10_admin0_test.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/sql/10_admin0_test.sql b/client/sql/10_admin0_test.sql index ede9107..2658d15 100644 --- a/client/sql/10_admin0_test.sql +++ b/client/sql/10_admin0_test.sql @@ -2,7 +2,7 @@ CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_admin0_polygons(user_id name, tx_id bigint, country_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_admin0_polygons invoked with params (%, %, %)', user_id, 'some_transaction_id', country_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_admin0_polygons invoked with params (%, %, %)', user_id, 'some_transaction_id', country_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; From 77d5c3771784cd87138acea128af0c0e31dcc12a Mon Sep 17 00:00:00 2001 From: Carla Date: Tue, 17 Nov 2015 10:20:12 +0100 Subject: [PATCH 02/10] typo cbd --- client/sql/20_admin1_test.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/sql/20_admin1_test.sql b/client/sql/20_admin1_test.sql index 3ecbfe6..6b908aa 100644 --- a/client/sql/20_admin1_test.sql +++ b/client/sql/20_admin1_test.sql @@ -2,7 +2,7 @@ CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_admin1_polygon(user_id name, tx_id bigint, admin1_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_admin1_polygon invoked with params (%, %, %)', user_id, 'some_transaction_id', admin1_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_admin1_polygon invoked with params (%, %, %)', user_id, 'some_transaction_id', admin1_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; @@ -10,7 +10,7 @@ $$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_admin1_polygon(user_id name, tx_id bigint, admin1_name text, country_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_admin1_polygon invoked with params (%, %, %, %)', user_id, 'some_transaction_id', admin1_name, country_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_admin1_polygon invoked with params (%, %, %, %)', user_id, 'some_transaction_id', admin1_name, country_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; From 30c02dd0538933531cd9cd778e420ac01c5429d9 Mon Sep 17 00:00:00 2001 From: Carla Date: Tue, 17 Nov 2015 10:20:31 +0100 Subject: [PATCH 03/10] typo cbd --- client/sql/30_namedplaces_test.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/sql/30_namedplaces_test.sql b/client/sql/30_namedplaces_test.sql index f0f8004..f1501e7 100644 --- a/client/sql/30_namedplaces_test.sql +++ b/client/sql/30_namedplaces_test.sql @@ -2,7 +2,7 @@ CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_namedplace_point(user_id name, tx_id bigint, city_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_namedplace_point invoked with params (%, %, %)', user_id, 'some_transaction_id', city_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_namedplace_point invoked with params (%, %, %)', user_id, 'some_transaction_id', city_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; @@ -10,7 +10,7 @@ $$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_namedplace_point(user_id name, tx_id bigint, city_name text, country_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_namedplace_point invoked with params (%, %, %, %)', user_id, 'some_transaction_id', city_name, country_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_namedplace_point invoked with params (%, %, %, %)', user_id, 'some_transaction_id', city_name, country_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; @@ -18,7 +18,7 @@ $$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_namedplace_point(user_id name, tx_id bigint, city_name text, admin1_name text, country_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_namedplace_point invoked with params (%, %, %, %, %)', user_id, 'some_transaction_id', city_name, admin1_name, country_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_namedplace_point invoked with params (%, %, %, %, %)', user_id, 'some_transaction_id', city_name, admin1_name, country_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; From 199a7ed90562b0bc01f38f638a02c93d5d38785f Mon Sep 17 00:00:00 2001 From: Carla Iriberri Date: Tue, 17 Nov 2015 11:30:25 +0100 Subject: [PATCH 04/10] Fixing adm0 plural naming and cdb typos in NOTICE messages --- client/expected/10_admin0_test.out | 16 +++++++-------- client/expected/20_admin1_test.out | 8 ++++---- client/expected/30_namedplaces_test.out | 12 ++++++------ client/expected/90_permissions_test.out | 26 ++++++++++++------------- client/sql/0.0.1/10_admin0.sql | 8 ++++---- client/sql/0.0.1/90_permissions.sql | 2 +- client/sql/10_admin0_test.sql | 6 +++--- client/sql/90_permissions_test.sql | 4 ++-- 8 files changed, 41 insertions(+), 41 deletions(-) diff --git a/client/expected/10_admin0_test.out b/client/expected/10_admin0_test.out index 37d99fc..2c4efee 100644 --- a/client/expected/10_admin0_test.out +++ b/client/expected/10_admin0_test.out @@ -1,18 +1,18 @@ -- Mock the server function -CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_admin0_polygons(user_id name, tx_id bigint, country_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_admin0_polygon(user_id name, tx_id bigint, country_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_admin0_polygons invoked with params (%, %, %)', user_id, 'some_transaction_id', country_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_admin0_polygon invoked with params (%, %, %)', user_id, 'some_transaction_id', country_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; -- Exercise the public and the proxied function -SELECT cdb_geocoder_client.geocode_admin0_polygons('Spain'); -NOTICE: cdb_geocoder_client._geocode_admin0_polygons(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_admin0_polygons invoked with params (postgres, some_transaction_id, Spain) -CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_admin0_polygons(session_user, txid_current(), country_name)" -PL/pgSQL function cdb_geocoder_client.geocode_admin0_polygons(text) line 5 at SQL statement - geocode_admin0_polygons -------------------------- +SELECT cdb_geocoder_client.geocode_admin0_polygon('Spain'); +NOTICE: cdb_geocoder_client._geocode_admin0_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_admin0_polygon invoked with params (postgres, some_transaction_id, Spain) +CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_admin0_polygon(session_user, txid_current(), country_name)" +PL/pgSQL function cdb_geocoder_client.geocode_admin0_polygon(text) line 5 at SQL statement + geocode_admin0_polygon +------------------------ (1 row) diff --git a/client/expected/20_admin1_test.out b/client/expected/20_admin1_test.out index 00ee342..86b3214 100644 --- a/client/expected/20_admin1_test.out +++ b/client/expected/20_admin1_test.out @@ -2,20 +2,20 @@ CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_admin1_polygon(user_id name, tx_id bigint, admin1_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_admin1_polygon invoked with params (%, %, %)', user_id, 'some_transaction_id', admin1_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_admin1_polygon invoked with params (%, %, %)', user_id, 'some_transaction_id', admin1_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_admin1_polygon(user_id name, tx_id bigint, admin1_name text, country_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_admin1_polygon invoked with params (%, %, %, %)', user_id, 'some_transaction_id', admin1_name, country_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_admin1_polygon invoked with params (%, %, %, %)', user_id, 'some_transaction_id', admin1_name, country_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; -- Exercise the public and the proxied function SELECT cdb_geocoder_client.geocode_admin1_polygon('California'); -NOTICE: cdb_geocoder_client._geocode_admin1_polygon(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_admin1_polygon invoked with params (postgres, some_transaction_id, California) +NOTICE: cdb_geocoder_client._geocode_admin1_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_admin1_polygon invoked with params (postgres, some_transaction_id, California) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_admin1_polygon(session_user, txid_current(), admin1_name)" PL/pgSQL function cdb_geocoder_client.geocode_admin1_polygon(text) line 5 at SQL statement geocode_admin1_polygon @@ -24,7 +24,7 @@ PL/pgSQL function cdb_geocoder_client.geocode_admin1_polygon(text) line 5 at SQL (1 row) SELECT cdb_geocoder_client.geocode_admin1_polygon('California', 'United States'); -NOTICE: cdb_geocoder_client._geocode_admin1_polygon(4): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_admin1_polygon invoked with params (postgres, some_transaction_id, California, United States) +NOTICE: cdb_geocoder_client._geocode_admin1_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_admin1_polygon invoked with params (postgres, some_transaction_id, California, United States) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_admin1_polygon(session_user, txid_current(), admin1_name, country_name)" PL/pgSQL function cdb_geocoder_client.geocode_admin1_polygon(text,text) line 5 at SQL statement geocode_admin1_polygon diff --git a/client/expected/30_namedplaces_test.out b/client/expected/30_namedplaces_test.out index 7bbd2f8..e476459 100644 --- a/client/expected/30_namedplaces_test.out +++ b/client/expected/30_namedplaces_test.out @@ -2,27 +2,27 @@ CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_namedplace_point(user_id name, tx_id bigint, city_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_namedplace_point invoked with params (%, %, %)', user_id, 'some_transaction_id', city_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_namedplace_point invoked with params (%, %, %)', user_id, 'some_transaction_id', city_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_namedplace_point(user_id name, tx_id bigint, city_name text, country_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_namedplace_point invoked with params (%, %, %, %)', user_id, 'some_transaction_id', city_name, country_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_namedplace_point invoked with params (%, %, %, %)', user_id, 'some_transaction_id', city_name, country_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_namedplace_point(user_id name, tx_id bigint, city_name text, admin1_name text, country_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_namedplace_point invoked with params (%, %, %, %, %)', user_id, 'some_transaction_id', city_name, admin1_name, country_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_namedplace_point invoked with params (%, %, %, %, %)', user_id, 'some_transaction_id', city_name, admin1_name, country_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; -- Exercise the public and the proxied function SELECT cdb_geocoder_client.geocode_namedplace_point('Elx'); -NOTICE: cdb_geocoder_client._geocode_namedplace_point(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, Elx) +NOTICE: cdb_geocoder_client._geocode_namedplace_point(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, Elx) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_namedplace_point(session_user, txid_current(), city_name)" PL/pgSQL function cdb_geocoder_client.geocode_namedplace_point(text) line 5 at SQL statement geocode_namedplace_point @@ -31,7 +31,7 @@ PL/pgSQL function cdb_geocoder_client.geocode_namedplace_point(text) line 5 at S (1 row) SELECT cdb_geocoder_client.geocode_namedplace_point('Elx', 'Spain'); -NOTICE: cdb_geocoder_client._geocode_namedplace_point(4): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, Elx, Spain) +NOTICE: cdb_geocoder_client._geocode_namedplace_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, Elx, Spain) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_namedplace_point(session_user, txid_current(), city_name, country_name)" PL/pgSQL function cdb_geocoder_client.geocode_namedplace_point(text,text) line 5 at SQL statement geocode_namedplace_point @@ -40,7 +40,7 @@ PL/pgSQL function cdb_geocoder_client.geocode_namedplace_point(text,text) line 5 (1 row) SELECT cdb_geocoder_client.geocode_namedplace_point('Elx', 'Valencia', 'Spain'); -NOTICE: cdb_geocoder_client._geocode_namedplace_point(5): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, Elx, Valencia, Spain) +NOTICE: cdb_geocoder_client._geocode_namedplace_point(5): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, Elx, Valencia, Spain) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_namedplace_point(session_user, txid_current(), city_name, admin1_name, country_name)" PL/pgSQL function cdb_geocoder_client.geocode_namedplace_point(text,text,text) line 5 at SQL statement geocode_namedplace_point diff --git a/client/expected/90_permissions_test.out b/client/expected/90_permissions_test.out index 1341c35..3077bd4 100644 --- a/client/expected/90_permissions_test.out +++ b/client/expected/90_permissions_test.out @@ -2,17 +2,17 @@ SET ROLE test_regular_user; -- Exercise the public function -- it is public, it shall work -SELECT cdb_geocoder_client.geocode_admin0_polygons('Spain'); -NOTICE: cdb_geocoder_client._geocode_admin0_polygons(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_admin0_polygons invoked with params (postgres, some_transaction_id, Spain) -CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_admin0_polygons(session_user, txid_current(), country_name)" -PL/pgSQL function cdb_geocoder_client.geocode_admin0_polygons(text) line 5 at SQL statement - geocode_admin0_polygons -------------------------- +SELECT cdb_geocoder_client.geocode_admin0_polygon('Spain'); +NOTICE: cdb_geocoder_client._geocode_admin0_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_admin0_polygon invoked with params (postgres, some_transaction_id, Spain) +CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_admin0_polygon(session_user, txid_current(), country_name)" +PL/pgSQL function cdb_geocoder_client.geocode_admin0_polygon(text) line 5 at SQL statement + geocode_admin0_polygon +------------------------ (1 row) SELECT cdb_geocoder_client.geocode_admin1_polygon('California'); -NOTICE: cdb_geocoder_client._geocode_admin1_polygon(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_admin1_polygon invoked with params (postgres, some_transaction_id, California) +NOTICE: cdb_geocoder_client._geocode_admin1_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_admin1_polygon invoked with params (postgres, some_transaction_id, California) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_admin1_polygon(session_user, txid_current(), admin1_name)" PL/pgSQL function cdb_geocoder_client.geocode_admin1_polygon(text) line 5 at SQL statement geocode_admin1_polygon @@ -21,7 +21,7 @@ PL/pgSQL function cdb_geocoder_client.geocode_admin1_polygon(text) line 5 at SQL (1 row) SELECT cdb_geocoder_client.geocode_admin1_polygon('California', 'United States'); -NOTICE: cdb_geocoder_client._geocode_admin1_polygon(4): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_admin1_polygon invoked with params (postgres, some_transaction_id, California, United States) +NOTICE: cdb_geocoder_client._geocode_admin1_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_admin1_polygon invoked with params (postgres, some_transaction_id, California, United States) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_admin1_polygon(session_user, txid_current(), admin1_name, country_name)" PL/pgSQL function cdb_geocoder_client.geocode_admin1_polygon(text,text) line 5 at SQL statement geocode_admin1_polygon @@ -30,7 +30,7 @@ PL/pgSQL function cdb_geocoder_client.geocode_admin1_polygon(text,text) line 5 a (1 row) SELECT cdb_geocoder_client.geocode_namedplace_point('Elx'); -NOTICE: cdb_geocoder_client._geocode_namedplace_point(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, Elx) +NOTICE: cdb_geocoder_client._geocode_namedplace_point(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, Elx) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_namedplace_point(session_user, txid_current(), city_name)" PL/pgSQL function cdb_geocoder_client.geocode_namedplace_point(text) line 5 at SQL statement geocode_namedplace_point @@ -39,7 +39,7 @@ PL/pgSQL function cdb_geocoder_client.geocode_namedplace_point(text) line 5 at S (1 row) SELECT cdb_geocoder_client.geocode_namedplace_point('Elx', 'Valencia'); -NOTICE: cdb_geocoder_client._geocode_namedplace_point(4): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, Elx, Valencia) +NOTICE: cdb_geocoder_client._geocode_namedplace_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, Elx, Valencia) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_namedplace_point(session_user, txid_current(), city_name, country_name)" PL/pgSQL function cdb_geocoder_client.geocode_namedplace_point(text,text) line 5 at SQL statement geocode_namedplace_point @@ -48,7 +48,7 @@ PL/pgSQL function cdb_geocoder_client.geocode_namedplace_point(text,text) line 5 (1 row) SELECT cdb_geocoder_client.geocode_namedplace_point('Elx', 'Valencia', 'Spain'); -NOTICE: cdb_geocoder_client._geocode_namedplace_point(5): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, Elx, Valencia, Spain) +NOTICE: cdb_geocoder_client._geocode_namedplace_point(5): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, Elx, Valencia, Spain) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_namedplace_point(session_user, txid_current(), city_name, admin1_name, country_name)" PL/pgSQL function cdb_geocoder_client.geocode_namedplace_point(text,text,text) line 5 at SQL statement geocode_namedplace_point @@ -84,8 +84,8 @@ PL/pgSQL function cdb_geocoder_client.geocode_ip(text) line 5 at SQL statement (1 row) -- Check the regular user has no permissions on private functions -SELECT cdb_geocoder_client._geocode_admin0_polygons('evil_user', 666, 'Hell'); -ERROR: permission denied for function _geocode_admin0_polygons +SELECT cdb_geocoder_client._geocode_admin0_polygon('evil_user', 666, 'Hell'); +ERROR: permission denied for function _geocode_admin0_polygon SELECT cdb_geocoder_client._geocode_admin1_polygon('evil_user', 666, 'Hell'); ERROR: permission denied for function _geocode_admin1_polygon SELECT cdb_geocoder_client._geocode_admin1_polygon('evil_user', 666, 'Sheol', 'Hell'); diff --git a/client/sql/0.0.1/10_admin0.sql b/client/sql/0.0.1/10_admin0.sql index db719fd..6337496 100644 --- a/client/sql/0.0.1/10_admin0.sql +++ b/client/sql/0.0.1/10_admin0.sql @@ -4,12 +4,12 @@ -- These are the only ones with permissions to publicuser role -- and should also be the only ones with SECURITY DEFINER -CREATE OR REPLACE FUNCTION cdb_geocoder_client.geocode_admin0_polygons(country_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client.geocode_admin0_polygon(country_name text) RETURNS Geometry AS $$ DECLARE ret Geometry; BEGIN - SELECT cdb_geocoder_client._geocode_admin0_polygons(session_user, txid_current(), country_name) INTO ret; + SELECT cdb_geocoder_client._geocode_admin0_polygon(session_user, txid_current(), country_name) INTO ret; RETURN ret; END; $$ LANGUAGE 'plpgsql' SECURITY DEFINER; @@ -19,8 +19,8 @@ $$ LANGUAGE 'plpgsql' SECURITY DEFINER; -------------------------------------------------------------------------------- -CREATE OR REPLACE FUNCTION cdb_geocoder_client._geocode_admin0_polygons(user_id name, tx_id bigint, country_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client._geocode_admin0_polygon(user_id name, tx_id bigint, country_name text) RETURNS Geometry AS $$ CONNECT cdb_geocoder_client._server_conn_str(); - SELECT cdb_geocoder_server.geocode_admin0_polygons(user_id, tx_id, country_name); + SELECT cdb_geocoder_server.geocode_admin0_polygon(user_id, tx_id, country_name); $$ LANGUAGE plproxy; diff --git a/client/sql/0.0.1/90_permissions.sql b/client/sql/0.0.1/90_permissions.sql index ec1c0aa..eaeaef0 100644 --- a/client/sql/0.0.1/90_permissions.sql +++ b/client/sql/0.0.1/90_permissions.sql @@ -12,7 +12,7 @@ REVOKE EXECUTE ON ALL FUNCTIONS IN SCHEMA cdb_geocoder_client FROM PUBLIC, publi -- Explicitly grant permissions to public functions -- NOTE: All public functions must be listed below, grating permissions to publicuser -GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_admin0_polygons(country_name text) TO publicuser; +GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_admin0_polygon(country_name text) TO publicuser; GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_admin1_polygon(admin1_name text) TO publicuser; GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_admin1_polygon(admin1_name text, country_name text) TO publicuser; GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_namedplace_point(city_name text) TO publicuser; diff --git a/client/sql/10_admin0_test.sql b/client/sql/10_admin0_test.sql index 2658d15..e54a746 100644 --- a/client/sql/10_admin0_test.sql +++ b/client/sql/10_admin0_test.sql @@ -1,12 +1,12 @@ -- Mock the server function -CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_admin0_polygons(user_id name, tx_id bigint, country_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_admin0_polygon(user_id name, tx_id bigint, country_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cdb_geocoder_server.geocode_admin0_polygons invoked with params (%, %, %)', user_id, 'some_transaction_id', country_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_admin0_polygon invoked with params (%, %, %)', user_id, 'some_transaction_id', country_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; -- Exercise the public and the proxied function -SELECT cdb_geocoder_client.geocode_admin0_polygons('Spain'); +SELECT cdb_geocoder_client.geocode_admin0_polygon('Spain'); diff --git a/client/sql/90_permissions_test.sql b/client/sql/90_permissions_test.sql index 1a1638b..6f160fa 100644 --- a/client/sql/90_permissions_test.sql +++ b/client/sql/90_permissions_test.sql @@ -3,7 +3,7 @@ SET ROLE test_regular_user; -- Exercise the public function -- it is public, it shall work -SELECT cdb_geocoder_client.geocode_admin0_polygons('Spain'); +SELECT cdb_geocoder_client.geocode_admin0_polygon('Spain'); SELECT cdb_geocoder_client.geocode_admin1_polygon('California'); SELECT cdb_geocoder_client.geocode_admin1_polygon('California', 'United States'); SELECT cdb_geocoder_client.geocode_namedplace_point('Elx'); @@ -14,7 +14,7 @@ SELECT cdb_geocoder_client.geocode_postalcode_point('03204', 'Spain'); SELECT cdb_geocoder_client.geocode_ip('8.8.8.8'); -- Check the regular user has no permissions on private functions -SELECT cdb_geocoder_client._geocode_admin0_polygons('evil_user', 666, 'Hell'); +SELECT cdb_geocoder_client._geocode_admin0_polygon('evil_user', 666, 'Hell'); SELECT cdb_geocoder_client._geocode_admin1_polygon('evil_user', 666, 'Hell'); SELECT cdb_geocoder_client._geocode_admin1_polygon('evil_user', 666, 'Sheol', 'Hell'); SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', 666, 'Sheol'); From 74fd173e63123e7b6e2432d4cc0627f2ed910824 Mon Sep 17 00:00:00 2001 From: Carla Date: Tue, 17 Nov 2015 11:35:12 +0100 Subject: [PATCH 05/10] Update 50_ipaddresses_test.sql --- client/sql/50_ipaddresses_test.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/sql/50_ipaddresses_test.sql b/client/sql/50_ipaddresses_test.sql index 2b545f7..63d43fd 100644 --- a/client/sql/50_ipaddresses_test.sql +++ b/client/sql/50_ipaddresses_test.sql @@ -2,11 +2,11 @@ CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_ip(user_id name, tx_id bigint, ip_address text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_namedplace_point invoked with params (%, %, %)', user_id, 'some_transaction_id', ip_address; + RAISE NOTICE 'cbd_geocoder_server.geocode_ip invoked with params (%, %, %)', user_id, 'some_transaction_id', ip_address; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; -- Exercise the public and the proxied function -SELECT cdb_geocoder_client.geocode_ip('8.8.8.8'); \ No newline at end of file +SELECT cdb_geocoder_client.geocode_ip('8.8.8.8'); From 35ed467c694345ded54acec8e17634ae7d30beb8 Mon Sep 17 00:00:00 2001 From: Carla Date: Tue, 17 Nov 2015 11:36:13 +0100 Subject: [PATCH 06/10] Update 50_ipaddresses_test.out --- client/expected/50_ipaddresses_test.out | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/expected/50_ipaddresses_test.out b/client/expected/50_ipaddresses_test.out index badc382..5a48213 100644 --- a/client/expected/50_ipaddresses_test.out +++ b/client/expected/50_ipaddresses_test.out @@ -2,7 +2,7 @@ CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_ip(user_id name, tx_id bigint, ip_address text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_namedplace_point invoked with params (%, %, %)', user_id, 'some_transaction_id', ip_address; + RAISE NOTICE 'cbd_geocoder_server.geocode_ip invoked with params (%, %, %)', user_id, 'some_transaction_id', ip_address; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; From 7cba8fd679b0632f0ec502c1297d676f4dcc3a8f Mon Sep 17 00:00:00 2001 From: Carla Iriberri Date: Tue, 17 Nov 2015 11:50:16 +0100 Subject: [PATCH 07/10] Fixes cdb typo in out --- client/expected/50_ipaddresses_test.out | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/expected/50_ipaddresses_test.out b/client/expected/50_ipaddresses_test.out index 5a48213..05f6e75 100644 --- a/client/expected/50_ipaddresses_test.out +++ b/client/expected/50_ipaddresses_test.out @@ -8,7 +8,7 @@ END; $$ LANGUAGE 'plpgsql'; -- Exercise the public and the proxied function SELECT cdb_geocoder_client.geocode_ip('8.8.8.8'); -NOTICE: cdb_geocoder_client._geocode_ip(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, 8.8.8.8) +NOTICE: cdb_geocoder_client._geocode_ip(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_ip invoked with params (postgres, some_transaction_id, 8.8.8.8) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_ip(session_user, txid_current(), ip_address)" PL/pgSQL function cdb_geocoder_client.geocode_ip(text) line 5 at SQL statement geocode_ip From b977277052c9bf387b2f28a4720a071a08e8e821 Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Tue, 17 Nov 2015 12:01:18 +0100 Subject: [PATCH 08/10] cartodb as dependency and use its config table #37 in the client. --- client/cdb_geocoder_client.control | 2 +- client/expected/00_installation_test.out | 9 +++-- client/expected/90_permissions_test.out | 5 +-- client/sql/0.0.1/05_geocoder_server_conf.sql | 38 -------------------- client/sql/0.0.1/06_geocoder_server_conn.sql | 4 +-- client/sql/00_installation_test.sql | 5 ++- client/sql/90_permissions_test.sql | 3 -- 7 files changed, 14 insertions(+), 52 deletions(-) delete mode 100644 client/sql/0.0.1/05_geocoder_server_conf.sql diff --git a/client/cdb_geocoder_client.control b/client/cdb_geocoder_client.control index b439b22..c903511 100644 --- a/client/cdb_geocoder_client.control +++ b/client/cdb_geocoder_client.control @@ -1,6 +1,6 @@ # CartoDB geocoder client API extension comment = 'CartoDB geocoder client API extension' default_version = '0.0.1' -requires = 'plproxy' +requires = 'plproxy, cartodb' superuser = true schema = cdb_geocoder_client diff --git a/client/expected/00_installation_test.out b/client/expected/00_installation_test.out index 621ce99..6ff9e30 100644 --- a/client/expected/00_installation_test.out +++ b/client/expected/00_installation_test.out @@ -1,12 +1,15 @@ -- Install dependencies CREATE EXTENSION postgis; +CREATE EXTENSION schema_triggers; +CREATE EXTENSION plpythonu; +CREATE EXTENSION cartodb; CREATE EXTENSION plproxy; -- Install the extension CREATE EXTENSION cdb_geocoder_client; -- Mock the server connection to point to this very test db -SELECT cdb_geocoder_client._config_set('db_server_config', '{"connection_str": "dbname=contrib_regression host=127.0.0.1 user=postgres"}'); - _config_set -------------- +SELECT cartodb.cdb_conf_setconf('geocoder_server_config', '{"connection_str": "dbname=contrib_regression host=127.0.0.1 user=postgres"}'); + cdb_conf_setconf +------------------ (1 row) diff --git a/client/expected/90_permissions_test.out b/client/expected/90_permissions_test.out index 3077bd4..a334cc8 100644 --- a/client/expected/90_permissions_test.out +++ b/client/expected/90_permissions_test.out @@ -75,7 +75,7 @@ PL/pgSQL function cdb_geocoder_client.geocode_postalcode_point(text,text) line 5 (1 row) SELECT cdb_geocoder_client.geocode_ip('8.8.8.8'); -NOTICE: cdb_geocoder_client._geocode_ip(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, 8.8.8.8) +NOTICE: cdb_geocoder_client._geocode_ip(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_ip invoked with params (postgres, some_transaction_id, 8.8.8.8) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_ip(session_user, txid_current(), ip_address)" PL/pgSQL function cdb_geocoder_client.geocode_ip(text) line 5 at SQL statement geocode_ip @@ -102,6 +102,3 @@ SELECT cdb_geocoder_client._geocode_postalcode_point('evil_user', 666, '66666', ERROR: permission denied for function _geocode_postalcode_point SELECT cdb_geocoder_client._geocode_ip('evil_user', 666, '8.8.8.8'); ERROR: permission denied for function _geocode_ip --- Check the regular user cannot look into config table -SELECT * from cdb_geocoder_client._config; -ERROR: permission denied for relation _config diff --git a/client/sql/0.0.1/05_geocoder_server_conf.sql b/client/sql/0.0.1/05_geocoder_server_conf.sql deleted file mode 100644 index 914e39f..0000000 --- a/client/sql/0.0.1/05_geocoder_server_conf.sql +++ /dev/null @@ -1,38 +0,0 @@ --- --- This extension has its own table for configurations. --- --- The table and the function are considered to be private and therefore --- no permissions are granted for any other user but the creator. - -CREATE TABLE IF NOT EXISTS cdb_geocoder_client._config ( KEY TEXT PRIMARY KEY, VALUE JSON NOT NULL ); - --- Needed to dump config in backups --- This can only be called from an SQL script executed by CREATE EXTENSION -SELECT pg_catalog.pg_extension_config_dump('cdb_geocoder_client._config', ''); - - -CREATE OR REPLACE FUNCTION cdb_geocoder_client._config_set(key text, value JSON) -RETURNS VOID AS $$ -BEGIN - PERFORM cdb_geocoder_client._config_remove(key); - EXECUTE 'INSERT INTO cdb_geocoder_client._config (KEY, VALUE) VALUES ($1, $2);' USING key, value; -END -$$ LANGUAGE PLPGSQL VOLATILE; - - -CREATE OR REPLACE FUNCTION cdb_geocoder_client._config_remove(key text) -RETURNS VOID AS $$ -BEGIN - EXECUTE 'DELETE FROM cdb_geocoder_client._config WHERE KEY = $1;' USING key; -END -$$ LANGUAGE PLPGSQL VOLATILE; - -CREATE OR REPLACE FUNCTION cdb_geocoder_client._config_get(key text) - RETURNS JSON AS $$ -DECLARE - value JSON; -BEGIN - EXECUTE 'SELECT VALUE FROM cdb_geocoder_client._config WHERE KEY = $1;' INTO value USING key; - RETURN value; -END -$$ LANGUAGE PLPGSQL STABLE; \ No newline at end of file diff --git a/client/sql/0.0.1/06_geocoder_server_conn.sql b/client/sql/0.0.1/06_geocoder_server_conn.sql index dd53dc3..387971f 100644 --- a/client/sql/0.0.1/06_geocoder_server_conn.sql +++ b/client/sql/0.0.1/06_geocoder_server_conn.sql @@ -9,8 +9,8 @@ RETURNS text AS $$ DECLARE db_connection_str text; BEGIN - SELECT cdb_geocoder_client._config_get('db_server_config')->'connection_str' INTO db_connection_str; + SELECT cartodb.cdb_conf_getconf('geocoder_server_config')->'connection_str' INTO db_connection_str; SELECT trim(both '"' FROM db_connection_str) INTO db_connection_str; RETURN db_connection_str; END; -$$ LANGUAGE 'plpgsql'; \ No newline at end of file +$$ LANGUAGE 'plpgsql'; diff --git a/client/sql/00_installation_test.sql b/client/sql/00_installation_test.sql index 4446f18..e03cafd 100644 --- a/client/sql/00_installation_test.sql +++ b/client/sql/00_installation_test.sql @@ -1,12 +1,15 @@ -- Install dependencies CREATE EXTENSION postgis; +CREATE EXTENSION schema_triggers; +CREATE EXTENSION plpythonu; +CREATE EXTENSION cartodb; CREATE EXTENSION plproxy; -- Install the extension CREATE EXTENSION cdb_geocoder_client; -- Mock the server connection to point to this very test db -SELECT cdb_geocoder_client._config_set('db_server_config', '{"connection_str": "dbname=contrib_regression host=127.0.0.1 user=postgres"}'); +SELECT cartodb.cdb_conf_setconf('geocoder_server_config', '{"connection_str": "dbname=contrib_regression host=127.0.0.1 user=postgres"}'); -- Mock the server schema CREATE SCHEMA cdb_geocoder_server; diff --git a/client/sql/90_permissions_test.sql b/client/sql/90_permissions_test.sql index 6f160fa..beb6ae2 100644 --- a/client/sql/90_permissions_test.sql +++ b/client/sql/90_permissions_test.sql @@ -23,6 +23,3 @@ SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', 666, 'Sheol', SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', 666, '66666', 'Hell'); SELECT cdb_geocoder_client._geocode_postalcode_point('evil_user', 666, '66666', 'Hell'); SELECT cdb_geocoder_client._geocode_ip('evil_user', 666, '8.8.8.8'); - --- Check the regular user cannot look into config table -SELECT * from cdb_geocoder_client._config; From c7b6db3560e412ab87399bb1b658b04eff2ad976 Mon Sep 17 00:00:00 2001 From: Carla Iriberri Date: Tue, 17 Nov 2015 12:26:18 +0100 Subject: [PATCH 09/10] Fixes IP address function naming and another CBD typo in postal codes --- client/expected/40_postalcodes_test.out | 8 ++++---- client/expected/50_ipaddresses_test.out | 16 ++++++++-------- client/expected/90_permissions_test.out | 20 ++++++++++---------- client/sql/0.0.1/50_ipaddresses.sql | 12 ++++++------ client/sql/0.0.1/90_permissions.sql | 2 +- client/sql/40_postalcodes_test.sql | 4 ++-- client/sql/50_ipaddresses_test.sql | 6 +++--- client/sql/90_permissions_test.sql | 4 ++-- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/client/expected/40_postalcodes_test.out b/client/expected/40_postalcodes_test.out index f179483..7b3b824 100644 --- a/client/expected/40_postalcodes_test.out +++ b/client/expected/40_postalcodes_test.out @@ -2,20 +2,20 @@ CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_postalcode_polygon(user_id name, tx_id bigint, postal_code text, country_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_postalcode_polygon invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_postalcode_polygon invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_postalcode_point(user_id name, tx_id bigint, postal_code text, country_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_postalcode_point invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_postalcode_point invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; -- Exercise the public and the proxied function SELECT cdb_geocoder_client.geocode_postalcode_polygon('03204', 'Spain'); -NOTICE: cdb_geocoder_client._geocode_postalcode_polygon(4): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_postalcode_polygon invoked with params (postgres, some_transaction_id, 03204, Spain) +NOTICE: cdb_geocoder_client._geocode_postalcode_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_postalcode_polygon invoked with params (postgres, some_transaction_id, 03204, Spain) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_postalcode_polygon(session_user, txid_current(), postal_code, country_name)" PL/pgSQL function cdb_geocoder_client.geocode_postalcode_polygon(text,text) line 5 at SQL statement geocode_postalcode_polygon @@ -24,7 +24,7 @@ PL/pgSQL function cdb_geocoder_client.geocode_postalcode_polygon(text,text) line (1 row) SELECT cdb_geocoder_client.geocode_postalcode_point('03204', 'Spain'); -NOTICE: cdb_geocoder_client._geocode_postalcode_point(4): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_postalcode_polygon invoked with params (postgres, some_transaction_id, 03204, Spain) +NOTICE: cdb_geocoder_client._geocode_postalcode_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_postalcode_polygon invoked with params (postgres, some_transaction_id, 03204, Spain) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_postalcode_point(session_user, txid_current(), postal_code, country_name)" PL/pgSQL function cdb_geocoder_client.geocode_postalcode_point(text,text) line 5 at SQL statement geocode_postalcode_point diff --git a/client/expected/50_ipaddresses_test.out b/client/expected/50_ipaddresses_test.out index 05f6e75..ef79b1a 100644 --- a/client/expected/50_ipaddresses_test.out +++ b/client/expected/50_ipaddresses_test.out @@ -1,18 +1,18 @@ -- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_ip(user_id name, tx_id bigint, ip_address text) +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_ipaddress_point(user_id name, tx_id bigint, ip_address text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_ip invoked with params (%, %, %)', user_id, 'some_transaction_id', ip_address; + RAISE NOTICE 'cdb_geocoder_server.geocode_ipaddress_point invoked with params (%, %, %)', user_id, 'some_transaction_id', ip_address; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; -- Exercise the public and the proxied function -SELECT cdb_geocoder_client.geocode_ip('8.8.8.8'); -NOTICE: cdb_geocoder_client._geocode_ip(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_ip invoked with params (postgres, some_transaction_id, 8.8.8.8) -CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_ip(session_user, txid_current(), ip_address)" -PL/pgSQL function cdb_geocoder_client.geocode_ip(text) line 5 at SQL statement - geocode_ip ------------- +SELECT cdb_geocoder_client.geocode_ipaddress_point('8.8.8.8'); +NOTICE: cdb_geocoder_client._geocode_ipaddress_point(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_ipaddress_point invoked with params (postgres, some_transaction_id, 8.8.8.8) +CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_ipaddress_point(session_user, txid_current(), ip_address)" +PL/pgSQL function cdb_geocoder_client.geocode_ipaddress_point(text) line 5 at SQL statement + geocode_ipaddress_point +------------------------- (1 row) diff --git a/client/expected/90_permissions_test.out b/client/expected/90_permissions_test.out index 3077bd4..951d19f 100644 --- a/client/expected/90_permissions_test.out +++ b/client/expected/90_permissions_test.out @@ -57,7 +57,7 @@ PL/pgSQL function cdb_geocoder_client.geocode_namedplace_point(text,text,text) l (1 row) SELECT cdb_geocoder_client.geocode_postalcode_polygon('03204', 'Spain'); -NOTICE: cdb_geocoder_client._geocode_postalcode_polygon(4): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_postalcode_polygon invoked with params (postgres, some_transaction_id, 03204, Spain) +NOTICE: cdb_geocoder_client._geocode_postalcode_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_postalcode_polygon invoked with params (postgres, some_transaction_id, 03204, Spain) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_postalcode_polygon(session_user, txid_current(), postal_code, country_name)" PL/pgSQL function cdb_geocoder_client.geocode_postalcode_polygon(text,text) line 5 at SQL statement geocode_postalcode_polygon @@ -66,7 +66,7 @@ PL/pgSQL function cdb_geocoder_client.geocode_postalcode_polygon(text,text) line (1 row) SELECT cdb_geocoder_client.geocode_postalcode_point('03204', 'Spain'); -NOTICE: cdb_geocoder_client._geocode_postalcode_point(4): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_postalcode_polygon invoked with params (postgres, some_transaction_id, 03204, Spain) +NOTICE: cdb_geocoder_client._geocode_postalcode_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_postalcode_polygon invoked with params (postgres, some_transaction_id, 03204, Spain) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_postalcode_point(session_user, txid_current(), postal_code, country_name)" PL/pgSQL function cdb_geocoder_client.geocode_postalcode_point(text,text) line 5 at SQL statement geocode_postalcode_point @@ -74,12 +74,12 @@ PL/pgSQL function cdb_geocoder_client.geocode_postalcode_point(text,text) line 5 (1 row) -SELECT cdb_geocoder_client.geocode_ip('8.8.8.8'); -NOTICE: cdb_geocoder_client._geocode_ip(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, 8.8.8.8) -CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_ip(session_user, txid_current(), ip_address)" -PL/pgSQL function cdb_geocoder_client.geocode_ip(text) line 5 at SQL statement - geocode_ip ------------- +SELECT cdb_geocoder_client.geocode_ipaddress_point('8.8.8.8'); +NOTICE: cdb_geocoder_client._geocode_ipaddress_point(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_ipaddress_point invoked with params (postgres, some_transaction_id, 8.8.8.8) +CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_ipaddress_point(session_user, txid_current(), ip_address)" +PL/pgSQL function cdb_geocoder_client.geocode_ipaddress_point(text) line 5 at SQL statement + geocode_ipaddress_point +------------------------- (1 row) @@ -100,8 +100,8 @@ SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', 666, '66666' ERROR: permission denied for function _geocode_postalcode_polygon SELECT cdb_geocoder_client._geocode_postalcode_point('evil_user', 666, '66666', 'Hell'); ERROR: permission denied for function _geocode_postalcode_point -SELECT cdb_geocoder_client._geocode_ip('evil_user', 666, '8.8.8.8'); -ERROR: permission denied for function _geocode_ip +SELECT cdb_geocoder_client._geocode_ipaddress_point('evil_user', 666, '8.8.8.8'); +ERROR: permission denied for function _geocode_ipaddress_point -- Check the regular user cannot look into config table SELECT * from cdb_geocoder_client._config; ERROR: permission denied for relation _config diff --git a/client/sql/0.0.1/50_ipaddresses.sql b/client/sql/0.0.1/50_ipaddresses.sql index c7b0c53..60602ab 100644 --- a/client/sql/0.0.1/50_ipaddresses.sql +++ b/client/sql/0.0.1/50_ipaddresses.sql @@ -4,13 +4,13 @@ -- These are the only ones with permissions to publicuser role -- and should also be the only ones with SECURITY DEFINER ----- geocode_ip(city_name text) -CREATE OR REPLACE FUNCTION cdb_geocoder_client.geocode_ip(ip_address text) +---- geocode_ipaddress_point(city_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client.geocode_ipaddress_point(ip_address text) RETURNS Geometry AS $$ DECLARE ret Geometry; BEGIN - SELECT cdb_geocoder_client._geocode_ip(session_user, txid_current(), ip_address) INTO ret; + SELECT cdb_geocoder_client._geocode_ipaddress_point(session_user, txid_current(), ip_address) INTO ret; RETURN ret; END; $$ LANGUAGE 'plpgsql' SECURITY DEFINER; @@ -19,9 +19,9 @@ $$ LANGUAGE 'plpgsql' SECURITY DEFINER; -------------------------------------------------------------------------------- ----- geocode_ip(ip_address text) -CREATE OR REPLACE FUNCTION cdb_geocoder_client._geocode_ip(user_id name, tx_id bigint, ip_address text) +---- geocode_ipaddress_point(ip_address text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client._geocode_ipaddress_point(user_id name, tx_id bigint, ip_address text) RETURNS Geometry AS $$ CONNECT cdb_geocoder_client._server_conn_str(); - SELECT cdb_geocoder_server.geocode_ip(user_id, tx_id, ip_address); + SELECT cdb_geocoder_server.geocode_ipaddress_point(user_id, tx_id, ip_address); $$ LANGUAGE plproxy; diff --git a/client/sql/0.0.1/90_permissions.sql b/client/sql/0.0.1/90_permissions.sql index eaeaef0..9fea793 100644 --- a/client/sql/0.0.1/90_permissions.sql +++ b/client/sql/0.0.1/90_permissions.sql @@ -20,4 +20,4 @@ GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_namedplace_point(city_name GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_namedplace_point(city_name text, admin1_name text, country_name text) TO publicuser; GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_postalcode_polygon(postal_code text, country_name text) TO publicuser; GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_postalcode_point(postal_code text, country_name text) TO publicuser; -GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_ip(ip_address text) TO publicuser; +GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_ipaddress_point(ip_address text) TO publicuser; diff --git a/client/sql/40_postalcodes_test.sql b/client/sql/40_postalcodes_test.sql index 8181808..a93425e 100644 --- a/client/sql/40_postalcodes_test.sql +++ b/client/sql/40_postalcodes_test.sql @@ -2,7 +2,7 @@ CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_postalcode_polygon(user_id name, tx_id bigint, postal_code text, country_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_postalcode_polygon invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_postalcode_polygon invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; @@ -10,7 +10,7 @@ $$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_postalcode_point(user_id name, tx_id bigint, postal_code text, country_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_postalcode_point invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_postalcode_point invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; diff --git a/client/sql/50_ipaddresses_test.sql b/client/sql/50_ipaddresses_test.sql index 63d43fd..2007820 100644 --- a/client/sql/50_ipaddresses_test.sql +++ b/client/sql/50_ipaddresses_test.sql @@ -1,12 +1,12 @@ -- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_ip(user_id name, tx_id bigint, ip_address text) +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_ipaddress_point(user_id name, tx_id bigint, ip_address text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_ip invoked with params (%, %, %)', user_id, 'some_transaction_id', ip_address; + RAISE NOTICE 'cdb_geocoder_server.geocode_ipaddress_point invoked with params (%, %, %)', user_id, 'some_transaction_id', ip_address; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; -- Exercise the public and the proxied function -SELECT cdb_geocoder_client.geocode_ip('8.8.8.8'); +SELECT cdb_geocoder_client.geocode_ipaddress_point('8.8.8.8'); diff --git a/client/sql/90_permissions_test.sql b/client/sql/90_permissions_test.sql index 6f160fa..ecbc466 100644 --- a/client/sql/90_permissions_test.sql +++ b/client/sql/90_permissions_test.sql @@ -11,7 +11,7 @@ SELECT cdb_geocoder_client.geocode_namedplace_point('Elx', 'Valencia'); SELECT cdb_geocoder_client.geocode_namedplace_point('Elx', 'Valencia', 'Spain'); SELECT cdb_geocoder_client.geocode_postalcode_polygon('03204', 'Spain'); SELECT cdb_geocoder_client.geocode_postalcode_point('03204', 'Spain'); -SELECT cdb_geocoder_client.geocode_ip('8.8.8.8'); +SELECT cdb_geocoder_client.geocode_ipaddress_point('8.8.8.8'); -- Check the regular user has no permissions on private functions SELECT cdb_geocoder_client._geocode_admin0_polygon('evil_user', 666, 'Hell'); @@ -22,7 +22,7 @@ SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', 666, 'Sheol', SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', 666, 'Sheol', 'Hell', 'Ugly world'); SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', 666, '66666', 'Hell'); SELECT cdb_geocoder_client._geocode_postalcode_point('evil_user', 666, '66666', 'Hell'); -SELECT cdb_geocoder_client._geocode_ip('evil_user', 666, '8.8.8.8'); +SELECT cdb_geocoder_client._geocode_ipaddress_point('evil_user', 666, '8.8.8.8'); -- Check the regular user cannot look into config table SELECT * from cdb_geocoder_client._config; From 01637004146e004a86f5a8228ed958dd8b0ced92 Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Tue, 17 Nov 2015 11:37:50 +0000 Subject: [PATCH 10/10] Fix merge conflict --- client/expected/90_permissions_test.out | 9 --------- client/sql/90_permissions_test.sql | 3 --- 2 files changed, 12 deletions(-) diff --git a/client/expected/90_permissions_test.out b/client/expected/90_permissions_test.out index 6adb4dd..00124ec 100644 --- a/client/expected/90_permissions_test.out +++ b/client/expected/90_permissions_test.out @@ -80,7 +80,6 @@ CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_ipaddress_point(ses PL/pgSQL function cdb_geocoder_client.geocode_ipaddress_point(text) line 5 at SQL statement geocode_ipaddress_point ------------------------- - (1 row) @@ -101,13 +100,5 @@ SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', 666, '66666' ERROR: permission denied for function _geocode_postalcode_polygon SELECT cdb_geocoder_client._geocode_postalcode_point('evil_user', 666, '66666', 'Hell'); ERROR: permission denied for function _geocode_postalcode_point -<<<<<<< HEAD SELECT cdb_geocoder_client._geocode_ipaddress_point('evil_user', 666, '8.8.8.8'); ERROR: permission denied for function _geocode_ipaddress_point --- Check the regular user cannot look into config table -SELECT * from cdb_geocoder_client._config; -ERROR: permission denied for relation _config -======= -SELECT cdb_geocoder_client._geocode_ip('evil_user', 666, '8.8.8.8'); -ERROR: permission denied for function _geocode_ip ->>>>>>> b977277052c9bf387b2f28a4720a071a08e8e821 diff --git a/client/sql/90_permissions_test.sql b/client/sql/90_permissions_test.sql index ecbc466..bab2ee1 100644 --- a/client/sql/90_permissions_test.sql +++ b/client/sql/90_permissions_test.sql @@ -23,6 +23,3 @@ SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', 666, 'Sheol', SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', 666, '66666', 'Hell'); SELECT cdb_geocoder_client._geocode_postalcode_point('evil_user', 666, '66666', 'Hell'); SELECT cdb_geocoder_client._geocode_ipaddress_point('evil_user', 666, '8.8.8.8'); - --- Check the regular user cannot look into config table -SELECT * from cdb_geocoder_client._config;