aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ms_specific_connector/pom.xml12
-rw-r--r--ms_specific_connector/src/main/resources/application.properties1
-rw-r--r--ms_specific_proxyservice/pom.xml16
-rw-r--r--ms_specific_proxyservice/src/assembly/assembly_dir.xml4
-rw-r--r--ms_specific_proxyservice/src/assembly/assembly_zip.xml4
-rw-r--r--ms_specific_proxyservice/src/main/resources/application.properties56
-rw-r--r--pom.xml5
7 files changed, 61 insertions, 37 deletions
diff --git a/ms_specific_connector/pom.xml b/ms_specific_connector/pom.xml
index 40c09731..be4d49e4 100644
--- a/ms_specific_connector/pom.xml
+++ b/ms_specific_connector/pom.xml
@@ -270,7 +270,15 @@
<version>2.2.6.RELEASE</version>
<configuration>
<executable>true</executable>
- <!-- layout>ZIP</layout -->
+ <additionalProperties>
+ <encoding.source>UTF-8</encoding.source>
+ <encoding.reporting>UTF-8</encoding.reporting>
+ <application.version>${ms_specific_connector.version}</application.version>
+ <core.version>${project.version}</core.version>
+ </additionalProperties>
+ <excludeInfoProperties>
+ <infoProperty>version</infoProperty>
+ </excludeInfoProperties>
</configuration>
<executions>
<execution>
@@ -290,7 +298,7 @@
<descriptor>src/assembly/assembly_dir.xml</descriptor>
<descriptor>src/assembly/assembly_zip.xml</descriptor>
</descriptors>
- <finalName>${project.artifactId}-${project.version}</finalName>
+ <finalName>${project.artifactId}-${ms_specific_connector.version}</finalName>
<outputDirectory>${project.parent.build.directory}</outputDirectory>
</configuration>
<executions>
diff --git a/ms_specific_connector/src/main/resources/application.properties b/ms_specific_connector/src/main/resources/application.properties
index 660e8099..1a245851 100644
--- a/ms_specific_connector/src/main/resources/application.properties
+++ b/ms_specific_connector/src/main/resources/application.properties
@@ -3,6 +3,7 @@ spring.config.use-legacy-processing=true
## ApplicationServer configuration
server.servlet.contextPath=/ms_connector
+server.error.path=/public/error
#server.port=7080
app.build.artifactId=ms_connector
diff --git a/ms_specific_proxyservice/pom.xml b/ms_specific_proxyservice/pom.xml
index f0266984..5f2cacb8 100644
--- a/ms_specific_proxyservice/pom.xml
+++ b/ms_specific_proxyservice/pom.xml
@@ -11,7 +11,7 @@
<name>MS-specific Proxy-Service</name>
<description>Austria specific eIDAS ms-specific Proxy-Service implementation</description>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>at.gv.egiz.components</groupId>
<artifactId>egiz-spring-api</artifactId>
@@ -155,7 +155,7 @@
</profile>
</profiles>
-<build>
+ <build>
<finalName>ms_proxyservice</finalName>
<plugins>
@@ -180,7 +180,15 @@
<version>2.2.6.RELEASE</version>
<configuration>
<executable>true</executable>
- <!-- layout>ZIP</layout -->
+ <additionalProperties>
+ <encoding.source>UTF-8</encoding.source>
+ <encoding.reporting>UTF-8</encoding.reporting>
+ <application.version>${ms_specific_proxyservice}</application.version>
+ <core.version>${project.version}</core.version>
+ </additionalProperties>
+ <excludeInfoProperties>
+ <infoProperty>version</infoProperty>
+ </excludeInfoProperties>
</configuration>
<executions>
<execution>
@@ -200,7 +208,7 @@
<descriptor>src/assembly/assembly_dir.xml</descriptor>
<descriptor>src/assembly/assembly_zip.xml</descriptor>
</descriptors>
- <finalName>${project.artifactId}-${project.version}</finalName>
+ <finalName>${project.artifactId}-${ms_specific_proxyservice}</finalName>
<outputDirectory>${project.parent.build.directory}</outputDirectory>
</configuration>
<executions>
diff --git a/ms_specific_proxyservice/src/assembly/assembly_dir.xml b/ms_specific_proxyservice/src/assembly/assembly_dir.xml
index 8c5452ff..84bd68d4 100644
--- a/ms_specific_proxyservice/src/assembly/assembly_dir.xml
+++ b/ms_specific_proxyservice/src/assembly/assembly_dir.xml
@@ -48,8 +48,8 @@
<outputDirectory>./infos</outputDirectory>
<includes>
<!-- include>README.md</include-->
- <include>readme_${project.version}.txt</include>
- <include>readme_${project.version}.md</include>
+ <include>readme_${ms_specific_proxyservice}.txt</include>
+ <include>readme_${ms_specific_proxyservice}.md</include>
<include>history.txt</include>
<include>eIDAS_Ref_Impl/*</include>
<include>handbook/*</include>
diff --git a/ms_specific_proxyservice/src/assembly/assembly_zip.xml b/ms_specific_proxyservice/src/assembly/assembly_zip.xml
index 117f990b..79596104 100644
--- a/ms_specific_proxyservice/src/assembly/assembly_zip.xml
+++ b/ms_specific_proxyservice/src/assembly/assembly_zip.xml
@@ -48,8 +48,8 @@
<outputDirectory>./infos</outputDirectory>
<includes>
<!-- include>README.md</include -->
- <include>readme_${project.version}.txt</include>
- <include>readme_${project.version}.md</include>
+ <include>readme_${ms_specific_proxyservice}.txt</include>
+ <include>readme_${ms_specific_proxyservice}.md</include>
<include>history.txt</include>
<include>handbook/*</include>
</includes>
diff --git a/ms_specific_proxyservice/src/main/resources/application.properties b/ms_specific_proxyservice/src/main/resources/application.properties
index c9d5e58f..ce4370a1 100644
--- a/ms_specific_proxyservice/src/main/resources/application.properties
+++ b/ms_specific_proxyservice/src/main/resources/application.properties
@@ -3,8 +3,10 @@ spring.config.use-legacy-processing=true
## ApplicationServer configuration
server.servlet.contextPath=/ms_proxyservice
+server.error.path=/public/error
#server.port=7080
+spring.application.name=ms_proxyservice
app.build.artifactId=ms_proxyservice
@@ -29,44 +31,31 @@ eidas.ms.core.logging.level.info.errorcodes=auth.21
##Monitoring
eidas.ms.monitoring.eIDASNode.metadata.url=
-
##Specific logger configuration
-eidas.ms.technicallog.write.MDS.into.techlog=true
-eidas.ms.revisionlog.write.MDS.into.revisionlog=true
eidas.ms.revisionlog.logIPAddressOfUser=true
+#############################################################################
##Directory for static Web content
eidas.ms.webcontent.static.directory=webcontent/
eidas.ms.webcontent.templates=templates/
eidas.ms.webcontent.properties=properties/messages
+#############################################################################
## extended validation of pending-request Id's
eidas.ms.core.pendingrequestid.maxlifetime=300
eidas.ms.core.pendingrequestid.digist.algorithm=HmacSHA256
#eidas.ms.core.pendingrequestid.digist.secret=pendingReqIdSecret
+#############################################################################
## HTTP-client defaults
eidas.ms.client.http.connection.timeout.socket=15
eidas.ms.client.http.connection.timeout.connection=15
eidas.ms.client.http.connection.timeout.request=15
-## Common PVP2 S-Profile (SAML2) configuration
-#eidas.ms.pvp2.metadata.organisation.name=JUnit
-#eidas.ms.pvp2.metadata.organisation.friendyname=For testing with jUnit
-#eidas.ms.pvp2.metadata.organisation.url=http://junit.test
-#eidas.ms.pvp2.metadata.contact.givenname=Max
-#eidas.ms.pvp2.metadata.contact.surname=Mustermann
-#eidas.ms.pvp2.metadata.contact.email=max@junit.test
-
-##only for advanced config
-eidas.ms.configuration.pvp.scheme.validation=true
-eidas.ms.configuration.pvp.enable.entitycategories=false
-
-
#############################################################################
## MS-speccific eIDAS-Proxy-Service configuration
eidas.ms.auth.eIDAS.proxy.attribute.mapping.config=misc/idaAttributeMapping.json
@@ -77,18 +66,23 @@ eidas.ms.auth.eIDAS.node_v2.proxy.entityId=ownSpecificProxy
eidas.ms.auth.eIDAS.node_v2.forward.method=POST
# Mandate configuration
-eidas.ms.auth.eIDAS.proxy.mandates.enabled=false
-#eidas.ms.auth.eIDAS.proxy.mandates.profiles.natural.default=
-#eidas.ms.auth.eIDAS.proxy.mandates.profiles.legal.default=
+eidas.ms.auth.eIDAS.proxy.mandates.enabled=true
+eidas.ms.auth.eIDAS.proxy.mandates.profiles.natural.default=GeneralvollmachtBilateral
+eidas.ms.auth.eIDAS.proxy.mandates.profiles.legal.default=Einzelvertretungsbefugnis
-## special foreign eIDAS-Connector configuration
-#eidas.ms.connector.0.uniqueID=https://demo.egiz.gv.at/demoportal_moaid-2.0/sp/eidas/metadata
-#eidas.ms.connector.0.countryCode=CC
-#eidas.ms.connector.0.mandates.enabled=false
-#eidas.ms.connector.0.mandates.natural=
-#eidas.ms.connector.0.mandates.legal=
-#eidas.ms.connector.0.auth.idaustria.entityId=
+#############################################################################
+## Common PVP2 S-Profile (SAML2) configuration
+#eidas.ms.pvp2.metadata.organisation.name=JUnit
+#eidas.ms.pvp2.metadata.organisation.friendyname=For testing with jUnit
+#eidas.ms.pvp2.metadata.organisation.url=http://junit.test
+#eidas.ms.pvp2.metadata.contact.givenname=Max
+#eidas.ms.pvp2.metadata.contact.surname=Mustermann
+#eidas.ms.pvp2.metadata.contact.email=max@junit.test
+
+##only for advanced config
+eidas.ms.configuration.pvp.scheme.validation=true
+eidas.ms.configuration.pvp.enable.entitycategories=false
## PVP2 S-Profile communication with ID Austria System
@@ -116,6 +110,16 @@ eidas.ms.modules.idaustriaauth.keystore.type=jks
#############################################################################
+## special foreign eIDAS-Connector configuration
+#eidas.ms.connector.0.uniqueID=https://demo.egiz.gv.at/demoportal_moaid-2.0/sp/eidas/metadata
+#eidas.ms.connector.0.countryCode=CC
+#eidas.ms.connector.0.mandates.enabled=false
+#eidas.ms.connector.0.mandates.natural=
+#eidas.ms.connector.0.mandates.legal=
+#eidas.ms.connector.0.auth.idaustria.entityId=
+
+
+#############################################################################
## advanced eIDAS attribute processing
# BORIS attribute for eJustice
diff --git a/pom.xml b/pom.xml
index e20e076e..9e801a52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,10 +15,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
-
<egiz.eidas.version>${project.version}</egiz.eidas.version>
+ <ms_specific_connector.version>1.3.3-SNAPSHOT</ms_specific_connector.version>
+ <ms_specific_proxyservice>1.0.0-SNAPSHOT</ms_specific_proxyservice>
+
+
<!-- ===================================================================== -->
<egiz-spring-api>0.3</egiz-spring-api>
<egiz-eventlog-slf4jBackend>0.4</egiz-eventlog-slf4jBackend>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 08:43:39 +0000