Skip to content
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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Refactor tce #86

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

Refactor tce #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
420c071
Set version 3.2.0
ioguix Jun 9, 2023
fec4f1c
Remove useless pgsodium.create_mask_view(oid,boolean)
ioguix Jun 9, 2023
d072843
Remove useless pgsodium.mask_columns(oid)
ioguix Jun 9, 2023
e382105
Remove useless schema pgsodium_masks
ioguix Jun 9, 2023
b56d914
Add 3.2.0 full script
ioguix Jun 9, 2023
990c48e
Rename constraint name to match the one from 3.2.0 full script
ioguix Jun 9, 2023
df73592
Add missing column user_data to the decrypted_key view
ioguix Jun 9, 2023
6ea0ad2
Fix privileges on key and decrypted_keys
ioguix Jun 9, 2023
aad3d33
Revoke default permission on pgsodium from pgsodium_keyholder
ioguix Jun 9, 2023
e702c98
Makes Dockerfile less chatty
ioguix Jun 9, 2023
eba5786
Test both full script and incremental script
ioguix Jun 9, 2023
b5da330
Avoid rebuilding the docker image when possible
ioguix Jun 9, 2023
389c131
Introduce pgsodium.debug GUC
ioguix Jun 21, 2023
458394d
Split trigger and view creation in different functions
ioguix Jun 21, 2023
04e18df
Implement generic encryption trigger in C
ioguix Jun 21, 2023
73acc11
Revoke all privilege from public on decrypting views
ioguix Jun 21, 2023
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
28 changes: 15 additions & 13 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ ARG version
ARG DEBIAN_FRONTEND=noninteractive

# install base dependences
RUN apt-get update && \
apt-get install -y make cmake git curl build-essential m4 sudo gdbserver \
gdb libreadline-dev bison flex zlib1g-dev tmux zile zip vim gawk wget
RUN apt-get -qq update && \
apt-get -qq install -y make cmake git curl build-essential m4 sudo gdbserver \
gdb libreadline-dev bison flex zlib1g-dev tmux zile zip vim gawk wget > /dev/null

# add postgres user and make data dir
RUN groupadd -r postgres && useradd --no-log-init -r -m -s /bin/bash -g postgres -G sudo postgres
Expand All @@ -15,27 +15,29 @@ WORKDIR "/home/postgres"

# get postgres source and compile with debug and no optimization
RUN git clone --branch REL_${version}_STABLE https://github.com/postgres/postgres.git --depth=1 && \
cd postgres && ./configure \
cd postgres && echo "Installing pgsql..." && ( ./configure \
--prefix=/usr/ \
--enable-debug \
--enable-depend --enable-cassert --enable-profiling \
CFLAGS="-ggdb -Og -g3 -fno-omit-frame-pointer" \
# CFLAGS="-O3" \
&& make -j 4 && make install
&& make -j 4 && make install ) > /dev/null
# CFLAGS="-O3"

RUN chown postgres:postgres /home/postgres

RUN curl -s -L https://github.com/theory/pgtap/archive/v1.2.0.tar.gz | tar zxvf - && cd pgtap-1.2.0 && make && make install
RUN curl -s -L https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz | tar zxvf - && cd libsodium-1.0.18 && ./configure && make check && make -j 4 install
RUN cpan App::cpanminus && cpan TAP::Parser::SourceHandler::pgTAP && cpan App::prove
RUN curl -s -L https://github.com/theory/pgtap/archive/v1.2.0.tar.gz | tar zxf - && cd pgtap-1.2.0 && (make && make install) > /dev/null
RUN curl -s -L https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz | tar zxf - && cd libsodium-1.0.18 && (./configure && make check && make -j 4 install) > /dev/null
RUN cpan App::cpanminus > /dev/null
RUN cpan TAP::Parser::SourceHandler::pgTAP > /dev/null
RUN cpan App::prove > /dev/null

