From 6e4f150c26b55cb2a0771e4d6c9b65cbc760c0f2 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Fri, 14 Feb 2014 16:11:09 +0100
Subject: logging

---
 id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml              | 6 +++++-
 .../egovernment/moa/id/protocols/stork2/AuthenticationRequest.java | 7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
index f8fdcaffc..b63d413d0 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -60,9 +60,13 @@
         <from>^/stork2/SendPEPSAuthnRequest$</from>
         <to type="forward">/dispatcher?mod=id_stork2&amp;action=AuthenticationRequest&amp;%{query-string}</to>
     </rule>
+    <rule match-type="regex">
+        <from>^/moa-id-auth/SendPEPSAuthnRequest$</from>
+        <to type="forward">/dispatcher?mod=id_stork2&amp;action=AuthenticationRequest&amp;%{query-string}</to>
+    </rule>
 
 
-	<rule match-type="regex">
+    <rule match-type="regex">
 		<from>^/oauth2/auth\\?(.*)$</from>
 		<to type="forward">/dispatcher?mod=id_oauth20&amp;action=AUTH&amp;%{query-string}</to>
 	</rule>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
index 1971fe12d..1fa88e0a2 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
@@ -156,11 +156,14 @@ public class AuthenticationRequest implements IAction {
             context.put("SAMLResponse", IOUtils.toString(authnResponse.getTokenSaml()));
             Logger.info("Putting saml token in response: " + org.bouncycastle.util.encoders.Base64.decode(context.get("SAMLResponse").toString()));
 
-            Logger.info("Putting assertion consumer url as action: " + ((STORKAuthnRequestDEL)req).getStorkAuthnRequest().getAssertionConsumerServiceURL());
+            Logger.debug("Putting assertion consumer url as action: " + ((STORKAuthnRequestDEL)req).getStorkAuthnRequest().getAssertionConsumerServiceURL());
             context.put("action", ((STORKAuthnRequestDEL) req).getStorkAuthnRequest().getAssertionConsumerServiceURL());
+            Logger.debug("Starting template merge");
             StringWriter writer = new StringWriter();
+            Logger.debug("Doing template merge");
             template.merge(context, writer);
-
+            Logger.debug("Template merge done");
+            Logger.debug("Sending html content: " + writer.toString().getBytes());
             httpResp.getOutputStream().write(writer.toString().getBytes());
 
         } catch (Exception e) {
-- 
cgit v1.2.3