Release eumw-1.1.1

Governikus · Dec 3, 2020 · db93daa · db93daa
1 parent e208326
commit db93daa
Show file tree

Hide file tree

Showing 17 changed files with 178 additions and 79 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 target/
 packer/
-*Jenkinsfile*
+*Jenkinsfile
 .hg/
 
 # IntelliJ project files

diff --git a/.hgtags b/.hgtags
@@ -17,3 +17,6 @@ cd6877486ad7373dae2fec12f9f74d19e78d1110 eumw-1.0.4
 e98bc5c6b60496c8d6533c5655626ba39701cf37 eumw-1.0.5
 a642705f08408a92390a630e88983470adb5b6e3 eumw-1.0.6
 85339cfcccdabfecb548a9ff0f06a0b7bf48c02f eumw-1.0.7
+6f5416237c12951f787b173076a3249f4ea7eb2d eumw-1.1.1.RC1
+9a7e2d39e97e2fb6be62227a1dd9b46ba0098961 eumw-1.1.1.RC2
+4868dfe3363f32b42c160d3d68aa17d9eebdb70b eumw-1.1.1.RC3
diff --git a/Jenkinsfile_release b/Jenkinsfile_release
@@ -0,0 +1,59 @@
+pipeline {
+
+    agent { label 'eumw' }
+
+	environment{
+            // As this runs on a dedicated eumw slave with docker already installed, do not use the docker swarm
+            DOCKER_HOST = ''
+            // This build should be pushed to docker.io so unset the jenkins global environment variable
+            DOCKER_REGISTRY=''
+        }
+
+	parameters {
+	    string(name: 'TAG', description: 'Mercurial Release Tag für dieses Release.')
+	}
+
+    tools {
+        jdk 'JDK8'
+        maven 'default'
+    }
+
+    options {
+        buildDiscarder(logRotator(numToKeepStr:'10'))
+
+        // 'wrapper' steps that should wrap the entire build execution
+        // Adds timestamps to the output logged by steps inside the wrapper.
+        timestamps()
+        timeout(time: 30, unit: 'MINUTES')
+    }
+
+    stages {
+        stage('Checkout') {
+            steps {
+                deleteDir()
+                // checkoutout repository contents to the working directory
+                checkout scm: [$class: 'MercurialSCM', source: 'https://hg.govkg.de/Autent/eumw', revision: params.TAG, revisionType: 'TAG', clean: true]
+            }
+        }
+
+        stage('Build') {
+            steps {
+                withMaven(
+                    maven: 'default',
+                     mavenSettingsConfig: 'bf027fa5-0956-42ce-a4bc-441a76737b0a')
+				{
+                    sh 'mvn clean deploy -PattachSourceAndJavaDoc,sign -Dgovernikus.scm.connection=scm:hg:https://hg.govkg.de/Autent/eumw -DaltSnapshotDeploymentRepository=nexus::default::https://repo.govkg.de/repository/autent-snapshots/ -DaltReleaseDeploymentRepository=nexus::default::https://repo.govkg.de/repository/autent-releases/ -DconnectionUrl=scm:hg:https://hg.govkg.de/Autent/eumw'
+                }
+            }
+        }
+
+        stage('BuildDoc') {
+            agent { label 'Docs' }
+            steps {
+                sh '''cd doc
+                    make clean latexpdf'''
+                archiveArtifacts 'doc/_build/latex/*.pdf'
+            }
+        }
+    }
+}
diff --git a/configuration-wizard/pom.xml b/configuration-wizard/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
     <artifactId>configuration-wizard</artifactId>
 

diff --git a/databasemigration/pom.xml b/databasemigration/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>eumw</artifactId>
 		<groupId>de.governikus.eumw</groupId>
-		<version>1.1.0</version>
+		<version>1.1.1</version>
 	</parent>
 	<artifactId>database-migration</artifactId>
 

diff --git a/dvca-connection-configurator/pom.xml b/dvca-connection-configurator/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
     <artifactId>dvca-connection-configurator</artifactId>
     <name>dvca-connection-configurator</name>

diff --git a/eidas-common/pom.xml b/eidas-common/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>de.governikus.eumw</groupId>
 		<artifactId>eumw</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.1</version>
 	</parent>
 	<artifactId>eidas-common</artifactId>
 

diff --git a/eidas-demo/pom.xml b/eidas-demo/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
     <artifactId>eidas-demo</artifactId>
 

diff --git a/eidas-middleware/pom.xml b/eidas-middleware/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
     <artifactId>eidas-middleware</artifactId>
 

diff --git a/eidas-starterkit/pom.xml b/eidas-starterkit/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>de.governikus.eumw</groupId>
 		<artifactId>eumw</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.1</version>
 	</parent>
 	<artifactId>eidas-starterkit</artifactId>
 

