diff options
author | Pamela Dragosh <pdragosh@research.att.com> | 2019-06-18 12:29:38 -0400 |
---|---|---|
committer | Pamela Dragosh <pdragosh@research.att.com> | 2019-06-19 08:20:29 -0400 |
commit | 0b3efb8634b0f13fd43735312c00589dec4edb17 (patch) | |
tree | ab570aeee401f380acf4a914edcae8a59c8b8db4 /docs/xacml/tutorial/app/src | |
parent | 2e478fa17f69cb97562a790e433c5873ed4502e9 (diff) |
Fix comments3.0.0
No license is needed since this is example code.
Issue-ID: POLICY-1842
Change-Id: Ib03594ec303b945ad20285c6a0d94b7c2bd04755
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'docs/xacml/tutorial/app/src')
3 files changed, 46 insertions, 69 deletions
diff --git a/docs/xacml/tutorial/app/src/main/java/org/onap/policy/tutorial/tutorial/TutorialApplication.java b/docs/xacml/tutorial/app/src/main/java/org/onap/policy/tutorial/tutorial/TutorialApplication.java index 99cbdcef..24e84049 100644 --- a/docs/xacml/tutorial/app/src/main/java/org/onap/policy/tutorial/tutorial/TutorialApplication.java +++ b/docs/xacml/tutorial/app/src/main/java/org/onap/policy/tutorial/tutorial/TutorialApplication.java @@ -2,15 +2,14 @@ package org.onap.policy.tutorial.tutorial; import java.util.Arrays; import java.util.List; - import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier; import org.onap.policy.pdp.xacml.application.common.ToscaPolicyTranslator; import org.onap.policy.pdp.xacml.application.common.std.StdXacmlApplicationServiceProvider; public class TutorialApplication extends StdXacmlApplicationServiceProvider { - - private final ToscaPolicyTypeIdentifier supportedPolicyType = new ToscaPolicyTypeIdentifier(); - private final TutorialTranslator translator = new TutorialTranslator(); + + private final ToscaPolicyTypeIdentifier supportedPolicyType = new ToscaPolicyTypeIdentifier(); + private final TutorialTranslator translator = new TutorialTranslator(); @Override public String applicationName() { @@ -29,12 +28,12 @@ public class TutorialApplication extends StdXacmlApplicationServiceProvider { @Override public boolean canSupportPolicyType(ToscaPolicyTypeIdentifier policyTypeId) { - return supportedPolicyType.equals(policyTypeId); + return supportedPolicyType.equals(policyTypeId); } @Override - protected ToscaPolicyTranslator getTranslator(String type) { - return translator; - } + protected ToscaPolicyTranslator getTranslator(String type) { + return translator; + } } diff --git a/docs/xacml/tutorial/app/src/main/java/org/onap/policy/tutorial/tutorial/TutorialRequest.java b/docs/xacml/tutorial/app/src/main/java/org/onap/policy/tutorial/tutorial/TutorialRequest.java index 33442b27..1f890314 100644 --- a/docs/xacml/tutorial/app/src/main/java/org/onap/policy/tutorial/tutorial/TutorialRequest.java +++ b/docs/xacml/tutorial/app/src/main/java/org/onap/policy/tutorial/tutorial/TutorialRequest.java @@ -2,14 +2,11 @@ package org.onap.policy.tutorial.tutorial; import java.util.Map; import java.util.Map.Entry; - import org.onap.policy.models.decisions.concepts.DecisionRequest; - import com.att.research.xacml.std.annotations.XACMLAction; import com.att.research.xacml.std.annotations.XACMLRequest; import com.att.research.xacml.std.annotations.XACMLResource; import com.att.research.xacml.std.annotations.XACMLSubject; - import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -25,7 +22,7 @@ public class TutorialRequest { @XACMLSubject(attributeId = "urn:org:onap:onap-component", includeInResults = true) private String onapComponent; - @XACMLSubject(attributeId = "urn:org:onap:onap-instance", includeInResults = true) + @XACMLSubject(attributeId = "urn:org:onap:onap-instance", includeInResults = true) private String onapInstance; @XACMLAction() @@ -41,10 +38,10 @@ public class TutorialRequest { private String permission; public static TutorialRequest createRequest(DecisionRequest decisionRequest) { - // - // Create our object - // - TutorialRequest request = new TutorialRequest(); + // + // Create our object + // + TutorialRequest request = new TutorialRequest(); // // Add the subject attributes // @@ -61,16 +58,16 @@ public class TutorialRequest { Map<String, Object> resources = decisionRequest.getResource(); for (Entry<String, Object> entrySet : resources.entrySet()) { if ("user".equals(entrySet.getKey())) { - request.user = entrySet.getValue().toString(); + request.user = entrySet.getValue().toString(); } if ("entity".equals(entrySet.getKey())) { - request.entity = entrySet.getValue().toString(); + request.entity = entrySet.getValue().toString(); } if ("permission".equals(entrySet.getKey())) { - request.permission = entrySet.getValue().toString(); + request.permission = entrySet.getValue().toString(); } - } - - return request; + } + + return request; } } diff --git a/docs/xacml/tutorial/app/src/main/java/org/onap/policy/tutorial/tutorial/TutorialTranslator.java b/docs/xacml/tutorial/app/src/main/java/org/onap/policy/tutorial/tutorial/TutorialTranslator.java index d118aabf..80f0c68c 100644 --- a/docs/xacml/tutorial/app/src/main/java/org/onap/policy/tutorial/tutorial/TutorialTranslator.java +++ b/docs/xacml/tutorial/app/src/main/java/org/onap/policy/tutorial/tutorial/TutorialTranslator.java @@ -2,7 +2,6 @@ package org.onap.policy.tutorial.tutorial; import java.util.List; import java.util.Map; - import org.onap.policy.models.decisions.concepts.DecisionRequest; import org.onap.policy.models.decisions.concepts.DecisionResponse; import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; @@ -10,7 +9,6 @@ import org.onap.policy.pdp.xacml.application.common.ToscaDictionary; import org.onap.policy.pdp.xacml.application.common.ToscaPolicyConversionException; import org.onap.policy.pdp.xacml.application.common.ToscaPolicyTranslator; import org.onap.policy.pdp.xacml.application.common.ToscaPolicyTranslatorUtils; - import com.att.research.xacml.api.DataTypeException; import com.att.research.xacml.api.Decision; import com.att.research.xacml.api.Identifier; @@ -20,7 +18,6 @@ import com.att.research.xacml.api.Result; import com.att.research.xacml.api.XACML3; import com.att.research.xacml.std.IdentifierImpl; import com.att.research.xacml.std.annotations.RequestParser; - import oasis.names.tc.xacml._3_0.core.schema.wd_17.AnyOfType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.EffectType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.MatchType; @@ -29,18 +26,16 @@ import oasis.names.tc.xacml._3_0.core.schema.wd_17.RuleType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.TargetType; public class TutorialTranslator implements ToscaPolicyTranslator { - - private static final Identifier ID_TUTORIAL_USER = - new IdentifierImpl(ToscaDictionary.ID_URN_ONAP, "tutorial-user"); - private static final Identifier ID_TUTORIAL_ENTITY = + + private static final Identifier ID_TUTORIAL_USER = new IdentifierImpl(ToscaDictionary.ID_URN_ONAP, "tutorial-user"); + private static final Identifier ID_TUTORIAL_ENTITY = new IdentifierImpl(ToscaDictionary.ID_URN_ONAP, "tutorial-entity"); - private static final Identifier ID_TUTORIAL_PERM = - new IdentifierImpl(ToscaDictionary.ID_URN_ONAP, "tutorial-perm"); + private static final Identifier ID_TUTORIAL_PERM = new IdentifierImpl(ToscaDictionary.ID_URN_ONAP, "tutorial-perm"); - public PolicyType convertPolicy(ToscaPolicy toscaPolicy) throws ToscaPolicyConversionException { - // - // Here is our policy with a version and default combining algo - // + public PolicyType convertPolicy(ToscaPolicy toscaPolicy) throws ToscaPolicyConversionException { + // + // Here is our policy with a version and default combining algo + // PolicyType newPolicyType = new PolicyType(); newPolicyType.setPolicyId(toscaPolicy.getMetadata().get("policy-id")); newPolicyType.setVersion(toscaPolicy.getMetadata().get("policy-version")); @@ -59,20 +54,12 @@ public class TutorialTranslator implements ToscaPolicyTranslator { // // For simplicity, let's just match on the action "authorize" and the user // - MatchType matchAction = ToscaPolicyTranslatorUtils.buildMatchTypeDesignator( - XACML3.ID_FUNCTION_STRING_EQUAL, - "authorize", - XACML3.ID_DATATYPE_STRING, - XACML3.ID_ACTION, - XACML3.ID_ATTRIBUTE_CATEGORY_ACTION); + MatchType matchAction = ToscaPolicyTranslatorUtils.buildMatchTypeDesignator(XACML3.ID_FUNCTION_STRING_EQUAL, + "authorize", XACML3.ID_DATATYPE_STRING, XACML3.ID_ACTION, XACML3.ID_ATTRIBUTE_CATEGORY_ACTION); Map<String, Object> props = toscaPolicy.getProperties(); String user = props.get("user").toString(); - MatchType matchUser = ToscaPolicyTranslatorUtils.buildMatchTypeDesignator( - XACML3.ID_FUNCTION_STRING_EQUAL, - user, - XACML3.ID_DATATYPE_STRING, - ID_TUTORIAL_USER, - XACML3.ID_ATTRIBUTE_CATEGORY_RESOURCE); + MatchType matchUser = ToscaPolicyTranslatorUtils.buildMatchTypeDesignator(XACML3.ID_FUNCTION_STRING_EQUAL, user, + XACML3.ID_DATATYPE_STRING, ID_TUTORIAL_USER, XACML3.ID_ATTRIBUTE_CATEGORY_RESOURCE); AnyOfType anyOf = new AnyOfType(); // // Create AllOf (AND) of just Policy Id @@ -86,47 +73,41 @@ public class TutorialTranslator implements ToscaPolicyTranslator { // Now add the rule for each permission // List<Object> permissions = (List<Object>) props.get("permissions"); - for (Object permission : permissions) { - - MatchType matchEntity = ToscaPolicyTranslatorUtils.buildMatchTypeDesignator( - XACML3.ID_FUNCTION_STRING_EQUAL, - ((Map<String, String>) permission).get("entity"), - XACML3.ID_DATATYPE_STRING, - ID_TUTORIAL_ENTITY, + for (Object permission : permissions) { + + MatchType matchEntity = ToscaPolicyTranslatorUtils.buildMatchTypeDesignator(XACML3.ID_FUNCTION_STRING_EQUAL, + ((Map<String, String>) permission).get("entity"), XACML3.ID_DATATYPE_STRING, ID_TUTORIAL_ENTITY, XACML3.ID_ATTRIBUTE_CATEGORY_RESOURCE); - + MatchType matchPermission = ToscaPolicyTranslatorUtils.buildMatchTypeDesignator( - XACML3.ID_FUNCTION_STRING_EQUAL, - ((Map<String, String>) permission).get("permission"), - XACML3.ID_DATATYPE_STRING, - ID_TUTORIAL_PERM, - XACML3.ID_ATTRIBUTE_CATEGORY_RESOURCE); + XACML3.ID_FUNCTION_STRING_EQUAL, ((Map<String, String>) permission).get("permission"), + XACML3.ID_DATATYPE_STRING, ID_TUTORIAL_PERM, XACML3.ID_ATTRIBUTE_CATEGORY_RESOURCE); anyOf = new AnyOfType(); anyOf.getAllOf().add(ToscaPolicyTranslatorUtils.buildAllOf(matchEntity)); anyOf.getAllOf().add(ToscaPolicyTranslatorUtils.buildAllOf(matchPermission)); target = new TargetType(); target.getAnyOf().add(anyOf); - + RuleType rule = new RuleType(); rule.setDescription("Default is to PERMIT if the policy matches."); rule.setRuleId(newPolicyType.getPolicyId() + ":rule"); rule.setEffect(EffectType.PERMIT); rule.setTarget(target); - + newPolicyType.getCombinerParametersOrRuleCombinerParametersOrVariableDefinition().add(rule); } - return newPolicyType; - } + return newPolicyType; + } - public Request convertRequest(DecisionRequest request) { + public Request convertRequest(DecisionRequest request) { try { return RequestParser.parseRequest(TutorialRequest.createRequest(request)); } catch (IllegalArgumentException | IllegalAccessException | DataTypeException e) { } - return null; - } + return null; + } - public DecisionResponse convertResponse(Response xacmlResponse) { + public DecisionResponse convertResponse(Response xacmlResponse) { DecisionResponse decisionResponse = new DecisionResponse(); // // Iterate through all the results @@ -156,6 +137,6 @@ public class TutorialTranslator implements ToscaPolicyTranslator { } return decisionResponse; - } + } } |