clean

1 files changed, 3 insertions, 36 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
index 9b46ee9c6..042d61080 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
 
 /**
  * Stork 2 Protocol Support
- * Date: 11/29/13, Time: 12:32 PM
  * @author bsuzic
  */
 public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
@@ -71,22 +70,9 @@ public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
          */
     public IRequest preProcess(HttpServletRequest request, HttpServletResponse response, String action) throws MOAIDException {
         Logger.debug("Starting preprocessing");
-        Logger.debug("Got request: " + request.toString());
         Logger.debug("Request method: " + request.getMethod());
-        for (Object o : Collections.list(request.getHeaderNames())) {
-            Logger.debug("Request header: " + o.toString() + ":::" + request.getHeader(o.toString()));
-        }
-        for (Object o : Collections.list(request.getParameterNames())) {
-            Logger.debug("Request parameter: " + o.toString() + "::::" + request.getParameter(o.toString()));
-        }
-
         Logger.debug("Request content length: " + request.getContentLength());
-        Logger.debug("Request query: " + request.getQueryString());
-        Logger.debug("Response: " + response.toString());
-        Logger.debug("Action: " + action);
-
-        Logger.debug("Processing saml request");
-        String SAMLRequest = request.getParameter("SAMLRequest");
+        Logger.debug("Initiating action: " + action);
 
         HTTPInTransport profileReq = new HttpServletRequestAdapter(request);
         HTTPOutTransport profileResp = new HttpServletResponseAdapter(response, request.isSecure());
@@ -104,28 +90,11 @@ public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
         } catch (Exception e) {
             Logger.error("Error decoding STORKAuthnRequest", e);
         }
-        /*
-
-        STORKAuthnRequestImpl ST2Req = (STORKAuthnRequestImpl)samlMessageContext.getInboundSAMLMessage();
-        //MOASTORKAuthnRequest STORK2Request = (MOASTORKAuthnRequest)samlMessageContext.getInboundSAMLMessage();
-        MOASTORKAuthnRequest STORK2Request = new MOASTORKAuthnRequest();
-        STORK2Request.setSTORKAuthnRequest(ST2Req);
-
-        Logger.debug("STORK2 Citizen code: " + ST2Req.getCitizenCountryCode());
-        Logger.debug("STORK2 QAA: " + ST2Req.getQAALevel());
-        Logger.debug("STORK2 ISSUER: " + ST2Req.getIssuer().toString());
-
-        */
-        //STORKAuthnReq storkAuthnReq = new STORKAuthnReq();
-
 
         MOASTORKAuthnRequest STORK2Request = new MOASTORKAuthnRequest();
 
 
         //extract STORK Response from HTTP Request
-        //Decodes SAML Response
-
-
         byte[] decSamlToken;
         try {
             decSamlToken = PEPSUtil.decodeSAMLToken(request.getParameter("SAMLRequest"));
@@ -138,12 +107,11 @@ public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
         STORKSAMLEngine engine = STORKSAMLEngine.getInstance("incoming");
 
         STORKAuthnRequest authnRequest = null;
-        Logger.error("decsamltoken" +decSamlToken.toString());
 
         try {
-        authnRequest = engine.validateSTORKAuthnRequest(decSamlToken);
+            authnRequest = engine.validateSTORKAuthnRequest(decSamlToken);
         } catch (STORKSAMLEngineException ex) {
-            Logger.error("Unable to validate storkrkauthnreqeust" + ex.getMessage() );
+            Logger.error("Unable to validate Stork AuthenticationRequest: " + ex.getMessage() );
         }
 
         Logger.error("acsu " + authnRequest.getAssertionConsumerServiceURL());
@@ -152,7 +120,6 @@ public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
         Logger.error("spid " + authnRequest.getSPID());
         Logger.error("spi " + authnRequest.getSpInstitution());
 
-        authnRequest.setCountry("");
         STORK2Request.setSTORKAuthnRequest(authnRequest);