aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-02-25 15:14:57 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-02-25 15:14:57 +0100
commit382052c4c666f0dd206985d3cbbe2b4ec36244dd (patch)
tree4800a71a19de9430d45dbc7f7aa8d1ccad614379
parent1515b8322397681ec1f8b9ba543e4669cd262534 (diff)
downloadmoa-id-spss-382052c4c666f0dd206985d3cbbe2b4ec36244dd.tar.gz
moa-id-spss-382052c4c666f0dd206985d3cbbe2b4ec36244dd.tar.bz2
moa-id-spss-382052c4c666f0dd206985d3cbbe2b4ec36244dd.zip
ConfigTool: if login is deactivated then redirect user to secure-area
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java9
-rw-r--r--id/ConfigWebTool/src/main/resources/struts.xml4
2 files changed, 12 insertions, 1 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
index 8885432f1..a51709e04 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
@@ -127,7 +127,14 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
try {
ConfigurationProvider config = ConfigurationProvider.getInstance();
pvp2LoginActiv = config.isPVP2LoginActive();
- return Constants.STRUTS_SUCCESS;
+
+ if (config.isLoginDeaktivated()) {
+ return "loginWithOutAuth";
+
+ } else {
+ return Constants.STRUTS_SUCCESS;
+
+ }
} catch (ConfigurationException e) {
log.warn("An internal error occurs.", e);
diff --git a/id/ConfigWebTool/src/main/resources/struts.xml b/id/ConfigWebTool/src/main/resources/struts.xml
index ee5baf8d6..9a098da5a 100644
--- a/id/ConfigWebTool/src/main/resources/struts.xml
+++ b/id/ConfigWebTool/src/main/resources/struts.xml
@@ -13,6 +13,10 @@
<action name="index" method="start" class="at.gv.egovernment.moa.id.configuration.struts.action.IndexAction">
<result name="success">/index.jsp</result>
+ <result name="loginWithOutAuth" type="redirectAction">
+ <param name="actionName">main</param>
+ <param name="namespace">/secure</param>
+ </result>
<interceptor-ref name="defaultStack"/>
</action>