From 95a543717f5492900fc5ad94e5a80b5da7d14b15 Mon Sep 17 00:00:00 2001
From: tknall <tknall@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Thu, 14 Dec 2006 15:29:00 +0000
Subject: basic authentication for logging disabled

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@22 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 release/2.32/pdf-as-2.32.jar                       | Bin 5389300 -> 5348997 bytes
 release/2.33/pdf-as-2.33.jar                       | Bin 0 -> 5349101 bytes
 .../wag/egov/egiz/ldap/api/LDAPAPIFactory.java     |   2 ++
 .../java/at/knowcenter/wag/egov/egiz/web/Sign.java |  26 +++++++++++++++++----
 src/site/changes.xml                               |   6 +++++
 5 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 release/2.33/pdf-as-2.33.jar

diff --git a/release/2.32/pdf-as-2.32.jar b/release/2.32/pdf-as-2.32.jar
index 3a146a8..1bd255e 100644
Binary files a/release/2.32/pdf-as-2.32.jar and b/release/2.32/pdf-as-2.32.jar differ
diff --git a/release/2.33/pdf-as-2.33.jar b/release/2.33/pdf-as-2.33.jar
new file mode 100644
index 0000000..a306a75
Binary files /dev/null and b/release/2.33/pdf-as-2.33.jar differ
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/ldap/api/LDAPAPIFactory.java b/src/main/java/at/knowcenter/wag/egov/egiz/ldap/api/LDAPAPIFactory.java
index 998af55..c474412 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/ldap/api/LDAPAPIFactory.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/ldap/api/LDAPAPIFactory.java
@@ -1,6 +1,7 @@
 package at.knowcenter.wag.egov.egiz.ldap.api;
 
 import iaik.security.ecc.provider.ECCProvider;
+import iaik.security.provider.IAIK;
 import at.knowcenter.wag.egov.egiz.ldap.client.LDAPIssuerNameFilter;
 import at.knowcenter.wag.egov.egiz.sig.LDAPAPI;
 
@@ -12,6 +13,7 @@ public abstract class LDAPAPIFactory {
 	private static LDAPAPIFactory ldapAPIfactoryInstance;
 
 	protected LDAPAPIFactory() {
+		IAIK.addAsProvider();
 		ECCProvider.addAsProvider();
 	}
 	
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/Sign.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/Sign.java
index a3ded84..0a5a451 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/Sign.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/Sign.java
@@ -99,6 +99,9 @@ public class Sign extends HttpServlet
     disp.forward(request, response);
   }
 
+  /**
+   * @author modified by tknall
+   */
   public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
   {
     String authenticate = request.getHeader(AUTH);
@@ -116,7 +119,10 @@ public class Sign extends HttpServlet
         String user_name = auth_value[0];
         String user_password = auth_value[1];
         logger_.info("username:" + user_name);
-        logger_.info("password:" + user_password);
+        // start modification tknall
+//        logger_.info("password:" + user_password);
+        logger_.info("password:XXXXXXXXXXXX");
+        // stop modification tknall
 
         HttpSession session = request.getSession();
         session.setAttribute(SessionAttributes.ATTRIBUTE_USER_NAME, user_name);
@@ -125,11 +131,23 @@ public class Sign extends HttpServlet
         dispatch(request, response, "/jsp/signupload.jsp");
         return;
       }
+      // start modification tknall
+    } else {
+       String user_name = "";
+       String user_password = "";
+       logger_.info("authenticate:User has not been authenticated!");
+       logger_.info("username: UNKNOWN");
+       logger_.info("password: XXXXXXXXXXXX");
+       HttpSession session = request.getSession();
+       session.setAttribute("uname", user_name);
+       session.setAttribute("upass", user_password);
+       dispatch(request, response, "/jsp/signupload.jsp");
     }
 
-    request.setAttribute("error", "Falsche Authentifikation");
-    request.setAttribute("cause", "Passwort oder Benutzername ist falsch");
-    dispatch(request, response, "/jsp/error.jsp");
+//    request.setAttribute("error", "Falsche Authentifikation");
+//    request.setAttribute("cause", "Passwort oder Benutzername ist falsch");
+//    dispatch(request, response, "/jsp/error.jsp");
+    // stop modification tknall
   }
 
   public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
diff --git a/src/site/changes.xml b/src/site/changes.xml
index 542b8c2..e6cf055 100644
--- a/src/site/changes.xml
+++ b/src/site/changes.xml
@@ -13,6 +13,12 @@
 			</release>
 		-->
 
+		<release version="2.33" date="2006-12-14" description="subsequent release">
+			<action dev="tknall" type="update">
+				basic authentication for logging disabled
+			</action>
+		</release>
+
 		<release version="2.32" date="2006-12-13" description="subsequent release">
 			<action dev="tknall" type="add">
 				LDAP support added
-- 
cgit v1.2.3