From 5e72494c61164869fbb605a134fe224ac5d5e7d8 Mon Sep 17 00:00:00 2001 From: kstranacher_eGovL Date: Thu, 27 Dec 2012 21:25:50 +0000 Subject: Update Integration TSL Library Update MOA-SP documentation Update repository (for TSL integration) Update MOA-ID (Organwalter bPK from MIS) git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1302 d688527b-c9ab-4aba-bd8d-4036d912da1d --- .../egovernment/moa/id/auth/AuthenticationServer.java | 16 +++++++++------- .../moa/id/auth/servlet/GetMISSessionIDServlet.java | 9 +++++++-- .../moa/id/util/client/mis/simple/MISMandate.java | 10 +++++++++- .../id/util/client/mis/simple/MISSimpleClient.java | 19 +++++++++++++++++-- 4 files changed, 42 insertions(+), 12 deletions(-) (limited to 'id/server/idserverlib/src/main/java/at') diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java index 2964f8a88..a2c1d6131 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java @@ -1872,6 +1872,7 @@ public class AuthenticationServer implements MOAIDAuthConstants { identificationType = ParepUtils.getIdentification(mandator, "Type"); identificationValue = ParepUtils.extractMandatorWbpk(mandator); + prPerson = ParepUtils.extractPrPersonOfMandate(mandate); if (physical && session.getBusinessService() @@ -1911,14 +1912,15 @@ public class AuthenticationServer implements MOAIDAuthConstants { // vsresp, // replacementIdentityLink); + Element mandatePerson = tempIdentityLink.getPrPerson(); - // try { - // System.out.println("MANDATE: " + - // DOMUtils.serializeNode(mandatePerson)); - // } - // catch(Exception e) { - // e.printStackTrace(); - // } +// try { +// System.out.println("MANDATE: " + +// DOMUtils.serializeNode(mandatePerson)); +// } +// catch(Exception e) { +// e.printStackTrace(); +// } String mandateData = null; boolean useCondition = false; int conditionLength = -1; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java index 74b2f80b9..a1b03fcad 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java @@ -35,6 +35,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.TransformerException; import org.apache.commons.lang.StringEscapeUtils; import org.w3c.dom.Element; @@ -44,6 +45,7 @@ import at.gv.egovernment.moa.id.MOAIDException; import at.gv.egovernment.moa.id.auth.AuthenticationServer; import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; import at.gv.egovernment.moa.id.auth.WrongParametersException; +import at.gv.egovernment.moa.id.auth.builder.BPKBuilder; import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.config.ConnectionParameter; @@ -158,7 +160,8 @@ public class GetMISSessionIDServlet extends AuthServlet { } // for now: list contains only one element - MISMandate mandate = (MISMandate)list.get(0); + MISMandate mandate = (MISMandate)list.get(0); + // verify mandate signature AuthenticationServer.getInstance().verifyMandate(sessionID, mandate); @@ -166,7 +169,9 @@ public class GetMISSessionIDServlet extends AuthServlet { byte[] byteMandate = mandate.getMandate(); String stringMandate = new String(byteMandate); Element mandateDoc = DOMUtils.parseDocument(stringMandate, false, null, null).getDocumentElement(); - //session.setMandateElem(mandateDoc.getDocumentElement()); + + //TODO OW bPK (Offen: was bei saml:NameIdentifier NameQualifier="urn:publicid:gv.at:cdid+bpk"> und