From b6d6d65334689f60d41a4eba1a1660c12e90d580 Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 14 Jul 2010 15:17:36 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1173
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 .../profiles/MOAIDTransformAuthBlockTable_EN.xml       |   2 +-
 ...\303\207\303\20403e694(SecureSignatureKeypair).cer" | Bin 0 -> 975 bytes
 id/server/doc/moa_id/id-admin_1.htm                    |   2 +-
 .../moa/id/auth/servlet/GetForeignIDServlet.java       |  11 +++++++++++
 .../auth/validator/parep/client/szrgw/SZRGWClient.java |  17 ++++++++++++++++-
 5 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 "id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-03.20080425-20180425.SerNo\303\224\303\207\303\20403e694(SecureSignatureKeypair).cer"

(limited to 'id/server')
diff --git a/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockTable_EN.xml b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockTable_EN.xml
index b9c613e2d..9a067b0ba 100644
--- a/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockTable_EN.xml
+++ b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockTable_EN.xml
@@ -6,7 +6,7 @@
 				<xsl:template match="/" xmlns="http://www.w3.org/1999/xhtml">
 					<html>
 						<head>
-							<title>Signatur der Anmeldedaten</title>
+							<title>Signing the authentication data</title>
 							<style type="text/css" media="screen">.boldstyle { font-weight: bold; } .italicstyle { font-style: italic; } .annotationstyle { font-size: small; } .graybground {background-color: #E0E0E0;}
 							.titlestyle{ text-decoration:underline; font-weight:bold; font-family: Verdana;  font-size: x-small; } 
 							.h4style{ font-family: Verdana; }
diff --git "a/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-03.20080425-20180425.SerNo\303\224\303\207\303\20403e694(SecureSignatureKeypair).cer" "b/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-03.20080425-20180425.SerNo\303\224\303\207\303\20403e694(SecureSignatureKeypair).cer"
new file mode 100644
index 000000000..ab9e0cd7d
Binary files /dev/null and "b/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-03.20080425-20180425.SerNo\303\224\303\207\303\20403e694(SecureSignatureKeypair).cer" differ
diff --git a/id/server/doc/moa_id/id-admin_1.htm b/id/server/doc/moa_id/id-admin_1.htm
index 1ec90a208..a695d73b0 100644
--- a/id/server/doc/moa_id/id-admin_1.htm
+++ b/id/server/doc/moa_id/id-admin_1.htm
@@ -226,7 +226,7 @@ Um MOA-ID-AUTH in Tomcat f&uuml;r den Ablauf vorzubereiten, sind folgende Schrit
                 </li>
                 <li>Die endorsed Libraries f&uuml;r Tomcat m&uuml;ssen aus dem
                   Verzeichnis $MOA_ID_INST_AUTH/endorsed in das Tomcat-Verzeichnis
-                  $CATALINA_HOME/common/endorsed kopieren werden. Folgende Libraries
+                  $CATALINA_HOME/common/endorsed kopieren werden. F&uuml;r Tomcat 6 m&uuml;ssen die Dateien in das Verzeichnis $CATALINA_HOME/endorsed kopiert werden (das Verzeichnis endorsed ist dabei im Allgemein erst anzulegen). Folgende Libraries
                   sind f&uuml;r das Deployment im endorsed Verzeichnis vorgesehen:
                   <ul>
                     <li>xalan.jar</li>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
index c2de2e3e1..282d7f583 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
@@ -9,6 +9,7 @@ import java.util.Map;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.transform.TransformerException;
 
 import org.apache.commons.fileupload.FileUploadException;
 import org.w3c.dom.Document;
@@ -33,6 +34,7 @@ import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
 import at.gv.egovernment.moa.id.util.ParamValidatorUtils;
 import at.gv.egovernment.moa.id.util.SSLUtils;
 import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.DOMUtils;
 import at.gv.egovernment.moa.util.URLEncoder;
 
 /**
@@ -116,11 +118,20 @@ public class GetForeignIDServlet extends AuthServlet {
 	    	// make SZR request to the identity link
 	    	CreateIdentityLinkResponse response = getIdentityLink(signature);
 	    	
+	   	    	
 	    	if (response.isError()) {	    		
 	    		throw new SZRGWClientException(response.getError());
 	    	}
 	    	else {
+	    		
 	    		Element samlAssertion = response.getAssertion();
+	    		
+	    		try {
+					System.out.println(DOMUtils.serializeNode(samlAssertion));
+				} catch (TransformerException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 		    	
 		    	IdentityLinkAssertionParser ilParser = new IdentityLinkAssertionParser(samlAssertion);
 		    	IdentityLink identitylink = ilParser.parseIdentityLink();
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClient.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClient.java
index 2080118d0..9cb7c7ab4 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClient.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClient.java
@@ -18,6 +18,7 @@ package at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 
 import javax.net.ssl.SSLSocketFactory;
 import javax.xml.parsers.DocumentBuilder;
@@ -27,6 +28,7 @@ import javax.xml.parsers.ParserConfigurationException;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.protocol.Protocol;
+import org.apache.xpath.XPathAPI;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -34,6 +36,7 @@ import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
 
 import at.gv.egovernment.moa.id.auth.validator.parep.ParepUtils;
+import at.gv.egovernment.moa.util.Constants;
 import at.gv.egovernment.moa.util.DOMUtils;
 
 
@@ -196,7 +199,19 @@ public class SZRGWClient {
       }
       else {
     	  // set assertion
-    	  response.setAssertion(doc.getDocumentElement());
+    	  DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+          Document newdoc = builder.newDocument();
+          
+          Element nameSpaceNode = newdoc.createElement("NameSpaceNode");
+          nameSpaceNode.setAttribute("xmlns:" + Constants.DSIG_PREFIX, Constants.DSIG_NS_URI);
+          nameSpaceNode.setAttribute("xmlns:" + Constants.SAML_PREFIX, Constants.SAML_NS_URI);
+          
+          Element samlAssertion = (Element)XPathAPI.selectSingleNode(doc, "//saml:Assertion[1]", nameSpaceNode);
+          
+          if (samlAssertion == null)
+        	  throw new SZRGWClientException("Could not found a saml:Assertion element in response.");
+          else
+        	  response.setAssertion(samlAssertion);
       }
     	
       return response;
-- 
cgit v1.2.3

