untested, but without dependency problems

1 files changed, 26 insertions, 25 deletions

diff --git a/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java b/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java
index 8dfe10268..54b137ce1 100644
--- a/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java
+++ b/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java
@@ -37,8 +37,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
 
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.idp.IModulInfo;
+import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
+import at.gv.egiz.eaaf.core.exceptions.EAAFException;
+import at.gv.egiz.eaaf.core.exceptions.EAAFStorageException;
 import at.gv.egiz.eaaf.core.exceptions.InvalidProtocolRequestException;
-import at.gv.egiz.eaaf.core.exceptions.ProtocolNotActiveException;
 import at.gv.egiz.eaaf.core.impl.idp.controller.AbstractAuthProtocolModulController;
 import at.gv.egovernment.moa.id.advancedlogging.MOAIDEventConstants;
 import at.gv.egovernment.moa.id.auth.exception.WrongParametersException;
@@ -47,7 +49,6 @@ import at.gv.egovernment.moa.id.commons.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.commons.api.IOAAuthParameters;
 import at.gv.egovernment.moa.id.commons.api.data.SAML1ConfigurationParameters;
 import at.gv.egovernment.moa.id.commons.api.exceptions.MOAIDException;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
 import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants;
 import at.gv.egovernment.moa.id.util.ParamValidatorUtils;
 import at.gv.egovernment.moa.logging.Logger;
@@ -60,7 +61,7 @@ import at.gv.egovernment.moa.util.URLEncoder;
  * @deprecated
  * @author tlenz
  *
