LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 85e21021232d18a3c2b1b1d16cf6d52237236f29 

Monotone-Revision: 002a7f40ed2519734c4baf4cd4433ecc02b46d54

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-10T21:31:13
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-06-10 21:31:13 +00:00
parent cc7cb9f2bb
commit 7ff3aba0c0
2 changed files with 54 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2010-06-10 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MainUI/SOGoUserHomePage.m (-logoffAction): split method in
smaller submethods for the sake of clarity. Also, we provide as
"CAS" mode where the redirection is made to the CAS logout page.
* SoObjects/SOGo/SOGoCASSession.m
(+CASSessionWithTicket:fromProxy:): added a new "fromProxy" parameter.
(+CASSessionWithIdentifier:fromProxy:): idem.

72
UI/MainUI/SOGoUserHomePage.m
View File

@ -35,11 +35,13 @@
#import <NGExtensions/NSObject+Logs.h>
#import <Appointments/SOGoFreeBusyObject.h>
#import <SOGo/SOGoCASSession.h>
#import <SOGo/SOGoUserManager.h>
#import <SOGo/SOGoWebAuthenticator.h>
#import <SOGo/SOGoUser.h>
#import <SOGo/SOGoUserDefaults.h>
#import <SOGo/SOGoUserFolder.h>
#import <SOGo/SOGoSystemDefaults.h>
#import <SOGo/NSCalendarDate+SOGo.h>
#import <SOGo/NSDictionary+Utilities.h>
#import <SOGoUI/UIxComponent.h>
@ -228,41 +230,67 @@
return response;
}
- (NSString *) _logoutRedirectURL
{
NSString *redirectURL;
SOGoSystemDefaults *sd;
id container;
sd = [SOGoSystemDefaults sharedSystemDefaults];
if ([[sd authenticationType] isEqualToString: @"cas"])
redirectURL = [SOGoCASSession CASURLWithAction: @"logout"
andParameters: nil];
else
{
container = [[self clientObject] container];
redirectURL = [container baseURLInContext: context];
}
return redirectURL;
}
- (WOCookie *) _logoutCookieWithDate: (NSCalendarDate *) date
{
SOGoWebAuthenticator *auth;
NSString *cookieName, *appName;
WOCookie *cookie;
cookie = nil;
auth = [[self clientObject] authenticatorInContext: context];
if ([auth respondsToSelector: @selector (cookieNameInContext:)])
{
cookieName = [auth cookieNameInContext: context];
if ([cookieName length])
{
cookie = [WOCookie cookieWithName: cookieName value: @"discard"];
appName = [[context request] applicationName];
[cookie setPath: [NSString stringWithFormat: @"/%@/", appName]];
[cookie setExpires: [date yesterday]];
}
}
return cookie;
}
- (id <WOActionResults>) logoffAction
{
WOResponse *response;
WOCookie *cookie;
SOGoWebAuthenticator *auth;
id container;
NSCalendarDate *date;
NSString *userName, *cookieName, *appName;
container = [[self clientObject] container];
NSString *userName;
userName = [[context activeUser] login];
[self logWithFormat: @"user '%@' logged off", userName];
response = [context response];
[response setStatus: 302];
[response setHeader: [container baseURLInContext: context]
forKey: @"location"];
response = [self redirectToLocation: [self _logoutRedirectURL]];
date = [NSCalendarDate calendarDate];
[date setTimeZone: [NSTimeZone timeZoneWithAbbreviation: @"GMT"]];
auth = [[self clientObject] authenticatorInContext: context];
if ([auth respondsToSelector: @selector (cookieNameInContext:)])
cookieName = [auth cookieNameInContext: context];
else
cookieName = nil;
if ([cookieName length])
{
cookie = [WOCookie cookieWithName: cookieName value: @"discard"];
appName = [[context request] applicationName];
[cookie setPath: [NSString stringWithFormat: @"/%@/", appName]];
[cookie setExpires: [date yesterday]];
[response addCookie: cookie];
}
cookie = [self _logoutCookieWithDate: date];
if (cookie)
[response addCookie: cookie];
[response setHeader: [date rfc822DateString] forKey: @"Last-Modified"];
[response setHeader: @"no-store, no-cache, must-revalidate,"