move citizen-card authentication and validation (Security-layer communication) to discrete module

5 files changed, 69 insertions, 892 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/HTTPRequestJSPForwarder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/HTTPRequestJSPForwarder.java
deleted file mode 100644
index 3e31c0403..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/HTTPRequestJSPForwarder.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- * 
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- * 
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- ******************************************************************************/
-/*
- * Copyright 2003 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-
-
-/*
- * Created on 17.02.2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package at.gv.egovernment.moa.id.util;
-
-import java.io.IOException;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import at.gv.egovernment.moa.logging.Logger;
-
-/**
- * @author rschamberger
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class HTTPRequestJSPForwarder {
-
-	/**
-	 * Forwards the HttpServletRequest to a customizable JSP Page and serves the Response. <br>
-	 * <ul>
-	 * <li>Logs the message</li>
-	 * </ul>
-	 * 
-	 * @param message message text
-	 * @param jspPageURI URI of the JSP page
-	 * @param context the servlet context of the servlet belonging to the req, resp
-	 * @param req servlet request
-	 * @param resp servlet response
-	 */
-	public static void forwardNamed(
-		String message,
-		String jspPageURI,
-		ServletContext context, 
-		HttpServletRequest req,
-		HttpServletResponse resp) {
-
-		if (null != message) {
-			Logger.info(message);
-			req.setAttribute("Message", message);
-		}
-		
-		//forward this to the given jsp page where the HTML response is generated
-		try {
-			context.getRequestDispatcher(jspPageURI).forward(req, resp);
-		} catch (IOException e) {
-			Logger.error(e);
-		} catch (ServletException e) {
-			Logger.error(e);
-    }
-	}
-
-	/**
-	 * Forwards the HttpServletRequest to the customizable JSP Page 'message.jsp' and serves the Response. <br>
-	 * <ul>
-	 * <li>Logs the message</li>
-	 * </ul>
-	 * 
-	 * @param message message text
-	 * @param context the servlet context of the servlet belonging to the req, resp
-	 * @param req servlet request
-	 * @param resp servlet response
-	 */
-	public static void forwardDefault(
-		String message,
-		ServletContext context, 
-		HttpServletRequest req,
-		HttpServletResponse resp) {
-			forwardNamed(message, "/message.jsp", context, req, resp);
-		}
-}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ServletUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ServletUtils.java
index 3dbc0ab7b..a4d79ac05 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ServletUtils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ServletUtils.java
@@ -1,183 +1,69 @@
-/*******************************************************************************

- * Copyright 2014 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- * 

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- * 

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- ******************************************************************************/

-/*

- * Copyright 2003 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- *

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- *

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- */

-

-

-/**

- * 

- */

-package at.gv.egovernment.moa.id.util;

-

-import java.io.IOException;

-import java.io.OutputStream;

-import java.net.URLEncoder;

-

-import javax.servlet.http.HttpServletRequest;

-import javax.servlet.http.HttpServletResponse;

-

-import at.gv.egovernment.moa.id.auth.AuthenticationServer;

-import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder;

-import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;

-import at.gv.egovernment.moa.id.auth.exception.MOAIDException;

-import at.gv.egovernment.moa.logging.Logger;

-

-/**

- * @author <a href="mailto:peter.danner@egiz.gv.at">Peter Danner</a>

- *

- */

