Skip to content

HIVE-28898: Include table ownership details in getTableMetas() for Ra… #5770

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

Merged
merged 4 commits into from
Apr 25, 2025
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -230,9 +230,9 @@ public List<TableMeta> filterTableMetas(String catName, String dbName, List<Tabl
}
tableNames.add(tableMeta.getTableName());
});
TableFilterContext tableFilterContext = new TableFilterContext(dbName, tableNames);
TableFilterContext tableFilterContext = TableFilterContext.createFromTableMetas(dbName, tableMetas);
HiveMetaStoreAuthzInfo hiveMetaStoreAuthzInfo = tableFilterContext.getAuthzContext();
final List<String> filteredTableNames = filterTableNames(hiveMetaStoreAuthzInfo, dbName, tableNames);
final List<String> filteredTableNames = filterTableNames(hiveMetaStoreAuthzInfo, dbName, tableNames);
if (!CollectionUtils.isEmpty(filteredTableNames)) {
Set<String> filteredTabs = new HashSet<>(filteredTableNames);
LOG.debug("<== HiveMetaStoreAuthorizer.filterTableMetas() : {}", filteredTabs);
Original file line number Diff line number Diff line change
@@ -20,22 +20,23 @@

package org.apache.hadoop.hive.ql.security.authorization.plugin.metastore.filtercontext;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.hive.metastore.api.Table;
import org.apache.hadoop.hive.metastore.api.TableMeta;
import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveOperationType;
import org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeObject;
import org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeObject.HivePrivilegeObjectType;
import org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeObject.HivePrivObjectActionType;
import org.apache.hadoop.hive.ql.security.authorization.plugin.metastore.HiveMetaStoreAuthorizableEvent;
import org.apache.hadoop.hive.ql.security.authorization.plugin.metastore.HiveMetaStoreAuthzInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

public class TableFilterContext extends HiveMetaStoreAuthorizableEvent {
private static final Logger LOG = LoggerFactory.getLogger(DatabaseFilterContext.class);
private static final Logger LOG = LoggerFactory.getLogger(TableFilterContext.class);

List<Table> tables = null;
List<String> tableNames = null;
@@ -53,9 +54,29 @@ public TableFilterContext(String dbName, List<String> tableNames) {
this.tableNames = tableNames;
}

@Override public HiveMetaStoreAuthzInfo getAuthzContext() {
HiveMetaStoreAuthzInfo ret =
new HiveMetaStoreAuthzInfo(preEventContext, HiveOperationType.QUERY, getInputHObjs(), getOutputHObjs(), null);
public static TableFilterContext createFromTableMetas(String dbName, List<TableMeta> tableMetas) {
List<Table> tables = new ArrayList<>();

for (TableMeta tableMeta : tableMetas) {
Table table = new Table();
table.setCatName(tableMeta.getCatName());
table.setDbName(dbName);
table.setTableName(tableMeta.getTableName());
if (tableMeta.isSetOwnerName()) {
table.setOwner(tableMeta.getOwnerName());
}
if (tableMeta.isSetOwnerType()) {
table.setOwnerType(tableMeta.getOwnerType());
}
tables.add(table);
}

return new TableFilterContext(tables);
}

@Override
public HiveMetaStoreAuthzInfo getAuthzContext() {
HiveMetaStoreAuthzInfo ret = new HiveMetaStoreAuthzInfo(preEventContext, HiveOperationType.QUERY, getInputHObjs(), getOutputHObjs(), null);
return ret;
}

@@ -66,18 +87,14 @@ private List<HivePrivilegeObject> getInputHObjs() {

if (tables != null) {
for (Table table : tables) {
HivePrivilegeObjectType type = HivePrivilegeObjectType.TABLE_OR_VIEW;
HivePrivObjectActionType objectActionType = HivePrivilegeObject.HivePrivObjectActionType.OTHER;
HivePrivilegeObject hivePrivilegeObject =
new HivePrivilegeObject(type, table.getDbName(), table.getTableName(), null, null, objectActionType, null, null, table.getOwner(), table.getOwnerType());
ret.add(hivePrivilegeObject);
ret.add(getHivePrivilegeObject(table));
}
} else {
for (String tableName : tableNames) {
HivePrivilegeObjectType type = HivePrivilegeObjectType.TABLE_OR_VIEW;
HivePrivObjectActionType objectActionType = HivePrivilegeObject.HivePrivObjectActionType.OTHER;
HivePrivilegeObject hivePrivilegeObject =
new HivePrivilegeObject(type, dbName, tableName, null, null, objectActionType, null, null);
HivePrivObjectActionType objectActionType = HivePrivObjectActionType.OTHER;
HivePrivilegeObject hivePrivilegeObject = new HivePrivilegeObject(
type, dbName, tableName, null, null, objectActionType, null, null);
ret.add(hivePrivilegeObject);
}
}
@@ -94,4 +111,4 @@ private List<HivePrivilegeObject> getOutputHObjs() {
public List<Table> getTables() {
return tables;
}
}
}
Loading
Loading