Skip to content

fix: aggregate result types respect column-level SELECT permission #653

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

Open
philipsorensen wants to merge 1 commit into
base: master
Choose a base branch
from
+227 −1
Open

fix: aggregate result types respect column-level SELECT permission #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/graphql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4754,7 +4754,8 @@ impl ___Type for AggregateNumericType {
let mut fields = Vec::new();

for col in self.table.columns.iter() {
if is_aggregatable(col, &self.aggregate_op)
if col.permissions.is_selectable
&& is_aggregatable(col, &self.aggregate_op)
&& let Some(scalar_type) = aggregate_result_type(col, &self.aggregate_op)
{
let field_name = self.schema.graphql_column_field_name(col);
Expand Down
144 changes: 144 additions & 0 deletions test/expected/permissions_aggregate_column.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
begin;
comment on schema public is e'@graphql({"inflect_names": true, "introspection": true})';
create table account(
id serial primary key,
balance numeric not null,
score int not null
);
-- Aggregates are opt-in per table.
comment on table account is e'@graphql({"aggregate": {"enabled": true}})';
insert into public.account(balance, score)
values
(100.00, 5),
(250.00, 9);
-- Superuser sees every aggregatable column, including `balance`.
select jsonb_pretty(
graphql.resolve($$
{
__type(name: "AccountSumAggregateResult") {
kind
fields { name }
}
}
$$)
);
jsonb_pretty
---------------------------------------
{ +
"data": { +
"__type": { +
"kind": "OBJECT", +
"fields": [ +
{ +
"name": "id" +
}, +
{ +
"name": "balance"+
}, +
{ +
"name": "score" +
} +
] +
} +
} +
}
(1 row)

create role api;
-- Grant access to GQL
grant usage on schema graphql to api;
-- `api` may read id + score, but NOT balance.
grant usage on schema public to api;
grant all on all tables in schema public to api;
revoke select on public.account from api;
grant select (id, score) on public.account to api;
set role api;
-- The aggregate result types must not expose the non-selectable `balance`
-- column (schema/introspection leak). Only `score` should appear.
select jsonb_pretty(
graphql.resolve($$
{
__type(name: "AccountSumAggregateResult") {
kind
fields { name }
}
}
$$)
);
jsonb_pretty
-------------------------------------
{ +
"data": { +
"__type": { +
"kind": "OBJECT", +
"fields": [ +
{ +
"name": "id" +
}, +
{ +
"name": "score"+
} +
] +
} +
} +
}
(1 row)

select jsonb_pretty(
graphql.resolve($$
{
__type(name: "AccountMaxAggregateResult") {
kind
fields { name }
}
}
$$)
);
jsonb_pretty
-------------------------------------
{ +
"data": { +
"__type": { +
"kind": "OBJECT", +
"fields": [ +
{ +
"name": "id" +
}, +
{ +
"name": "score"+
} +
] +
} +
} +
}
(1 row)

-- Aggregating a permitted column still works.
select jsonb_pretty(
graphql.resolve($$
{
accountCollection {
aggregate {
sum { score }
}
}
}
$$)
);
jsonb_pretty
---------------------------------
{ +
"data": { +
"accountCollection": { +
"aggregate": { +
"sum": { +
"score": 14+
} +
} +
} +
} +
}
(1 row)

reset role;
rollback;
81 changes: 81 additions & 0 deletions test/sql/permissions_aggregate_column.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
begin;
comment on schema public is e'@graphql({"inflect_names": true, "introspection": true})';

create table account(
id serial primary key,
balance numeric not null,
score int not null
);

-- Aggregates are opt-in per table.
comment on table account is e'@graphql({"aggregate": {"enabled": true}})';

insert into public.account(balance, score)
values
(100.00, 5),
(250.00, 9);

-- Superuser sees every aggregatable column, including `balance`.
select jsonb_pretty(
graphql.resolve($$
{
__type(name: "AccountSumAggregateResult") {
kind
fields { name }
}
}
$$)
);

create role api;

-- Grant access to GQL
grant usage on schema graphql to api;

-- `api` may read id + score, but NOT balance.
grant usage on schema public to api;
grant all on all tables in schema public to api;
revoke select on public.account from api;
grant select (id, score) on public.account to api;

set role api;

-- The aggregate result types must not expose the non-selectable `balance`
-- column (schema/introspection leak). Only `score` should appear.
select jsonb_pretty(
graphql.resolve($$
{
__type(name: "AccountSumAggregateResult") {
kind
fields { name }
}
}
$$)
);

select jsonb_pretty(
graphql.resolve($$
{
__type(name: "AccountMaxAggregateResult") {
kind
fields { name }
}
}
$$)
);

-- Aggregating a permitted column still works.
select jsonb_pretty(
graphql.resolve($$
{
accountCollection {
aggregate {
sum { score }
}
}
}
$$)
);

reset role;
rollback;