-public class ServletUtils {

-  

-  /**

-   * Writes out whether the CreateXMLSignatureRequest or a Redirect for form input processing 

-   * depending on the requests starting text.

-   * 

-   * @param resp The httpServletResponse

-   * @param session The current AuthenticationSession

-   * @param createXMLSignatureRequestOrRedirect The request

-   * @param servletGoal The servlet to which the redirect should happen

-   * @param servletName The servlet name for debug purposes

-   * @throws MOAIDException

-   * @throws IOException

-   */

-  public static void writeCreateXMLSignatureRequestOrRedirect(HttpServletResponse resp, AuthenticationSession session, String createXMLSignatureRequestOrRedirect, String servletGoal, String servletName) 

-  throws MOAIDException,

-         IOException

-  { 

-    if (!createXMLSignatureRequestOrRedirect.startsWith("Redirect")) {

-      resp.setStatus(307);

-      String dataURL = new DataURLBuilder().buildDataURL(

-        session.getAuthURL(), AuthenticationServer.REQ_VERIFY_AUTH_BLOCK, session.getSessionID());

-      resp.addHeader("Location", dataURL);

-      

-      //TODO test impact of explicit setting charset with older versions of BKUs (HotSign)

-      resp.setContentType("text/xml;charset=UTF-8");

-      

-      OutputStream out = resp.getOutputStream();

-      out.write(createXMLSignatureRequestOrRedirect.getBytes("UTF-8"));

-      out.flush();

-      out.close();

-      Logger.debug("Finished POST " + servletName);

-      

-    } else {

-      String redirectURL = new DataURLBuilder().buildDataURL(session.getAuthURL(), servletGoal, session.getSessionID());

-      resp.setContentType("text/html");

-      resp.setStatus(302);

-      resp.addHeader("Location", redirectURL);

-      Logger.debug("REDIRECT TO: " + redirectURL);

-      

-    }

-  }

-  /**

-   * Writes out whether the CreateXMLSignatureRequest or a Redirect for form input processing 

-   * depending on the requests starting text.

-   * 

-   * @param resp The httpServletResponse

-   * @param createXMLSignatureRequestOrRedirect The request

-   * @param servletGoal The servlet to which the redirect should happen

-   * @param servletName The servlet name for debug purposes

-   * @throws MOAIDException

-   * @throws IOException

-   */

-  public static void writeCreateXMLSignatureRequest(HttpServletResponse resp, String createXMLSignatureRequestOrRedirect, String servletGoal, String servletName, String dataURL) 

-  throws MOAIDException,

-         IOException

-  { 

-      resp.setStatus(307);

-      resp.addHeader("Location", dataURL);

-      

-      //TODO test impact of explicit setting charset with older versions of BKUs (HotSign)

-      resp.setContentType("text/xml;charset=UTF-8");

-            

-      OutputStream out = resp.getOutputStream();

-      out.write(createXMLSignatureRequestOrRedirect.getBytes("UTF-8"));

-      out.flush();

-      out.close();

-      Logger.debug("Finished POST " + servletName);

-    

-  }

-

-  /**

-   * Writes out whether the CreateXMLSignatureRequest or a Redirect for form input processing 

-   * depending on the requests starting text.

-   * 

-   * @param resp The httpServletResponse

-   * @param session The current AuthenticationSession

-   * @param createXMLSignatureRequestOrRedirect The request

-   * @param servletGoal The servlet to which the redirect should happen

-   * @param servletName The servlet name for debug purposes

-   * @throws MOAIDException

-   * @throws IOException

-   */

-  public static void writeCreateXMLSignatureRequestURLEncoded(HttpServletResponse resp, AuthenticationSession session, String createXMLSignatureRequestOrRedirect, String servletGoal, String servletName, String dataURL) 

-  throws MOAIDException,

-         IOException { 

-	  resp.setStatus(200);

-	  Logger.debug("ContentType set to: application/x-www-form-urlencoded");

-	

-	  resp.setContentType("application/x-www-form-urlencoded");

-	  

-	  String content = "XMLRequest=" + URLEncoder.encode(createXMLSignatureRequestOrRedirect, "UTF-8") + "&" + 

-	  					"DataURL=" + URLEncoder.encode(dataURL, "UTF-8");

-      

-      OutputStream out = resp.getOutputStream();

-      out.write(content.getBytes("UTF-8"));

-      out.flush();

-      out.close();

-      Logger.debug("Finished POST " + servletName);

-    

-  }

-

-  public static String getBaseUrl( HttpServletRequest request ) {

-	    if ( ( request.getServerPort() == 80 ) ||

-	         ( request.getServerPort() == 443 ) )

-	      return request.getScheme() + "://" +

-	             request.getServerName() +

-	             request.getContextPath();

-	    else

-	      return request.getScheme() + "://" +

-	             request.getServerName() + ":" + request.getServerPort() +

-	             request.getContextPath();

-	  }

-  

-}

