Refactoring to eIDASNode 2.2, eaaf-components 1.0.8

8 files changed, 42 insertions, 9 deletions

diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java
index e14205b9..07103ff2 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java
@@ -39,6 +39,7 @@ import at.gv.egiz.eaaf.core.api.idp.auth.data.IAuthProcessDataContainer;
 import at.gv.egiz.eaaf.core.exceptions.EAAFAuthenticationException;
 import at.gv.egiz.eaaf.core.exceptions.EAAFBuilderException;
 import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
+import at.gv.egiz.eaaf.core.exceptions.EAAFException;
 import at.gv.egiz.eaaf.core.exceptions.EAAFParserException;
 import at.gv.egiz.eaaf.core.exceptions.XPathException;
 import at.gv.egiz.eaaf.core.impl.data.Pair;
@@ -57,7 +58,7 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 		AuthenticationData authData = new AuthenticationData();
 		
 		try {
-			generateBasicAuthData(authData, pendingReq, authProcessData);
+			generateDeprecatedBasicAuthData(authData, pendingReq, authProcessData);
 			
 			//set specific informations 
 			authData.setSsoSessionValidTo(new Date(new Date().getTime() 
@@ -75,6 +76,24 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 	}
 
 	@Override
+	protected IAuthData buildDeprecatedAuthData(IRequest arg0) throws EAAFException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	protected void buildServiceSpecificAuthenticationData(IAuthData arg0, IRequest arg1) throws EAAFException {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	protected IAuthData getAuthDataInstance(IRequest arg0) throws EAAFException {
+		return new AuthenticationData();
+		
+	}
+	
+	@Override
 	protected Pair<String, String> buildOAspecificbPK(IRequest pendingReq, AuthenticationData authData) throws EAAFBuilderException {
 		//TODO: check if bPK already exists
 		
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java
index ede992c1..37602a67 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java
@@ -176,8 +176,8 @@ public class MonitoringController {
 	
 	private String testConfig( ) throws Exception {
 		try {
-			if (config.getFullConfigurationProperties() != null 
-					&& config.getFullConfigurationProperties().size() > 0)
+			if (config.getBasicConfigurationWithPrefix(MSeIDASNodeConstants.PROP_CONFIG_SP_LIST_PREFIX) != null 
+					&& config.getBasicConfigurationWithPrefix(MSeIDASNodeConstants.PROP_CONFIG_SP_LIST_PREFIX).size() > 0)
 				return TEST_CONFIG + MESSAGE_OK;
 			
 			else
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/ProcessEngineSignalController.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/ProcessEngineSignalController.java
index 848eaa85..f7367849 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/ProcessEngineSignalController.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/ProcessEngineSignalController.java
@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
+import at.gv.egiz.eaaf.core.exceptions.EAAFException;
 import at.gv.egiz.eaaf.core.impl.idp.controller.AbstractProcessEngineSignalController;
 
 /**
@@ -44,7 +45,7 @@ public class ProcessEngineSignalController extends AbstractProcessEngineSignalCo
 	@RequestMapping(value = {MSeIDASNodeConstants.ENDPOINT_COUNTRYSELECTION
 			                }, 
 			        method = {RequestMethod.POST, RequestMethod.GET})
-	public void performGenericAuthenticationProcess(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+	public void performGenericAuthenticationProcess(HttpServletRequest req, HttpServletResponse resp) throws IOException, EAAFException {
 		signalProcessManagement(req, resp);
 		
 	}
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/logger/RevisionLogger.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/logger/RevisionLogger.java
index 8b558118..0a50039e 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/logger/RevisionLogger.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/logger/RevisionLogger.java
@@ -85,7 +85,7 @@ public class RevisionLogger extends EventLogFactory implements IRevisionLogger {
 		try {
 			if (event.getEventCode() >= 1100) {
 				if ( (event.getEventCode() == EventConstants.TRANSACTION_IP) 
-						&& !basicConfig.getBasicMOAIDConfigurationBoolean(
+						&& !basicConfig.getBasicConfigurationBoolean(
 								MSeIDASNodeConstants.PROP_CONFIG_REVISIONLOG_LOG_IP_ADDRESS_OF_USER, true) ) {
 					log.trace("Ignore Event: " + event.getEventCode() + " because IP adresse logging prohibited");
 					return;
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/mapper/LoALevelMapper.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/mapper/LoALevelMapper.java
index 08d2ae80..a0b3c695 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/mapper/LoALevelMapper.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/mapper/LoALevelMapper.java
@@ -53,4 +53,9 @@ public class LoALevelMapper implements ILoALevelMapper{
 			
 	}
 
+	@Override
+	public String mapeIDASQAAToSTORKQAA(String eidasqaaLevel) {
+		return null;
+	}
+
 }
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java
index 078ca8e9..a707c827 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java
@@ -64,8 +64,8 @@ public class GenerateCountrySelectionFrameTask extends AbstractAuthServletTask {
 					pendingReq, 
 					MSeIDASNodeConstants.TEMPLATE_HTML_COUNTRYSELECTION, 
 					MSeIDASNodeConstants.ENDPOINT_COUNTRYSELECTION); 
-					 			 
-			guiBuilder.build(response, config, "BKU-Selection form");
+					 		 	 
+			guiBuilder.build(request, response, config, "BKU-Selection form");
 			
 		} catch (GUIBuildException e) {	
 			log.warn("Can not build GUI:'BKU-Selection'. Msg:" + e.getMessage());
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java
index f1ee3a14..9be87a95 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java
@@ -132,14 +132,14 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
 	private MetadataFilterChain buildMetadataFilterChain(ISPConfiguration oaParam, String metadataURL, String trustStoreUrl, String trustStorePassword) throws CertificateException, PVP2MetadataException{
 		MetadataFilterChain filterChain = new MetadataFilterChain();		
 		filterChain.getFilters().add(new SchemaValidationFilter(
-				basicConfig.getBasicMOAIDConfigurationBoolean(MSeIDASNodeConstants.PROP_CONFIG_PVP_SCHEME_VALIDATION, true)));
+				basicConfig.getBasicConfigurationBoolean(MSeIDASNodeConstants.PROP_CONFIG_PVP_SCHEME_VALIDATION, true)));
 					
 		filterChain.getFilters().add(
 				new MetadataSignatureVerificationFilter(
 						trustStoreUrl, trustStorePassword, metadataURL));
 				
 		filterChain.getFilters().add(new PVPEntityCategoryFilter(
-				basicConfig.getBasicMOAIDConfigurationBoolean(MSeIDASNodeConstants.PROP_CONFIG_PVP_ENABLE_ENTITYCATEGORIES, true)));
+				basicConfig.getBasicConfigurationBoolean(MSeIDASNodeConstants.PROP_CONFIG_PVP_ENABLE_ENTITYCATEGORIES, true)));
 		
 		return filterChain;		
 	}
diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
index 01be5ab7..a1abca76 100644
--- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml
+++ b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
@@ -70,6 +70,14 @@
 		</property>
  	</bean>
  	
+ 	<bean 	id="eaafProtocolAuthenticationService"
+			class="at.gv.egiz.eaaf.core.impl.idp.auth.services.ProtocolAuthenticationService">
+		<property name="guiBuilder" ref="DefaultGUIBuilderImpl"/>
+	</bean>
+ 	
+ 	<bean id="simplePendingReqIdGenerationStrategy" 
+			class="at.gv.egiz.eaaf.core.impl.utils.SimplePendingRequestIdGenerationStrategy"/>
+ 	
  	<bean id="PVPMetadataProvider"
  			class="at.asitplus.eidas.specific.connector.provider.PVPMetadataProvider" />