Commit df137c2d authored by Neil Crossley's avatar Neil Crossley
Browse files

Bump version and add initial ssa server.

parent b688c917
......@@ -14,7 +14,7 @@
<parent>
<groupId>de.governikus.eumw</groupId>
<artifactId>eumw</artifactId>
<version>1.1.0</version>
<version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>configuration-wizard</artifactId>
......
......@@ -14,7 +14,7 @@
<parent>
<artifactId>eumw</artifactId>
<groupId>de.governikus.eumw</groupId>
<version>1.1.0</version>
<version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>database-migration</artifactId>
......
......@@ -14,7 +14,7 @@
<parent>
<groupId>de.governikus.eumw</groupId>
<artifactId>eumw</artifactId>
<version>1.1.0</version>
<version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>dvca-connection-configurator</artifactId>
<name>dvca-connection-configurator</name>
......
......@@ -14,7 +14,7 @@
<parent>
<groupId>de.governikus.eumw</groupId>
<artifactId>eumw</artifactId>
<version>1.1.0</version>
<version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>eidas-common</artifactId>
......
......@@ -14,7 +14,7 @@
<parent>
<groupId>de.governikus.eumw</groupId>
<artifactId>eumw</artifactId>
<version>1.1.0</version>
<version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>eidas-demo</artifactId>
......
......@@ -14,7 +14,7 @@
<parent>
<groupId>de.governikus.eumw</groupId>
<artifactId>eumw</artifactId>
<version>1.1.0</version>
<version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>eidas-middleware</artifactId>
......
......@@ -14,7 +14,7 @@
<parent>
<groupId>de.governikus.eumw</groupId>
<artifactId>eumw</artifactId>
<version>1.1.0</version>
<version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>eidas-starterkit</artifactId>
......
......@@ -14,7 +14,7 @@
<parent>
<groupId>de.governikus.eumw</groupId>
<artifactId>eumw</artifactId>
<version>1.1.0</version>
<version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>password-generator</artifactId>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2019 Governikus KG. Licensed under the EUPL, Version 1.2 or as soon they will be approved by
~ the European Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work except
~ in compliance with the Licence. You may obtain a copy of the Licence at:
~ http://joinup.ec.europa.eu/software/page/eupl Unless required by applicable law or agreed to in writing,
~ software distributed under the Licence is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS
~ OF ANY KIND, either express or implied. See the Licence for the specific language governing permissions and
~ limitations under the Licence.
-->
~ Copyright (c) 2019 Governikus KG. Licensed under the EUPL, Version 1.2 or as soon they will be approved by
~ the European Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work except
~ in compliance with the Licence. You may obtain a copy of the Licence at:
~ http://joinup.ec.europa.eu/software/page/eupl Unless required by applicable law or agreed to in writing,
~ software distributed under the Licence is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS
~ OF ANY KIND, either express or implied. See the Licence for the specific language governing permissions and
~ limitations under the Licence.
-->
<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>
<groupId>de.governikus.eumw</groupId>
<artifactId>eumw</artifactId>
<version>1.1.0</version>
<version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>EU Middleware</name>
......@@ -37,8 +37,8 @@
<scm>
<url>https://github.com/Governikus/${project.artifactId}</url>
<connection>${governikus.scm.connection}</connection>
<tag>eumw-1.1.0</tag>
</scm>
<tag>eumw-1.1.0</tag>
</scm>
<developers>
<developer>
......@@ -109,6 +109,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<!-- Java compiler target version -->
<maven.compiler.target>1.8</maven.compiler.target>
<version.toolchain>1.8</version.toolchain>
<!-- crypto -->
<version.bouncycastle>1.61</version.bouncycastle>
......@@ -209,7 +210,7 @@
<inherited>true</inherited>
<configuration>
<!-- per our convention, all submodules must have
the same version as the parent -->
the same version as the parent -->
<autoVersionSubmodules>true</autoVersionSubmodules>
<releaseProfiles>attachSourceAndJavaDoc,sign</releaseProfiles>
......@@ -237,14 +238,14 @@
</configuration>
</plugin>
<!-- TODO maven surefire plugin 2.20 has a memory leak so
we will downgrade surefire here until this is fixed with the next release -->
we will downgrade surefire here until this is fixed with the next release -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<!-- alphabetical on even hours, reverse alphabetical
on odd hours -->
on odd hours -->
<runOrder>hourly</runOrder>
<forkMode>once</forkMode>
<forkCount>1</forkCount>
......@@ -409,6 +410,25 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<version>1.1</version>
<executions>
<execution>
<goals>
<goal>toolchain</goal>
</goals>
</execution>
</executions>
<configuration>
<toolchains>
<jdk>
<version>${version.toolchain}</version>
</jdk>
</toolchains>
</configuration>
</plugin>
</plugins>
</build>
......@@ -424,7 +444,8 @@
<module>configuration-wizard</module>
<module>utils</module>
<module>dvca-connection-configurator</module>
</modules>
<module>ssa-server</module>
</modules>
<dependencies>
<dependency>
......@@ -914,7 +935,7 @@
<configuration>
<excludes>
<!-- exclude javassist classes (leads to
runtime exception in coverage) -->
runtime exception in coverage) -->
<exclude>*_javassist_*</exclude>
<exclude>org.springframework.*</exclude>
</excludes>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2019 Governikus KG. Licensed under the EUPL, Version 1.2 or as soon they will be approved by
~ the European Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work except
~ in compliance with the Licence. You may obtain a copy of the Licence at:
~ http://joinup.ec.europa.eu/software/page/eupl Unless required by applicable law or agreed to in writing,
~ software distributed under the Licence is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS
~ OF ANY KIND, either express or implied. See the Licence for the specific language governing permissions and
~ limitations under the Licence.
-->
~ Copyright (c) 2019 Governikus KG. Licensed under the EUPL, Version 1.2 or as soon they will be approved by
~ the European Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work except
~ in compliance with the Licence. You may obtain a copy of the Licence at:
~ http://joinup.ec.europa.eu/software/page/eupl Unless required by applicable law or agreed to in writing,
~ software distributed under the Licence is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS
~ OF ANY KIND, either express or implied. See the Licence for the specific language governing permissions and
~ limitations under the Licence.
-->
<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">
<parent>
<artifactId>eumw</artifactId>
<groupId>de.governikus.eumw</groupId>
<version>1.1.0</version>
<version>1.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -59,7 +59,6 @@
<xjbSources>
<xjbSource>${project.basedir}/src/main/resources/xjb/generated-source-settings.xjb</xjbSource>
</xjbSources>
</configuration>
</plugin>
</plugins>
......
......@@ -14,7 +14,7 @@
<parent>
<groupId>de.governikus.eumw</groupId>
<artifactId>eumw</artifactId>
<version>1.1.0</version>
<version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>poseidas</artifactId>
......
<?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>de.governikus.eumw</groupId>
<artifactId>eumw</artifactId>
<version>1.2.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<packaging>pom</packaging>
<name>SSA-Server</name>
<artifactId>ssa-server</artifactId>
<modules>
<module>sam</module>
<module>server</module>
</modules>
<licenses>
<license>
<name>GNU General Public License Version 3</name>
<url>https://www.gnu.org/licenses/gpl-3.0</url>
<distribution>manual</distribution>
</license>
</licenses>
<organization>
<name>ecsec GmbH</name>
<url>https://www.ecsec.de/</url>
</organization>
<developers>
<developer>
<name>Tobias Wich</name>
<email>tobias.wich@ecsec.de</email>
<organization>ecsec GmbH</organization>
</developer>
<developer>
<name>Michael Rauh</name>
<email>michael.rauh@ecsec.de</email>
<organization>ecsec GmbH</organization>
</developer>
<developer>
<name>René Lottes</name>
<email>rene.lottes@ecsec.de</email>
<organization>ecsec GmbH</organization>
</developer>
<developer>
<name>Neil Crossley</name>
<email>neil.crossley@ecsec.de</email>
<organization>ecsec GmbH</organization>
</developer>
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<version.toolchain>[11,)</version.toolchain>
<maven.min.version>3.5.0</maven.min.version>
<version.maven.surefire.plugin>2.22.1</version.maven.surefire.plugin>
<version.maven.failsafe.plugin>2.22.1</version.maven.failsafe.plugin>
<!-- fix for netbeans as it executes the surefire:test task directly -->
<argLine>-Djdk.attach.allowAttachSelf</argLine>
<!-- Netbeans config properties -->
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size>4</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size>
<org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap>none</org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap>
<org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>4</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>
<org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>4</org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>
<org-netbeans-modules-editor-indent.CodeStyle.project.tab-size>4</org-netbeans-modules-editor-indent.CodeStyle.project.tab-size>
<org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width>120</org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width>
<org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>false</org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>
<org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.26</version>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
<version>7.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
<version>1.3.4</version>
</dependency>
<!--Test-->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.14.3</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<archiveClasses>false</archiveClasses>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4.1</version>
<configuration>
<rules>
<requireMavenVersion>
<version>[${maven.min.version},)</version>
</requireMavenVersion>
</rules>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<version>1.1</version>
<configuration>
<toolchains>
<jdk>
<version>${version.toolchain}</version>
</jdk>
</toolchains>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.maven.surefire.plugin}</version>
<configuration>
<!--
HACK: disabled the following hack because it was causing problems.
<argLine>@{argLine} ${argLine}</argLine>
-->
<systemPropertyVariables>
<coverage-output>none</coverage-output> <!-- disable jmockit coverage -->
</systemPropertyVariables>
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven.failsafe.plugin.version}</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.12.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
<version>2.4</version>
<configuration>
<tagListOptions>
<tagClasses>
<tagClass>
<displayName>Todo Work</displayName>
<tags>
<tag>
<matchString>TODO</matchString>
<matchType>exact</matchType>
</tag>
<tag>
<matchString>FIXME</matchString>
<matchType>exact</matchType>
</tag>
</tags>
</tagClass>
</tagClasses>
</tagListOptions>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.4</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<!-- In the past there have been incompatibilities of maven 2 and 3, so just accept version 3 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-default</id>
<goals>
<goal>enforce</goal>
</goals>
</execution>
<execution>
<id>enforce-clean</id>
<phase>pre-clean</phase>
<goals>
<goal>enforce</goal>
</goals>
</execution>
<execution>
<id>enforce-site</id>
<phase>pre-site</phase>
<goals>
<goal>enforce</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>toolchain</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<?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>
<artifactId>ssa-server</artifactId>
<groupId>de.governikus.eumw</groupId>
<version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>reqesidta</groupId>
<artifactId>sam</artifactId>
<version>1.2.0-SNAPSHOT</version>
<name>sam</name>
</project>
<?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>
<artifactId>ssa-server</artifactId>
<groupId>de.governikus.eumw</groupId>
<version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>server</artifactId>
<version>1.2.0-SNAPSHOT</version>
<name>server</name>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
</dependency>
<!--Test-->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package reqesidta.ssa.server.config;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigBeanFactory;
import com.typesafe.config.ConfigFactory;
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.security.GeneralSecurityException;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
*
* @author René Lottes
*/
@ApplicationScoped
public class ConfigLoader {
private static final Logger LOG = LoggerFactory.getLogger(ConfigLoader.class);
private final SSAConfig configBean;
public ConfigLoader() throws IOException, URISyntaxException, GeneralSecurityException {
// load config from $HOME/ssa-server.conf and merge with bundled reference.conf
String homeDir = System.getProperty("user.home");
File path = new File(homeDir, "ssa-server.conf");
// set property to load external file
if (path.exists()) {
LOG.debug("Loading config {}", path.getAbsolutePath());
System.setProperty("config.url", path.toURI().toString());
}
ConfigFactory.invalidateCaches();
Config rawCfg = ConfigFactory.load();
this.configBean = ConfigBeanFactory.create(rawCfg.getConfig("ssa-config"), SSAConfig.class);
}
@Produces
public SSAConfig getConfig() {
return this.configBean;
}
}
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package reqesidta.ssa.server.config;
/**
*
* @author René Lottes
*/
public class SSAConfig {