Skip to content

fix: Pass reasonForSelect to view identity for definer mode #26724

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
kevintang2022 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Pass reasonForSelect to view identity for definer mode #26724

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
6 changes: 5 additions & 1 deletion ...n-base/src/main/java/com/facebook/presto/connector/system/SystemConnectorSessionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
import com.facebook.presto.spi.connector.ConnectorTransactionHandle;
import com.facebook.presto.spi.security.ConnectorIdentity;
import com.facebook.presto.spi.security.Identity;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;

import java.util.Optional;

import static com.facebook.presto.metadata.SessionPropertyManager.createTestingSessionPropertyManager;

Expand All @@ -35,7 +39,7 @@ public static Session toSession(ConnectorTransactionHandle transactionHandle, Co
{
TransactionId transactionId = ((GlobalSystemTransactionHandle) transactionHandle).getTransactionId();
ConnectorIdentity connectorIdentity = session.getIdentity();
Identity identity = new Identity(connectorIdentity.getUser(), connectorIdentity.getPrincipal(), connectorIdentity.getExtraCredentials());
Identity identity = new Identity(connectorIdentity.getUser(), connectorIdentity.getPrincipal(), ImmutableMap.of(), connectorIdentity.getExtraCredentials(), ImmutableMap.of(), Optional.empty(), connectorIdentity.getReasonForSelect(), ImmutableList.of());
return Session.builder(createTestingSessionPropertyManager(SYSTEM_SESSION_PROPERTIES))
.setQueryId(new QueryId(session.getQueryId()))
.setTransactionId(transactionId)
Expand Down
2 changes: 1 addition & 1 deletion presto-main-base/src/main/java/com/facebook/presto/sql/MaterializedViewUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public static Session buildOwnerSession(Session session, Optional<String> owner,
public static Identity getOwnerIdentity(Optional<String> owner, Session session)
{
if (owner.isPresent() && !owner.get().equals(session.getIdentity().getUser())) {
return new Identity(owner.get(), Optional.empty(), session.getIdentity().getExtraCredentials());
return new Identity(owner.get(), Optional.empty(), ImmutableMap.of(), session.getIdentity().getExtraCredentials(), ImmutableMap.of(), Optional.empty(), session.getIdentity().getReasonForSelect(), ImmutableList.of());
}
return session.getIdentity();
}
Expand Down
4 changes: 2 additions & 2 deletions presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/StatementAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2474,7 +2474,7 @@ private Scope processMaterializedView(
if (!owner.isPresent()) {
throw new SemanticException(NOT_SUPPORTED, "Owner must be present for DEFINER security mode");
}
queryIdentity = new Identity(owner.get(), Optional.empty(), session.getIdentity().getExtraCredentials());
queryIdentity = new Identity(owner.get(), Optional.empty(), emptyMap(), session.getIdentity().getExtraCredentials(), emptyMap(), Optional.empty(), session.getIdentity().getReasonForSelect(), emptyList());
// For materialized views, use regular access control (not ViewAccessControl)
// to check SELECT permissions on base tables, not CREATE VIEW permissions
queryAccessControl = accessControl;
Expand Down Expand Up @@ -4258,7 +4258,7 @@ private RelationType analyzeView(Query query, QualifiedObjectName name, Optional
AccessControl viewAccessControl;
if (owner.isPresent() && !owner.get().equals(session.getIdentity().getUser())) {
// definer mode
identity = new Identity(owner.get(), Optional.empty(), session.getIdentity().getExtraCredentials());
identity = new Identity(owner.get(), Optional.empty(), emptyMap(), session.getIdentity().getExtraCredentials(), emptyMap(), Optional.empty(), session.getIdentity().getReasonForSelect(), emptyList());
viewAccessControl = new ViewAccessControl(accessControl);
}
else {
Expand Down
Loading