inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.2. to HEAD

Browse Source 
7236: Merged V2.1 to V2.2
      7205: Typos and fixed Italian messages
      7234: Fix AR-1824 (Login ticket stuff)
      7235: Fix for AWC-1513 and AWC-1139


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-10-26 13:21:16 +00:00
parent b65c1e6371
commit 1f79b3f660
1 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
source/web/index.jsp
View File

@@ -33,6 +33,7 @@
<%@ page import="org.alfresco.service.cmr.security.PersonService" %> <%@ page import="org.alfresco.service.cmr.security.PersonService" %>
<%@ page import="org.alfresco.service.cmr.security.PermissionService" %> <%@ page import="org.alfresco.service.cmr.security.PermissionService" %>
<%@ page import="org.alfresco.service.cmr.repository.NodeRef" %> <%@ page import="org.alfresco.service.cmr.repository.NodeRef" %>
<%@ page import="org.alfresco.repo.security.authentication.AuthenticationException" %>
<%@ page import="org.alfresco.config.ConfigService" %> <%@ page import="org.alfresco.config.ConfigService" %>
<%@ page import="org.alfresco.web.app.servlet.AuthenticationHelper" %> <%@ page import="org.alfresco.web.app.servlet.AuthenticationHelper" %>
<%@ page import="org.alfresco.web.app.servlet.FacesHelper" %> <%@ page import="org.alfresco.web.app.servlet.FacesHelper" %>
@@ -49,16 +50,40 @@ ConfigService configService = (ConfigService)context.getBean("webClientConfigSer
ClientConfigElement configElement = (ClientConfigElement)configService.getGlobalConfig().getConfigElement("client"); ClientConfigElement configElement = (ClientConfigElement)configService.getGlobalConfig().getConfigElement("client");
String location = configElement.getInitialLocation(); String location = configElement.getInitialLocation();
AuthenticationService authService = (AuthenticationService)context.getBean("AuthenticationService");
// override with the users preference if they have one // override with the users preference if they have one
User user = (User)session.getAttribute(AuthenticationHelper.AUTHENTICATION_USER); User user = (User)session.getAttribute(AuthenticationHelper.AUTHENTICATION_USER);
if (user != null) if (user != null)
{ {
// ensure construction of the FacesContext before attemping a service call UserTransaction tx = ((TransactionService)context.getBean("TransactionService")).getUserTransaction();;
FacesContext fc = FacesHelper.getFacesContext(request, response, application); tx.begin();
String preference = (String)PreferencesService.getPreferences(fc).getValue("start-location"); try
if (preference != null) {
authService.validate(user.getTicket());
// ensure construction of the FacesContext before attemping a service call
FacesContext fc = FacesHelper.getFacesContext(request, response, application);
String preference = (String)PreferencesService.getPreferences(fc).getValue("start-location");
if (preference != null)
{
location = preference;
}
tx.commit();
}
catch (AuthenticationException authErr)
{ {
location = preference; try { tx.rollback(); } catch (Throwable tex) {}
// expired ticket
AuthenticationService unpAuth = (AuthenticationService)context.getBean("authenticationService");
unpAuth.invalidateTicket(unpAuth.getCurrentTicket());
unpAuth.clearCurrentSecurityContext();
}
catch (Throwable e)
{
try { tx.rollback(); } catch (Throwable tex) {}
} }
} }
else else
@@ -67,7 +92,6 @@ else
tx.begin(); tx.begin();
try try
{ {
AuthenticationService authService = (AuthenticationService)context.getBean("AuthenticationService");
authService.authenticateAsGuest(); authService.authenticateAsGuest();
PersonService personService = (PersonService)context.getBean("personService"); PersonService personService = (PersonService)context.getBean("personService");
NodeRef guestRef = personService.getPerson(PermissionService.GUEST_AUTHORITY); NodeRef guestRef = personService.getPerson(PermissionService.GUEST_AUTHORITY);