- */
+ */ 
 
 @Controller
 public class SAML1Protocol extends AbstractAuthProtocolModulController implements IModulInfo {
@@ -99,15 +100,15 @@ public class SAML1Protocol extends AbstractAuthProtocolModulController implement
 
 	
 	@RequestMapping(value = "/StartAuthentication", method = {RequestMethod.POST, RequestMethod.GET})
-	public void SAML1AuthnRequest(HttpServletRequest req, HttpServletResponse resp) throws MOAIDException, IOException {		
-		if (!AuthConfigurationProviderFactory.getInstance().getAllowedProtocols().isSAML1Active()) {
-			Logger.info("SAML1 is deaktivated!");
-			throw new ProtocolNotActiveException("auth.22", new Object[] { "SAML 1" });
-			
-		}
+	public void SAML1AuthnRequest(HttpServletRequest req, HttpServletResponse resp) throws IOException, EAAFException {		
+//		if (!AuthConfigurationProviderFactory.getInstance().getAllowedProtocols().isSAML1Active()) {
+//			Logger.info("SAML1 is deaktivated!");
+//			throw new ProtocolNotActiveException("auth.22", new Object[] { "SAML 1" });
+//			
+//		}
 		
 		SAML1RequestImpl pendingReq = applicationContext.getBean(SAML1RequestImpl.class);
-		pendingReq.initialize(req);
+		pendingReq.initialize(req, authConfig);
 		pendingReq.setModule(NAME);
 	
 		revisionsLogger.logEvent(MOAIDEventConstants.SESSION_CREATED, pendingReq.getUniqueSessionIdentifier());
@@ -128,15 +129,15 @@ public class SAML1Protocol extends AbstractAuthProtocolModulController implement
 	
 	
 	public void preProcess(HttpServletRequest request,
-			HttpServletResponse response, SAML1RequestImpl pendingRequest) throws MOAIDException {
+			HttpServletResponse response, SAML1RequestImpl pendingRequest) throws MOAIDException, InvalidProtocolRequestException, EAAFConfigurationException, EAAFStorageException {
 		try {	
-			String oaURL = (String) request.getParameter(PARAM_OA);
+			String oaURL = (String) request.getParameter(MOAIDAuthConstants.PARAM_OA);
 			//oaURL = StringEscapeUtils.escapeHtml(oaURL);
 			
-			String target = (String) request.getParameter(PARAM_TARGET);
+			String target = (String) request.getParameter(MOAIDAuthConstants.PARAM_TARGET);
 			target = StringEscapeUtils.escapeHtml(target);
 			
-			String sourceID = request.getParameter(PARAM_SOURCEID);
+			String sourceID = request.getParameter(MOAIDAuthConstants.PARAM_SOURCEID);
 			sourceID = StringEscapeUtils.escapeHtml(sourceID);
 			
 			//the target parameter is used to define the OA in SAML1 standard
@@ -147,35 +148,35 @@ public class SAML1Protocol extends AbstractAuthProtocolModulController implement
 			
 			if (MiscUtil.isEmpty(oaURL)) {
 				Logger.info("Receive SAML1 request with no OA parameter. Authentication STOPPED!");
-				throw new WrongParametersException("StartAuthentication", PARAM_OA,
+				throw new WrongParametersException("StartAuthentication", MOAIDAuthConstants.PARAM_OA,
 						"auth.12");
 				
 			}
 			
 			if (!ParamValidatorUtils.isValidOA(oaURL))
-				throw new WrongParametersException("StartAuthentication", PARAM_OA,
+				throw new WrongParametersException("StartAuthentication", MOAIDAuthConstants.PARAM_OA,
 						"auth.12");
 			
-			pendingRequest.setOAURL(oaURL);
+			pendingRequest.setSPEntityId(oaURL);
 			
 			Logger.info("Dispatch SAML1 Request: OAURL=" + oaURL);
 			
 		    if (!ParamValidatorUtils.isValidSourceID(sourceID))
-	            throw new WrongParametersException("StartAuthentication", PARAM_SOURCEID, "auth.12");
+	            throw new WrongParametersException("StartAuthentication", MOAIDAuthConstants.PARAM_SOURCEID, "auth.12");
 			
 			
 			//load Target only from OA config
-			IOAAuthParameters oaParam = authConfig.getOnlineApplicationParameter(oaURL);
+			IOAAuthParameters oaParam = authConfig.getServiceProviderConfiguration(oaURL, IOAAuthParameters.class);
 			
 			if (oaParam == null)
 				throw new InvalidProtocolRequestException("auth.00",
-						new Object[] { null });
+						new Object[] { null }, "No Online-Application configuration found");
 					
 			SAML1ConfigurationParameters saml1 = oaParam.getSAML1Parameter();
 			if (saml1 == null || !(saml1.isIsActive() != null && saml1.isIsActive()) ) {
 				Logger.info("Online-Application " + oaURL + " can not use SAML1 for authentication.");
 				throw new InvalidProtocolRequestException("auth.00",
-						new Object[] { null });
+						new Object[] { null }, "OA: " + oaURL + " can not used with SAML1");
 			}
 			pendingRequest.setOnlineApplicationConfiguration(oaParam);
 			
@@ -213,7 +214,7 @@ public class SAML1Protocol extends AbstractAuthProtocolModulController implement
 			pendingRequest.setAction(GetArtifactAction.class.getName());
 			
 		} catch (WrongParametersException e) {
-			throw new InvalidProtocolRequestException(e.getMessageId(), e.getParameters());
+			throw new InvalidProtocolRequestException(e.getMessageId(), e.getParameters(), "SAML1 parameter validation FAILED");
 			
 		} catch (InvalidProtocolRequestException e) {
 			throw e;
@@ -226,15 +227,15 @@ public class SAML1Protocol extends AbstractAuthProtocolModulController implement
 			HttpServletRequest request, HttpServletResponse response,
 			IRequest protocolRequest) 
 					throws Throwable{
-		if (!protocolRequest.getOnlineApplicationConfiguration().getSAML1Parameter().isProvideAllErrors())
+		if (!protocolRequest.getServiceProviderConfiguration(IOAAuthParameters.class).getSAML1Parameter().isProvideAllErrors())
 			return false;
 		
 		else {	
 			String samlArtifactBase64 = saml1AuthServer.BuildErrorAssertion(e, protocolRequest);
 		
 			String url = protocolRequest.getAuthURL() + "/RedirectServlet";
-			url = addURLParameter(url, RedirectServlet.REDIRCT_PARAM_URL, URLEncoder.encode(protocolRequest.getOAURL(), "UTF-8"));
-			url = addURLParameter(url, PARAM_SAMLARTIFACT, URLEncoder.encode(samlArtifactBase64, "UTF-8"));
+			url = addURLParameter(url, RedirectServlet.REDIRCT_PARAM_URL, URLEncoder.encode(protocolRequest.getSPEntityId(), "UTF-8"));
+			url = addURLParameter(url, MOAIDAuthConstants.PARAM_SAMLARTIFACT, URLEncoder.encode(samlArtifactBase64, "UTF-8"));
 			url = response.encodeRedirectURL(url);
 		
 			response.setContentType("text/html");