aboutsummaryrefslogtreecommitdiff
path: root/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java
diff options
context:
space:
mode:
Diffstat (limited to 'id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java')
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java123
1 files changed, 8 insertions, 115 deletions
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 27f956c40..acd96dee0 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,22 +24,17 @@
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.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;
@@ -48,17 +43,9 @@ 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
@@ -68,7 +55,12 @@ import at.gv.egovernment.moa.util.DOMUtils;
*/
public class VerifyCertificateServlet extends AuthServlet {
- /**
+ /**
+ *
+ */
+ private static final long serialVersionUID = -4110159749768152538L;
+
+/**
* Constructor for VerifyCertificateServlet.
*/
public VerifyCertificateServlet() {
@@ -171,106 +163,7 @@ public class VerifyCertificateServlet extends AuthServlet {
catch (MOAIDException ex) {
handleError(null, ex, req, resp);
}
- }
-
- /**
- * Does the request to the SZR-GW
- * @param givenname
- * @param familyname
- * @param dateofbirth
- * @return Identity link assertion
- * @throws SZRGWClientException
- */
- /*private Element getIdentityLink(Element signature) throws SZRGWClientException {*/
-// private Element getIdentityLink(X509Certificate cert) throws SZRGWClientException {
-//
-// SZRGWClient client = new SZRGWClient();
-//
-// try {
-// AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
-// ConnectionParameter connectionParameters = authConf.getForeignIDConnectionParameter();
-// //url = "http://localhost:8081/szr-gateway/services/IdentityLinkCreation";
-// Logger.debug("Connection Parameters: " + connectionParameters);
-// client.setAddress(connectionParameters.getUrl());
-// if (connectionParameters.getUrl().toLowerCase().startsWith("https:")) {
-// Logger.debug("Initialisiere SSL Verbindung");
-// try {
-// client.setSSLSocketFactory(SSLUtils.getSSLSocketFactory(AuthConfigurationProvider.getInstance(), connectionParameters));
-// } catch (IOException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// } catch (GeneralSecurityException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// } catch (PKIException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// }
-// }
-//
-// Logger.info("Starte Kommunikation mit dem Stammzahlenregister Gateway(" + connectionParameters.getUrl() + ")...");
-//
-//
-// }
-// catch (ConfigurationException e) {
-// Logger.warn(e);
-// Logger.warn(MOAIDMessageProvider.getInstance().getMessage("config.12", null ));
-//
-// }
-// // create request
-// Document doc = buildGetIdentityLinkRequest(cert);
-// Element request = doc.getDocumentElement();
-// CreateIdentityLinkResponse response = null;
-//
-// //try {
-// response = client.createIdentityLinkResponse(request);
-// //} catch (SZRGWClientException e) {
-// // give him a second try - Nach dem Starten des Tomcat wird beim ersten Mal das Client-Zertifikat offenbar vom HTTPClient nicht mitgeschickt.
-// // client = new SZRGWClient(url);
-// // response = client.createIdentityLinkResponse(request);
-// // }
-//
-//
-// return response.getAssertion();
-//
-// }
-
-// /**
-// * Builds the szrgw:GetIdentityLinkRequest für the SZR-GW
-// * @param givenname
-// * @param familyname
-// * @param birthday
-// * @return
-// */
-// private static Document buildGetIdentityLinkRequest(X509Certificate cert) {
-//
-// try {
-// byte[] certbyte = cert.getEncoded();
-// String certstring = Base64.encode(certbyte);
-//
-// DocumentBuilderFactory factory =DocumentBuilderFactory.newInstance();
-// factory.setNamespaceAware(true);
-// DocumentBuilder builder = factory.newDocumentBuilder();
-// Document doc = builder.newDocument();
-//
-// Element getIdentityLink = doc.createElementNS(SZRGWConstants.SZRGW_REQUEST_NS, "szrgw:GetIdentityLinkRequest");
-// getIdentityLink.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:szrgw", SZRGWConstants.SZRGW_REQUEST_NS);
-// doc.appendChild(getIdentityLink);
-//
-// Element x509certificate = doc.createElementNS(SZRGWConstants.SZRGW_REQUEST_NS, "szrgw:X509Certificate");
-// getIdentityLink.appendChild(x509certificate);
-// Text certbase64 = doc.createTextNode(certstring);
-// x509certificate.appendChild(certbase64);
-//
-// return doc;
-// } catch (ParserConfigurationException e) {
-// e.printStackTrace();
-// } catch (CertificateEncodingException e) {
-// e.printStackTrace();
-// }
-// return null;
-//
-// }
-//
+ }
+
}