Skip to content

Avoid permission checks for masked columns when the table doesn't hav… #4724

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

Closed
frankgh wants to merge 1 commit into from
+11 −7
Closed

Avoid permission checks for masked columns when the table doesn't hav… #4724

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
1 change: 1 addition & 0 deletions CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
6.0-alpha2
* Avoid permission checks for masked columns when the table doesn't have any (CASSANDRA-21299)
* Reduce allocations and array copies due to buffer resizing in LocalDataResponse during row serialization (CASSANDRA-21285)
* Implement a guardrail for client driver versions (CASSANDRA-21146)
* Enable IAuthenticator to declare supported and alterable role options (CASSANDRA-20834)
Expand Down
3 changes: 2 additions & 1 deletion src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,8 @@ public void authorize(ClientState state) throws InvalidRequestException, Unautho
for (Function function : getFunctions())
state.ensurePermission(Permission.EXECUTE, function);

if (!state.hasTablePermission(table, Permission.UNMASK) &&
if (table.hasMaskedColumns() &&
!state.hasTablePermission(table, Permission.UNMASK) &&
!state.hasTablePermission(table, Permission.SELECT_MASKED))
{
List<ColumnMetadata> queriedMaskedColumns = table.columns()
Expand Down
14 changes: 8 additions & 6 deletions src/java/org/apache/cassandra/schema/TableMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,9 @@ public enum Kind
public final List<ColumnMetadata> columnsWithConstraints;
public final List<ColumnMetadata> notNullColumns;

// remember whether there are masked columns or not
private final boolean hasMaskedColumns;

protected TableMetadata(Builder builder)
{
flags = Sets.immutableEnumSet(builder.flags);
Expand Down Expand Up @@ -285,6 +288,7 @@ else if (isIndex())

List<ColumnMetadata> columnsWithConstraints = new ArrayList<>();
List<ColumnMetadata> notNullColumns = new ArrayList<>();
boolean hasMaskedColumns = false;

for (ColumnMetadata column : this.columns())
{
Expand All @@ -295,7 +299,10 @@ else if (isIndex())
notNullColumns.add(column);

}
if (column.isMasked())
hasMaskedColumns = true;
}
this.hasMaskedColumns = hasMaskedColumns;
this.columnsWithConstraints = columnsWithConstraints;
this.notNullColumns = notNullColumns;
}
Expand Down Expand Up @@ -584,12 +591,7 @@ public boolean hasStaticColumns()
*/
public boolean hasMaskedColumns()
{
for (ColumnMetadata column : columns.values())
{
if (column.isMasked())
return true;
}
return false;
return hasMaskedColumns;
}

/**
Expand Down