Repository: incubator-ranger Updated Branches: refs/heads/tag-policy cc2b96ec8 -> 83cb21e0b
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/83cb21e0/security-admin/src/main/java/org/apache/ranger/service/RangerTaggedResourceServiceBase.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerTaggedResourceServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/RangerTaggedResourceServiceBase.java index f673466..5f97001 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/RangerTaggedResourceServiceBase.java +++ b/security-admin/src/main/java/org/apache/ranger/service/RangerTaggedResourceServiceBase.java @@ -29,41 +29,32 @@ import org.apache.ranger.common.GUIDUtil; import org.apache.ranger.common.MessageEnums; import org.apache.ranger.entity.XXResourceDef; import org.apache.ranger.entity.XXService; -import org.apache.ranger.entity.XXTag; -import org.apache.ranger.entity.XXTagAttribute; import org.apache.ranger.entity.XXTaggedResource; import org.apache.ranger.entity.XXTaggedResourceValue; import org.apache.ranger.plugin.model.RangerPolicy; import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyResource; -import org.apache.ranger.plugin.model.RangerTaggedResource; -import org.apache.ranger.plugin.model.RangerTaggedResourceKey; -import org.apache.ranger.plugin.model.RangerTaggedResource.RangerResourceTag; +import org.apache.ranger.plugin.model.RangerServiceResource; import org.apache.ranger.plugin.store.PList; import org.apache.ranger.plugin.util.SearchFilter; import org.springframework.beans.factory.annotation.Autowired; -public abstract class RangerTaggedResourceServiceBase<T extends XXTaggedResource, V extends RangerTaggedResource> extends RangerBaseModelService<T, V> { +public abstract class RangerTaggedResourceServiceBase<T extends XXTaggedResource, V extends RangerServiceResource> extends RangerBaseModelService<T, V> { @Autowired GUIDUtil guidUtil; @Override @SuppressWarnings("unchecked") - protected XXTaggedResource mapViewToEntityBean(RangerTaggedResource vObj, XXTaggedResource xObj, int operationContext) { + protected XXTaggedResource mapViewToEntityBean(RangerServiceResource vObj, XXTaggedResource xObj, int operationContext) { String guid = (StringUtils.isEmpty(vObj.getGuid())) ? guidUtil.genGUID() : vObj.getGuid(); xObj.setGuid(guid); xObj.setVersion(vObj.getVersion()); xObj.setIsEnabled(vObj.getIsEnabled()); - xObj.setExternalId(vObj.getExternalId()); - RangerTaggedResourceKey key = vObj.getKey(); - if (key == null) { - throw restErrorUtil.createRESTException("Error Populating XXTaggedResource. Key cannot be null in RangerTaggedResource.", MessageEnums.INVALID_INPUT_DATA); - } - XXService xService = daoMgr.getXXService().findByName(key.getServiceName()); + XXService xService = daoMgr.getXXService().findByName(vObj.getServiceName()); if (xService == null) { - throw restErrorUtil.createRESTException("Error Populating XXTaggedResource. No Service found with name: " + key.getServiceName(), MessageEnums.INVALID_INPUT_DATA); + throw restErrorUtil.createRESTException("Error Populating XXTaggedResource. No Service found with name: " + vObj.getServiceName(), MessageEnums.INVALID_INPUT_DATA); } xObj.setServiceId(xService.getId()); @@ -73,61 +64,16 @@ public abstract class RangerTaggedResourceServiceBase<T extends XXTaggedResource @Override @SuppressWarnings("unchecked") - protected RangerTaggedResource mapEntityToViewBean(RangerTaggedResource vObj, XXTaggedResource xObj) { + protected RangerServiceResource mapEntityToViewBean(RangerServiceResource vObj, XXTaggedResource xObj) { vObj.setGuid(xObj.getGuid()); vObj.setVersion(xObj.getVersion()); vObj.setIsEnabled(xObj.getIsEnabled()); - vObj.setExternalId(xObj.getExternalId()); - - RangerTaggedResourceKey key = populateRangerTaggedResourceKey(xObj); - vObj.setKey(key); - - List<RangerResourceTag> tags = populateRangerResourceTags(xObj); - vObj.setTags(tags); - - return vObj; - } - - private List<RangerResourceTag> populateRangerResourceTags(XXTaggedResource xTaggedRes) { - if (xTaggedRes == null) { - return null; - } - - List<RangerResourceTag> tags = new ArrayList<RangerTaggedResource.RangerResourceTag>(); - - List<XXTag> xTagList = daoMgr.getXXTag().findByTaggedResource(xTaggedRes.getId()); - - for (XXTag xTag : xTagList) { - RangerResourceTag tag = new RangerResourceTag(); - List<XXTagAttribute> tagAttrList = daoMgr.getXXTagAttribute().findByTagId(xTag.getId()); - Map<String, String> attrList = new HashMap<String, String>(); + XXService xService = daoMgr.getXXService().getById(xObj.getServiceId()); - for (XXTagAttribute tagAttr : tagAttrList) { - attrList.put(tagAttr.getName(), tagAttr.getValue()); - } + vObj.setServiceName(xService.getName()); - tag.setAttributeValues(attrList); - tag.setName(xTag.getName()); - tag.setExternalId(xTag.getExternalId()); - - tags.add(tag); - } - - return tags; - } - - private RangerTaggedResourceKey populateRangerTaggedResourceKey(XXTaggedResource xTaggedRes) { - if (xTaggedRes == null) { - return null; - } - - RangerTaggedResourceKey key = new RangerTaggedResourceKey(); - - XXService xService = daoMgr.getXXService().getById(xTaggedRes.getServiceId()); - key.setServiceName(xService.getName()); - - List<XXTaggedResourceValue> resValueList = daoMgr.getXXTaggedResourceValue().findByTaggedResId(xTaggedRes.getId()); + List<XXTaggedResourceValue> resValueList = daoMgr.getXXTaggedResourceValue().findByTaggedResId(xObj.getId()); Map<String, RangerPolicy.RangerPolicyResource> resourceSpec = new HashMap<String, RangerPolicy.RangerPolicyResource>(); for (XXTaggedResourceValue resValue : resValueList) { @@ -142,19 +88,21 @@ public abstract class RangerTaggedResourceServiceBase<T extends XXTaggedResource resourceSpec.put(xResDef.getName(), policyRes); } - key.setResourceSpec(resourceSpec); - return key; + + vObj.setResourceSpec(resourceSpec); + + return vObj; } @SuppressWarnings("unchecked") - public PList<RangerTaggedResource> searchRangerTaggedResources(SearchFilter searchFilter) { - PList<RangerTaggedResource> retList = new PList<RangerTaggedResource>(); - List<RangerTaggedResource> taggedResList = new ArrayList<RangerTaggedResource>(); + public PList<RangerServiceResource> searchRangerTaggedResources(SearchFilter searchFilter) { + PList<RangerServiceResource> retList = new PList<RangerServiceResource>(); + List<RangerServiceResource> taggedResList = new ArrayList<RangerServiceResource>(); List<XXTaggedResource> xTaggedResList = (List<XXTaggedResource>) searchRangerObjects(searchFilter, searchFields, sortFields, (PList<V>) retList); for (XXTaggedResource xTaggedRes : xTaggedResList) { - RangerTaggedResource taggedRes = populateViewBean((T) xTaggedRes); + RangerServiceResource taggedRes = populateViewBean((T) xTaggedRes); taggedResList.add(taggedRes); } retList.setList(taggedResList); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/83cb21e0/security-admin/src/main/resources/conf.dist/security-applicationContext.xml ---------------------------------------------------------------------- diff --git a/security-admin/src/main/resources/conf.dist/security-applicationContext.xml b/security-admin/src/main/resources/conf.dist/security-applicationContext.xml index 38eaf9a..9986959 100644 --- a/security-admin/src/main/resources/conf.dist/security-applicationContext.xml +++ b/security-admin/src/main/resources/conf.dist/security-applicationContext.xml @@ -61,12 +61,8 @@ http://www.springframework.org/schema/security/spring-security-oauth2-1.0.xsd";> <security:http pattern="/service/plugins/policies/download/*" security="none"/> <security:http pattern="/service/plugins/services/grant/*" security="none"/> <security:http pattern="/service/plugins/services/revoke/*" security="none"/> - <security:http pattern="/service/tag-def/v1/resources/lookup-tags" security="none"/> - <security:http pattern="/service/tag-def/v1/resources/all-resources" security="none"/> - <security:http pattern="/service/tag-def/v1/resources/updated-resources" security="none"/> - <security:http pattern="/service/tag-def/v1/resources/set-resources" security="none"/> - <security:http pattern="/service/tag-def/v1/resources/set-resource" security="none"/> - <security:http pattern="/service/tag-def/v1/resources/update-resource" security="none"/> + <security:http pattern="/service/tags/download/*" security="none"/> + <!--<security:http pattern="/service/users/default" security="none"/> <security:http pattern="/service/xusers/groups/**" security="none"/> <security:http pattern="/service/xusers/users/*" security="none"/>
