diff options
Diffstat (limited to 'id/server/idserverlib/src/main/resources')
6 files changed, 97 insertions, 45 deletions
diff --git a/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.auth.modules.AuthModule b/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.auth.modules.AuthModule new file mode 100644 index 000000000..7e2315fd7 --- /dev/null +++ b/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.auth.modules.AuthModule @@ -0,0 +1,2 @@ +# The default moaid process +at.gv.egovernment.moa.id.auth.modules.BKUSelectionModuleImpl diff --git a/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/internal/BKUSelection.process.xml b/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/internal/BKUSelection.process.xml new file mode 100644 index 000000000..b61ee5f2d --- /dev/null +++ b/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/internal/BKUSelection.process.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<pd:ProcessDefinition id="BKUSelectionProcess" xmlns:pd="http://reference.e-government.gv.at/namespace/moa/process/definition/v1"> + +<!-- + - National authentication with Austrian Citizen Card and mobile signature with our without mandate. + - Legacy authentication for foreign citizens using MOCCA supported signature cards. +--> + <pd:Task id="initializeBKUSelection" class="GenerateBKUSelectionFrameTask" async="true"/> + <pd:Task id="parseBKUSelection" class="EvaluateBKUSelectionTask" /> + <pd:Task id="restartAuthProzessManagement" class="RestartAuthnProcessManagment"/> + + <!-- Process is triggered either by GenerateIFrameTemplateServlet (upon bku selection) or by AuthenticationManager (upon legacy authentication start using legacy parameters. --> + <pd:StartEvent id="start" /> + + <pd:Transition from="start" to="initializeBKUSelection" /> + + <pd:Transition from="initializeBKUSelection" to="parseBKUSelection" /> + + + <!-- + BKU selection process MUST always end with 'restartAuthProzessManagement'! + Last synchron steps before 'restartAuthProzessManagement' MUST NOT write to httpServletResponse object! + --> + <pd:Transition from="parseBKUSelection" to="restartAuthProzessManagement" /> + + <pd:Transition from="restartAuthProzessManagement" to="end" /> + + <pd:EndEvent id="end" /> + +</pd:ProcessDefinition> diff --git a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml new file mode 100644 index 000000000..05ceb65f4 --- /dev/null +++ b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:context="http://www.springframework.org/schema/context" + xmlns:tx="http://www.springframework.org/schema/tx" + xmlns:aop="http://www.springframework.org/schema/aop" + xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd"> + + <bean id="MOAID_AuthenticationManager" + class="at.gv.egovernment.moa.id.moduls.AuthenticationManager"/> + + <bean id="AuthenticationDataBuilder" + class="at.gv.egovernment.moa.id.auth.builder.AuthenticationDataBuilder"/> + + <bean id="MOAID_SSOManager" + class="at.gv.egovernment.moa.id.moduls.SSOManager"/> + + <bean id="TransactionStorage" + class="at.gv.egovernment.moa.id.storage.DBTransactionStorage"/> + + <bean id="AuthenticationSessionStoreage" + class="at.gv.egovernment.moa.id.storage.DBAuthenticationSessionStoreage"/> + + <bean id="RequestStorage" + class="at.gv.egovernment.moa.id.moduls.RequestStorage"/> + + <bean id="ProcessInstanceStoreage" + class="at.gv.egovernment.moa.id.process.dao.ProcessInstanceStoreDAOImpl"/> + + <bean id="StatisticLogger" + class="at.gv.egovernment.moa.id.advancedlogging.StatisticLogger"/> + + <bean id="MOAReversionLogger" + class="at.gv.egovernment.moa.id.advancedlogging.MOAReversionLogger"/> + + <bean id="AuthenticationSessionCleaner" + class="at.gv.egovernment.moa.id.auth.AuthenticationSessionCleaner"/> + +<!-- Authentication Process Tasks --> + <bean id="GenerateBKUSelectionFrameTask" + class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.GenerateBKUSelectionFrameTask"/> + + <bean id="EvaluateBKUSelectionTask" + class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.EvaluateBKUSelectionTask"/> + + <bean id="RestartAuthProzessManagement" + class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.RestartAuthProzessManagement"/> + + <bean id="FinalizeAuthenticationTask" + class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.FinalizeAuthenticationTask"/> + + <bean id="CreateInterfedeartionRequestTask" + class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.CreateInterfedeartionRequestTask"/> + + <bean id="ReceiveInterfederationResponseTask" + class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.ReceiveInterfederationResponseTask"/> + +</beans>
\ No newline at end of file diff --git a/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml b/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml deleted file mode 100644 index 5855fc766..000000000 --- a/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:context="http://www.springframework.org/schema/context" - xmlns:tx="http://www.springframework.org/schema/tx" - xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd"> - - <context:property-placeholder location="${moa.id.configuration}"/> - - <bean id="moaidauthconfig" class="at.gv.egovernment.moa.id.config.auth.PropertyBasedAuthConfigurationProvider"> - <constructor-arg value="#{systemProperties['moa.id.configuration']}"/> - </bean> - - <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close"> - <aop:scoped-proxy/> - <property name="driverClassName" value="${configuration.hibernate.connection.driver_class}" /> - <property name="url" value="${configuration.hibernate.connection.url}"/> - <property name="username" value="${configuration.hibernate.connection.username}" /> - <property name="password" value="${configuration.hibernate.connection.password}" /> - - <property name="connectionProperties" value="${configuration.dbcp.connectionProperties}" /> - <property name="initialSize" value="${configuration.dbcp.initialSize}" /> - <property name="maxActive" value="${configuration.dbcp.maxActive}" /> - <property name="maxIdle" value="${configuration.dbcp.maxIdle}" /> - <property name="minIdle" value="${configuration.dbcp.minIdle}" /> - <property name="maxWait" value="${configuration.dbcp.maxWaitMillis}" /> - <property name="testOnBorrow" value="${configuration.dbcp.testOnBorrow}" /> - <property name="testOnReturn" value="${configuration.dbcp.testOnReturn}" /> - <property name="testWhileIdle" value="${configuration.dbcp.testWhileIdle}" /> - <property name="validationQuery" value="${configuration.dbcp.validationQuery}" /> - </bean> - - <bean id="jpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter"> - <property name="showSql" value="${configuration.hibernate.show_sql}" /> - <property name="generateDdl" value="${configuration.jpaVendorAdapter.generateDdl}" /> - <property name="databasePlatform" value="${configuration.hibernate.dialect}" /> - </bean> - - -</beans>
\ No newline at end of file diff --git a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties index cabf1557e..8329db941 100644 --- a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties +++ b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties @@ -52,7 +52,8 @@ init.00=MOA ID Authentisierung wurde erfolgreich gestartet init.01=Fehler beim Aktivieren des IAIK-JCE/JSSE/JDK1.3 Workaround\: SSL ist m\u00F6glicherweise nicht verf\u00FCgbar
init.02=Fehler beim Starten des Service MOA-ID-Auth
init.04=Fehler beim Datenbankzugriff mit der SessionID {0}
-
+
+internal.00=W\u00e4hrend des Anmeldevorgangs wurde ein nicht erlaubter Prozesszustand erreicht wodurch der Anmeldeprozess aus sicherheitsgr\u00FCnden abgebrochen wurde.
config.00=MOA ID Konfiguration erfolgreich geladen: {0}
config.01=Umgebungsvariable "moa.id.configuration" nicht gesetzt
diff --git a/id/server/idserverlib/src/main/resources/resources/properties/protocol_response_statuscodes_de.properties b/id/server/idserverlib/src/main/resources/resources/properties/protocol_response_statuscodes_de.properties index abd5d15f3..a8583d945 100644 --- a/id/server/idserverlib/src/main/resources/resources/properties/protocol_response_statuscodes_de.properties +++ b/id/server/idserverlib/src/main/resources/resources/properties/protocol_response_statuscodes_de.properties @@ -32,6 +32,8 @@ init.00=9199 init.01=9199 init.02=9199 init.04=9101 + +internal.00=9199 config.00=9199 config.01=9199 |