Commit 6aa7d024 authored by cdanger's avatar cdanger

- Upgraded core-pdp-api version to 5.0.0 allowing to pass new parameter

for global PDP environment properties to Attribute Provider extensions
parent 7e53a04b
# Change log # Change log
All notable changes to this project are documented in this file following the [Keep a CHANGELOG](http://keepachangelog.com) conventions. All notable changes to this project are documented in this file following the [Keep a CHANGELOG](http://keepachangelog.com) conventions.
## Unreleased
## 4.0.2 ## 4.0.2
### Fixed ### Fixed
- Issues reported by Codacyi (including fixed issues in upgraded dependency core-pdp-api 4.0.2) - Issues reported by Codacyi (including fixed issues in upgraded dependency core-pdp-api 4.0.2)
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>${artifactId.prefix}-core-pdp-api</artifactId> <artifactId>${artifactId.prefix}-core-pdp-api</artifactId>
<version>4.0.2</version> <version>5.0.0</version>
</dependency> </dependency>
<!-- /Authzforce dependencies --> <!-- /Authzforce dependencies -->
......
...@@ -223,7 +223,7 @@ public interface RootPolicyEvaluator extends Closeable ...@@ -223,7 +223,7 @@ public interface RootPolicyEvaluator extends Closeable
} }
// Initialize ExpressionFactory // Initialize ExpressionFactory
this.expressionFactory = new ExpressionFactoryImpl(attributeFactory, functionRegistry, jaxbAttributeProviderConfs, maxVariableReferenceDepth, enableXPath, strictAttributeIssuerMatch); this.expressionFactory = new ExpressionFactoryImpl(attributeFactory, functionRegistry, jaxbAttributeProviderConfs, maxVariableReferenceDepth, enableXPath, strictAttributeIssuerMatch, environmentProperties);
final RootPolicyProviderModule.Factory<AbstractPolicyProvider> rootPolicyProviderModFactory = PdpExtensionLoader.getJaxbBoundExtension(RootPolicyProviderModule.Factory.class, jaxbRootPolicyProviderConf.getClass()); final RootPolicyProviderModule.Factory<AbstractPolicyProvider> rootPolicyProviderModFactory = PdpExtensionLoader.getJaxbBoundExtension(RootPolicyProviderModule.Factory.class, jaxbRootPolicyProviderConf.getClass());
......
...@@ -50,7 +50,7 @@ public class TestApplyMarshalling ...@@ -50,7 +50,7 @@ public class TestApplyMarshalling
try try
{ {
STD_EXPRESSION_FACTORY = new ExpressionFactoryImpl(StandardDatatypeFactoryRegistry.MANDATORY_DATATYPES, StandardFunctionRegistry.getInstance(true), STD_EXPRESSION_FACTORY = new ExpressionFactoryImpl(StandardDatatypeFactoryRegistry.MANDATORY_DATATYPES, StandardFunctionRegistry.getInstance(true),
null, 0, false, false); null, 0, false, false, null);
} catch (IllegalArgumentException | IOException e) } catch (IllegalArgumentException | IOException e)
{ {
throw new RuntimeException(e); throw new RuntimeException(e);
......
...@@ -28,25 +28,26 @@ import java.util.Map; ...@@ -28,25 +28,26 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.Attribute;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeDesignatorType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.Attributes;
import org.ow2.authzforce.core.pdp.api.AttributeGUID; import org.ow2.authzforce.core.pdp.api.AttributeGUID;
import org.ow2.authzforce.core.pdp.api.AttributeProvider; import org.ow2.authzforce.core.pdp.api.AttributeProvider;
import org.ow2.authzforce.core.pdp.api.BaseAttributeProviderModule; import org.ow2.authzforce.core.pdp.api.BaseAttributeProviderModule;
import org.ow2.authzforce.core.pdp.api.CloseableAttributeProviderModule; import org.ow2.authzforce.core.pdp.api.CloseableAttributeProviderModule;
import org.ow2.authzforce.core.pdp.api.EnvironmentProperties;
import org.ow2.authzforce.core.pdp.api.EvaluationContext; import org.ow2.authzforce.core.pdp.api.EvaluationContext;
import org.ow2.authzforce.core.pdp.api.IndeterminateEvaluationException; import org.ow2.authzforce.core.pdp.api.IndeterminateEvaluationException;
import org.ow2.authzforce.core.pdp.api.JaxbXACMLUtils.JaxbXACMLAttributeParser; import org.ow2.authzforce.core.pdp.api.JaxbXACMLUtils.JaxbXACMLAttributeParser;
import org.ow2.authzforce.core.pdp.api.JaxbXACMLUtils.NonIssuedLikeIssuedStrictJaxbXACMLAttributeParser; import org.ow2.authzforce.core.pdp.api.JaxbXACMLUtils.NonIssuedLikeIssuedStrictJaxbXACMLAttributeParser;
import org.ow2.authzforce.core.pdp.api.StatusHelper;
import org.ow2.authzforce.core.pdp.api.value.AttributeValue; import org.ow2.authzforce.core.pdp.api.value.AttributeValue;
import org.ow2.authzforce.core.pdp.api.value.Bag; import org.ow2.authzforce.core.pdp.api.value.Bag;
import org.ow2.authzforce.core.pdp.api.value.Datatype; import org.ow2.authzforce.core.pdp.api.value.Datatype;
import org.ow2.authzforce.core.pdp.api.value.DatatypeFactoryRegistry; import org.ow2.authzforce.core.pdp.api.value.DatatypeFactoryRegistry;
import org.ow2.authzforce.core.pdp.api.StatusHelper;
import org.ow2.authzforce.core.xmlns.test.TestAttributeProvider; import org.ow2.authzforce.core.xmlns.test.TestAttributeProvider;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.Attribute;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeDesignatorType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.Attributes;
/** /**
* *
* Fake AttributeProviderModule for test purposes only that can be configured to support a specific set of attribute Providers, but always return an empty bag * Fake AttributeProviderModule for test purposes only that can be configured to support a specific set of attribute Providers, but always return an empty bag
...@@ -69,7 +70,7 @@ public class TestAttributeProviderModule extends BaseAttributeProviderModule ...@@ -69,7 +70,7 @@ public class TestAttributeProviderModule extends BaseAttributeProviderModule
} }
@Override @Override
public DependencyAwareFactory getInstance(final TestAttributeProvider conf) public DependencyAwareFactory getInstance(final TestAttributeProvider conf, EnvironmentProperties environmentProperties)
{ {
return new DependencyAwareFactory() return new DependencyAwareFactory()
{ {
......
...@@ -70,7 +70,7 @@ public abstract class FunctionTest ...@@ -70,7 +70,7 @@ public abstract class FunctionTest
{ {
try try
{ {
STD_EXPRESSION_FACTORY = new ExpressionFactoryImpl(StandardDatatypeFactoryRegistry.MANDATORY_DATATYPES, StandardFunctionRegistry.getInstance(true), null, 0, false, false); STD_EXPRESSION_FACTORY = new ExpressionFactoryImpl(StandardDatatypeFactoryRegistry.MANDATORY_DATATYPES, StandardFunctionRegistry.getInstance(true), null, 0, false, false, null);
} catch (IllegalArgumentException | IOException e) } catch (IllegalArgumentException | IOException e)
{ {
throw new RuntimeException(e); throw new RuntimeException(e);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment