diff options
| -rw-r--r-- | id/moa-spss-container/pom.xml | 415 | ||||
| -rw-r--r-- | id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java | 41 |
2 files changed, 242 insertions, 214 deletions
diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml index fb27ca174..75f8d1d35 100644 --- a/id/moa-spss-container/pom.xml +++ b/id/moa-spss-container/pom.xml @@ -1,4 +1,7 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>MOA</groupId> @@ -9,226 +12,216 @@ <artifactId>moa-spss-container</artifactId> <name>MOA-SPSS-Container-for-MOA-ID</name> <description>This module holds MOA-SPSS and all required library</description> - + <properties> - <repositoryPath>${basedir}/../../repository</repositoryPath> - </properties> - + <repositoryPath>${basedir}/../../repository</repositoryPath> + </properties> + <repositories> - <repository> - <id>MOA</id> - <name>MOA Dependencies</name> - <releases> - <enabled>true</enabled> - <checksumPolicy>ignore</checksumPolicy> - </releases> - <layout>default</layout> - <url>file://${repositoryPath}</url> - </repository> + <repository> + <id>MOA</id> + <name>MOA Dependencies</name> + <releases> + <enabled>true</enabled> + <checksumPolicy>ignore</checksumPolicy> + </releases> + <layout>default</layout> + <url>file://${repositoryPath}</url> + </repository> + <repository> + <id>MOA_web</id> + <name>MOA Dependencies weblocation</name> + <releases> + <enabled>true</enabled> + <checksumPolicy>ignore</checksumPolicy> + </releases> + <layout>default</layout> + <url>https://git.egiz.gv.at/EAAF-Components/plain/eaaf_modules/eaaf_module_moa-sig/repository</url> + </repository> </repositories> - + <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <includes> - <include>${basedir}/../../repository/MOA/spss/ext_libs/*.jar</include> - </includes> - </configuration> + <includes> + <include>${basedir}/../../repository/MOA/spss/ext_libs/*.jar</include> + </includes> + </configuration> </plugin> - </plugins> - + </plugins> + </build> - + <dependencies> - <dependency> - <groupId>MOA.spss.server</groupId> - <artifactId>moa-sig-lib</artifactId> - <version>3.1.2</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <artifactId>*</artifactId> - <groupId>axis</groupId> - </exclusion> - </exclusions> - </dependency> - - -<!-- MOA-SPSS 3.x --> - <dependency> - <groupId>MOA.spss</groupId> - <artifactId>common</artifactId> - <version>3.1.2</version> - </dependency> - <dependency> - <groupId>MOA.spss</groupId> - <artifactId>tsl_lib</artifactId> - <version>2.0.2</version> - </dependency> - <dependency> - <groupId>iaik.prod</groupId> - <artifactId>iaik_cms</artifactId> - <version>5.1</version> - </dependency> - <dependency> - <groupId>iaik.prod</groupId> - <artifactId>iaik_cpades</artifactId> - <version>2.5.1_moa</version> - </dependency> - <dependency> - <groupId>iaik.prod</groupId> - <artifactId>iaik_cpxlevel</artifactId> - <version>0.9_moa</version> - </dependency> - <dependency> - <groupId>iaik.prod</groupId> - <artifactId>iaik_eccelerate</artifactId> - <version>5.01</version> - </dependency> - - <dependency> - <groupId>iaik.prod</groupId> - <artifactId>iaik_eccelerate_addon</artifactId> - <version>5.01</version> - </dependency> - - <dependency> - <groupId>iaik.prod</groupId> - <artifactId>iaik_eccelerate_cms</artifactId> - <version>5.01</version> - </dependency> - <dependency> - <groupId>iaik.prod</groupId> - <artifactId>iaik_jce_full</artifactId> - <!-- <scope>provided</scope> --> - </dependency> - <dependency> - <groupId>iaik.prod</groupId> - <artifactId>iaik_jsse</artifactId> - <version>4.4</version> - </dependency> - <dependency> - <groupId>iaik.prod</groupId> + <dependency> + <groupId>MOA.spss.server</groupId> + <artifactId>moa-sig-lib</artifactId> + <version>3.1.2</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>axis</groupId> + </exclusion> + </exclusions> + </dependency> + + + <!-- MOA-SPSS 3.x --> + <dependency> + <groupId>MOA.spss</groupId> + <artifactId>common</artifactId> + <version>3.1.2</version> + </dependency> + <dependency> + <groupId>MOA.spss</groupId> + <artifactId>tsl_lib</artifactId> + <version>2.0.2</version> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_cms</artifactId> + <version>5.1</version> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_cpades</artifactId> + <version>2.5.1_moa</version> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_cpxlevel</artifactId> + <version>0.9_moa</version> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_eccelerate</artifactId> + <version>5.01</version> + </dependency> + + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_eccelerate_addon</artifactId> + <version>5.01</version> + </dependency> + + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_eccelerate_cms</artifactId> + <version>5.01</version> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_jce_full</artifactId> + <!-- <scope>provided</scope> --> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_jsse</artifactId> + <version>4.4</version> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> <artifactId>iaik_moa</artifactId> <version>2.06</version> - </dependency> - <dependency> - <groupId>iaik.prod</groupId> - <artifactId>iaik_pki_module</artifactId> - <version>2.01_moa</version> - </dependency> - <dependency> - <groupId>iaik.prod</groupId> - <artifactId>iaik_sva</artifactId> - <version>1.0.2_moa</version> - </dependency> - <dependency> - <groupId>iaik.prod</groupId> - <artifactId>iaik_tsp</artifactId> - <version>2.32_eval</version> - </dependency> - <dependency> - <groupId>iaik.prod</groupId> - <artifactId>iaik_util</artifactId> - <version>0.23</version> - </dependency> - <dependency> - <groupId>iaik.prod</groupId> - <artifactId>iaik_xades</artifactId> - <version>2.13_moa</version> - </dependency> - <dependency> - <groupId>iaik.prod</groupId> - <artifactId>iaik_xsect</artifactId> - <version>2.13_moa</version> - </dependency> - - - - - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.postgresql</groupId> - <artifactId>postgresql</artifactId> - </dependency> - - <dependency> - <groupId>iaik.prod</groupId> - <artifactId>iaik_Pkcs11Provider</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>iaik.prod</groupId> - <artifactId>iaik_Pkcs11Wrapper</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>iaik.prod</groupId> - <artifactId>iaik_Pkcs11Wrapper</artifactId> - <classifier>win32</classifier> - <type>dll</type> - <scope>runtime</scope> - <optional>true</optional> - </dependency> - - - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - -<!-- <dependency> - <groupId>xalan-bin-dist</groupId> - <artifactId>xalan</artifactId> - should be provided by the container or jre - <scope>provided</scope> - <exclusions> - <exclusion> - <artifactId>serializer</artifactId> - <groupId>xalan</groupId> - </exclusion> - </exclusions> - </dependency> --> -<!-- <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - should be provided by the container or jre - <scope>provided</scope> - </dependency> --> -<!-- <dependency> - <groupId>xalan-bin-dist</groupId> - <artifactId>xml-apis</artifactId> - should be provided by the container or jre - <scope>provided</scope> - </dependency> - <dependency> - <groupId>xalan-bin-dist</groupId> - <artifactId>serializer</artifactId> - should be provided by the container or jre - <scope>provided</scope> - </dependency> --> - + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_pki_module</artifactId> + <version>2.01_moa</version> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_sva</artifactId> + <version>1.0.2_moa</version> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_tsp</artifactId> + <version>2.32_eval</version> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_util</artifactId> + <version>0.23</version> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_xades</artifactId> + <version>2.13_moa</version> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_xsect</artifactId> + <version>2.13_moa</version> + </dependency> + + + + + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + </dependency> + + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_Pkcs11Provider</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_Pkcs11Wrapper</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_Pkcs11Wrapper</artifactId> + <classifier>win32</classifier> + <type>dll</type> + <scope>runtime</scope> + <optional>true</optional> + </dependency> + + + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </dependency> + + <!-- <dependency> <groupId>xalan-bin-dist</groupId> <artifactId>xalan</artifactId> + should be provided by the container or jre <scope>provided</scope> <exclusions> + <exclusion> <artifactId>serializer</artifactId> <groupId>xalan</groupId> + </exclusion> </exclusions> </dependency> --> + <!-- <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> + should be provided by the container or jre <scope>provided</scope> </dependency> --> + <!-- <dependency> <groupId>xalan-bin-dist</groupId> <artifactId>xml-apis</artifactId> + should be provided by the container or jre <scope>provided</scope> </dependency> + <dependency> <groupId>xalan-bin-dist</groupId> <artifactId>serializer</artifactId> + should be provided by the container or jre <scope>provided</scope> </dependency> --> + </dependencies> - + </project>
\ No newline at end of file diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java index 6a01bd1fb..cdb0dae98 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java @@ -558,6 +558,10 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder Logger.info("Post-Processing for Austrian eID finished"); } + + injectNewEidAttributes(authData, session); + + //#################################################################### //copy all generic authentication information, which are not processed before to authData Iterator<String> copyInterator = includedToGenericAuthData.iterator(); @@ -582,7 +586,33 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder } - /** + private void injectNewEidAttributes(MOAAuthenticationData authData, IAuthenticationSession session) { + try { + String onlineIdl = session.getGenericDataFromSession(PVPConstants.EID_E_ID_TOKEN_NAME, String.class); + if (StringUtils.isNoneEmpty(onlineIdl)) { + authData.seteIDToken(Base64Utils.decode(onlineIdl, true)); + } + + } catch (IOException e) { + Logger.warn("Attribute: " + PVPConstants.EID_E_ID_TOKEN_NAME + " found, but injection failed: " + e.getMessage()); + + } + +// try { +// String eidStatusLevel = session.getGenericDataFromSession(PVPConstants.EID_IDENTITY_STATUS_LEVEL_NAME, String.class); +// if (StringUtils.isNotEmpty(eidStatusLevel)) { +// authData.setEidStatus(PVPConstants.EID_IDENTITY_STATUS_LEVEL_VALUES.); +// } +// } catch (Exception e) { +// Logger.warn("Attribute: " + PVPConstants.EID_IDENTITY_STATUS_LEVEL_NAME + " found, but injection failed: " + e.getMessage()); +// +// } + + } + + + + /** * @param authData * @param notValidbPK * @param notValidbPKType @@ -894,7 +924,12 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder } } catch (Exception e) { - Logger.warn("Foreign bPK generation FAILED for sector: " + foreignSector, e); + Logger.info("Foreign bPK generation FAILED for sector: " + foreignSector); + if (Logger.isDebugEnabled()) { + Logger.warn("Details: ", e); + + } + } @@ -928,7 +963,7 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder } } catch (Exception e) { - Logger.warn("Can NOT generate additional bPKs. Reason: " + e.getMessage()); + Logger.info("Can NOT generate additional bPKs. Reason: " + e.getMessage()); if (Logger.isDebugEnabled()) { Logger.warn("StackTrace: ", e); |