You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2017/06/06 15:03:25 UTC
[2/2] syncope git commit: Minor fixes
Minor fixes
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/33a3b0a1
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/33a3b0a1
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/33a3b0a1
Branch: refs/heads/master
Commit: 33a3b0a1435932e40e72fd2e03a9a32a2d24086b
Parents: b715166
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Jun 6 17:03:08 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Jun 6 17:03:16 2017 +0200
----------------------------------------------------------------------
.../console/SyncopeConsoleRequestCycleListener.java | 11 +++++++++--
.../wicket/markup/html/form/ActionsPanel.properties | 4 ++--
.../wicket/markup/html/form/ActionsPanel_it.properties | 4 ++--
.../markup/html/form/ActionsPanel_pt_BR.properties | 4 ++--
.../wicket/markup/html/form/ActionsPanel_ru.properties | 4 ++--
.../core/spring/security/JWTAuthenticationFilter.java | 2 +-
6 files changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/33a3b0a1/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java
index ac09333..91e55e6 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java
@@ -20,6 +20,7 @@ package org.apache.syncope.client.console;
import java.security.AccessControlException;
import javax.ws.rs.BadRequestException;
+import javax.ws.rs.ForbiddenException;
import javax.xml.ws.WebServiceException;
import org.apache.syncope.client.console.pages.Login;
import org.apache.syncope.common.lib.SyncopeClientException;
@@ -86,8 +87,14 @@ public class SyncopeConsoleRequestCycleListener extends AbstractRequestCycleList
errorParameters.add("errorMessage", REST);
errorPage = new Login(errorParameters);
} else {
- // redirect to default Wicket error page
- errorPage = new ExceptionErrorPage(e, null);
+ Throwable cause = instanceOf(e, ForbiddenException.class);
+ if (cause == null) {
+ // redirect to default Wicket error page
+ errorPage = new ExceptionErrorPage(e, null);
+ } else {
+ errorParameters.add("errorMessage", cause.getMessage());
+ errorPage = new Login(errorParameters);
+ }
}
if (errorPage instanceof Login) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/33a3b0a1/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties
index 79692d8..bb1697e 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties
@@ -19,8 +19,8 @@ mapping.title=mapping
mapping.alt=mapping icon
mustchangepassword.class=fa fa-lock
-mustchangepassword.title=set must change password
-mustchangepassword.alt=must change password icon
+mustchangepassword.title=toggle must change password
+mustchangepassword.alt=toggle change password icon
set_latest_sync_token.class=fa fa-hourglass-start
set_latest_sync_token.title=set last sync token
http://git-wip-us.apache.org/repos/asf/syncope/blob/33a3b0a1/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties
index cffac92..70cb4fe 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties
@@ -19,8 +19,8 @@ mapping.title=mapping
mapping.alt=mapping icon
mustchangepassword.class=fa fa-lock
-mustchangepassword.title=set must change password
-mustchangepassword.alt=must change password icon
+mustchangepassword.title=toggle must change password
+mustchangepassword.alt=toggle change password icon
set_latest_sync_token.class=fa fa-hourglass-start
set_latest_sync_token.title=set last sync token
http://git-wip-us.apache.org/repos/asf/syncope/blob/33a3b0a1/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties
index cffac92..70cb4fe 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties
@@ -19,8 +19,8 @@ mapping.title=mapping
mapping.alt=mapping icon
mustchangepassword.class=fa fa-lock
-mustchangepassword.title=set must change password
-mustchangepassword.alt=must change password icon
+mustchangepassword.title=toggle must change password
+mustchangepassword.alt=toggle change password icon
set_latest_sync_token.class=fa fa-hourglass-start
set_latest_sync_token.title=set last sync token
http://git-wip-us.apache.org/repos/asf/syncope/blob/33a3b0a1/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties
index cffac92..70cb4fe 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties
@@ -19,8 +19,8 @@ mapping.title=mapping
mapping.alt=mapping icon
mustchangepassword.class=fa fa-lock
-mustchangepassword.title=set must change password
-mustchangepassword.alt=must change password icon
+mustchangepassword.title=toggle must change password
+mustchangepassword.alt=toggle change password icon
set_latest_sync_token.class=fa fa-hourglass-start
set_latest_sync_token.title=set last sync token
http://git-wip-us.apache.org/repos/asf/syncope/blob/33a3b0a1/core/spring/src/main/java/org/apache/syncope/core/spring/security/JWTAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/core/spring/src/main/java/org/apache/syncope/core/spring/security/JWTAuthenticationFilter.java b/core/spring/src/main/java/org/apache/syncope/core/spring/security/JWTAuthenticationFilter.java
index c1520fa..3263abe 100644
--- a/core/spring/src/main/java/org/apache/syncope/core/spring/security/JWTAuthenticationFilter.java
+++ b/core/spring/src/main/java/org/apache/syncope/core/spring/security/JWTAuthenticationFilter.java
@@ -87,7 +87,7 @@ public class JWTAuthenticationFilter extends OncePerRequestFilter {
return;
}
- LOG.debug("JWT receveid: {}", stringToken);
+ LOG.debug("JWT received: {}", stringToken);
JwsJwtCompactConsumer consumer = new JwsJwtCompactConsumer(stringToken);
try {