diff --git a/password-generator/pom.xml b/password-generator/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
     <artifactId>password-generator</artifactId>
 

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
 
     <groupId>de.governikus.eumw</groupId>
     <artifactId>eumw</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
     <packaging>pom</packaging>
 
     <name>EU Middleware</name>
@@ -37,7 +37,7 @@
     <scm>
         <url>https://github.com/Governikus/${project.artifactId}</url>
         <connection>${governikus.scm.connection}</connection>
-      <tag>eumw-1.1.0</tag>
+      <tag>eumw-1.1.1</tag>
   </scm>
 
     <developers>
@@ -348,19 +348,15 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jarsigner-plugin</artifactId>
-                    <version>1.4</version>
+                    <version>3.0.0</version>
                     <configuration>
                         <keystore>NONE</keystore>
                         <storetype>PKCS11</storetype>
                         <tsa>http://timestamp.globalsign.com/scripts/timestamp.dll</tsa>
                         <providerClass>sun.security.pkcs11.SunPKCS11</providerClass>
-                        <providerArg>${java.home}/../bin/eToken.cfg</providerArg>
+                        <providerArg>${globalsign.config}</providerArg>
                         <alias>${globalsign.alias}</alias>
                         <storepass>${globalsign.storepass}</storepass>
-                        <arguments>
-                            <argument>${sign.proxy.host}</argument>
-                            <argument>${sign.proxy.port}</argument>
-                        </arguments>
                     </configuration>
                 </plugin>
             </plugins>
@@ -853,7 +849,6 @@
                                 <id>attach-javadocs</id>
                                 <goals>
                                     <goal>jar</goal>
-                                    <goal>test-jar</goal>
                                 </goals>
                             </execution>
                         </executions>

diff --git a/poseidas-configuration/pom.xml b/poseidas-configuration/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <artifactId>eumw</artifactId>
         <groupId>de.governikus.eumw</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/poseidas/pom.xml b/poseidas/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>de.governikus.eumw</groupId>
 		<artifactId>eumw</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.1</version>
 	</parent>
 	<artifactId>poseidas</artifactId>
 

diff --git a/poseidas/src/main/java/de/governikus/eumw/poseidas/cardbase/npa/InfoSelector.java b/poseidas/src/main/java/de/governikus/eumw/poseidas/cardbase/npa/InfoSelector.java
@@ -1,21 +1,20 @@
 /*
- * 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) 2020 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.
  */
 
 package de.governikus.eumw.poseidas.cardbase.npa;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
 
 import de.governikus.eumw.poseidas.cardbase.AssertUtil;
-import de.governikus.eumw.poseidas.cardbase.asn1.OID;
 import de.governikus.eumw.poseidas.cardbase.asn1.npa.si.AlgorithmIdentifier;
 import de.governikus.eumw.poseidas.cardbase.asn1.npa.si.ChipAuthenticationDomainParameterInfo;
 import de.governikus.eumw.poseidas.cardbase.asn1.npa.si.ChipAuthenticationInfo;
@@ -29,9 +28,8 @@
 
 
 /**
- * Selector for several kinds of info as {@link PACEInfo}, {@link PACEDomainParameterInfo},
- * {@link DomainParameterInfo}, {@link TerminalAuthenticationInfo}, {@link ChipAuthenticationInfo} and
- * {@link ChipAuthenticationDomainParameterInfo}.
+ * Selector for several kinds of info as {@link PACEInfo}, {@link PACEDomainParameterInfo}, {@link DomainParameterInfo},
+ * {@link TerminalAuthenticationInfo}, {@link ChipAuthenticationInfo} and {@link ChipAuthenticationDomainParameterInfo}.
  *
  * @author Arne Stahlbock, ast@bos-bremen.de
  * @author Jens Wothe, jw@bos-bremen.de
@@ -42,8 +40,8 @@ public final class InfoSelector
   /**
    * Selects a set of domain parameters for CA.
    *
-   * @param setCADomainParameterInfos set of available {@link ChipAuthenticationDomainParameterInfo},
-   *          <code>null</code> or empty not permitted
+   * @param setCADomainParameterInfos set of available {@link ChipAuthenticationDomainParameterInfo}, <code>null</code>
+   *          or empty not permitted
    * @return selected {@link ChipAuthenticationDomainParameterInfo}
    * @throws IllegalArgumentException if given set <code>null</code> or empty
    */
@@ -81,10 +79,10 @@ private static ChipAuthenticationDomainParameterInfo selectCADomainParameterInfo
   /**
    * Selects Chip Authentication variant to be used.
    *
-   * @param listCAInfos list of {@link ChipAuthenticationInfo} from which to select, <code>null</code> or
-   *          empty not permitted
-   * @param caDomainParameterInfo previously selected {@link ChipAuthenticationDomainParameterInfo},
-   *          <code>null</code> not permitted
+   * @param listCAInfos list of {@link ChipAuthenticationInfo} from which to select, <code>null</code> or empty not
+   *          permitted
+   * @param caDomainParameterInfo previously selected {@link ChipAuthenticationDomainParameterInfo}, <code>null</code>
+   *          not permitted
    * @return selected {@link ChipAuthenticationData}, <code>null</code> if no selection possible
    * @throws IllegalArgumentException if any parameter <code>null</code> or empty
    */
