- IAIK Libraries (repository) aktualisiert:

	iaik-moa:           Version 1.29
	iaik_jce_full:		Version 4.0_MOA
	iaik_cms:			Version 4.1_MOA
- Einbindung von Online-Vollmachten
- Update MOA-Template zur Bürgerkartenauswahl
- Update Doku
- Update Transformationen (für Online-Vollmachten)
- Änderung der Konfiguration für:
	- Online-Vollmachten		

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1199 d688527b-c9ab-4aba-bd8d-4036d912da1d

6 files changed, 358 insertions, 1 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
index 79db9907b..d35fc875d 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
@@ -446,6 +446,9 @@ public class ParamValidatorUtils {
    

    public static boolean isValidXMLDocument(String document) {

 	   

+	   if (document == null)

+		   return false;

+	   

 	   Logger.debug("Überprüfe Parameter XMLDocument");

 	   try {   

 		   DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();

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 1915ce40a..24e5ff3d0 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
@@ -64,7 +64,8 @@ public class ServletUtils {
       out.write(createXMLSignatureRequestOrRedirect.getBytes("UTF-8"));

       out.flush();

       out.close();

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

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

     } else {

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

       resp.setContentType("text/html");

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
new file mode 100644
index 000000000..59ca0d5ca
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISMandate.java
@@ -0,0 +1,48 @@
+package at.gv.egovernment.moa.id.util.client.mis.simple;

+

+public class MISMandate {

+

+	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 private String OID_ORGANWALTER = "1.2.40.0.10.3.4";

+	final static private String TEXT_ORGANWALTER = "Organwalter";

+	

+	

+	private String oid = null;

+	private byte[] mandate = null;

+	

+	public String getProfRep() {

+  	return oid;

+  }

+	public void setProfRep(String oid) {

+  	this.oid = oid;

+  }

+	public byte[] getMandate() {

+  	return mandate;

+  }

+	public void setMandate(byte[] mandate) {

+  	this.mandate = mandate;

+  }

+	

+	public String getTextualDescriptionOfOID() {

+		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;

+		

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

+		

+	}

+

+}

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
new file mode 100644
index 000000000..d8bec4900
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSessionId.java
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000..25c341584
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java
@@ -0,0 +1,261 @@
+package at.gv.egovernment.moa.id.util.client.mis.simple;

+

+import java.io.BufferedReader;

+import java.io.IOException;

+import java.io.InputStream;

+import java.io.InputStreamReader;

+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.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.xerces.parsers.DOMParser;

+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.InputSource;

+import org.xml.sax.SAXException;

+import org.xml.sax.SAXNotRecognizedException;

+import org.xml.sax.SAXNotSupportedException;

+

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

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

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

+

+

+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 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 foundMandates = new ArrayList();

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

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

+				MISMandate misMandate = new MISMandate();

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

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

+				}

+				

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

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

+				foundMandates.add(misMandate);

+			}

+			return foundMandates;

+		} catch (ParserConfigurationException e) {

+			throw new MISSimpleClientException(e);

+		} catch (DOMException e) {

+			throw new MISSimpleClientException(e);

+		} catch (TransformerException e) {

+			throw new MISSimpleClientException(e);

+		} 

+	}

+	

+	public static MISSessionId sendSessionIdRequest(String webServiceURL, byte[] idl, byte[] cert, String redirectURL, String mandateIdentifier[], SSLSocketFactory sSLSocketFactory) throws MISSimpleClientException {

+		if (webServiceURL == null) {

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

+		}

+		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);

+			}

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

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

+			mirElement.appendChild(redirectElement);

+			if (mandateIdentifier != null && mandateIdentifier.length > 0) {

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

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

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

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

+					mandateIdentifierElement.appendChild(doc.createTextNode(mandateIdentifier[i]));

+					mandateIdentifiersElement.appendChild(mandateIdentifierElement);

+				}

+				filtersElement.appendChild(mandateIdentifiersElement);

+				mirElement.appendChild(filtersElement);

+			}

+			// 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(e);

+		} catch (DOMException e) {

+			throw new MISSimpleClientException(e);

+		} catch (TransformerException e) {

+			throw new MISSimpleClientException(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("Fehler beim Abfragen des Online-Vollmachten Services: " + code + " / " + text);	    }

+		} catch (TransformerException e) {

+			throw new MISSimpleClientException(e);

+		}

+	}

+	

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

+		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 = new HttpClient();

+			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(e);

+		} catch (TransformerException e) {

+			throw new MISSimpleClientException(e);

+		} catch (SAXException e) {

+			throw new MISSimpleClientException(e);

+		} catch (ParserConfigurationException e) {

+			throw new MISSimpleClientException(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(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(e);

+		}

+	}	

+}
\ No newline at end of file
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClientException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClientException.java
new file mode 100644
index 000000000..6f2627e1d
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClientException.java
@@ -0,0 +1,22 @@
+package at.gv.egovernment.moa.id.util.client.mis.simple;

+

+public class MISSimpleClientException extends Exception {

+

+	private static final long serialVersionUID = 1L;

+

+	public MISSimpleClientException() {

+	}

+

+	public MISSimpleClientException(String message) {

+		super(message);

+	}

+

+	public MISSimpleClientException(Throwable cause) {

+		super(cause);

+	}

+

+	public MISSimpleClientException(String message, Throwable cause) {

+		super(message, cause);

+	}

+

+}
\ No newline at end of file