-
Notifications
You must be signed in to change notification settings - Fork 4.8k
HIVE-29248: Propagate HiveAccessControlException to HiveCatalog #6171
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
okumin
wants to merge
2
commits into
apache:master
Choose a base branch
from
okumin:HIVE-29248-error-message
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
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
147 changes: 147 additions & 0 deletions
147
iceberg/iceberg-catalog/src/test/java/org/apache/iceberg/hive/MockHiveAuthorizer.java
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 |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.iceberg.hive; | ||
|
|
||
| import java.util.List; | ||
| import org.apache.hadoop.hive.conf.HiveConf; | ||
| import org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider; | ||
| import org.apache.hadoop.hive.ql.security.authorization.plugin.AbstractHiveAuthorizer; | ||
| import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAccessControlException; | ||
| import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAuthzContext; | ||
| import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveOperationType; | ||
| import org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrincipal; | ||
| import org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilege; | ||
| import org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeInfo; | ||
| import org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeObject; | ||
| import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveRoleGrant; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class MockHiveAuthorizer extends AbstractHiveAuthorizer { | ||
| public static final String PERMISSION_TEST_USER = "permission_test_user"; | ||
| private static final Logger LOG = LoggerFactory.getLogger(MockHiveAuthorizer.class); | ||
|
|
||
| private final HiveAuthenticationProvider authenticator; | ||
|
|
||
| public MockHiveAuthorizer(HiveAuthenticationProvider authenticator) { | ||
| this.authenticator = authenticator; | ||
| } | ||
|
|
||
| @Override | ||
| public VERSION getVersion() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public void grantPrivileges(List<HivePrincipal> hivePrincipals, List<HivePrivilege> hivePrivileges, | ||
| HivePrivilegeObject hivePrivObject, HivePrincipal grantorPrincipal, boolean grantOption) { | ||
| // NOP | ||
| } | ||
|
|
||
| @Override | ||
| public void revokePrivileges(List<HivePrincipal> hivePrincipals, List<HivePrivilege> hivePrivileges, | ||
| HivePrivilegeObject hivePrivObject, HivePrincipal grantorPrincipal, boolean grantOption) { | ||
| // NOP | ||
| } | ||
|
|
||
| @Override | ||
| public void createRole(String roleName, HivePrincipal adminGrantor) { | ||
| // NOP | ||
| } | ||
|
|
||
| @Override | ||
| public void dropRole(String roleName) { | ||
| // NOP | ||
| } | ||
|
|
||
| @Override | ||
| public List<HiveRoleGrant> getPrincipalGrantInfoForRole(String roleName) { | ||
| return List.of(); | ||
| } | ||
|
|
||
| @Override | ||
| public List<HiveRoleGrant> getRoleGrantInfoForPrincipal(HivePrincipal principal) { | ||
| return List.of(); | ||
| } | ||
|
|
||
| @Override | ||
| public void grantRole(List<HivePrincipal> hivePrincipals, List<String> roles, boolean grantOption, | ||
| HivePrincipal grantorPrinc) { | ||
| // NOP | ||
| } | ||
|
|
||
| @Override | ||
| public void revokeRole(List<HivePrincipal> hivePrincipals, List<String> roles, boolean grantOption, | ||
| HivePrincipal grantorPrinc) { | ||
| // NOP | ||
| } | ||
|
|
||
| @Override | ||
| public void checkPrivileges(HiveOperationType hiveOpType, List<HivePrivilegeObject> inputsHObjs, | ||
| List<HivePrivilegeObject> outputHObjs, HiveAuthzContext context) throws HiveAccessControlException { | ||
| LOG.info("Checking privileges. User={}, Operation={}, inputs={}, outputs={}", authenticator.getUserName(), | ||
| hiveOpType, inputsHObjs, outputHObjs); | ||
| if (PERMISSION_TEST_USER.equals(authenticator.getUserName())) { | ||
| throw new HiveAccessControlException(String.format("Unauthorized. Operation=%s, inputs=%s, outputs=%s", | ||
| hiveOpType, inputsHObjs, outputHObjs)); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public List<HivePrivilegeObject> filterListCmdObjects(List<HivePrivilegeObject> listObjs, HiveAuthzContext context) { | ||
| return List.of(); | ||
| } | ||
|
|
||
| @Override | ||
| public List<String> getAllRoles() { | ||
| return List.of(); | ||
| } | ||
|
|
||
| @Override | ||
| public List<HivePrivilegeInfo> showPrivileges(HivePrincipal principal, HivePrivilegeObject privObj) { | ||
| return List.of(); | ||
| } | ||
|
|
||
| @Override | ||
| public void setCurrentRole(String roleName) { | ||
| // NOP | ||
| } | ||
|
|
||
| @Override | ||
| public List<String> getCurrentRoleNames() { | ||
| return List.of(); | ||
| } | ||
|
|
||
| @Override | ||
| public void applyAuthorizationConfigPolicy(HiveConf hiveConf) { | ||
| // NOP | ||
| } | ||
|
|
||
| @Override | ||
| public List<HivePrivilegeObject> applyRowFilterAndColumnMasking(HiveAuthzContext context, | ||
| List<HivePrivilegeObject> privObjs) { | ||
| return List.of(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean needTransform() { | ||
| return false; | ||
| } | ||
| } |
35 changes: 35 additions & 0 deletions
35
iceberg/iceberg-catalog/src/test/java/org/apache/iceberg/hive/MockHiveAuthorizerFactory.java
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 |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.iceberg.hive; | ||
|
|
||
| import org.apache.hadoop.hive.conf.HiveConf; | ||
| import org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider; | ||
| import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAuthorizer; | ||
| import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAuthorizerFactory; | ||
| import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAuthzSessionContext; | ||
| import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveMetastoreClientFactory; | ||
|
|
||
| public class MockHiveAuthorizerFactory implements HiveAuthorizerFactory { | ||
| @Override | ||
| public HiveAuthorizer createHiveAuthorizer(HiveMetastoreClientFactory metastoreClientFactory, HiveConf conf, | ||
| HiveAuthenticationProvider hiveAuthenticator, HiveAuthzSessionContext ctx) { | ||
| return new MockHiveAuthorizer(hiveAuthenticator); | ||
| } | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should we just check for contains "org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAccessControlException" ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The current style is aligned with L118,
Got exception: org.apache.thrift.transport.TTransportException. To be honest, I don't have a preference. They should eventually be consistent between apache/hive and apache/iceberg.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i would use regex to check for the exception class only