Repository: ranger Updated Branches: refs/heads/master 75b8a422c -> f5c15d40b
RANGER-1781: RangerUI :Policy create/edit form should display only relevant accesses based on the user-selected resource Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/f5c15d40 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/f5c15d40 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/f5c15d40 Branch: refs/heads/master Commit: f5c15d40b57adc68bed84f3dc89af8038c6bff19 Parents: 75b8a42 Author: Abhay Kulkarni <[email protected]> Authored: Mon Feb 5 11:15:10 2018 -0800 Committer: Abhay Kulkarni <[email protected]> Committed: Mon Feb 5 11:15:10 2018 -0800 ---------------------------------------------------------------------- .../model/validation/RangerServiceDefValidator.java | 11 +++++++++-- .../ranger/plugin/store/EmbeddedServiceDefsUtil.java | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/f5c15d40/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java index 608d258..d5f3fe5 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java @@ -44,6 +44,7 @@ import org.apache.ranger.plugin.store.ServiceStore; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import org.apache.ranger.plugin.util.ServiceDefUtil; public class RangerServiceDefValidator extends RangerValidator { @@ -58,8 +59,14 @@ public class RangerServiceDefValidator extends RangerValidator { LOG.debug(String.format("==> RangerServiceDefValidator.validate(%s, %s)", serviceDef, action)); } + RangerServiceDef normalizedServiceDef = ServiceDefUtil.normalize(serviceDef); + + if(LOG.isDebugEnabled()) { + LOG.debug(String.format("Normalized Service Definition being validated: (%s, %s)", serviceDef, action)); + } + List<ValidationFailureDetails> failures = new ArrayList<>(); - boolean valid = isValid(serviceDef, action, failures); + boolean valid = isValid(normalizedServiceDef, action, failures); String message = ""; try { if (!valid) { @@ -68,7 +75,7 @@ public class RangerServiceDefValidator extends RangerValidator { } } finally { if(LOG.isDebugEnabled()) { - LOG.debug(String.format("<== RangerServiceDefValidator.validate(%s, %s): %s, reason[%s]", serviceDef, action, valid, message)); + LOG.debug(String.format("<== RangerServiceDefValidator.validate(%s, %s): %s, reason[%s]", normalizedServiceDef, action, valid, message)); } } } http://git-wip-us.apache.org/repos/asf/ranger/blob/f5c15d40/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java index 08f5437..899bcac 100755 --- a/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java @@ -32,6 +32,7 @@ import org.apache.ranger.plugin.model.RangerServiceDef; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import org.apache.ranger.plugin.util.ServiceDefUtil; /* * This utility class deals with service-defs embedded in ranger-plugins-common @@ -219,7 +220,7 @@ public class EmbeddedServiceDefsUtil { try { ret = store.getServiceDefByName(serviceDefName); if(ret == null && createEmbeddedServiceDefs && createServiceDef) { - ret = loadEmbeddedServiceDef(serviceDefName); + ret = ServiceDefUtil.normalize(loadEmbeddedServiceDef(serviceDefName)); LOG.info("creating embedded service-def " + serviceDefName); if (ret.getId() != null) {
