diff options
| author | kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2011-10-12 10:53:56 +0000 | 
|---|---|---|
| committer | kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2011-10-12 10:53:56 +0000 | 
| commit | e031b0d5854e4038d28c262109c2529609418ffe (patch) | |
| tree | 500788ef2f83c51b0b6c7bdb0e0ba78dd24f5dcc /id/server/idserverlib/src | |
| parent | f4386f6f0346fa2a5432c3f95fcc852f7a7df1ec (diff) | |
| download | moa-id-spss-e031b0d5854e4038d28c262109c2529609418ffe.tar.gz moa-id-spss-e031b0d5854e4038d28c262109c2529609418ffe.tar.bz2 moa-id-spss-e031b0d5854e4038d28c262109c2529609418ffe.zip | |
* Aktualisierung imports
MOA-ID:
* Abfrage auf Vollmachtenmodus bei nicht öffentlicher Andwendung
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1222 d688527b-c9ab-4aba-bd8d-4036d912da1d
Diffstat (limited to 'id/server/idserverlib/src')
25 files changed, 206 insertions, 365 deletions
| 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 27a2f3050..c4ab80c66 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 @@ -24,15 +24,11 @@  package at.gv.egovernment.moa.id.auth; -import iaik.ixsil.exceptions.UtilsException; -import iaik.ixsil.util.Utils;  import iaik.pki.PKIException;  import iaik.x509.X509Certificate;  import java.io.ByteArrayInputStream;  import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException;  import java.io.IOException;  import java.security.GeneralSecurityException;  import java.security.Principal; @@ -324,6 +320,20 @@ public class AuthenticationServer implements MOAIDAuthConstants {      String scheme)      throws WrongParametersException, AuthenticationException, ConfigurationException, BuildException { +	  String useMandateString = null; +	  boolean useMandateBoolean = false; +	  if ((useMandate != null) && (useMandate.compareTo("") != 0)) { +		  	useMandateString = useMandate; +	    } +	    else { +	    	useMandateString = "false"; +	    } +	   +	  if (useMandateString.compareToIgnoreCase("true") == 0) +		  useMandateBoolean = true; +	  else +		  useMandateBoolean = false; +	        if (isEmpty(sessionID)) {        if (isEmpty(authURL))          throw new WrongParametersException("StartAuthentication", "AuthURL", "auth.05"); @@ -353,6 +363,10 @@ public class AuthenticationServer implements MOAIDAuthConstants {          if (isEmpty(target))            throw new WrongParametersException("StartAuthentication", PARAM_TARGET, "auth.05");        } else { +    	if (useMandateBoolean) { +    		Logger.error("Online-Mandate Mode for bussines application not supported."); +			throw new AuthenticationException("auth.17", null); +    	}          target = null;          targetFriendlyName = null;        } @@ -376,17 +390,13 @@ public class AuthenticationServer implements MOAIDAuthConstants {      }      session.setBkuURL(bkuURL);      session.setDomainIdentifier(oaParam.getIdentityLinkDomainIdentifier()); +    session.setUseMandate(useMandateString);      String infoboxReadRequest =         new InfoboxReadRequestBuilder().build(oaParam.getSlVersion12(),                                               oaParam.getBusinessService(),                                                   oaParam.getIdentityLinkDomainIdentifier()); -    if ((useMandate != null) && (useMandate.compareTo("") != 0)) { -    	session.setUseMandate(useMandate); -    } -    else { -    	session.setUseMandate("false"); -    } +          String dataURL =        new DataURLBuilder().buildDataURL(          session.getAuthURL(), diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java index f22db8e39..d40cd1909 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java @@ -24,19 +24,11 @@  package at.gv.egovernment.moa.id.auth.builder; -import java.io.BufferedReader;  import java.io.IOException;  import java.io.StringReader;  import java.io.StringWriter; -import at.gv.egovernment.moa.id.AuthenticationException;  import at.gv.egovernment.moa.id.BuildException; -import at.gv.egovernment.moa.id.config.ConfigurationException; -import at.gv.egovernment.moa.id.config.OnlineMandatesTemplates; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.util.FileUtils;  /**   * Builder for HTML form requesting the security layer implementation diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetVerifyAuthBlockFormBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetVerifyAuthBlockFormBuilder.java index 3e67858a3..ea3d170eb 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetVerifyAuthBlockFormBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetVerifyAuthBlockFormBuilder.java @@ -24,11 +24,7 @@  package at.gv.egovernment.moa.id.auth.builder;
 -import java.io.IOException;
 -import java.io.StringReader;
 -import java.io.StringWriter;
 -
 -import at.gv.egovernment.moa.id.BuildException;
 +import at.gv.egovernment.moa.id.BuildException;  /**
   * Builder for HTML form requesting a security layer request
 diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java index e13379bda..3ab8ff819 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java @@ -32,8 +32,6 @@ import java.util.Iterator;  import java.util.List;  import java.util.Vector; -import org.w3c.dom.Element; -  import at.gv.egovernment.moa.id.auth.validator.InfoboxValidator;  import at.gv.egovernment.moa.id.auth.validator.parep.ParepUtils;  import at.gv.egovernment.moa.id.data.AuthenticationData; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/ErrorResponseParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/ErrorResponseParser.java index 9bc22ac98..9b95edc77 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/ErrorResponseParser.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/ErrorResponseParser.java @@ -24,13 +24,10 @@  package at.gv.egovernment.moa.id.auth.parser; -import java.util.List; -  import org.w3c.dom.Element;  import org.w3c.dom.NodeList;  import at.gv.egovernment.moa.id.ParseException; -import at.gv.egovernment.moa.util.DOMUtils;  /**   * Parses an <code><ErrorResponse></code>. diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java index 48ca083c5..760df649d 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java @@ -36,20 +36,17 @@ import javax.xml.parsers.ParserConfigurationException;  import javax.xml.transform.TransformerException;  import org.apache.axis.encoding.Base64; +import org.apache.xpath.XPathAPI;  import org.w3c.dom.Document;  import org.w3c.dom.Element;  import at.gv.egovernment.moa.id.AuthenticationException;  import at.gv.egovernment.moa.id.ParseException;  import at.gv.egovernment.moa.id.auth.data.IdentityLink; -import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWConstants;  import at.gv.egovernment.moa.util.Constants;  import at.gv.egovernment.moa.util.DOMUtils;  import at.gv.egovernment.moa.util.XPathUtils; -//import com.sun.org.apache.xpath.internal.XPathAPI; -import org.apache.xpath.XPathAPI; -  /**   * Parses an <code><InfoboxReadResponse></code>.   *  diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/VerifyXMLSignatureResponseParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/VerifyXMLSignatureResponseParser.java index 001cda196..4ddad2429 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/VerifyXMLSignatureResponseParser.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/VerifyXMLSignatureResponseParser.java @@ -26,16 +26,16 @@ package at.gv.egovernment.moa.id.auth.parser;  import iaik.utils.Base64InputStream;  import iaik.x509.X509Certificate; +  import java.io.ByteArrayInputStream;  import java.io.InputStream;  import org.w3c.dom.Element; -import at.gv.egovernment.moa.id.*; +import at.gv.egovernment.moa.id.ParseException;  import at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse;  import at.gv.egovernment.moa.util.Constants;  import at.gv.egovernment.moa.util.DOMUtils; -import at.gv.egovernment.moa.util.OutputXML2File;  import at.gv.egovernment.moa.util.XPathUtils;  /** 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 99cf8af5e..c135cd3c7 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 @@ -24,44 +24,42 @@  package at.gv.egovernment.moa.id.auth.servlet;
 -import iaik.pki.PKIException;
 -
 -import java.io.IOException;
 -import java.security.GeneralSecurityException;
 -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.apache.commons.lang.StringEscapeUtils;
 -import org.w3c.dom.Document;
 -import org.w3c.dom.Element;
 -
 -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.DataURLBuilder;
 -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 -import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse;
 -import at.gv.egovernment.moa.id.auth.data.IdentityLink;
 -import at.gv.egovernment.moa.id.auth.parser.CreateXMLSignatureResponseParser;
 -import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser;
 -import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.CreateIdentityLinkResponse;
 -import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWClient;
 -import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWClientException;
 -import at.gv.egovernment.moa.id.config.ConfigurationException;
 -import at.gv.egovernment.moa.id.config.ConnectionParameter;
 -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 -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;
 +import iaik.pki.PKIException; + +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.util.Map; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.fileupload.FileUploadException; +import org.apache.commons.lang.StringEscapeUtils; +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +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.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse; +import at.gv.egovernment.moa.id.auth.data.IdentityLink; +import at.gv.egovernment.moa.id.auth.parser.CreateXMLSignatureResponseParser; +import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser; +import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.CreateIdentityLinkResponse; +import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWClient; +import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWClientException; +import at.gv.egovernment.moa.id.config.ConfigurationException; +import at.gv.egovernment.moa.id.config.ConnectionParameter; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +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.URLEncoder;  /**
   * Servlet requested for getting the foreign eID
 diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java index 181c46bf9..acf8b0b64 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java @@ -24,49 +24,41 @@  package at.gv.egovernment.moa.id.auth.servlet;
 -import iaik.pki.PKIException;
 -import iaik.x509.X509Certificate;
 -
 -import java.io.IOException;
 -import java.security.GeneralSecurityException;
 -import java.security.cert.CertificateEncodingException;
 -import java.util.Map;
 -
 -import javax.net.ssl.SSLSocketFactory;
 -import javax.servlet.ServletException;
 -import javax.servlet.http.HttpServletRequest;
 -import javax.servlet.http.HttpServletResponse;
 -import javax.xml.parsers.DocumentBuilder;
 -import javax.xml.parsers.DocumentBuilderFactory;
 -import javax.xml.parsers.ParserConfigurationException;
 -import javax.xml.transform.TransformerException;
 -
 -import org.apache.axis.encoding.Base64;
 -import org.apache.commons.fileupload.FileUploadException;
 -import org.apache.commons.lang.StringEscapeUtils;
 -import org.w3c.dom.Document;
 -import org.w3c.dom.Element;
 -import org.w3c.dom.Text;
 -
 -import at.gv.egovernment.moa.id.AuthenticationException;
 -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.DataURLBuilder;
 -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 -import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWConstants;
 -import at.gv.egovernment.moa.id.config.ConnectionParameter;
 -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 -import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 -import at.gv.egovernment.moa.id.util.ParamValidatorUtils;
 -import at.gv.egovernment.moa.id.util.SSLUtils;
 -import at.gv.egovernment.moa.id.util.ServletUtils;
 -import at.gv.egovernment.moa.id.util.client.mis.simple.MISSessionId;
 -import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClient;
 -import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClientException;
 -import at.gv.egovernment.moa.logging.Logger;
 -import at.gv.egovernment.moa.util.DOMUtils;
 +import iaik.pki.PKIException; +import iaik.x509.X509Certificate; + +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.util.Map; + +import javax.net.ssl.SSLSocketFactory; +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.apache.commons.lang.StringEscapeUtils; +import org.w3c.dom.Element; + +import at.gv.egovernment.moa.id.AuthenticationException; +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.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.config.ConnectionParameter; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; +import at.gv.egovernment.moa.id.util.ParamValidatorUtils; +import at.gv.egovernment.moa.id.util.SSLUtils; +import at.gv.egovernment.moa.id.util.ServletUtils; +import at.gv.egovernment.moa.id.util.client.mis.simple.MISSessionId; +import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClient; +import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClientException; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.DOMUtils;  /**
   * Servlet requested for getting the foreign eID
 diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java index df5abe4f5..6d4a21674 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java @@ -27,7 +27,6 @@ package at.gv.egovernment.moa.id.auth.servlet;  import java.io.IOException;  import java.util.Map; -import javax.net.ssl.SSLSocketFactory;  import javax.servlet.ServletException;  import javax.servlet.http.HttpServletRequest;  import javax.servlet.http.HttpServletResponse; @@ -44,10 +43,7 @@ import at.gv.egovernment.moa.id.auth.WrongParametersException;  import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder;  import at.gv.egovernment.moa.id.auth.builder.InfoboxReadRequestBuilderCertificate;  import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.config.ConnectionParameter; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;  import at.gv.egovernment.moa.id.util.ParamValidatorUtils; -import at.gv.egovernment.moa.id.util.SSLUtils;  import at.gv.egovernment.moa.id.util.ServletUtils;  import at.gv.egovernment.moa.logging.Logger; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepInputProcessor.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepInputProcessor.java index 542b03f37..c8020cda4 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepInputProcessor.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepInputProcessor.java @@ -24,15 +24,10 @@  package at.gv.egovernment.moa.id.auth.validator.parep;
 -import java.util.Map;
 -
 -import org.w3c.dom.Element;
 -
 -import at.gv.egovernment.moa.id.auth.data.InfoboxValidationResult;
 -import at.gv.egovernment.moa.id.auth.data.InfoboxValidatorParams;
 -import at.gv.egovernment.moa.id.auth.validator.ValidateException;
 -import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.CreateMandateRequest;
 -import at.gv.egovernment.moa.id.auth.validator.parep.config.ParepConfiguration;
 +import java.util.Map; + +import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.CreateMandateRequest; +import at.gv.egovernment.moa.id.auth.validator.parep.config.ParepConfiguration;  /**
   * Input processor for infobox validators.
 diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java index 1ba38c908..1e35b1f67 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java @@ -24,36 +24,35 @@  package at.gv.egovernment.moa.id.auth.validator.parep;
 -import java.io.File;
 -import java.io.FileInputStream;
 -import java.io.FileOutputStream;
 -import java.io.IOException;
 -import java.io.InputStream;
 -import java.io.OutputStream;
 -import java.io.OutputStreamWriter;
 -
 -import javax.xml.parsers.DocumentBuilderFactory;
 -
 -import org.apache.xml.serialize.OutputFormat;
 -import org.apache.xml.serialize.XMLSerializer;
 -import org.apache.xpath.XPathAPI;
 -import org.w3c.dom.Document;
 -import org.w3c.dom.Element;
 -import org.w3c.dom.Node;
 -import org.w3c.dom.NodeList;
 -
 -import at.gv.egovernment.moa.id.BuildException;
 -import at.gv.egovernment.moa.id.ParseException;
 -import at.gv.egovernment.moa.id.auth.builder.BPKBuilder;
 -import at.gv.egovernment.moa.id.auth.validator.ValidateException;
 -import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWClientException;
 -import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWConstants;
 -import at.gv.egovernment.moa.id.config.ConfigurationException;
 -import at.gv.egovernment.moa.logging.Logger;
 -import at.gv.egovernment.moa.util.BoolUtils;
 -import at.gv.egovernment.moa.util.Constants;
 +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; + +import javax.xml.parsers.DocumentBuilderFactory; + +import org.apache.xml.serialize.OutputFormat; +import org.apache.xml.serialize.XMLSerializer; +import org.apache.xpath.XPathAPI; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +import at.gv.egovernment.moa.id.BuildException; +import at.gv.egovernment.moa.id.ParseException; +import at.gv.egovernment.moa.id.auth.builder.BPKBuilder; +import at.gv.egovernment.moa.id.auth.validator.ValidateException; +import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWClientException; +import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWConstants; +import at.gv.egovernment.moa.id.config.ConfigurationException; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.BoolUtils; +import at.gv.egovernment.moa.util.Constants;  import at.gv.egovernment.moa.util.DOMUtils; -import at.gv.egovernment.moa.util.StringUtils;
 +import at.gv.egovernment.moa.util.StringUtils;  /**
   * This class implements a set of utility methods.
 diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/CreateIdentityLinkResponse.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/CreateIdentityLinkResponse.java index b96beeedf..eae5dba05 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/CreateIdentityLinkResponse.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/CreateIdentityLinkResponse.java @@ -25,10 +25,7 @@  package at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw;
 -import org.apache.xpath.XPathAPI;
 -import org.w3c.dom.Element;
 -import org.w3c.dom.Node;
 -import org.w3c.dom.NodeList;
 +import org.w3c.dom.Element;  /**
 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 4a23df3fb..e3457f4de 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 @@ -27,7 +27,6 @@ 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; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/config/ParepConfiguration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/config/ParepConfiguration.java index 1932183f1..bc5a0e061 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/config/ParepConfiguration.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/config/ParepConfiguration.java @@ -24,26 +24,24 @@  package at.gv.egovernment.moa.id.auth.validator.parep.config;
 -import java.io.File;
 -import java.io.FileInputStream;
 -import java.util.HashMap;
 -
 -import org.apache.xpath.XPathAPI;
 -import org.w3c.dom.Document;
 -import org.w3c.dom.Element;
 -import org.w3c.dom.Node;
 -import org.w3c.dom.NodeList;
 -
 -import at.gv.egovernment.moa.id.auth.validator.parep.ParepUtils;
 -import at.gv.egovernment.moa.id.auth.validator.parep.ParepValidator;
 -import at.gv.egovernment.moa.id.auth.validator.parep.PartyRepresentative;
 -import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWConstants;
 -import at.gv.egovernment.moa.id.config.ConfigurationException;
 -import at.gv.egovernment.moa.id.config.ConfigurationProvider;
 -import at.gv.egovernment.moa.id.config.ConnectionParameter;
 -import at.gv.egovernment.moa.logging.Logger;
 -import at.gv.egovernment.moa.util.BoolUtils;
 -import at.gv.egovernment.moa.util.Constants;
 +import java.io.File; +import java.io.FileInputStream; +import java.util.HashMap; + +import org.apache.xpath.XPathAPI; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +import at.gv.egovernment.moa.id.auth.validator.parep.ParepUtils; +import at.gv.egovernment.moa.id.auth.validator.parep.ParepValidator; +import at.gv.egovernment.moa.id.auth.validator.parep.PartyRepresentative; +import at.gv.egovernment.moa.id.config.ConfigurationException; +import at.gv.egovernment.moa.id.config.ConfigurationProvider; +import at.gv.egovernment.moa.id.config.ConnectionParameter; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.Constants;  /**
   * This class implements the Configuration.
 diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java index d81435f83..7fe85cfae 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java @@ -639,38 +639,7 @@ public class ConfigurationBuilder { -  protected OnlineMandatesTemplates[] buildTemplateOnlineMandatesOA(Node contextNode, OnlineMandatesTemplates[] defaultTemplatesOnlineMandates) { -	   -	  String xpathExpr = OA_AUTH_COMPONENT_TEMPLATE_ONLINEMANDATES_BKU_XPATH; -	  List onlineMandatesTemplatesList = new ArrayList(); -	   -	  NodeIterator bkuIter = XPathUtils.selectNodeIterator(contextNode, xpathExpr); -	       -	  Element bkuElem; -	  while ((bkuElem = (Element) bkuIter.nextNode()) != null) { -		  String bkuUrl = XPathUtils.getAttributeValue(bkuElem, "@URL", null);	    	   -		  String moaidTemplateUrl = XPathUtils.getAttributeValue(bkuElem, CONF + "MOA-ID-Template/@URL", null); -		  String mandateTemplateUrl = XPathUtils.getAttributeValue(bkuElem, CONF + "MandateTemplate/@URL", null); -	    	   -		  OnlineMandatesTemplates template = new OnlineMandatesTemplates(); -		  template.setBkuURL(bkuUrl); -		  template.setMoaIdTemplateURL(moaidTemplateUrl); -		  template.setMandatesTemplateURL(mandateTemplateUrl); -	    	   -		  onlineMandatesTemplatesList.add(template); -		   -	  } -	   -	  if (onlineMandatesTemplatesList.isEmpty()) -		  return defaultTemplatesOnlineMandates; -	   -	  OnlineMandatesTemplates[] onlinemandatesTemplates = new OnlineMandatesTemplates[onlineMandatesTemplatesList.size()]; -	  onlineMandatesTemplatesList.toArray(onlinemandatesTemplates); -	   -	  return onlinemandatesTemplates; -	       -  } - +      /**     * Method buildConnectionParameter: internal Method for creating a  diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OnlineMandatesTemplates.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OnlineMandatesTemplates.java deleted file mode 100644 index 99cf75270..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OnlineMandatesTemplates.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * 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.config;
 -
 -public class OnlineMandatesTemplates {
 -
 -	private String bkuURL;
 -	
 -	private String moaIdTemplateURL;
 -	
 -	private String mandatesTemplateURL;
 -
 -	/**
 -	 * @return the bkuURL
 -	 */
 -	public String getBkuURL() {
 -		return bkuURL;
 -	}
 -
 -	/**
 -	 * @param bkuURL the bkuURL to set
 -	 */
 -	public void setBkuURL(String bkuURL) {
 -		this.bkuURL = bkuURL;
 -	}
 -
 -	/**
 -	 * @return the moaIdTemplateURL
 -	 */
 -	public String getMoaIdTemplateURL() {
 -		return moaIdTemplateURL;
 -	}
 -
 -	/**
 -	 * @param moaIdTemplateURL the moaIdTemplateURL to set
 -	 */
 -	public void setMoaIdTemplateURL(String moaIdTemplateURL) {
 -		this.moaIdTemplateURL = moaIdTemplateURL;
 -	}
 -
 -	/**
 -	 * @return the mandatesTemplateURL
 -	 */
 -	public String getMandatesTemplateURL() {
 -		return mandatesTemplateURL;
 -	}
 -
 -	/**
 -	 * @param mandatesTemplateURL the mandatesTemplateURL to set
 -	 */
 -	public void setMandatesTemplateURL(String mandatesTemplateURL) {
 -		this.mandatesTemplateURL = mandatesTemplateURL;
 -	}
 -	
 -	
 -}
 diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/TargetsAndSectorNames.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/TargetsAndSectorNames.java index 6ca4ef3d1..1fe8f13b6 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/TargetsAndSectorNames.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/TargetsAndSectorNames.java @@ -27,8 +27,6 @@   */
  package at.gv.egovernment.moa.id.config;
 -import java.util.HashMap;
 -import java.util.Map;
  /**
   * This interface contains all actual possible targets in Austria (shortcuts and friendly names)
 diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java index ec1a478f7..04b92f209 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java @@ -316,23 +316,23 @@ public class AuthConfigurationProvider extends ConfigurationProvider {  //  	}  //  } -  /** -   * Loads the <code>transformsInfos</code> from files. -   * @throws Exception on any exception thrown -   */ -  private String[] loadTransformsInfos(String[] transformsInfoFileNames) throws Exception { -     -    String[] transformsInfos = new String[transformsInfoFileNames.length]; -    for (int i = 0; i < transformsInfoFileNames.length; i++) { -      String fileURL = transformsInfoFileNames[i]; - -      //if fileURL is relative to rootConfigFileDir make it absolute           -      fileURL = FileUtils.makeAbsoluteURL(fileURL, rootConfigFileDir);       -      String transformsInfo = FileUtils.readURL(fileURL, DEFAULT_ENCODING); -      transformsInfos[i] = transformsInfo; -    } -    return transformsInfos; -  } +//  /** +//   * Loads the <code>transformsInfos</code> from files. +//   * @throws Exception on any exception thrown +//   */ +//  private String[] loadTransformsInfos(String[] transformsInfoFileNames) throws Exception { +//     +//    String[] transformsInfos = new String[transformsInfoFileNames.length]; +//    for (int i = 0; i < transformsInfoFileNames.length; i++) { +//      String fileURL = transformsInfoFileNames[i]; +// +//      //if fileURL is relative to rootConfigFileDir make it absolute           +//      fileURL = FileUtils.makeAbsoluteURL(fileURL, rootConfigFileDir);       +//      String transformsInfo = FileUtils.readURL(fileURL, DEFAULT_ENCODING); +//      transformsInfos[i] = transformsInfo; +//    } +//    return transformsInfos; +//  }    /**     * Return a string array with all filenames leading     * to the Transforms Information for the Security Layer diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java index 1e169aef3..f85666acf 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java @@ -25,7 +25,6 @@  package at.gv.egovernment.moa.id.config.auth;  import at.gv.egovernment.moa.id.config.OAParameter; -import at.gv.egovernment.moa.id.config.OnlineMandatesTemplates;  /**   * Configuration parameters belonging to an online application, diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java index f5083cf2a..f2aca057a 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java @@ -27,7 +27,6 @@ package at.gv.egovernment.moa.id.proxy.parser;  import org.w3c.dom.Element;  import at.gv.egovernment.moa.id.ParseException; -import at.gv.egovernment.moa.id.auth.builder.BPKBuilder;  import at.gv.egovernment.moa.id.data.AuthenticationData;  import at.gv.egovernment.moa.util.BoolUtils;  import at.gv.egovernment.moa.util.Constants; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java index d7e8ae686..06dbf7d0c 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java @@ -29,11 +29,8 @@ import java.io.BufferedOutputStream;  import java.io.IOException;  import java.io.InputStream;  import java.io.OutputStream; -import java.io.PrintWriter;  import java.io.StringWriter;  import java.net.HttpURLConnection; -import java.net.MalformedURLException; -import java.net.URL;  import java.util.Enumeration;  import java.util.HashMap;  import java.util.Iterator; @@ -59,11 +56,10 @@ import at.gv.egovernment.moa.id.ParseException;  import at.gv.egovernment.moa.id.ServiceException;  import at.gv.egovernment.moa.id.config.ConfigurationException;  import at.gv.egovernment.moa.id.config.ConnectionParameter; -import at.gv.egovernment.moa.id.config.proxy.ProxyConfigurationProvider;  import at.gv.egovernment.moa.id.config.proxy.OAConfiguration;  import at.gv.egovernment.moa.id.config.proxy.OAProxyParameter; +import at.gv.egovernment.moa.id.config.proxy.ProxyConfigurationProvider;  import at.gv.egovernment.moa.id.data.AuthenticationData; -import at.gv.egovernment.moa.id.data.CookieManager;  import at.gv.egovernment.moa.id.proxy.ConnectionBuilder;  import at.gv.egovernment.moa.id.proxy.ConnectionBuilderFactory;  import at.gv.egovernment.moa.id.proxy.LoginParameterResolver; 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 index 60678fe22..1181253f1 100644 --- 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 @@ -24,38 +24,31 @@  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;
 +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.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.validator.parep.client.szrgw.SZRGWSecureSocketFactory; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.DOMUtils;  import at.gv.egovernment.moa.util.StringUtils; diff --git a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties index b8ee6ac68..db6fbe990 100644 --- a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties +++ b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties @@ -34,6 +34,7 @@ auth.13=Vollmachtenmodus für ausländische Bürger wird nicht unterstützt.  auth.14=Zertifikat konnte nicht ausgelesen werden.
  auth.15=Fehler bei Anfrage an Vollmachten Service.
  auth.16=Fehler bei Abarbeitung der Vollmacht in "{0}"
 +auth.17=Vollmachtenmodus für nicht-öffentlichen Bereich wird nicht unterstützt.
  init.00=MOA ID Authentisierung wurde erfolgreich gestartet
  init.01=Fehler beim Aktivieren des IAIK-JCE/JSSE/JDK1.3 Workaround: SSL ist möglicherweise nicht verfügbar
 diff --git a/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java index e663aedd9..4e83bce9d 100644 --- a/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java +++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java @@ -73,21 +73,21 @@ public class IdentityLinkAssertionParserTest extends UnitTestCase {      }    } -  public void testParseIdentityLink() throws Exception { -    IdentityLink idl = ilap.parseIdentityLink(); -    System.out.println(idl.getGivenName()); -    System.out.println(idl.getFamilyName()); -    System.out.println(idl.getDateOfBirth()); -    System.out.println(idl.getIdentificationValue()); - -    VerifyXMLSignatureRequestBuilder vx = new VerifyXMLSignatureRequestBuilder(); -     -  // Element zurück bekommen:  vx.build(idl.getSamlAssertion()); -     -    IdentityLinkValidator idVali = IdentityLinkValidator.getInstance(); -    idVali.validate(idl); -     -  } +//  public void testParseIdentityLink() throws Exception { +//    IdentityLink idl = ilap.parseIdentityLink(); +//    System.out.println(idl.getGivenName()); +//    System.out.println(idl.getFamilyName()); +//    System.out.println(idl.getDateOfBirth()); +//    System.out.println(idl.getIdentificationValue()); +// +//    VerifyXMLSignatureRequestBuilder vx = new VerifyXMLSignatureRequestBuilder(); +//     +//  // Element zurück bekommen:  vx.build(idl.getSamlAssertion()); +//     +//    IdentityLinkValidator idVali = IdentityLinkValidator.getInstance(); +//    idVali.validate(idl); +//     +//  }  //  public void testParseIdentityLinkECC() throws Exception {  //     RandomAccessFile s = | 
