Author: sshyrkov Date: Thu Jun 21 11:59:37 2007 New Revision: 17685 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17685&repname= =3Djahia Log: JAHIA-1603: Probl=C3=A8me d'autentification sur IE et sur page type 403 lor= sque la session expire. =
http://www.jahia.net/jira/browse/JAHIA-1603 Resolved: this is only reproducable if the currently logged user tries to s= ee the page, where she does not has read rights. I added a "logout" link fo= r the action, that will invalidate current session and redirect to the firs= t page. This is not an ideal silution, but at least the user will not be fo= rced to close the browser or to delete the cookies. Added: trunk/core/src/webapp/jsp/logout.jsp Modified: trunk/core/src/conf/java/JahiaEnginesResources.properties trunk/core/src/conf/java/JahiaMessageResources_de.properties trunk/core/src/conf/java/JahiaMessageResources_en.properties trunk/core/src/conf/java/JahiaMessageResources_es.properties trunk/core/src/conf/java/JahiaMessageResources_fr.properties trunk/core/src/conf/java/JahiaMessageResources_it.properties trunk/core/src/conf/java/JahiaMessageResources_pt.properties trunk/core/src/java/org/jahia/bin/JahiaErrorDisplay.java trunk/core/src/webapp/jsp/jahia/errors/error_403.jsp Modified: trunk/core/src/conf/java/JahiaEnginesResources.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaEnginesResources.properties&rev=3D17685&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/conf/java/JahiaEnginesResources.properties (original) +++ trunk/core/src/conf/java/JahiaEnginesResources.properties Thu Jun 21 11= :59:37 2007 @@ -563,6 +563,7 @@ org.jahia.bin.JahiaErrorDisplay.jspError.label =3D JSP Error org.jahia.bin.JahiaErrorDisplay.login.label =3D Login org.jahia.bin.JahiaErrorDisplay.loginAgain.label =3D Please login into the= system if you haven't already. +org.jahia.bin.JahiaErrorDisplay.logout.label =3D Logout org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D A mail notifica= tion has been sent to the Administrator. org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Page not foun= d. org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Click here to retu= rn to Jahia Modified: trunk/core/src/conf/java/JahiaMessageResources_de.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaMessageResources_de.properties&rev=3D17685&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/conf/java/JahiaMessageResources_de.properties (original) +++ trunk/core/src/conf/java/JahiaMessageResources_de.properties Thu Jun 21= 11:59:37 2007 @@ -194,6 +194,7 @@ org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Jahia-Fehler org.jahia.bin.JahiaErrorDisplay.login.label =3D Anmelden org.jahia.bin.JahiaErrorDisplay.loginAgain.label =3D Sie m=C3=BCssen sich = erneut anmelden +org.jahia.bin.JahiaErrorDisplay.logout.label =3D Abmelden org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D Der Administrat= or wurde per E-Mail benachrichtigt. org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Seite nicht g= efunden org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Klicken Sie hier, = um zu Jahia zur=C3=BCckzukehren. Modified: trunk/core/src/conf/java/JahiaMessageResources_en.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaMessageResources_en.properties&rev=3D17685&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/conf/java/JahiaMessageResources_en.properties (original) +++ trunk/core/src/conf/java/JahiaMessageResources_en.properties Thu Jun 21= 11:59:37 2007 @@ -196,6 +196,7 @@ org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Jahia Error org.jahia.bin.JahiaErrorDisplay.login.label =3D Login org.jahia.bin.JahiaErrorDisplay.loginAgain.label =3D You must log in again +org.jahia.bin.JahiaErrorDisplay.logout.label =3D Logout org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D A mail notifica= tion has been sent to the Administrator. org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Page not foun= d. org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Click here to retu= rn to Jahia Modified: trunk/core/src/conf/java/JahiaMessageResources_es.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaMessageResources_es.properties&rev=3D17685&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/conf/java/JahiaMessageResources_es.properties (original) +++ trunk/core/src/conf/java/JahiaMessageResources_es.properties Thu Jun 21= 11:59:37 2007 @@ -193,6 +193,7 @@ org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Error de Jahia org.jahia.bin.JahiaErrorDisplay.login.label =3D Iniciar sesi=C3=B3n org.jahia.bin.JahiaErrorDisplay.loginAgain.label =3D Debe iniciar sesi=C3= =B3n nuevamente +org.jahia.bin.JahiaErrorDisplay.logout.label =3D Cerrar sesi=C3=B3n org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D Se envi=C3=B3 u= na notificaci=C3=B3n por correo electr=C3=B3nico al administrador. org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - P=C3=A1gina n= o encontrada. org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Para volver a Jahi= a haga clic aqu=C3=AD Modified: trunk/core/src/conf/java/JahiaMessageResources_fr.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaMessageResources_fr.properties&rev=3D17685&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/conf/java/JahiaMessageResources_fr.properties (original) +++ trunk/core/src/conf/java/JahiaMessageResources_fr.properties Thu Jun 21= 11:59:37 2007 @@ -194,6 +194,7 @@ org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Erreur Jahia org.jahia.bin.JahiaErrorDisplay.login.label =3D S'authentifier org.jahia.bin.JahiaErrorDisplay.loginAgain.label =3D Vous devez de nouveau= vous connecter +org.jahia.bin.JahiaErrorDisplay.logout.label =3D Se d=C3=A9connecter org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D Un e-mail de no= tification a =C3=A9t=C3=A9 envoy=C3=A9 =C3=A0 l'administrateur. org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Page non trou= v=C3=A9e org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Cliquez ici pour r= evenir =C3=A0 Jahia Modified: trunk/core/src/conf/java/JahiaMessageResources_it.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaMessageResources_it.properties&rev=3D17685&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/conf/java/JahiaMessageResources_it.properties (original) +++ trunk/core/src/conf/java/JahiaMessageResources_it.properties Thu Jun 21= 11:59:37 2007 @@ -193,6 +193,7 @@ org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Errore Jahia org.jahia.bin.JahiaErrorDisplay.login.label =3D Accesso org.jahia.bin.JahiaErrorDisplay.loginAgain.label =3D =C3=88 necessario acc= edere di nuovo +org.jahia.bin.JahiaErrorDisplay.logout.label =3D Disconnetti org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D Un'e-mail di no= tifica =C3=A8 stata inviata all'amministratore. org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Pagina non tr= ovata. org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Fare clic qui per = tornare a Jahia Modified: trunk/core/src/conf/java/JahiaMessageResources_pt.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaMessageResources_pt.properties&rev=3D17685&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/conf/java/JahiaMessageResources_pt.properties (original) +++ trunk/core/src/conf/java/JahiaMessageResources_pt.properties Thu Jun 21= 11:59:37 2007 @@ -193,6 +193,7 @@ org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Erro do Jahia org.jahia.bin.JahiaErrorDisplay.login.label =3D Login org.jahia.bin.JahiaErrorDisplay.loginAgain.label =3D Fa=C3=A7a login novam= ente +org.jahia.bin.JahiaErrorDisplay.logout.label =3D Logout org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D Um e-mail de no= tifica=C3=A7=C3=A3o foi enviado ao Administrador. org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - P=C3=A1gina n= =C3=A3o encontrada. org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Clique aqui para v= oltar ao Jahia Modified: trunk/core/src/java/org/jahia/bin/JahiaErrorDisplay.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o= rg/jahia/bin/JahiaErrorDisplay.java&rev=3D17685&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/java/org/jahia/bin/JahiaErrorDisplay.java (original) +++ trunk/core/src/java/org/jahia/bin/JahiaErrorDisplay.java Thu Jun 21 11:= 59:37 2007 @@ -79,6 +79,8 @@ private static final String DISPATCH_DESTINATION =3D DISPATCH_ROOT + D= ISPATCH_DIRECTORY + "/error.jsp"; private static final String DISPATCH_PREFIX =3D "error_"; private static final boolean IS_STACK_INCLUDED =3D true; + private static final Pattern ERROR_CODE_PATTERN =3D Pattern + .compile("\\d\\d\\d"); = public static final String DISPLAY_JAHIA_ERROR =3D "displayJahiaError"; = @@ -242,8 +244,7 @@ int errorint =3D 0; = // 2005/05/20 :: uses regexp to extract html error code. - Pattern p =3D Pattern.compile("\\d\\d\\d"); - Matcher m =3D p.matcher(errorstring); + Matcher m =3D ERROR_CODE_PATTERN.matcher(errorstring); if (m.find()) { errorstring =3D m.group(); } @@ -345,11 +346,9 @@ int errorInt) { try { String to =3D null, subject =3D null, from =3D null, - cc =3D null, bcc =3D null, url =3D null; + cc =3D null, bcc =3D null; String mailhost =3D null; String mailer =3D "Jahia Server 1.0"; - String protocol =3D null, host =3D null, user =3D null, passwo= rd =3D null; - String record =3D null; // name of folder in which to recor= d mail = to =3D jSettings.mail_administrator; from =3D jSettings.mail_from; Modified: trunk/core/src/webapp/jsp/jahia/errors/error_403.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/errors/error_403.jsp&rev=3D17685&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/webapp/jsp/jahia/errors/error_403.jsp (original) +++ trunk/core/src/webapp/jsp/jahia/errors/error_403.jsp Thu Jun 21 11:59:3= 7 2007 @@ -14,15 +14,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. = See the License for the specific language governing permissions and = limitations under the License. ---%> -<%@ page language=3D"java" %> -<?xml version=3D"1.0" encoding=3D"iso-8859-1"?> -<% +--%><%@ page language=3D"java" = +%><?xml version=3D"1.0" encoding=3D"iso-8859-1"?><% + = final String cpath =3D Jahia.getContextPath(); final String spath =3D Jahia.getServletPath(); = -%> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> <html xmlns=3D"http://www.w3.org/1999/xhtml";> <head> @@ -35,7 +33,16 @@ <script type=3D"text/javascript" src=3D"<%=3Drequest.getContextPath()%= >/jsp/jahia/javascript/jahia.js"></script> <script type=3D"text/javascript" src=3D"<%=3Drequest.getContextPath()%= >/jsp/jahia/errors/error_include.js"></script> </head> - +<% + final JahiaUser currentUser =3D ((JahiaUser) session.getAttribute(Proc= essingContext.SESSION_USER)); + final String currentUserName; + if (currentUser !=3D null) { + currentUserName =3D currentUser.getUsername(); + } else { + currentUserName =3D null; + } + boolean isGuest =3D currentUserName =3D=3D null || "guest".equals(curr= entUserName); +%> <body> <br/><br/><br/> = @@ -51,7 +58,9 @@ = <p><jahia:engineResourceBundle resourceName=3D"org.jahia.bin.J= ahiaErrorDisplay.accessForbidden.label"/></p> = + <% if (isGuest) { %> <p><jahia:engineResourceBundle resourceName=3D"org.jahia.bin.J= ahiaErrorDisplay.loginAgain.label"/></p> + <% } %> = <script type=3D"text/javascript"> <!-- @@ -64,20 +73,12 @@ </tr> <tr > <td align=3D"left" class=3D"boxcontentcolorLeft"> - <% - final JahiaUser currentUser =3D ((JahiaUser) session.getAt= tribute(ProcessingContext.SESSION_USER)); - final String currentUserName; - if (currentUser !=3D null) { - currentUserName =3D currentUser.getUsername(); - } else { - currentUserName =3D null; - } - %> - <% if (currentUserName =3D=3D null || "guest".equals(currentUs= erName)) { %> + <% if (isGuest) { %> <a href=3D"javascript:EnginePopup('login')" class=3D"bold"><ja= hia:engineResourceBundle resourceName=3D"org.jahia.bin.JahiaErrorDisplay.login.= label"/></a> <% } else { %> - + <a href=3D"<%=3D request.getContextPath() + "/jsp/logout.jsp" = %>" class=3D"bold"><jahia:engineResourceBundle + resourceName=3D"org.jahia.bin.JahiaErrorDisplay.logout= .label"/></a> <% } %> </td> <td align=3D"right" class=3D"boxcontentcolorRight"> Added: trunk/core/src/webapp/jsp/logout.jsp URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/core/src= /webapp/jsp/logout.jsp&rev=3D17685&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/webapp/jsp/logout.jsp (added) +++ trunk/core/src/webapp/jsp/logout.jsp Thu Jun 21 11:59:37 2007 @@ -0,0 +1,5 @@ +<%@ page language=3D"java" contentType=3D"text/html; charset=3DISO-8859-1"= pageEncoding=3D"ISO-8859-1" +%><% +session.invalidate(); +response.sendRedirect(request.getContextPath() + "/Jahia/"); = +%> \ No newline at end of file _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
