Commit eb7b94ef authored by Romain Ferrari's avatar Romain Ferrari

Preparing merge

parent 5465c89e
......@@ -22,12 +22,6 @@
<!-- Publicly browsable repository URL. For example, via Gitlab web UI. -->
<url>${scm.baseUrl}/core</url>
</scm>
<properties>
<!-- JDK versions for AspectJ -->
<jdk.source>1.7</jdk.source>
<jdk.target>1.7</jdk.target>
<debug>false</debug>
</properties>
<dependencies>
<dependency>
<!-- Used only to do Strings.join() in StandardFactory's init debug messages -->
......@@ -57,20 +51,53 @@
<artifactId>xml-resolver</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<!-- For validation of XACML RFC822Name (email address) -->
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>1.5.4</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<!-- For validating IP addresses (XACML IPAdress datatype), Domain names (XACML DNSName datatype),
etc. without any DNS resolution -->
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
</dependency>
<dependency>
<!-- For XACML AttributeSelector evaluation and XPath-based functions (making reference to [XF]) -->
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
<version>9.6.0-5</version>
</dependency>
<dependency>
<!-- Used for DOM parsing / XPath evaluation -->
<groupId>com.thalesgroup.appsec</groupId>
<artifactId>thales-appsec-common-utils</artifactId>
</dependency>
<!-- Authzforce dependencies -->
<!-- xml-ns-model and xacml-model dependencies are declared here only to work around maven-jaxb2-plugin bug: cannot resolve
episodes from indirect dependencies with useDependenciesAsEpisodes option. -->
<dependency>
<groupId>com.thalesgroup.authzforce</groupId>
<artifactId>authzforce-core-model</artifactId>
<artifactId>authzforce-xml-ns-model</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.thalesgroup.authzforce</groupId>
<artifactId>authzforce-xacml-model</artifactId>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>com.thalesgroup.authzforce</groupId>
<artifactId>authzforce-pdp-ext-model</artifactId>
<version>3.2.7</version>
</dependency>
<!-- /Authzforce dependencies -->
<!-- Test dependencies -->
......@@ -90,6 +117,39 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.5</version>
<configuration>
<targetJdk>1.7</targetJdk>
<excludeRoots>
<excludeRoot>target/generated-sources</excludeRoot>
<excludeRoot>target/generated-test-sources</excludeRoot>
</excludeRoots>
</configuration>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<!-- Apache license Headers -->
<groupId>com.mycila</groupId>
......@@ -121,19 +181,8 @@
<exclude>**/*.md</exclude>
<exclude>**/*.properties</exclude>
<exclude>**/*.gitignore</exclude>
<exclude>src/main/java/com/sun/xacml/cond/xacmlv3/Apply.java</exclude>
</excludes>
<includes>
<include>src/main/java/com/sun/xacml/xacmlv3/**</include>
<include>src/main/java/com/sun/xacml/cond/xacmlv3/**</include>
<include>src/main/java/com/sun/xacml/ctx/xacmlv3/**</include>
<include>src/main/java/com/sun/xacml/CacheManager.java</include>
<include>src/main/java/com/sun/xacml/ObligationExpressions.java</include>
<include>src/main/java/com/sun/xacml/combine/PermitUnlessDenyPolicyAlg</include>
<include>src/main/java/com/sun/xacml/combine/PermitUnlessDenyRuleAlg</include>
<include>src/main/java/com/sun/xacml/combine/DenyUnlessPermitPolicyAlg</include>
<include>src/main/java/com/sun/xacml/combine/DenyUnlessPermitRuleAlg</include>
<include>src/main/java/com/sun/xacml/finder/impl/MultipleResourceFinder.java</include>
<include>src/main/java/com/thalesgroup/authzforce/core/**</include>
<!-- Include test files also -->
<include>src/test/java/**</include>
......@@ -186,21 +235,6 @@
<extension>true</extension>
<useDependenciesAsEpisodes>true</useDependenciesAsEpisodes>
<strict>false</strict>
<!-- Episodes: Only episodes for schemas referenced (imported/included) by schema(s) in schemaDirectory
can be listed here. If not possible, just create an empty schema in schemaDirectory which imports all
the episode elements but does nothing with them. -->
<!-- <episodes> -->
<!-- </episodes> -->
<!-- <plugins> -->
<!-- <plugin> -->
<!-- <groupId>com.thalesgroup.ktd.scis</groupId> -->
<!-- <artifactId>oasis-xacml-model</artifactId> -->
<!-- </plugin> -->
<!-- <plugin> -->
<!-- <groupId>com.thalesgroup.authzforce</groupId> -->
<!-- <artifactId>authzforce-core-model</artifactId> -->
<!-- </plugin> -->
<!-- </plugins> -->
<catalog>src/main/jaxb/catalog.xml</catalog>
<removeOldOutput>true</removeOldOutput>
<bindingDirectory>src/main/jaxb</bindingDirectory>
......@@ -234,42 +268,7 @@
</configuration>
</execution>
</executions>
</plugin>
<!-- Maven compiler configuration -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-testCompile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
<configuration>
<verbose>${debug}</verbose>
<showWeaveInfo>${debug}</showWeaveInfo>
<outxml>${debug}</outxml>
<source>${jdk.source}</source>
<target>${jdk.target}</target>
</configuration>
</execution>
<execution>
<id>default-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<source>${jdk.source}</source>
<target>${jdk.target}</target>
</configuration>
</execution>
</executions>
<configuration>
<source>${jdk.source}</source>
<target>${jdk.target}</target>
</configuration>
</plugin>
</plugin>
<!-- Test configuration -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
......
......@@ -67,7 +67,7 @@ import com.sun.xacml.cond.xacmlv3.EvaluationResult;
import com.sun.xacml.finder.AttributeFinder;
import com.thalesgroup.appsec.util.Utils;
import com.thalesgroup.authzforce.core.PdpModelHandler;
import com.thalesgroup.authzforce.xacml.schema.XACMLCategory;
import com.thalesgroup.authzforce.xacml._3_0.identifiers.XACMLCategory;
/**
* A basic implementation of <code>EvaluationCtx</code> that is created from an XACML Request and
......
......@@ -60,7 +60,7 @@ import com.sun.xacml.finder.PolicyFinderResult;
import com.sun.xacml.finder.ResourceFinder;
import com.sun.xacml.finder.ResourceFinderResult;
import com.thalesgroup.appsec.util.Utils;
import com.thalesgroup.authzforce.xacml.schema.XACMLCategory;
import com.thalesgroup.authzforce.xacml._3_0.identifiers.XACMLCategory;
/**
* This is the core class for the XACML engine, providing the starting point for request evaluation.
......
......@@ -39,7 +39,7 @@ import com.sun.xacml.combine.CombiningAlgFactory;
import com.sun.xacml.combine.CombiningAlgFactoryProxy;
import com.sun.xacml.cond.FunctionFactory;
import com.sun.xacml.cond.FunctionFactoryProxy;
import com.thalesgroup.authzforce.xacml.schema.XACMLVersion;
import com.thalesgroup.authzforce.xacml._3_0.identifiers.XACMLVersion;
/**
......
......@@ -57,7 +57,7 @@ import com.sun.xacml.cond.Evaluatable;
import com.sun.xacml.cond.xacmlv3.EvaluationResult;
import com.sun.xacml.ctx.Status;
import com.thalesgroup.authzforce.core.PdpModelHandler;
import com.thalesgroup.authzforce.xacml.schema.XACMLCategory;
import com.thalesgroup.authzforce.xacml._3_0.identifiers.XACMLCategory;
public class AttributeDesignator extends AttributeDesignatorType implements Evaluatable
{
......
......@@ -35,7 +35,6 @@ package com.sun.xacml.finder;
import com.sun.xacml.EvaluationCtx;
import com.sun.xacml.attr.xacmlv3.AttributeValue;
import com.thalesgroup.authz.model.ext._3.AbstractResourceFinder;
import com.thalesgroup.authzforce.core.IPdpExtension;
......
......@@ -33,8 +33,7 @@ import com.sun.xacml.Indenter;
import com.sun.xacml.ParsingException;
import com.sun.xacml.PolicyMetaData;
import com.sun.xacml.ctx.Attribute;
import com.thalesgroup.authzforce.xacml.schema.XACMLAttributeId;
import com.thalesgroup.authzforce.xacml.schema.XACMLVersion;
import com.thalesgroup.authzforce.xacml._3_0.identifiers.XACMLAttributeId;
/**
* Represents the AttributesType XML type found in the context schema.
......
......@@ -20,10 +20,8 @@ package com.thalesgroup.authzforce.core;
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -32,25 +30,33 @@ import java.util.Map;
import javax.xml.bind.JAXBException;
import javax.xml.transform.Source;
import net.sf.ehcache.Cache;
import net.sf.ehcache.store.MemoryStoreEvictionPolicy;
import org.apache.commons.jxpath.Functions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
import org.springframework.xml.transform.ResourceSource;
import com.sun.xacml.PDP;
import com.sun.xacml.PDPConfig;
import com.sun.xacml.UnknownIdentifierException;
import com.sun.xacml.attr.AttributeFactory;
import com.sun.xacml.attr.AttributeProxy;
import com.sun.xacml.attr.BaseAttributeFactory;
import com.sun.xacml.attr.StandardAttributeFactory;
import com.sun.xacml.combine.BaseCombiningAlgFactory;
import com.sun.xacml.combine.CombiningAlgFactory;
import com.sun.xacml.combine.CombiningAlgorithm;
import com.sun.xacml.combine.StandardCombiningAlgFactory;
import com.sun.xacml.cond.BaseFunctionFactory;
import com.sun.xacml.cond.BasicFunctionFactoryProxy;
import com.sun.xacml.cond.Function;
import com.sun.xacml.cond.FunctionFactory;
import com.sun.xacml.cond.FunctionFactoryProxy;
import com.sun.xacml.cond.StandardFunctionFactory;
import com.sun.xacml.cond.cluster.FunctionCluster;
import com.sun.xacml.finder.AttributeFinder;
import com.sun.xacml.finder.AttributeFinderModule;
import com.sun.xacml.finder.PolicyFinder;
......@@ -63,23 +69,7 @@ import com.sun.xacml.support.finder.StaticPolicyFinderModule;
import com.sun.xacml.support.finder.StaticRefPolicyFinderModule;
import com.thalesgroup.authz.model.ext._3.AbstractAttributeFinder;
import com.thalesgroup.authz.model.ext._3.AbstractPolicyFinder;
import com.thalesgroup.authz.model.ext._3.AbstractResourceFinder;
import com.thalesgroup.authz.model.ext._3.Cache;
import com.thalesgroup.authz.model.ext._3.CacheMemoryStoreEvictionPolicy;
import com.thalesgroup.authzforce.pdp.model._2014._12.AttributeFactory;
import com.thalesgroup.authzforce.pdp.model._2014._12.AttributeSelectorXPathFinder;
import com.thalesgroup.authzforce.pdp.model._2014._12.CombiningAlgFactory;
import com.thalesgroup.authzforce.pdp.model._2014._12.CombiningAlgFactory.Algorithm;
import com.thalesgroup.authzforce.pdp.model._2014._12.CurrentDateTimeFinder;
import com.thalesgroup.authzforce.pdp.model._2014._12.FunctionFactory;
import com.thalesgroup.authzforce.pdp.model._2014._12.Functions;
import com.thalesgroup.authzforce.pdp.model._2014._12.Functions.Function;
import com.thalesgroup.authzforce.pdp.model._2014._12.Functions.FunctionCluster;
import com.thalesgroup.authzforce.pdp.model._2014._12.PDP;
import com.thalesgroup.authzforce.pdp.model._2014._12.Pdps;
import com.thalesgroup.authzforce.pdp.model._2014._12.StaticPolicyFinder;
import com.thalesgroup.authzforce.pdp.model._2014._12.StaticRefPolicyFinder;
import com.thalesgroup.authzforce.pdp.model._2014._12.XacmlFeatureIdToImplementation;
/**
* XML-based Configuration manager using XML schema and JAXB to load PDP configurations
......
......@@ -52,11 +52,6 @@ import org.w3c.dom.NodeList;
import com.blogspot.illegalargumentexception.NamespaceContextMap;
import com.thalesgroup.appsec.util.Utils;
import com.thalesgroup.authzforce.pdp.model._2014._12.AttributeSelectorXPathFinder;
import com.thalesgroup.authzforce.pdp.model._2014._12.CurrentDateTimeFinder;
import com.thalesgroup.authzforce.pdp.model._2014._12.Pdps;
import com.thalesgroup.authzforce.pdp.model._2014._12.StaticPolicyFinder;
import com.thalesgroup.authzforce.pdp.model._2014._12.StaticRefPolicyFinder;
/**
* PDP Engine XML configuration handler
......
<?xml version="1.0" encoding="UTF-8"?>
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<!-- For Maven JAXB plugin -->
<system systemId="http://www.w3.org/2001/xml.xsd" uri="maven:com.thalesgroup.ktd.scis:xml-ns-model:jar!/xml.xsd" />
<system systemId="http://www.w3.org/2001/xml.xsd" uri="maven:com.thalesgroup.authzforce:authzforce-xml-ns-model:jar!/xml.xsd" />
<public publicId="http://thalesgroup.com/authz/model/ext/3.0"
uri="maven:com.thalesgroup.authzforce:authzforce-core-model:jar!/authz-ext-base.xsd" />
uri="maven:com.thalesgroup.authzforce:authzforce-pdp-ext-model:jar!/authz-ext-base.xsd" />
<public publicId="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17"
uri="maven:com.thalesgroup.ktd.scis:oasis-xacml-model:jar!/xacml-core-v3-schema-wd-17.xsd" />
</catalog>
\ No newline at end of file
uri="maven:com.thalesgroup.authzforce:authzforce-xacml-model:jar!/xacml-core-v3-schema-wd-17.xsd" />
</catalog>
This diff is collapsed.
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