Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Fix CVE-2020-14350#18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion.gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,4 +8,3 @@ regression.out
*.gcov
tags

aqo--?.?.sql
11 changes: 3 additions & 8 deletionsMakefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,14 +13,12 @@ REGRESS =aqo_disabled \
aqo_intelligent \
aqo_forced \
aqo_learn \
schema
schema \
aqo_CVE-2020-14350

EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add

DATA = aqo--1.0.sql aqo--1.0--1.1.sql
DATA_built = aqo--1.1.sql

TAP_TESTS = 1
DATA = aqo--1.0.sql aqo--1.0--1.1.sql aqo--1.1.sql

MODULE_big = aqo
ifdef USE_PGXS
Expand All@@ -34,6 +32,3 @@ include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
endif


$(DATA_built): $(DATA)
cat $+ > $@
65 changes: 65 additions & 0 deletionsaqo--1.1.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
\echo Use "CREATE EXTENSION aqo" to load this file. \quit

CREATE TABLE public.aqo_queries (
query_hashint CONSTRAINT aqo_queries_query_hash_idx PRIMARY KEY,
learn_aqoboolean NOT NULL,
use_aqoboolean NOT NULL,
fspace_hashint NOT NULL,
auto_tuningboolean NOT NULL
);

CREATE TABLE public.aqo_query_texts (
query_hashint CONSTRAINT aqo_query_texts_query_hash_idx PRIMARY KEY REFERENCES public.aqo_queries ON DELETE CASCADE,
query_texttext NOT NULL
);

CREATE TABLE public.aqo_query_stat (
query_hashint CONSTRAINT aqo_query_stat_idx PRIMARY KEY REFERENCES public.aqo_queries ON DELETE CASCADE,
execution_time_with_aqodouble precision[],
execution_time_without_aqodouble precision[],
planning_time_with_aqodouble precision[],
planning_time_without_aqodouble precision[],
cardinality_error_with_aqodouble precision[],
cardinality_error_without_aqodouble precision[],
executions_with_aqobigint,
executions_without_aqobigint
);

CREATE TABLE public.aqo_data (
fspace_hashint NOT NULL REFERENCES public.aqo_queries ON DELETE CASCADE,
fsspace_hashint NOT NULL,
nfeaturesint NOT NULL,
featuresdouble precision[][],
targetsdouble precision[],
UNIQUE (fspace_hash, fsspace_hash)
);

CREATE UNIQUE INDEX aqo_fss_access_idx ON public.aqo_data (fspace_hash, fsspace_hash);

ALTER TABLE public.aqo_data ALTER COLUMN features SET STORAGE MAIN;
ALTER TABLE public.aqo_data ALTER COLUMN targets SET STORAGE MAIN;
ALTER TABLE public.aqo_query_stat
ALTER COLUMN execution_time_with_aqo SET STORAGE MAIN;
ALTER TABLE public.aqo_query_stat
ALTER COLUMN execution_time_without_aqo SET STORAGE MAIN;
ALTER TABLE public.aqo_query_stat
ALTER COLUMN planning_time_with_aqo SET STORAGE MAIN;
ALTER TABLE public.aqo_query_stat
ALTER COLUMN planning_time_without_aqo SET STORAGE MAIN;
ALTER TABLE public.aqo_query_stat
ALTER COLUMN cardinality_error_without_aqo SET STORAGE MAIN;
ALTER TABLE public.aqo_query_stat
ALTER COLUMN cardinality_error_with_aqo SET STORAGE MAIN;

INSERT INTO public.aqo_queries VALUES (0, false, false, 0, false);
INSERT INTO public.aqo_query_texts VALUES (0, 'COMMON feature space (do not delete!)');
-- a virtual query for COMMON feature space

CREATE FUNCTION invalidate_deactivated_queries_cache() RETURNS trigger
AS 'MODULE_PATHNAME' LANGUAGE C;

CREATE TRIGGER aqo_queries_invalidate AFTER UPDATE OR DELETE OR TRUNCATE
ON public.aqo_queries FOR EACH STATEMENT
EXECUTE PROCEDURE invalidate_deactivated_queries_cache();

