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

Jump to bottom

Register has_database/schema_privilege functions under pg_catalog #15770

Merged
merged 1 commit into from
Mar 27, 2024
Merged

Register has_database/schema_privilege functions under pg_catalog #15770

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion docs/appendices/release-notes/5.6.4.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,6 @@
Fixes
=====

None
- Changed :ref:`scalar-has-database-priv` and :ref:`scalar-has-schema-priv`
functions to be registered under :ref:`postgres-pg_catalog` schema, to be

Check warning on line 51 in docs/appendices/release-notes/5.6.4.rst

View workflow job for this annotation

GitHub Actions / Vale 

[vale] reported by reviewdog 🐶
[CrateDB.Terminology] Prefer 'PostgreSQL' over 'postgres'

Raw Output:
{"message": "[CrateDB.Terminology] Prefer 'PostgreSQL' over 'postgres'", "location": {"path": "docs/appendices/release-notes/5.6.4.rst", "range": {"start": {"line": 51, "column": 42}}}, "severity": "WARNING"}
compatible with PostgreSQL behaviour.
4 changes: 3 additions & 1 deletion server/src/main/java/io/crate/expression/scalar/HasDatabasePrivilegeFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@

import io.crate.Constants;
import io.crate.common.FourFunction;
import io.crate.metadata.FunctionName;
import io.crate.metadata.Functions;
import io.crate.metadata.functions.BoundSignature;
import io.crate.metadata.functions.Signature;
import io.crate.metadata.pgcatalog.PgCatalogSchemaInfo;
import io.crate.role.Permission;
import io.crate.role.Privilege;
import io.crate.role.Role;
Expand All @@ -42,7 +44,7 @@

public class HasDatabasePrivilegeFunction extends HasPrivilegeFunction {

public static final String NAME = "has_database_privilege";
public static final FunctionName NAME = new FunctionName(PgCatalogSchemaInfo.NAME, "has_database_privilege");

private static final FourFunction<Roles, Role, Object, Collection<Permission>, Boolean> CHECK_BY_DB_NAME =
(roles, user, db, permissions) -> {
Expand Down
4 changes: 3 additions & 1 deletion server/src/main/java/io/crate/expression/scalar/HasSchemaPrivilegeFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@
import org.jetbrains.annotations.Nullable;

import io.crate.common.FourFunction;
import io.crate.metadata.FunctionName;
import io.crate.metadata.Functions;
import io.crate.metadata.functions.BoundSignature;
import io.crate.metadata.functions.Signature;
import io.crate.metadata.pgcatalog.PgCatalogSchemaInfo;
import io.crate.metadata.pgcatalog.PgCatalogTableDefinitions;
import io.crate.role.Permission;
import io.crate.role.Role;
Expand All @@ -41,7 +43,7 @@

public class HasSchemaPrivilegeFunction extends HasPrivilegeFunction {

public static final String NAME = "has_schema_privilege";
public static final FunctionName NAME = new FunctionName(PgCatalogSchemaInfo.NAME, "has_schema_privilege");

private static final FourFunction<Roles, Role, Object, Collection<Permission>, Boolean> CHECK_BY_SCHEMA_NAME =
(roles, user, schema, permissions) -> {
Expand Down
6 changes: 6 additions & 0 deletions server/src/test/java/io/crate/expression/scalar/HasDatabasePrivilegeFunctionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@ tableSources, null, randomFrom(Role.CRATE_USER, TEST_USER_WITH_AL_ON_CLUSTER, TE
List.of(Role.CRATE_USER, TEST_USER, TEST_USER_WITH_CREATE));
}

@Test
public void test_function_registered_under_pg_catalog() {
sqlExpressions = new SqlExpressions(tableSources, null, Role.CRATE_USER);
assertEvaluate("pg_catalog.has_database_privilege('crate', 'crate', 'CONNECT')", true);
}

@Test
public void test_no_user_compile_gets_new_instance() {
assertCompileAsSuperUser("has_database_privilege(name, 'CONNECT')", isNotSameInstance());
Expand Down
6 changes: 6 additions & 0 deletions server/src/test/java/io/crate/expression/scalar/HasSchemaPrivilegeFunctionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ public void prepare() {
tableSources, null, randomFrom(TEST_USER_WITH_AL_ON_CLUSTER, TEST_USER_WITH_DQL_ON_SYS, Role.CRATE_USER), List.of(TEST_USER));
}

@Test
public void test_function_registered_under_pg_catalog() {
sqlExpressions = new SqlExpressions(tableSources, null, Role.CRATE_USER);
assertEvaluate("pg_catalog.has_schema_privilege('crate', 'sys', 'USAGE')", true);
}

@Test
public void test_no_user_compile_gets_new_instance() {
assertCompileAsSuperUser("has_schema_privilege(name, 'USAGE')", isNotSameInstance());
Expand Down