@@ -95,59 +93,31 @@ public static ChipAuthenticationData selectCAData(Collection<ChipAuthenticationI
     AssertUtil.notNullOrEmpty(listCAInfos, "list of chip authentication info");
     AssertUtil.notNullOrEmpty(listCaDomParams, "list of chip authentication domain parameter info");
 
-    Collection<ChipAuthenticationDomainParameterInfo> matchingDomParamInfoSet = new HashSet<>();
+    Map<ChipAuthenticationDomainParameterInfo, ChipAuthenticationInfo> matchingDomParamInfoMap = new HashMap<>();
     for ( ChipAuthenticationInfo caInfo : listCAInfos )
     {
       for ( ChipAuthenticationDomainParameterInfo cadpi : listCaDomParams )
       {
-        if ((caInfo.getKeyID() == null && cadpi.getKeyID() == null)
-            || (caInfo.getKeyID() != null && caInfo.getKeyID().equals(cadpi.getKeyID())))
+        if (caInfo.getVersion() == 2 && ((caInfo.getKeyID() == null && cadpi.getKeyID() == null)
+                                         || (caInfo.getKeyID() != null && caInfo.getKeyID().equals(cadpi.getKeyID()))))
         {
-          matchingDomParamInfoSet.add(cadpi);
+          matchingDomParamInfoMap.put(cadpi, caInfo);
         }
       }
     }
 
-    ChipAuthenticationDomainParameterInfo selectedDomainParams = selectCADomainParameterInfo(matchingDomParamInfoSet);
-    for ( ChipAuthenticationInfo caInfo : listCAInfos )
+    ChipAuthenticationDomainParameterInfo selectedDomainParams = selectCADomainParameterInfo(matchingDomParamInfoMap.keySet());
+    if (selectedDomainParams != null)
     {
-      try
-      {
-        if (caInfo.getKeyID() != null && caInfo.getKeyID().equals(selectedDomainParams.getKeyID()))
-        {
-          return new ChipAuthenticationData(caInfo, selectedDomainParams);
-        }
-      }
-      catch (IOException e)
-      {
-        continue;
-      }
-    }
-
-    OID protocol = selectedDomainParams.getProtocol();
-    for ( ChipAuthenticationInfo caInfo : listCAInfos )
-    {
-      try
-      {
-        OID caInfoProt = caInfo.getProtocol();
-        if (caInfoProt.toString().startsWith(protocol.toString()))
-        {
-          return new ChipAuthenticationData(caInfo, selectedDomainParams);
-        }
-      }
-      catch (IOException e)
-      {
-        continue;
-      }
+      return new ChipAuthenticationData(matchingDomParamInfoMap.get(selectedDomainParams), selectedDomainParams);
     }
     return null;
   }
 
   /**
    * Selects {@link PACEInfo} to be used.
    *
-   * @param listPACEInfos list of {@link PACEInfo} from which to select, <code>null</code> or empty list not
-   *          permitted
+   * @param listPACEInfos list of {@link PACEInfo} from which to select, <code>null</code> or empty list not permitted
    * @return selected {@link PACEInfo}
    * @throws IllegalArgumentException if given list <code>null</code> or empty
    */
@@ -187,8 +157,8 @@ public static PACEInfo selectPACEInfo(Collection<PACEInfo> listPACEInfos)
   /**
    * Selects {@link ChipAuthenticationPublicKeyInfo} to be used.
    *
-   * @param caPubKeyList list of {@link ChipAuthenticationPublicKeyInfo} from which to select,
-   *          <code>null</code> or empty not permitted
+   * @param caPubKeyList list of {@link ChipAuthenticationPublicKeyInfo} from which to select, <code>null</code> or
+   *          empty not permitted
    * @param caInfo previously selected {@link ChipAuthenticationInfo}, <code>null</code> not permitted
    * @return selected {@link ChipAuthenticationPublicKeyInfo}, <code>null</code> if no selection possible
    * @throws IllegalArgumentException if any parameter <code>null</code> or empty
@@ -254,8 +224,7 @@ public static class ChipAuthenticationData
     private final ChipAuthenticationDomainParameterInfo caDomParamInfo;
 
 
-    private ChipAuthenticationData(ChipAuthenticationInfo caInfo,
-                                  ChipAuthenticationDomainParameterInfo caDomParamInfo)
+    private ChipAuthenticationData(ChipAuthenticationInfo caInfo, ChipAuthenticationDomainParameterInfo caDomParamInfo)
     {
       super();
       AssertUtil.notNull(caInfo, "ca info");