RUN git clone --depth 1 https://github.com/lacanoid/pgddl.git
RUN cd pgddl && make && make install && cd ..
RUN git clone --depth 1 https://github.com/lacanoid/pgddl.git && \
(cd pgddl && make && make install && cd ..) > /dev/null

RUN mkdir "/home/postgres/pgsodium"
WORKDIR "/home/postgres/pgsodium"
COPY . .
RUN make -j 4 && make install
RUN echo "Installing pgsodium..." && (make -j 4 && make install) > /dev/null
RUN ldconfig
RUN cd `pg_config --sharedir`/extension/
RUN cp getkey_scripts/pgsodium_getkey_urandom.sh `pg_config --sharedir`/extension/pgsodium_getkey
Expand All @@ -53,6 +55,6 @@ RUN echo "postgres ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && \

# start the database
USER postgres
RUN initdb -D "$PGDATA"
RUN initdb -D "$PGDATA" > /dev/null
EXPOSE 5432
CMD ["/usr/bin/postgres"]
4 changes: 2 additions & 2 deletions META.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "pgsodium",
"abstract": "Postgres extension for libsodium functions",
"description": "pgsodium is a PostgreSQL extension that exposes modern libsodium based cryptographic functions to SQL.",
"version": "3.1.7",
"version": "3.2.0",
"maintainer": [
"Michel Pelletier <[email protected]>"
],
Expand All @@ -13,7 +13,7 @@
"abstract": "Postgres extension for libsodium functions",
"file": "src/pgsodium.h",
"docfile": "README.md",
"version": "3.1.7"
"version": "3.2.0"
}
},
"prereqs": {
Expand Down
2 changes: 1 addition & 1 deletion pgsodium.control
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# pgsodium extension
comment = 'Postgres extension for libsodium functions'
default_version = '3.1.7'
default_version = '3.2.0'
relocatable = false
schema = pgsodium
41 changes: 40 additions & 1 deletion pgsodium_tapgen.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use Getopt::Long;
use File::Spec;

my $PGSODIUM_VERSION = '3.1.7';
my $PGSODIUM_VERSION = '3.2.0';

my $curr;
my $rs;
Expand Down Expand Up @@ -115,6 +115,45 @@
printf "SELECT is_member_of( %s, %s );\n", $r->[0], $r->[1];
}

$rs = $dbh->selectcol_arrayref(q{
SELECT format('(%L::text, %L::text, %L::text, %L::text)',
pg_catalog.pg_get_userbyid(d.defaclrole), n.nspname,
CASE d.defaclobjtype
WHEN 'r' THEN 'table'
WHEN 'S' THEN 'sequence'
WHEN 'f' THEN 'function'
WHEN 'T' THEN 'type'
WHEN 'n' THEN 'schema'
END,
pg_catalog.array_to_string(d.defaclacl, E'\n'))
FROM pg_catalog.pg_default_acl d
LEFT JOIN pg_catalog.pg_namespace n ON n.oid = d.defaclnamespace
ORDER BY 1
}) or die;

if (scalar @$rs) {
print "\n\n\n---- DEFAULT PRIVS\n\n";
print q{SELECT result_eq($$
SELECT pg_catalog.pg_get_userbyid(d.defaclrole)::text, n.nspname::text,
CASE d.defaclobjtype
WHEN 'r' THEN 'table'
WHEN 'S' THEN 'sequence'
WHEN 'f' THEN 'function'
WHEN 'T' THEN 'type'
WHEN 'n' THEN 'schema'
END,
pg_catalog.array_to_string(d.defaclacl, E'\n')::text
FROM pg_catalog.pg_default_acl d
LEFT JOIN pg_catalog.pg_namespace n ON n.oid = d.defaclnamespace
ORDER BY 1, 2, 3$$,
$$ VALUES
},
join(",\n ", @$rs), q{
$$,
'Check default privileges');
};
}

print "\n\n\n---- SCHEMAS\n\n";

$rs = $dbh->selectall_arrayref(q{
Expand Down
Loading