You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2008/04/06 22:11:51 UTC
svn commit: r645297 - in /lenya/branches/branch_1_2_x_shibboleth/src:
java/org/apache/lenya/ac/shibboleth/ShibbolethAuthenticator.java
webapp/lenya/resources/i18n/cmsui.xml
webapp/lenya/resources/i18n/cmsui_de.xml
Author: andreas
Date: Sun Apr 6 13:11:43 2008
New Revision: 645297
URL: http://svn.apache.org/viewvc?rev=645297&view=rev
Log:
Add message about cookies after an unsuccessful authorization and Shibboleth redirect.
Modified:
lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/shibboleth/ShibbolethAuthenticator.java
lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui.xml
lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui_de.xml
Modified: lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/shibboleth/ShibbolethAuthenticator.java
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/shibboleth/ShibbolethAuthenticator.java?rev=645297&r1=645296&r2=645297&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/shibboleth/ShibbolethAuthenticator.java (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/shibboleth/ShibbolethAuthenticator.java Sun Apr 6 13:11:43 2008
@@ -17,9 +17,11 @@
*/
package org.apache.lenya.ac.shibboleth;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -298,7 +300,7 @@
String userId = user.getId();
String previouslyRedirectedUserId = getPreviouslyRedirectedUser(request);
if (previouslyRedirectedUserId != null && userId.equals(previouslyRedirectedUserId)) {
- // reportAuthorizationError(request);
+ reportAuthorizationError(request);
loginUri = super.getLoginUri(request);
}
else {
@@ -316,8 +318,11 @@
}
protected void reportAuthorizationError(Request request) {
- Message msg = new Message("access-denied");
- Message[] messages = { msg };
+ Session session = request.getSession();
+ Message[] messages = (Message[]) session.getAttribute(DelegatingAuthorizerAction.ERRORS);
+ List messageList = messages == null ? new ArrayList(1) : new ArrayList(Arrays.asList(messages));
+ messageList.add(new Message("shibboleth-delete-cookies"));
+ messages = (Message[]) messageList.toArray(new Message[messageList.size()]);
request.getSession().setAttribute(DelegatingAuthorizerAction.ERRORS, messages);
}
Modified: lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui.xml?rev=645297&r1=645296&r2=645297&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui.xml (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui.xml Sun Apr 6 13:11:43 2008
@@ -106,6 +106,9 @@
<message key="try-user-lenya">Try user {0} and password {1} (editor), or user {2} and password {3} (reviewer)</message>
<message key="page-can-only-accessed-by">This page can only be accessed by</message>
<message key="access-denied">Access denied</message>
+ <message key="shibboleth-delete-cookies">
+ If you want to log in with a different account, please delete the cookies in your browser.
+ </message>
<!-- logout screen -->
<message key="logout-from-pub">LOGOUT from the {0} Publication</message>
Modified: lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui_de.xml?rev=645297&r1=645296&r2=645297&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui_de.xml (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui_de.xml Sun Apr 6 13:11:43 2008
@@ -106,6 +106,9 @@
<message key="try-user-lenya">Versuchen Sie Benutzername {0} und Passwort {1} (Bearbeiter), oder Benutzername {2} und Passwort {3} (Prüfer)</message>
<message key="page-can-only-accessed-by">Auf diese Seite haben nur die folgenden Nutzer Zugriff:</message>
<message key="access-denied">Zugriff verweigert</message>
+ <message key="shibboleth-delete-cookies">
+ Wenn Sie sich mit einem anderen Account anmelden wollen, löschen Sie bitte die Cookies in Ihrem Browser.
+ </message>
<!-- logout screen -->
<message key="logout-from-pub">Abmelden von der {0} Publikation</message>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org