aboutsummaryrefslogtreecommitdiff
path: root/id/server
diff options
context:
space:
mode:
Diffstat (limited to 'id/server')
-rw-r--r--id/server/auth/src/main/webapp/WEB-INF/web.xml12
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java5
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java12
3 files changed, 10 insertions, 19 deletions
diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml
index d60d73fd2..4efda0c79 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -94,11 +94,11 @@
<servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
</servlet>
- <!-- JSP servlet -->
- <servlet>
+ <!-- JSP servlet -->
+<!-- <servlet>
<servlet-name>jspservlet</servlet-name>
<servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
- </servlet>
+ </servlet> -->
<servlet>
<servlet-name>PEPSConnectorServlet</servlet-name>
<display-name>PEPSConnectorServlet</display-name>
@@ -143,15 +143,15 @@
<!-- servlet mapping for jsp pages -->
<!-- errorpage.jsp (customizeable) -->
- <servlet-mapping>
+<!-- <servlet-mapping>
<servlet-name>jspservlet</servlet-name>
<url-pattern>/errorpage-auth.jsp</url-pattern>
</servlet-mapping>
- <!-- message.jsp (customizeable) used for non error messages (e.g. ConfigurationUpdate) -->
+ message.jsp (customizeable) used for non error messages (e.g. ConfigurationUpdate)
<servlet-mapping>
<servlet-name>jspservlet</servlet-name>
<url-pattern>/message-auth.jsp</url-pattern>
- </servlet-mapping>
+ </servlet-mapping> -->
<!-- <servlet-mapping>
<servlet-name>SelectBKU</servlet-name>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
index 175aeeab7..8a5782bcf 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
@@ -45,13 +45,9 @@
package at.gv.egovernment.moa.id.auth.servlet;
-import iaik.security.ecc.provider.ECCProvider;
-import iaik.security.provider.IAIK;
-
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.security.Security;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
@@ -60,7 +56,6 @@ import java.util.Map;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java
index 0e72f219d..778c5ef34 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java
@@ -74,8 +74,8 @@ public class IDPSingleLogOutServlet extends AuthServlet {
context.put("errorMsg",
MOAIDMessageProvider.getInstance().getMessage("slo.01", null));
- ssomanager.printSingleLogOutInfo(context, resp);
-
+ ssomanager.printSingleLogOutInfo(context, resp);
+
} catch (MOAIDException e) {
handleErrorNoRedirect(e.getMessage(), e, req, resp);
@@ -84,12 +84,8 @@ public class IDPSingleLogOutServlet extends AuthServlet {
}
- }
-
- if (MiscUtil.isNotEmpty(status)) {
- //print status information
-
-
+ return;
+
} else if (MiscUtil.isNotEmpty(ssoid)) {
if (ssomanager.isValidSSOSession(ssoid, null)) {