+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ * 
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ * 
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ ******************************************************************************/
+/*
+ * Copyright 2003 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+
+
+/**
+ * 
+ */
+package at.gv.egovernment.moa.id.util;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class ServletUtils {
+  
+	
+  public static String getBaseUrl( HttpServletRequest request ) {
+	    if ( ( request.getServerPort() == 80 ) ||
+	         ( request.getServerPort() == 443 ) )
+	      return request.getScheme() + "://" +
+	             request.getServerName() +
+	             request.getContextPath();
+	    else
+	      return request.getScheme() + "://" +
+	             request.getServerName() + ":" + request.getServerPort() +
+	             request.getContextPath();
+	  }
+  
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISMandate.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISMandate.java
deleted file mode 100644
index 8e42f0df7..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISMandate.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************

- * Copyright 2014 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- * 

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- * 

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- ******************************************************************************/

-/*

- * Copyright 2003 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- *

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- *

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- */

-

-

-package at.gv.egovernment.moa.id.util.client.mis.simple;

-

-import java.io.Serializable;

-

-import org.w3c.dom.Element;

-

-import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;

-import at.gv.egovernment.moa.id.util.MandateBuilder;

-import at.gv.egovernment.moa.logging.Logger;

-import at.gv.egovernment.moa.util.DOMUtils;

-import at.gv.egovernment.moa.util.MiscUtil;

-

-public class MISMandate implements Serializable{

-

-	private static final long serialVersionUID = 1L;

-		

-	final static private String OID_NOTAR = "1.2.40.0.10.3.1";

-	final static private String TEXT_NOTAR = "berufsmäßige(r) Parteienvertreter(in) mit Notariatseigenschaft";

-	

-	final static private String OID_RECHTSANWALT = "1.2.40.0.10.3.2";

-	final static private String TEXT_RECHTSANWALT = "berufsmäßige(r) Parteienvertreter(in) mit Rechtsanwaltseigenschaft";

-	

-	final static private String OID_ZIVILTECHNIKER = "1.2.40.0.10.3.3";

-	final static private String TEXT_ZIVILTECHNIKER = "berufsmäßige(r) Parteienvertreter(in) mit Ziviltechnikerinneneigenschaft";

-

-	final static public String OID_ORGANWALTER = "1.2.40.0.10.3.4";

-	final static private String TEXT_ORGANWALTER = "Organwalter";

-	

-	final static public String OID_ELGA_OMBUTSSTELLE = "1.2.40.0.34.3.1.3";

-	final static public String OID_ELGA_OMBUTSSTELLE_TEST = "1.2.40.0.34.3.1.2.99.9";

-	final static private String TEXT_ELGA_OMBUTSSTELLE = "ELGA-Ombudsstelle";

-	

-	private String oid = null;

-	private byte[] mandate = null;

-	private String owBPK = null;

-	private boolean isFullMandateIncluded = false;

-	

-	public String getProfRep() {

-  	return oid;

-  }

-	public void setProfRep(String oid) {

-  	this.oid = oid;

-  }

-	public void setOWbPK(String oWbPK) {

-		this.owBPK = oWbPK;

-	}

-	

-	public String getOWbPK() {

-		return owBPK;

-	}

-	public byte[] getMandate() {

-  	return mandate;

-  }

-	

-	public Element getMandateDOM() {

-		try {

-			byte[] byteMandate = mandate;

-			String stringMandate = new String(byteMandate);

-			return DOMUtils.parseDocument(stringMandate, false, null, null).getDocumentElement();

-			

-		}

-		catch (Throwable e) {

-			Logger.warn("Mandate content could not be generated from MISMandate.");

-			return null;

-		}

-	}

-	

-	public Mandate getMandateJaxB() {

-		Element domMandate = getMandateDOM();

-		if (domMandate != null)

-			return MandateBuilder.buildMandate(domMandate);

-		

-		return null;

-	}

-	

-	public void setMandate(byte[] mandate) {

-  	this.mandate = mandate;

-  }

-	

-	public String getTextualDescriptionOfOID() {

-		if (MiscUtil.isNotEmpty(this.oid)) {

-			if (this.oid.equalsIgnoreCase(OID_NOTAR))

-				return TEXT_NOTAR;

-			if (this.oid.equalsIgnoreCase(OID_RECHTSANWALT))

-				return TEXT_RECHTSANWALT;

-			if (this.oid.equalsIgnoreCase(OID_ZIVILTECHNIKER))

-				return TEXT_ZIVILTECHNIKER;

-			if (this.oid.equalsIgnoreCase(OID_ORGANWALTER))

-				return TEXT_ORGANWALTER;

-			if (this.oid.equalsIgnoreCase(OID_ELGA_OMBUTSSTELLE) 

-					|| this.oid.equalsIgnoreCase(OID_ELGA_OMBUTSSTELLE_TEST))

-				return TEXT_ELGA_OMBUTSSTELLE;

-			

-			return "Keine textuelle Beschreibung für OID " + oid;

-			

-		} else {

-			return null;

-		}

-		

-	}

-	/**

-	 * @return the isFullMandateIncluded

-	 */

-	public boolean isFullMandateIncluded() {

-		return isFullMandateIncluded;

-	}

-	/**

-	 * @param isFullMandateIncluded the isFullMandateIncluded to set

-	 */

-	public void setFullMandateIncluded(boolean isFullMandateIncluded) {

-		this.isFullMandateIncluded = isFullMandateIncluded;

-	}

-

-	

-}

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSessionId.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSessionId.java
deleted file mode 100644
index 9050a0f38..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSessionId.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************

- * Copyright 2014 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- * 

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- * 

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- ******************************************************************************/

-/*

- * Copyright 2003 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- *

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- *

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- */

-

-

-package at.gv.egovernment.moa.id.util.client.mis.simple;

-

-public class MISSessionId {

-

-	private String sessiondId = null;

-	private String redirectURL = null;

-	

-	public String getSessiondId() {

-  	return sessiondId;

-  }

-	public void setSessiondId(String sessiondId) {

-  	this.sessiondId = sessiondId;

-  }

-	public String getRedirectURL() {

-  	return redirectURL;

-  }

-	public void setRedirectURL(String redirectURL) {

-  	this.redirectURL = redirectURL;

-  }

-

-	

-}

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java
deleted file mode 100644
index 24c96a78f..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*******************************************************************************

- * Copyright 2014 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- * 

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- * 

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- ******************************************************************************/

-/*

- * Copyright 2003 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- *

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- *

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- */

-

-

-package at.gv.egovernment.moa.id.util.client.mis.simple;

-

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.List;

-

-import javax.net.ssl.SSLSocketFactory;

-import javax.xml.parsers.DocumentBuilderFactory;

-import javax.xml.parsers.ParserConfigurationException;

-import javax.xml.transform.TransformerException;

-

-import org.apache.commons.codec.binary.Base64;

-import org.apache.commons.httpclient.HostConfiguration;

-import org.apache.commons.httpclient.HttpClient;

-import org.apache.commons.httpclient.methods.PostMethod;

-import org.apache.commons.httpclient.methods.StringRequestEntity;

-import org.apache.commons.httpclient.protocol.Protocol;

-import org.apache.xpath.XPathAPI;

-import org.w3c.dom.DOMException;

-import org.w3c.dom.Document;

-import org.w3c.dom.Element;

-import org.w3c.dom.Node;

-import org.w3c.dom.NodeList;

-import org.xml.sax.SAXException;

-

-import at.gv.egovernment.moa.id.auth.exception.MISSimpleClientException;

-import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWSecureSocketFactory;

-import at.gv.egovernment.moa.id.commons.utils.HttpClientWithProxySupport;

-import at.gv.egovernment.moa.logging.Logger;

-import at.gv.egovernment.moa.util.DOMUtils;

-import at.gv.egovernment.moa.util.StringUtils;

-

-

-public class MISSimpleClient {

-

-		

-	private final static String SOAP_NS = "http://schemas.xmlsoap.org/soap/envelope/";

-	private final static String MIS_NS = "http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd";

-	

-	private static Element NS_NODE = null;

-	

-		

-	static {

-		try {

-			NS_NODE = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument().createElement("test");

-			NS_NODE.setAttribute("xmlns:soap", SOAP_NS);

-			NS_NODE.setAttribute("xmlns:mis", MIS_NS);

-		} catch (Exception e) {

-			Logger.warn("Error initializing namespace node.", e);

-		}

-	}

-	

-	public static List<MISMandate> sendGetMandatesRequest(String webServiceURL, String sessionId, SSLSocketFactory sSLSocketFactory) throws MISSimpleClientException {

-		if (webServiceURL == null) {

-			throw new NullPointerException("Argument webServiceURL must not be null.");

-		}

-		if (sessionId == null) {

-			throw new NullPointerException("Argument sessionId must not be null.");

-		}

-		

-		// ssl settings

-		if (sSLSocketFactory != null) {

-	        SZRGWSecureSocketFactory fac = new SZRGWSecureSocketFactory(sSLSocketFactory); 

-	        Protocol.registerProtocol("https", new Protocol("https", fac, 443));

-		}

-

-		

-		try {

-			Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();

-			Element mirElement = doc.createElementNS(MIS_NS, "MandateIssueRequest");

-			Element sessionIdElement = doc.createElementNS(MIS_NS, "SessionID");

-			sessionIdElement.appendChild(doc.createTextNode(sessionId));

-			mirElement.appendChild(sessionIdElement);

-	    

-			// send soap request

-			Element mandateIssueResponseElement = sendSOAPRequest(webServiceURL, mirElement);

-	    

-			// check for error

-			checkForError(mandateIssueResponseElement);

-	    

-			// check for session id

-			NodeList mandateElements  = XPathAPI.selectNodeList(mandateIssueResponseElement, "//mis:MandateIssueResponse/mis:Mandates/mis:Mandate", NS_NODE);

-	    

-			if (mandateElements == null || mandateElements.getLength() == 0) {

-				throw new MISSimpleClientException("No mandates found in response.");

-			}

-	    

-			ArrayList<MISMandate> foundMandates = new ArrayList<MISMandate>();

-			for (int i=0; i<mandateElements.getLength(); i++) {

-				Element mandate = (Element) mandateElements.item(i);

-								

-				MISMandate misMandate = new MISMandate();

-				if (mandate.hasAttribute("ProfessionalRepresentative")) {

-//					System.out.println("OID: " + mandate.getAttribute("ProfessionalRepresentative"));

-					misMandate.setProfRep(mandate.getAttribute("ProfessionalRepresentative"));

-				}

-				if (mandate.hasAttribute("OWbPK")) {

-					misMandate.setOWbPK(mandate.getAttribute("OWbPK"));

-//					System.out.println("OWBPK: " + mandate.getAttribute("OWbPK"));

-				}

-				

-				//misMandate.setMandate(Base64.decodeBase64(DOMUtils.getText(mandate)));

-				misMandate.setMandate(Base64.decodeBase64(DOMUtils.getText(mandate).getBytes()));

-				misMandate.setFullMandateIncluded(true);

-				

-				foundMandates.add(misMandate);

-			}

-			return foundMandates;

-		} catch (ParserConfigurationException e) {

-			throw new MISSimpleClientException("service.06", e);

-		} catch (DOMException e) {

-			throw new MISSimpleClientException("service.06", e);

-		} catch (TransformerException e) {

-			throw new MISSimpleClientException("service.06", e);

-		} 

-	}

-	

-	public static MISSessionId sendSessionIdRequest(String webServiceURL, byte[] idl, byte[] cert, String oaFriendlyName, String redirectURL, String referenceValue, List<String> mandateIdentifier, String targetType, byte[] authBlock, SSLSocketFactory sSLSocketFactory) throws MISSimpleClientException {

-		if (webServiceURL == null) {

-			throw new MISSimpleClientException("service.04");

-		}

-		if (idl == null) {

-			throw new NullPointerException("Argument idl must not be null.");

-		}

-		if (redirectURL == null) {

-			throw new NullPointerException("Argument redirectURL must not be null.");

-		}

-		

-		// ssl settings

-		if (sSLSocketFactory != null) {

-	        SZRGWSecureSocketFactory fac = new SZRGWSecureSocketFactory(sSLSocketFactory); 

-	        Protocol.registerProtocol("https", new Protocol("https", fac, 443));

-		}

-		

-		try {

-			Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();

-			Element mirElement = doc.createElementNS(MIS_NS, "MandateIssueRequest");

-			Element idlElement = doc.createElementNS(MIS_NS, "IdentityLink");

-	    

-			

-			idlElement.appendChild(doc.createTextNode(new String(Base64.encodeBase64(idl))));

-			mirElement.appendChild(idlElement);

-

-			if (cert != null && cert.length > 0) {

-				Element certElement = doc.createElementNS(MIS_NS, "X509SignatureCertificate");

-				certElement.appendChild(doc.createTextNode(new String(Base64.encodeBase64(cert))));

-				//certElement.appendChild(doc.createTextNode(Base64.encodeBase64(cert)));

-				//	    	certElement.appendChild(doc.createTextNode(new String(Base64.encodeBase64(cert))));

-				mirElement.appendChild(certElement);

-			}

-			

-			if (!StringUtils.isEmpty(oaFriendlyName)) {

-				Element oaFriendlyNameElement = doc.createElementNS(MIS_NS, "OAFriendlyName");

-				oaFriendlyNameElement.appendChild(doc.createTextNode(oaFriendlyName));

-				mirElement.appendChild(oaFriendlyNameElement);

-			}

-			

-			Element redirectElement = doc.createElementNS(MIS_NS, "RedirectURL");

-			redirectElement.appendChild(doc.createTextNode(redirectURL));

-			mirElement.appendChild(redirectElement);

-			

-			Element referenceValueElement = doc.createElementNS(MIS_NS, "ReferenceValue");

-			referenceValueElement.appendChild(doc.createTextNode(referenceValue));

-			mirElement.appendChild(referenceValueElement);

-			

-			if (mandateIdentifier != null && mandateIdentifier.size() > 0) {

-				Element filtersElement = doc.createElementNS(MIS_NS, "Filters");

-				Element mandateIdentifiersElement = doc.createElementNS(MIS_NS, "MandateIdentifiers");

-				for (int i=0; i<mandateIdentifier.size(); i++) {

-					Element mandateIdentifierElement = doc.createElementNS(MIS_NS, "MandateIdentifier");

-					mandateIdentifierElement.appendChild(doc.createTextNode(mandateIdentifier.get(i)));

-					mandateIdentifiersElement.appendChild(mandateIdentifierElement);

-				}

-				filtersElement.appendChild(mandateIdentifiersElement);

-				mirElement.appendChild(filtersElement);

-			}

-

-			//add Target element

-			Element targetElement = doc.createElementNS(MIS_NS, "Target");

-			Element targetTypeElement = doc.createElementNS(MIS_NS, "Type");

-			targetTypeElement.appendChild(doc.createTextNode(targetType));

-			targetElement.appendChild(targetTypeElement);

-			mirElement.appendChild(targetElement);

-			

-			//add AuthBlock element

-			Element authBlockElement = doc.createElementNS(MIS_NS, "authBlock");

-			authBlockElement.appendChild(doc.createTextNode(new String(Base64.encodeBase64(authBlock))));

-			mirElement.appendChild(authBlockElement);

-						

-			// send soap request

-			Element mandateIssueResponseElement = sendSOAPRequest(webServiceURL, mirElement);

-

-			// check for error

-			checkForError(mandateIssueResponseElement);

-	    

-			// check for session id

-			//String sessionId = ((Node) XPathAPI.selectSingleNode(mandateIssueResponseElement, "/mis:MandateIssueResponse/mis:SessionID/text()", NS_NODE)).getNodeValue();

-			Node sessionIdNode = ((Node) XPathAPI.selectSingleNode(mandateIssueResponseElement, "//mis:MandateIssueResponse/mis:SessionID/text()", NS_NODE));

-			if (sessionIdNode == null) {

-				throw new MISSimpleClientException("SessionId not found in response.");

-			}

-			String sessionId = sessionIdNode.getNodeValue();

-

-			Node guiRedirectURLNode = ((Node) XPathAPI.selectSingleNode(mandateIssueResponseElement, "//mis:MandateIssueResponse/mis:GuiRedirectURL/text()", NS_NODE));

-			if (guiRedirectURLNode == null) {

-				throw new MISSimpleClientException("GuiRedirectURL not found in response.");

-			}

-			String guiRedirectURL = guiRedirectURLNode.getNodeValue();

-	    

-			// create return object

-			MISSessionId msid = new MISSessionId();

-			msid.setSessiondId(sessionId);

-			msid.setRedirectURL(guiRedirectURL);

-	    

-			return msid;

-		} catch (ParserConfigurationException e) {

-			throw new MISSimpleClientException("service.06", e);

-		} catch (DOMException e) {

-			throw new MISSimpleClientException("service.06", e);

-		} catch (TransformerException e) {

-			throw new MISSimpleClientException("service.06", e);

-		}

-		

-	}

-	

-	private static void checkForError(Element mandateIssueResponseElement) throws MISSimpleClientException {

-		if (mandateIssueResponseElement == null) {

-			throw new NullPointerException("Argument mandateIssueResponseElement must not be null.");

-		}

-		try {

-		    Element errorElement = (Element) XPathAPI.selectSingleNode(mandateIssueResponseElement, "//mis:MandateIssueResponse/mis:Error", NS_NODE);

-		    if (errorElement != null) {

-		    	String code = ((Node) XPathAPI.selectSingleNode(mandateIssueResponseElement, "//mis:MandateIssueResponse/mis:Error/mis:Code/text()", NS_NODE)).getNodeValue();

-		    	String text = ((Node) XPathAPI.selectSingleNode(mandateIssueResponseElement, "//mis:MandateIssueResponse/mis:Error/mis:Text/text()", NS_NODE)).getNodeValue();

-		    	throw new MISSimpleClientException("service.05", code, text);	    }

-		    

-		} catch (TransformerException e) {

-			throw new MISSimpleClientException("auth.15", e);

-		}

-	}

-	

-	private static Element sendSOAPRequest(String webServiceURL, Element request) throws MISSimpleClientException {

-		

-//		try {

-//			System.out.println("REQUEST-MIS: \n"  + DOMUtils.serializeNode(request));

-//		} catch (TransformerException e1) {

-//			e1.printStackTrace();

-//		} catch (IOException e1) {

-//			e1.printStackTrace();

-//		}

-		

-		if (webServiceURL == null) {

-			throw new NullPointerException("Argument webServiceURL must not be null.");

-		}

-		if (request == null) {

-			throw new NullPointerException("Argument request must not be null.");

-		}

-		try {

-			HttpClient httpclient = HttpClientWithProxySupport.getHttpClient();

-			PostMethod post = new PostMethod(webServiceURL);

-			StringRequestEntity re = new StringRequestEntity(DOMUtils.serializeNode(packIntoSOAP(request)),"text/xml", "UTF-8");

-			post.setRequestEntity(re);

-			int responseCode = httpclient.executeMethod(post);

-			

-			if (responseCode != 200) {

-				throw new MISSimpleClientException("Invalid HTTP response code " + responseCode);

-			}

-			//Element elem = parse(post.getResponseBodyAsStream());

-			Document doc = DOMUtils.parseDocumentSimple(post.getResponseBodyAsStream());

-			return unpackFromSOAP(doc.getDocumentElement());

-			

-		} catch(IOException e) {

-			throw new MISSimpleClientException("service.04", e);

-			

-		} catch (TransformerException e) {

-			throw new MISSimpleClientException("service.06", e);

-			

-		} catch (SAXException e) {

-			throw new MISSimpleClientException("service.06", e);

-			

-		} catch (ParserConfigurationException e) {

-			throw new MISSimpleClientException("service.06", e);

-			

-		} catch (Exception e) {

-			throw new MISSimpleClientException("service.06", e);

-			

-		}

-		

-	}

-	

-	private static Element packIntoSOAP(Element element) throws MISSimpleClientException {

-		try {

-			Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();

-			Element soapEnvelope = doc.createElement("Envelope");

-			soapEnvelope.setAttribute("xmlns", SOAP_NS);

-			Element soapBody = doc.createElement("Body");

-			soapEnvelope.appendChild(soapBody);

-			soapBody.appendChild(doc.importNode(element, true));

-			return soapEnvelope;

-		} catch(ParserConfigurationException e) {

-			throw new MISSimpleClientException("service.06", e);

-		}

-	}

-	

-	private static Element unpackFromSOAP(Element element) throws MISSimpleClientException {

-		try {

-			return (Element) XPathAPI.selectSingleNode(element, "/soap:Envelope/soap:Body/child::*[position()=1]", NS_NODE);

-		} catch(TransformerException e) {

-			throw new MISSimpleClientException("service.06", e);

-		}

-	}	

-}