}
protected synchronized void init() {
- if (this.needsInit) {
- logger.info("Initializing OnapPolicyFinderFactory Properties ");
+ if (! this.needsInit) {
+ logger.info("Does not need initialization");
+ return;
+ }
+ logger.info("Initializing OnapPolicyFinderFactory Properties ");
- //
- // Check for property that combines root policies into one policyset
- //
- String combiningAlgorithm = properties.getProperty(
- ATTPDPProperties.PROP_POLICYFINDERFACTORY_COMBINEROOTPOLICIES);
- if (combiningAlgorithm != null) {
- try {
- logger.info("Combining root policies with {}", combiningAlgorithm);
- //
- // Find the combining algorithm
- //
- CombiningAlgorithm<PolicySetChild> algorithm = CombiningAlgorithmFactory.newInstance()
- .getPolicyCombiningAlgorithm(new IdentifierImpl(combiningAlgorithm));
- //
- // Create our root policy
- //
- PolicySet root = new PolicySet();
- root.setIdentifier(new IdentifierImpl(UUID.randomUUID().toString()));
- root.setVersion(StdVersion.newInstance("1.0"));
- root.setTarget(new Target());
- //
- // Set the algorithm
- //
- root.setPolicyCombiningAlgorithm(algorithm);
- //
- // Load all our root policies
- //
- for (PolicyDef policy : this.getPolicyDefs(XACMLProperties.PROP_ROOTPOLICIES)) {
- root.addChild(policy);
- }
- //
- // Set this policy as the root
- //
- this.rootPolicies = new ArrayList<>();
- this.rootPolicies.add(root);
- } catch (Exception e) {
- logger.error("Failed to load Combining Algorithm Factory: {}", e.getLocalizedMessage());
+ //
+ // Check for property that combines root policies into one policyset
+ //
+ String combiningAlgorithm = properties.getProperty(
+ ATTPDPProperties.PROP_POLICYFINDERFACTORY_COMBINEROOTPOLICIES);
+ if (combiningAlgorithm != null) {
+ try {
+ logger.info("Combining root policies with {}", combiningAlgorithm);
+ //
+ // Find the combining algorithm
+ //
+ CombiningAlgorithm<PolicySetChild> algorithm = CombiningAlgorithmFactory.newInstance()
+ .getPolicyCombiningAlgorithm(new IdentifierImpl(combiningAlgorithm));
+ //
+ // Create our root policy
+ //
+ PolicySet root = new PolicySet();
+ root.setIdentifier(new IdentifierImpl(UUID.randomUUID().toString()));
+ root.setVersion(StdVersion.newInstance("1.0"));
+ root.setTarget(new Target());
+ //
+ // Set the algorithm
+ //
+ root.setPolicyCombiningAlgorithm(algorithm);
+ //
+ // Load all our root policies
+ //
+ for (PolicyDef policy : this.getPolicyDefs(XACMLProperties.PROP_ROOTPOLICIES)) {
+ root.addChild(policy);
}
- } else {
- logger.info("Loading root policies");
- this.rootPolicies = this.getPolicyDefs(XACMLProperties.PROP_ROOTPOLICIES);
+ //
+ // Set this policy as the root
+ //
+ this.rootPolicies = new ArrayList<>();
+ this.rootPolicies.add(root);
+ } catch (Exception e) {
+ logger.error("Failed to load Combining Algorithm Factory", e);
}
- this.referencedPolicies = this.getPolicyDefs(XACMLProperties.PROP_REFERENCEDPOLICIES);
- logger.info("Root Policies: {}", this.rootPolicies.size());
- logger.info("Referenced Policies: {}", this.referencedPolicies.size());
- this.needsInit = false;
+ } else {
+ logger.info("Loading root policies");
+ this.rootPolicies = this.getPolicyDefs(XACMLProperties.PROP_ROOTPOLICIES);
}
+ this.referencedPolicies = this.getPolicyDefs(XACMLProperties.PROP_REFERENCEDPOLICIES);
+ logger.info("Root Policies: {}", this.rootPolicies.size());
+ logger.info("Referenced Policies: {}", this.referencedPolicies.size());
+ //
+ // Make sure we set that we don't need initialization
+ //
+ this.needsInit = false;
}
@Override
import lombok.ToString;
import org.onap.policy.models.decisions.concepts.DecisionRequest;
import org.onap.policy.pdp.xacml.application.common.ToscaDictionary;
+import org.onap.policy.pdp.xacml.application.common.XacmlApplicationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@XACMLAction()
private String action;
+ protected static DataTypeFactory dataTypeFactory = null;
+
public StdMatchablePolicyRequest() {
super();
}
- protected static DataTypeFactory dataTypeFactory = null;
-
protected static synchronized DataTypeFactory getDataTypeFactory() {
try {
if (dataTypeFactory != null) {
return dataTypeFactory;
}
dataTypeFactory = DataTypeFactory.newInstance();
- if (dataTypeFactory == null) {
- LOGGER.error("Could not create data type factory");
- }
} catch (FactoryException e) {
LOGGER.error("Can't get Data type Factory: {}", e);
}
*
* @param decisionRequest Input DecisionRequest
* @return Request XACML Request object
- * @throws DataTypeException DataType exception
- * @throws IllegalAccessException Illegal access exception
+ * @throws XacmlApplicationException Exception occurred parsing or creating request
*/
@SuppressWarnings({"rawtypes", "unchecked"})
- public static Request createInstance(DecisionRequest decisionRequest) throws IllegalAccessException,
- DataTypeException {
+ public static Request createInstance(DecisionRequest decisionRequest) throws XacmlApplicationException {
//
// Create our request object
//
// Parse the request - we use the annotations to create a
// basic XACML request.
//
- Request xacmlRequest = RequestParser.parseRequest(request);
+ Request xacmlRequest;
+ try {
+ xacmlRequest = RequestParser.parseRequest(request);
+ } catch (IllegalAccessException | DataTypeException e) {
+ throw new XacmlApplicationException("Could not parse request " + e.getLocalizedMessage());
+ }
//
// Create an object we can add to
//
// Its possible we may have to load the policy type model
// and use that to validate the fields that are matchable.
//
- if (entrySet.getValue() instanceof Collection) {
- addResources(resourceAttributes, (Collection) entrySet.getValue(), entrySet.getKey());
- } else {
- addResources(resourceAttributes, Arrays.asList(entrySet.getValue().toString()), entrySet.getKey());
+ try {
+ if (entrySet.getValue() instanceof Collection) {
+ addResources(resourceAttributes, (Collection) entrySet.getValue(), entrySet.getKey());
+ } else {
+ addResources(resourceAttributes, Arrays.asList(entrySet.getValue().toString()), entrySet.getKey());
+ }
+ } catch (DataTypeException e) {
+ throw new XacmlApplicationException("Failed to add resource " + e.getLocalizedMessage());
}
}
mutableRequest.add(resourceAttributes);
package org.onap.policy.pdp.xacml.application.common.std;
import com.att.research.xacml.api.AttributeAssignment;
-import com.att.research.xacml.api.DataTypeException;
import com.att.research.xacml.api.Decision;
import com.att.research.xacml.api.Identifier;
import com.att.research.xacml.api.Obligation;
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 org.onap.policy.pdp.xacml.application.common.XacmlApplicationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
LOGGER.info("Converting Request {}", request);
try {
return StdMatchablePolicyRequest.createInstance(request);
- } catch (IllegalArgumentException | IllegalAccessException | DataTypeException e) {
+ } catch (XacmlApplicationException e) {
LOGGER.error("Failed to convert DecisionRequest: {}", e);
}
//
//
// We care about the content attribute
//
- if (ToscaDictionary.ID_OBLIGATION_POLICY_MONITORING_CONTENTS
+ if (! ToscaDictionary.ID_OBLIGATION_POLICY_MONITORING_CONTENTS
.equals(assignment.getAttributeId())) {
//
- // The contents are in Json form
+ // If its not there, move on
//
- Object stringContents = assignment.getAttributeValue().getValue();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Policy contents: {}{}", System.lineSeparator(), stringContents);
- }
- //
- // Let's parse it into a map using Gson
- //
- Gson gson = new Gson();
- @SuppressWarnings("unchecked")
- Map<String, Object> result = gson.fromJson(stringContents.toString() ,Map.class);
- //
- // Find the metadata section
- //
- @SuppressWarnings("unchecked")
- Map<String, Object> metadata = (Map<String, Object>) result.get("metadata");
- if (metadata != null) {
- decisionResponse.getPolicies().put(metadata.get(POLICY_ID).toString(), result);
- } else {
- LOGGER.error("Missing metadata section in policy contained in obligation.");
- }
+ continue;
+ }
+ //
+ // The contents are in Json form
+ //
+ Object stringContents = assignment.getAttributeValue().getValue();
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info("Policy contents: {}{}", System.lineSeparator(), stringContents);
+ }
+ //
+ // Let's parse it into a map using Gson
+ //
+ Gson gson = new Gson();
+ @SuppressWarnings("unchecked")
+ Map<String, Object> result = gson.fromJson(stringContents.toString() ,Map.class);
+ //
+ // Find the metadata section
+ //
+ @SuppressWarnings("unchecked")
+ Map<String, Object> metadata = (Map<String, Object>) result.get("metadata");
+ if (metadata != null) {
+ decisionResponse.getPolicies().put(metadata.get(POLICY_ID).toString(), result);
+ } else {
+ LOGGER.error("Missing metadata section in policy contained in obligation.");
}
}
}
continue;
}
for (Entry<String, String> entrySet : propertiesEntry.getValue().getMetadata().entrySet()) {
- if (entrySet.getKey().equals("matchable") && entrySet.getValue().equals("true")) {
+ if ("matchable".equals(entrySet.getKey()) && "true".equals(entrySet.getValue())) {
return true;
}
}
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
-import com.att.research.xacml.api.DataTypeException;
import com.att.research.xacml.api.Request;
import com.att.research.xacml.api.RequestAttributes;
import com.att.research.xacml.api.XACML3;
import org.mockito.MockitoAnnotations;
import org.onap.policy.models.decisions.concepts.DecisionRequest;
import org.onap.policy.pdp.xacml.application.common.ToscaDictionary;
+import org.onap.policy.pdp.xacml.application.common.XacmlApplicationException;
public class StdMatchablePolicyRequestTest {
private static final String ACTION = "my-action";
}
@Test
- public void testCreateInstance() throws IllegalAccessException, DataTypeException {
+ public void testCreateInstance() throws XacmlApplicationException {
resources.put("resource1", RESOURCE1);
resources.put("resource2", RESOURCE2);
resources.put("resource3", Arrays.asList(RESOURCE3, RESOURCE4));
import org.onap.policy.pdpx.main.rest.provider.DecisionProvider;
import org.onap.policy.pdpx.main.rest.provider.HealthCheckProvider;
import org.onap.policy.pdpx.main.rest.provider.StatisticsProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Class to provide xacml pdp REST services.
schemes = {SwaggerDefinition.Scheme.HTTP, SwaggerDefinition.Scheme.HTTPS},
securityDefinition = @SecurityDefinition(basicAuthDefinitions = {@BasicAuthDefinition(key = "basicAuth")}))
public class XacmlPdpRestController {
+ private static final Logger LOGGER = LoggerFactory.getLogger(XacmlPdpRestController.class);
public static final String APPLICATION_YAML = "application/yaml";
+
@GET
@Path("/healthcheck")
@ApiOperation(value = "Perform a system healthcheck",
return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)
.entity(new DecisionProvider().fetchDecision(body)).build();
} catch (DecisionException e) {
+ LOGGER.error("Decision exception", e);
XacmlPdpStatisticsManager.getCurrent().updateErrorCount();
return addLoggingHeaders(
addVersionControlHeaders(Response.status((e.getErrorResponse().getResponseCode()))), requestId)
*
* @param resourceFile resource file
* @param service XacmlApplicationServiceProvider
- * @throws CoderException exception if it cannot be decoded
* @throws XacmlApplicationException If the application cannot load the policy
*/
public static List<ToscaPolicy> loadPolicies(String resourceFile, XacmlApplicationServiceProvider service)
- throws CoderException, XacmlApplicationException {
+ throws XacmlApplicationException {
//
// Our return object
//
//
// Serialize it into a class
//
- ToscaServiceTemplate serviceTemplate = yamlCoder.decode(policyYaml, ToscaServiceTemplate.class);
+ ToscaServiceTemplate serviceTemplate;
+ try {
+ serviceTemplate = yamlCoder.decode(policyYaml, ToscaServiceTemplate.class);
+ } catch (CoderException e) {
+ throw new XacmlApplicationException("Failed to decode policy from resource file "
+ + e.getLocalizedMessage());
+ }
//
// Make sure all the fields are setup properly
//
Code Review / policy / xacml-pdp.git / commitdiff