You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by sp...@apache.org on 2019/09/19 18:01:46 UTC
[ranger] branch master updated: RANGER-2577: Added jersey-bundle
dependency jar as part of ozone plugin as well as fixed one minor issue to
handle authz request for volume properly.
This is an automated email from the ASF dual-hosted git repository.
spolavarapu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new d17fa2c RANGER-2577: Added jersey-bundle dependency jar as part of ozone plugin as well as fixed one minor issue to handle authz request for volume properly.
d17fa2c is described below
commit d17fa2c7230260cc3d4ddbef3fc6ab8bddb4154a
Author: Sailaja Polavarapu <sp...@cloudera.com>
AuthorDate: Thu Sep 19 11:01:30 2019 -0700
RANGER-2577: Added jersey-bundle dependency jar as part of ozone plugin as well as fixed one minor issue to handle authz request for volume properly.
---
.../ozone/authorizer/RangerOzoneAuthorizer.java | 25 ++++++++++++----------
src/main/assembly/plugin-ozone.xml | 2 ++
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/plugin-ozone/src/main/java/org/apache/ranger/authorization/ozone/authorizer/RangerOzoneAuthorizer.java b/plugin-ozone/src/main/java/org/apache/ranger/authorization/ozone/authorizer/RangerOzoneAuthorizer.java
index 40d853d..46b9932 100644
--- a/plugin-ozone/src/main/java/org/apache/ranger/authorization/ozone/authorizer/RangerOzoneAuthorizer.java
+++ b/plugin-ozone/src/main/java/org/apache/ranger/authorization/ozone/authorizer/RangerOzoneAuthorizer.java
@@ -79,7 +79,8 @@ public class RangerOzoneAuthorizer implements IAccessAuthorizer {
if (LOG.isDebugEnabled()) {
LOG.debug("==> RangerOzoneAuthorizer.checkAccess with operation = " + operation + ", resource = " +
- resource + ", store type = " + OzoneObj.StoreType.values() + ", ugi = " + ugi + ", ip = " + context.getIp() + ")");
+ resource + ", store type = " + OzoneObj.StoreType.values() + ", ugi = " + ugi + ", ip = " +
+ context.getIp() + ", resourceType = " + ozoneObj.getResourceType() + ")");
}
if (rangerPlugin == null) {
@@ -127,20 +128,22 @@ public class RangerOzoneAuthorizer implements IAccessAuthorizer {
rangerRequest.setAction(action);
rangerRequest.setRequestData(resource);
rangerRequest.setClusterName(clusterName);
- if (ozoneObj.getStoreType() == OzoneObj.StoreType.S3) {
- rangerResource.setValue(KEY_RESOURCE_VOLUME, "s3Vol");
- } else {
- rangerResource.setValue(KEY_RESOURCE_VOLUME, ozoneObj.getVolumeName());
- }
- if (ozoneObj.getResourceType() == OzoneObj.ResourceType.BUCKET) {
- rangerResource.setValue(KEY_RESOURCE_BUCKET, ozoneObj.getBucketName());
- } else if (ozoneObj.getResourceType() == OzoneObj.ResourceType.KEY) {
+ if (ozoneObj.getResourceType() == OzoneObj.ResourceType.VOLUME) {
+ rangerResource.setValue(KEY_RESOURCE_VOLUME, ozoneObj.getVolumeName());
+ } else if (ozoneObj.getResourceType() == OzoneObj.ResourceType.BUCKET || ozoneObj.getResourceType() == OzoneObj.ResourceType.KEY) {
+ if (ozoneObj.getStoreType() == OzoneObj.StoreType.S3) {
+ rangerResource.setValue(KEY_RESOURCE_VOLUME, "s3Vol");
+ } else {
+ rangerResource.setValue(KEY_RESOURCE_VOLUME, ozoneObj.getVolumeName());
+ }
rangerResource.setValue(KEY_RESOURCE_BUCKET, ozoneObj.getBucketName());
- rangerResource.setValue(KEY_RESOURCE_KEY, ozoneObj.getKeyName());
+ if (ozoneObj.getResourceType() == OzoneObj.ResourceType.KEY) {
+ rangerResource.setValue(KEY_RESOURCE_KEY, ozoneObj.getKeyName());
+ }
} else {
LOG.fatal("Unsupported resource = " + resource);
- MiscUtil.logErrorMessageByInterval(LOG, "Unsupported resource = " + resource
+ MiscUtil.logErrorMessageByInterval(LOG, "Unsupported resource type " + ozoneObj.getResourceType() + " for resource = " + resource
+ ", request=" + rangerRequest);
return returnValue;
}
diff --git a/src/main/assembly/plugin-ozone.xml b/src/main/assembly/plugin-ozone.xml
index 504d205..868a63c 100644
--- a/src/main/assembly/plugin-ozone.xml
+++ b/src/main/assembly/plugin-ozone.xml
@@ -64,6 +64,7 @@
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration2.version}</include>
<include>com.sun.jersey:jersey-core</include>
<include>com.sun.jersey:jersey-client</include>
+ <include>com.sun.jersey:jersey-bundle</include>
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.version}</include>
<include>com.kstruct:gethostname4j</include>
<include>net.java.dev.jna:jna</include>
@@ -102,6 +103,7 @@
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration2.version}</include>
<include>com.sun.jersey:jersey-core</include>
<include>com.sun.jersey:jersey-client</include>
+ <include>com.sun.jersey:jersey-bundle</include>
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.version}</include>
<include>commons-lang:commons-lang</include>
<include>com.kstruct:gethostname4j</include>