refactor PVP implementation to share code with PVP Service-Provider moduls

1 files changed, 45 insertions, 45 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java
index 6fb03a37d..88f0e3b74 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java
@@ -22,13 +22,11 @@
  *******************************************************************************/
 package at.gv.egovernment.moa.id.protocols.pvp2x;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.xml.transform.TransformerException;
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.joda.time.DateTime;
@@ -49,7 +47,6 @@ import org.opensaml.saml2.metadata.AttributeConsumingService;
 import org.opensaml.saml2.metadata.EntityDescriptor;
 import org.opensaml.saml2.metadata.SPSSODescriptor;
 import org.opensaml.ws.security.SecurityPolicyException;
-import org.opensaml.xml.io.MarshallingException;
 import org.opensaml.xml.security.SecurityException;
 import org.opensaml.xml.signature.SignableXMLObject;
 import org.springframework.stereotype.Controller;
@@ -145,7 +142,8 @@ public class PVP2XProtocol extends AbstractAuthProtocolModulController  {
 			
 		}
 		//create pendingRequest object
-		PVPTargetConfiguration pendingReq = new PVPTargetConfiguration(req);
+		PVPTargetConfiguration pendingReq = applicationContext.getBean(PVPTargetConfiguration.class);
+		pendingReq.initialize(req);
 		pendingReq.setModule(NAME);
 		
 		revisionsLogger.logEvent(
@@ -155,7 +153,7 @@ public class PVP2XProtocol extends AbstractAuthProtocolModulController  {
 				req.getRemoteAddr());
 				
 		MetadataAction metadataAction = applicationContext.getBean(MetadataAction.class);
-		metadataAction.processRequest(new PVPTargetConfiguration(req), 
+		metadataAction.processRequest(pendingReq, 
 				req, resp, null);
 		
 	}
@@ -171,7 +169,8 @@ public class PVP2XProtocol extends AbstractAuthProtocolModulController  {
 		
 		try {
 			//create pendingRequest object
-			PVPTargetConfiguration pendingReq = new PVPTargetConfiguration(req);
+			PVPTargetConfiguration pendingReq = applicationContext.getBean(PVPTargetConfiguration.class);
+			pendingReq.initialize(req);
 			pendingReq.setModule(NAME);
 			
 			revisionsLogger.logEvent(MOAIDEventConstants.SESSION_CREATED, pendingReq.getUniqueSessionIdentifier());
@@ -219,7 +218,8 @@ public class PVP2XProtocol extends AbstractAuthProtocolModulController  {
 		
 		try {
 			//create pendingRequest object
-			PVPTargetConfiguration pendingReq = new PVPTargetConfiguration(req);
+			PVPTargetConfiguration pendingReq = applicationContext.getBean(PVPTargetConfiguration.class);
+			pendingReq.initialize(req);
 			pendingReq.setModule(NAME);
 			
 			revisionsLogger.logEvent(MOAIDEventConstants.SESSION_CREATED, pendingReq.getUniqueSessionIdentifier());
@@ -732,42 +732,42 @@ public class PVP2XProtocol extends AbstractAuthProtocolModulController  {
 		
 	}
 	
-	/**
-	 * PreProcess AuthResponse and Assertion 
-	 * @param msg
-	 */
-	private MOAResponse preProcessAuthResponse(MOAResponse msg) {
-		Logger.debug("Start PVP21 assertion processing... ");
-		Response samlResp = (Response) msg.getResponse();
-		
-		try {
-			if (samlResp.getStatus().getStatusCode().getValue().equals(StatusCode.SUCCESS_URI)) {
-				
-				//validate PVP 2.1 assertion
-				SAMLVerificationEngine.validateAssertion(samlResp, true);
-
-				msg.setSAMLMessage(SAML2Utils.asDOMDocument(samlResp).getDocumentElement());
-				return msg;
-				
-			} else {
-				Logger.debug("Receive StatusCode " + samlResp.getStatus().getStatusCode().getValue() 
-						+ " from interfederated IDP.");
-						
-			}
-						
-		} catch (IOException e) {
-			Logger.warn("Interfederation response marshaling FAILED.", e);
-			
-		} catch (MarshallingException e) {
-			Logger.warn("Interfederation response marshaling FAILED.", e);
-			
-		} catch (TransformerException e) {
-			Logger.warn("Interfederation response marshaling FAILED.", e);
-			
-		} catch (AssertionValidationExeption e) {
-			//error is already logged, to nothing
-		}
-		
-		return null;
-	}	
+//	/**
+//	 * PreProcess AuthResponse and Assertion 
+//	 * @param msg
+//	 */
+//	private MOAResponse preProcessAuthResponse(MOAResponse msg) {
+//		Logger.debug("Start PVP21 assertion processing... ");
+//		Response samlResp = (Response) msg.getResponse();
+//		
+//		try {
+//			if (samlResp.getStatus().getStatusCode().getValue().equals(StatusCode.SUCCESS_URI)) {
+//				
+//				//validate PVP 2.1 assertion
+//				SAMLVerificationEngine.validateAssertion(samlResp, true);
+//
+//				msg.setSAMLMessage(SAML2Utils.asDOMDocument(samlResp).getDocumentElement());
+//				return msg;
+//				
+//			} else {
+//				Logger.debug("Receive StatusCode " + samlResp.getStatus().getStatusCode().getValue() 
+//						+ " from interfederated IDP.");
+//						
+//			}
+//						
+//		} catch (IOException e) {
+//			Logger.warn("Interfederation response marshaling FAILED.", e);
+//			
+//		} catch (MarshallingException e) {
+//			Logger.warn("Interfederation response marshaling FAILED.", e);
+//			
+//		} catch (TransformerException e) {
+//			Logger.warn("Interfederation response marshaling FAILED.", e);
+//			
+//		} catch (AssertionValidationExeption e) {
+//			//error is already logged, to nothing
+//		}
+//		
+//		return null;
+//	}	
 }