76 changes: 76 additions & 0 deletionsexpected/aqo_CVE-2020-14350.out
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
/*
* Check fix for CVE-2020-14350.
* See also 7eeb1d986 postgresql commit.
*/
SET client_min_messages = 'warning';
DROP ROLE IF EXISTS regress_hacker;
SET client_min_messages = 'notice';
CREATE ROLE regress_hacker LOGIN;
-- Test 1
RESET ROLE;
ALTER ROLE regress_hacker NOSUPERUSER;
SET ROLE regress_hacker;
SHOW is_superuser;
is_superuser
--------------
off
(1 row)

CREATE FUNCTION format(f text, r regclass, t text)
RETURNS text
AS $$
BEGIN
ALTER ROLE regress_hacker SUPERUSER;
RETURN '';
END
$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
RESET ROLE;
CREATE EXTENSION aqo;
-- Test result (must be 'off')
SET ROLE regress_hacker;
SHOW is_superuser;
is_superuser
--------------
off
(1 row)

RESET ROLE;
DROP FUNCTION format(text, regclass, text);
DROP EXTENSION IF EXISTS aqo;
-- Test 2
RESET ROLE;
ALTER ROLE regress_hacker NOSUPERUSER;
SET ROLE regress_hacker;
SHOW is_superuser;
is_superuser
--------------
off
(1 row)

CREATE FUNCTION aqo_migrate_to_1_1_get_pk(rel text)
RETURNS regclass
AS $$
DECLARE
ret regclass;
BEGIN
ALTER ROLE regress_hacker SUPERUSER;
SELECT * FROM aqo_migrate_to_1_1_get_pk(rel::regclass) INTO ret;
RETURN ret;
END
$$ LANGUAGE plpgsql;
RESET ROLE;
CREATE EXTENSION aqo;
-- Test result (must be 'off')
SET ROLE regress_hacker;
SHOW is_superuser;
is_superuser
--------------
off
(1 row)

RESET ROLE;
DROP FUNCTION aqo_migrate_to_1_1_get_pk(text);
DROP EXTENSION IF EXISTS aqo;
-- Cleanup
RESET ROLE;
DROP ROLE regress_hacker;
71 changes: 71 additions & 0 deletionssql/aqo_CVE-2020-14350.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
/*
* Check fix for CVE-2020-14350.
* See also 7eeb1d986 postgresql commit.
*/

SET client_min_messages = 'warning';
DROP ROLE IF EXISTS regress_hacker;
SET client_min_messages = 'notice';

CREATE ROLE regress_hacker LOGIN;

-- Test 1
RESET ROLE;
ALTER ROLE regress_hacker NOSUPERUSER;

SET ROLE regress_hacker;
SHOW is_superuser;
CREATE FUNCTION format(f text, r regclass, t text)
RETURNS text
AS $$
BEGIN
ALTER ROLE regress_hacker SUPERUSER;
RETURN '';
END
$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;

RESET ROLE;
CREATE EXTENSION aqo;

-- Test result (must be 'off')
SET ROLE regress_hacker;
SHOW is_superuser;

RESET ROLE;
DROP FUNCTION format(text, regclass, text);
DROP EXTENSION IF EXISTS aqo;

-- Test 2
RESET ROLE;
ALTER ROLE regress_hacker NOSUPERUSER;

SET ROLE regress_hacker;
SHOW is_superuser;

CREATE FUNCTION aqo_migrate_to_1_1_get_pk(rel text)
RETURNS regclass
AS $$
DECLARE
ret regclass;
BEGIN
ALTER ROLE regress_hacker SUPERUSER;
SELECT * FROM aqo_migrate_to_1_1_get_pk(rel::regclass) INTO ret;
RETURN ret;
END
$$ LANGUAGE plpgsql;

RESET ROLE;
CREATE EXTENSION aqo;

-- Test result (must be 'off')
SET ROLE regress_hacker;
SHOW is_superuser;

RESET ROLE;
DROP FUNCTION aqo_migrate_to_1_1_get_pk(text);
DROP EXTENSION IF EXISTS aqo;

-- Cleanup
RESET ROLE;
DROP ROLE regress_hacker;

43 changes: 0 additions & 43 deletionst/000_security.pl
View file
Open in desktop

This file was deleted.

[8]ページ先頭
©2009-2025 Movatter.jp