Skip to content

HIVE-29804: Include table inputs for HS2 authorization SHOW TBLPROPER… #6683

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

HIVE-29804: Include table inputs for HS2 authorization SHOW TBLPROPER… #6683

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
5 changes: 4 additions & 1 deletion ...org/apache/hadoop/hive/ql/ddl/table/info/show/properties/ShowTablePropertiesAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import org.apache.hadoop.hive.ql.ddl.DDLSemanticAnalyzerFactory.DDLType;
import org.apache.hadoop.hive.ql.exec.Task;
import org.apache.hadoop.hive.ql.exec.TaskFactory;
import org.apache.hadoop.hive.ql.hooks.ReadEntity;
import org.apache.hadoop.hive.ql.metadata.Table;
import org.apache.hadoop.hive.ql.parse.ASTNode;
import org.apache.hadoop.hive.ql.parse.BaseSemanticAnalyzer;
import org.apache.hadoop.hive.ql.parse.HiveParser;
Expand All @@ -45,7 +47,8 @@ public void analyzeInternal(ASTNode root) throws SemanticException {
TableName tableName = getQualifiedTableName((ASTNode) root.getChild(0));
String propertyName = (root.getChildCount() > 1) ? unescapeSQLString(root.getChild(1).getText()) : null;

getTable(tableName); // validate that table exists
Table table = getTable(tableName);
inputs.add(new ReadEntity(table));

ShowTablePropertiesDesc desc = new ShowTablePropertiesDesc(ctx.getResFile().toString(), tableName, propertyName);
Task<DDLWork> task = TaskFactory.get(new DDLWork(getInputs(), getOutputs(), desc));
Expand Down
8 changes: 6 additions & 2 deletions ...rc/java/org/apache/hadoop/hive/ql/ddl/table/info/show/status/ShowTableStatusAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@
import org.apache.hadoop.hive.ql.ddl.table.partition.PartitionUtils;
import org.apache.hadoop.hive.ql.exec.Task;
import org.apache.hadoop.hive.ql.exec.TaskFactory;
import org.apache.hadoop.hive.ql.hooks.ReadEntity;
import org.apache.hadoop.hive.ql.metadata.Table;
import org.apache.hadoop.hive.ql.parse.ASTNode;
import org.apache.hadoop.hive.ql.parse.BaseSemanticAnalyzer;
import org.apache.hadoop.hive.ql.parse.HiveParser;
import org.apache.hadoop.hive.ql.parse.HiveTableName;
import org.apache.hadoop.hive.ql.parse.SemanticException;
import org.apache.hadoop.hive.ql.session.SessionState;

Expand Down Expand Up @@ -68,9 +69,12 @@ public void analyzeInternal(ASTNode root) throws SemanticException {
}
}

Table table = getTable(dbName, tableNames, true);
inputs.add(new ReadEntity(table));

if (partitionSpec != null) {
// validate that partition exists
PartitionUtils.getPartition(db, getTable(HiveTableName.of(tableNames)), partitionSpec, true);
PartitionUtils.getPartition(db, table, partitionSpec, true);
}

ShowTableStatusDesc desc = new ShowTableStatusDesc(ctx.getResFile(), dbName, tableNames, partitionSpec);
Expand Down
10 changes: 10 additions & 0 deletions ql/src/test/queries/clientnegative/authorization_show_tableextended_nosel.q
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--! qt:authorizer
set user.name=user1;

create table t_show_ext(i int);

grant all on table t_show_ext to user user2;
revoke select on table t_show_ext from user user2;

set user.name=user2;
show table extended like 't_show_ext';
10 changes: 10 additions & 0 deletions ql/src/test/queries/clientnegative/authorization_show_tblproperties_nosel.q
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--! qt:authorizer
set user.name=user1;

create table t_show_props(i int);

grant all on table t_show_props to user user2;
revoke select on table t_show_props from user user2;

set user.name=user2;
show tblproperties t_show_props;
21 changes: 21 additions & 0 deletions ql/src/test/results/clientnegative/authorization_show_tableextended_nosel.q.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
PREHOOK: query: create table t_show_ext(i int)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@t_show_ext
POSTHOOK: query: create table t_show_ext(i int)
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_show_ext
PREHOOK: query: grant all on table t_show_ext to user user2
PREHOOK: type: GRANT_PRIVILEGE
PREHOOK: Output: default@t_show_ext
POSTHOOK: query: grant all on table t_show_ext to user user2
POSTHOOK: type: GRANT_PRIVILEGE
POSTHOOK: Output: default@t_show_ext
PREHOOK: query: revoke select on table t_show_ext from user user2
PREHOOK: type: REVOKE_PRIVILEGE
PREHOOK: Output: default@t_show_ext
POSTHOOK: query: revoke select on table t_show_ext from user user2
POSTHOOK: type: REVOKE_PRIVILEGE
POSTHOOK: Output: default@t_show_ext
FAILED: HiveAccessControlException Permission denied: Principal [name=user2, type=USER] does not have following privileges for operation SHOW_TABLESTATUS [[SELECT] on Object [type=TABLE_OR_VIEW, name=hive.default.t_show_ext]]
21 changes: 21 additions & 0 deletions ql/src/test/results/clientnegative/authorization_show_tblproperties_nosel.q.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
PREHOOK: query: create table t_show_props(i int)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@t_show_props
POSTHOOK: query: create table t_show_props(i int)
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_show_props
PREHOOK: query: grant all on table t_show_props to user user2
PREHOOK: type: GRANT_PRIVILEGE
PREHOOK: Output: default@t_show_props
POSTHOOK: query: grant all on table t_show_props to user user2
POSTHOOK: type: GRANT_PRIVILEGE
POSTHOOK: Output: default@t_show_props
PREHOOK: query: revoke select on table t_show_props from user user2
PREHOOK: type: REVOKE_PRIVILEGE
PREHOOK: Output: default@t_show_props
POSTHOOK: query: revoke select on table t_show_props from user user2
POSTHOOK: type: REVOKE_PRIVILEGE
POSTHOOK: Output: default@t_show_props
FAILED: HiveAccessControlException Permission denied: Principal [name=user2, type=USER] does not have following privileges for operation SHOW_TBLPROPERTIES [[SELECT] on Object [type=TABLE_OR_VIEW, name=hive.default.t_show_props]]
Loading