From 249ded0cad445464239553f5629a59524ae785d7 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 19 Sep 2014 11:02:16 +0200 Subject: solve SLO frontchannel timeout problem --- .../conf/moa-id/htmlTemplates/slo_template.html | 19 ++++++++++++++++--- .../moa/id/auth/servlet/RedirectServlet.java | 3 ++- .../resources/resources/templates/slo_template.html | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) (limited to 'id/server') diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html index 88279ee96..6cefe4054 100644 --- a/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html +++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html @@ -380,7 +380,21 @@ function sloTimeOut() { window.location.href="$timeoutURL"; - } + } + function RestartAfterDelay() { + var eDate = null; + var MilliSekZeit = 0; + var SysDatumJetzt = new Date(); + var SysDatumJetztMilli = SysDatumJetzt.getTime(); + + do { + eDate = new Date(); + MilliSekZeit = eDate.getTime(); + + } while ((MilliSekZeit-SysDatumJetztMilli) < $timeout); + + sloTimeOut(); + } #end @@ -389,7 +403,7 @@ #if($timeoutURL) - + #else #end @@ -446,6 +460,5 @@ #foreach( $el in $redirectURLs ) #end - \ No newline at end of file diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/RedirectServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/RedirectServlet.java index 6e1811c8b..532ccb7ba 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/RedirectServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/RedirectServlet.java @@ -33,6 +33,7 @@ import at.gv.egovernment.moa.id.auth.builder.RedirectFormBuilder; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; import at.gv.egovernment.moa.id.moduls.SSOManager; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.MiscUtil; @@ -63,7 +64,7 @@ public class RedirectServlet extends AuthServlet{ String redirectTarget = DEFAULT_REDIRECTTARGET; try { oa = ConfigurationDBRead.getActiveOnlineApplication(url); - if (oa == null) { + if (oa == null && !url.startsWith(AuthConfigurationProvider.getInstance().getPublicURLPrefix())) { resp.sendError(HttpServletResponse.SC_FORBIDDEN, "Parameters not valid"); return; diff --git a/id/server/idserverlib/src/main/resources/resources/templates/slo_template.html b/id/server/idserverlib/src/main/resources/resources/templates/slo_template.html index 88279ee96..b241e85cf 100644 --- a/id/server/idserverlib/src/main/resources/resources/templates/slo_template.html +++ b/id/server/idserverlib/src/main/resources/resources/templates/slo_template.html @@ -389,7 +389,7 @@ #if($timeoutURL) - + #else #end -- cgit v1.2.3 From 35d6ba874ebf42ae921a9c8a82b55bafc771a69d Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 19 Sep 2014 11:09:41 +0200 Subject: update libraries - opensaml > 2.6.3 - iaik-moa > 1.51 - iaik_jce_full > 5.2 - iaik_cms > 5.0 --- id/server/idserverlib/pom.xml | 16 +++++++++++++-- .../moa/id/auth/MOAIDAuthInitializer.java | 8 ++------ .../VerifyXMLSignatureResponseValidator.java | 24 ++++++++++++++++------ id/server/stork2-commons/pom.xml | 14 ++++++++++--- id/server/stork2-saml-engine/pom.xml | 8 ++++++-- 5 files changed, 51 insertions(+), 19 deletions(-) (limited to 'id/server') diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index a8ffd10bc..00d128ca5 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -226,11 +226,23 @@ org.opensaml opensaml - + + + org.slf4j + log4j-over-slf4j + + + org.opensaml xmltooling - + + + org.slf4j + log4j-over-slf4j + + + @@ -55,8 +63,8 @@ - org.opensaml - opensaml + org.opensaml + opensaml org.slf4j diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml index 89ddab22a..30f2bff7c 100644 --- a/id/server/stork2-saml-engine/pom.xml +++ b/id/server/stork2-saml-engine/pom.xml @@ -49,12 +49,12 @@ eu.stork Commons ${commons.version} - + @@ -82,6 +82,10 @@ org.slf4j jul-to-slf4j + + bcprov-jdk15on + org.bouncycastle + -- cgit v1.2.3