SSO and Configuration updated

TODO:
  --PVP2 from configuration
  --UseIFrame for OAs
  --SSO with mandates
  --Resign IdentityLink
  --Encrypted MOASession in Database

1 files changed, 19 insertions, 2 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/RedirectServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/RedirectServlet.java
index 310f3509c..5a0bd33bf 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/RedirectServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/RedirectServlet.java
@@ -9,6 +9,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import at.gv.egovernment.moa.id.auth.builder.RedirectFormBuilder;
 import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.MiscUtil;
+import at.gv.egovernment.moa.util.URLEncoder;
 
 
 
@@ -16,16 +18,31 @@ public class RedirectServlet extends AuthServlet{
 
 	private static final long serialVersionUID = 1L;
 
-	public static final String REDIRCT_GETPARAM = "redirecturl";
+	public static final String REDIRCT_PARAM_URL = "redirecturl";
+
 	
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 			throws ServletException, IOException {
 		Logger.info("Receive " + RedirectServlet.class + " Request");
 		
-		String url = req.getParameter(REDIRCT_GETPARAM);
+		String url = req.getParameter(REDIRCT_PARAM_URL);
+		String target = req.getParameter(PARAM_TARGET);
+		String artifact = req.getParameter(PARAM_SAMLARTIFACT);
 		
 		Logger.info("Redirect to " + url);
 		
+		if (MiscUtil.isNotEmpty(target)) {
+//			redirectURL = addURLParameter(redirectURL, PARAM_TARGET,
+//					URLEncoder.encode(session.getTarget(), "UTF-8"));
+			url = addURLParameter(url, PARAM_TARGET,
+			URLEncoder.encode(target, "UTF-8"));
+
+
+		}
+		url = addURLParameter(url, PARAM_SAMLARTIFACT,
+				URLEncoder.encode(artifact, "UTF-8"));
+		url = resp.encodeRedirectURL(url);
+		
 		String redirect_form = RedirectFormBuilder.buildLoginForm(url);
 		
 		resp.setContentType("text/html;charset=UTF-8");