-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Add support for GRANT/DENY/REVOKE on branches #25152
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ebyhr
wants to merge
1
commit into
trinodb:master
Choose a base branch
from
ebyhr:ebi/iceberg-branching-v3
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,6 +27,7 @@ | |
import io.trino.spi.security.Privilege; | ||
import io.trino.sql.tree.Deny; | ||
import io.trino.sql.tree.Expression; | ||
import io.trino.sql.tree.Identifier; | ||
|
||
import java.util.List; | ||
import java.util.Optional; | ||
|
@@ -82,6 +83,10 @@ else if (entityKind.equalsIgnoreCase("SCHEMA")) { | |
|
||
private static void executeDenyOnSchema(Session session, Deny statement, Metadata metadata, AccessControl accessControl) | ||
{ | ||
if (statement.getGrantObject().getBranch().isPresent()) { | ||
throw semanticException(NOT_SUPPORTED, statement, "Denying on branch is not supported"); | ||
} | ||
|
||
CatalogSchemaName schemaName = createCatalogSchemaName(session, statement, Optional.of(statement.getGrantObject().getName())); | ||
|
||
if (!metadata.schemaExists(session, schemaName)) { | ||
|
@@ -99,6 +104,7 @@ private static void executeDenyOnSchema(Session session, Deny statement, Metadat | |
private static void executeDenyOnTable(Session session, Deny statement, Metadata metadata, AccessControl accessControl) | ||
{ | ||
QualifiedObjectName tableName = createQualifiedObjectName(session, statement, statement.getGrantObject().getName()); | ||
Optional<Identifier> branch = statement.getGrantObject().getBranch(); | ||
|
||
if (!metadata.isMaterializedView(session, tableName) && !metadata.isView(session, tableName)) { | ||
RedirectionAwareTableHandle redirection = metadata.getRedirectionAwareTableHandle(session, tableName); | ||
|
@@ -112,15 +118,23 @@ private static void executeDenyOnTable(Session session, Deny statement, Metadata | |
|
||
Set<Privilege> privileges = parseStatementPrivileges(statement, statement.getPrivileges()); | ||
|
||
for (Privilege privilege : privileges) { | ||
accessControl.checkCanDenyTablePrivilege(session.toSecurityContext(), privilege, tableName, createPrincipal(statement.getGrantee())); | ||
if (branch.isEmpty()) { | ||
privileges.forEach(privilege -> accessControl.checkCanDenyTablePrivilege(session.toSecurityContext(), privilege, tableName, createPrincipal(statement.getGrantee()))); | ||
metadata.denyTablePrivileges(session, tableName, privileges, createPrincipal(statement.getGrantee())); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should go after the loop. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is not inside a loop. |
||
} | ||
else { | ||
String branchName = branch.get().getValue(); | ||
privileges.forEach(privilege -> accessControl.checkCanDenyTableBranchPrivilege(session.toSecurityContext(), privilege, tableName, branchName, createPrincipal(statement.getGrantee()))); | ||
metadata.denyTableBranchPrivileges(session, tableName, branchName, privileges, createPrincipal(statement.getGrantee())); | ||
ebyhr marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
metadata.denyTablePrivileges(session, tableName, privileges, createPrincipal(statement.getGrantee())); | ||
} | ||
|
||
private static void executeDenyOnEntity(Session session, Deny statement, Metadata metadata, String entityKind, AccessControl accessControl) | ||
{ | ||
if (statement.getGrantObject().getBranch().isPresent()) { | ||
throw semanticException(NOT_SUPPORTED, statement, "Denying on branch is not supported"); | ||
} | ||
|
||
EntityKindAndName entity = createEntityKindAndName(entityKind, statement.getGrantObject().getName()); | ||
Set<EntityPrivilege> privileges = fetchEntityKindPrivileges(entityKind, metadata, statement.getPrivileges()); | ||
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.