Redesigned Dispatcher system to actions

1 files changed, 34 insertions, 2 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 f58b411d1..fa5ff9ecf 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
@@ -3,6 +3,7 @@ package at.gv.egovernment.moa.id.protocols.pvp2x;
 import iaik.pkcs.pkcs11.objects.Object;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
@@ -11,17 +12,24 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.opensaml.saml2.core.RequestAbstractType;
+import org.opensaml.saml2.core.Response;
+import org.opensaml.saml2.core.Status;
+import org.opensaml.saml2.core.StatusCode;
+import org.opensaml.saml2.core.StatusMessage;
 
 import at.gv.egovernment.moa.id.MOAIDException;
 import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.auth.WrongParametersException;
+import at.gv.egovernment.moa.id.moduls.IAction;
 import at.gv.egovernment.moa.id.moduls.IModulInfo;
 import at.gv.egovernment.moa.id.moduls.IRequest;
+import at.gv.egovernment.moa.id.moduls.NoPassivAuthenticationException;
 import at.gv.egovernment.moa.id.moduls.ServletInfo;
 import at.gv.egovernment.moa.id.moduls.ServletType;
 import at.gv.egovernment.moa.id.protocols.pvp2x.binding.IDecoder;
 import at.gv.egovernment.moa.id.protocols.pvp2x.binding.PostBinding;
 import at.gv.egovernment.moa.id.protocols.pvp2x.binding.RedirectBinding;
+import at.gv.egovernment.moa.id.protocols.pvp2x.utils.SAML2Utils;
 import at.gv.egovernment.moa.id.util.ParamValidatorUtils;
 
 public class PVP2XProtocol implements IModulInfo, MOAIDAuthConstants {
@@ -36,6 +44,8 @@ public class PVP2XProtocol implements IModulInfo, MOAIDAuthConstants {
 
 	private static List<IDecoder> decoder = new ArrayList<IDecoder>();
 
+	private static HashMap<String, IAction> actions = new HashMap<String, IAction>();
+	
 	static {
 		servletList.add(new ServletInfo(PVPProcessor.class, REDIRECT,
 				ServletType.AUTH));
@@ -44,7 +54,10 @@ public class PVP2XProtocol implements IModulInfo, MOAIDAuthConstants {
 
 		decoder.add(new PostBinding());
 		decoder.add(new RedirectBinding());
-
+		
+		actions.put(REDIRECT, new AuthenticationAction());
+		actions.put(POST, new AuthenticationAction());
+		
 		instance = new PVP2XProtocol();
 	}
 
@@ -99,6 +112,7 @@ public class PVP2XProtocol implements IModulInfo, MOAIDAuthConstants {
 				throw new WrongParametersException("StartAuthentication",
 						PARAM_OA, "auth.12");
 			config.setOAURL(oaURL);
+			config.setRequest(samlReq);
 			request.getSession().setAttribute(PARAM_OA, oaURL);
 
 			return config;
@@ -110,8 +124,26 @@ public class PVP2XProtocol implements IModulInfo, MOAIDAuthConstants {
 
 	public boolean generateErrorMessage(Throwable e,
 			HttpServletRequest request, HttpServletResponse response) {
-		// TODO Auto-generated method stub
+		Response samlResponse = SAML2Utils.createSAMLObject(Response.class);
+		Status status = SAML2Utils.createSAMLObject(Status.class);
+		StatusCode statusCode = SAML2Utils.createSAMLObject(StatusCode.class);
+		StatusMessage statusMessage = SAML2Utils.createSAMLObject(StatusMessage.class);
+		if(e instanceof NoPassivAuthenticationException) {
+			statusCode.setValue(StatusCode.NO_PASSIVE_URI);
+			statusMessage.setMessage(e.getLocalizedMessage());	
+		} else {
+			statusCode.setValue(StatusCode.RESPONDER_URI);
+			statusMessage.setMessage(e.getLocalizedMessage());
+		}
+		
+		status.setStatusCode(statusCode);
+		status.setStatusMessage(statusMessage);
+		samlResponse.setStatus(status);
 		return false;
 	}
 
+	public IAction getAction(String action) {
+		return actions.get(action);
+	}
+
 }