From 61d276832ebcf1901183dab323126f8ecb6a7370 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Thu, 11 Apr 2019 09:44:11 +0200
Subject: refactor protocol finalization to support protocol response without
 final redirect

---
 eaaf_modules/eaaf_module_pvp2_core/pom.xml           | 20 +++++++++++++++++++-
 .../modules/pvp2/idp/impl/AbstractPVP2XProtocol.java |  6 +++---
 eaaf_modules/eaaf_module_pvp2_sp/pom.xml             |  8 +++++++-
 eaaf_modules/pom.xml                                 |  3 ++-
 4 files changed, 31 insertions(+), 6 deletions(-)

(limited to 'eaaf_modules')

diff --git a/eaaf_modules/eaaf_module_pvp2_core/pom.xml b/eaaf_modules/eaaf_module_pvp2_core/pom.xml
index 8b886df6..e5cc555a 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/pom.xml
+++ b/eaaf_modules/eaaf_module_pvp2_core/pom.xml
@@ -29,15 +29,33 @@
   
   	<dependency>
   		<groupId>org.opensaml</groupId>
-  		<artifactId>opensaml</artifactId>  		
+  		<artifactId>opensaml</artifactId>
+  		<exclusions>
+  			<exclusion>
+  				<groupId>org.slf4j</groupId>
+  				<artifactId>log4j-over-slf4j</artifactId>
+  			</exclusion>
+  		</exclusions>
   	</dependency>
   	<dependency>
   		<groupId>org.opensaml</groupId>
 		<artifactId>xmltooling</artifactId>
+		<exclusions>
+			<exclusion>
+				<groupId>org.slf4j</groupId>
+				<artifactId>log4j-over-slf4j</artifactId>
+			</exclusion>
+		</exclusions>
   	</dependency>
   	<dependency>
   		<groupId>org.opensaml</groupId>
 		<artifactId>openws</artifactId>
+		<exclusions>
+			<exclusion>
+				<groupId>org.slf4j</groupId>
+				<artifactId>log4j-over-slf4j</artifactId>
+			</exclusion>
+		</exclusions>
   	</dependency>
   	<dependency>
   		<groupId>org.apache.santuario</groupId>
diff --git a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPVP2XProtocol.java b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPVP2XProtocol.java
index f384cfae..3298559a 100644
--- a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPVP2XProtocol.java
+++ b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPVP2XProtocol.java
@@ -63,7 +63,7 @@ import at.gv.egiz.eaaf.core.exceptions.EAAFException;
 import at.gv.egiz.eaaf.core.exceptions.InvalidProtocolRequestException;
 import at.gv.egiz.eaaf.core.exceptions.NoPassivAuthenticationException;
 import at.gv.egiz.eaaf.core.exceptions.SLOException;
-import at.gv.egiz.eaaf.core.impl.idp.controller.AbstractAuthProtocolModulController;
+import at.gv.egiz.eaaf.core.impl.idp.controller.AbstractController;
 import at.gv.egiz.eaaf.modules.pvp2.PVPEventConstants;
 import at.gv.egiz.eaaf.modules.pvp2.api.IPVP2BasicConfiguration;
 import at.gv.egiz.eaaf.modules.pvp2.api.binding.IEncoder;
@@ -85,7 +85,7 @@ import at.gv.egiz.eaaf.modules.pvp2.impl.validation.EAAFURICompare;
 import at.gv.egiz.eaaf.modules.pvp2.impl.validation.TrustEngineFactory;
 import at.gv.egiz.eaaf.modules.pvp2.impl.verification.SAMLVerificationEngine;
  
-public abstract class AbstractPVP2XProtocol extends AbstractAuthProtocolModulController implements IModulInfo {
+public abstract class AbstractPVP2XProtocol extends AbstractController implements IModulInfo {
 	private static final Logger log = LoggerFactory.getLogger(AbstractPVP2XProtocol.class);
 	
 	@Autowired(required=true) protected IPVP2BasicConfiguration pvpBasicConfiguration;
@@ -409,7 +409,7 @@ public abstract class AbstractPVP2XProtocol extends AbstractAuthProtocolModulCon
 			
 			
 			//switch to session authentication
-			performAuthentication(request, response, pendingReq);								
+			protAuthService.performAuthentication(request, response, pendingReq);								
 	}
 
 	
diff --git a/eaaf_modules/eaaf_module_pvp2_sp/pom.xml b/eaaf_modules/eaaf_module_pvp2_sp/pom.xml
index c6e0b9e5..a4e8d4ca 100644
--- a/eaaf_modules/eaaf_module_pvp2_sp/pom.xml
+++ b/eaaf_modules/eaaf_module_pvp2_sp/pom.xml
@@ -22,7 +22,13 @@
   		<groupId>at.gv.egiz.eaaf</groupId>
   		<artifactId>eaaf_module_pvp2_core</artifactId>
   		<version>${egiz.eaaf.version}</version>
-  	</dependency>
+  		<exclusions>
+  			<exclusion>
+  				<groupId>org.slf4j</groupId>
+  				<artifactId>log4j-over-slf4j</artifactId>
+  			</exclusion>
+  		</exclusions>
+   	</dependency>
   	
   	<dependency>
 		<groupId>javax.servlet</groupId>
diff --git a/eaaf_modules/pom.xml b/eaaf_modules/pom.xml
index d1b5d6e3..585655b1 100644
--- a/eaaf_modules/pom.xml
+++ b/eaaf_modules/pom.xml
@@ -21,6 +21,7 @@
     <module>eaaf_module_pvp2_core</module>
     <module>eaaf_module_pvp2_idp</module>
     <module>eaaf_module_pvp2_sp</module>
-  </modules>
+    <module>eaaf_module_auth_sl20</module>
+	</modules>
 	
 </project>
\ No newline at end of file
-- 
cgit v1.2.3