amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-08 18:05:08 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 3e6948059832484bb80a8445b88f9673d85ac1ba

Browse Source 
Monotone-Revision: dbf0e1c560253d898374155e0aa7bd9b90bc6555

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-11-20T20:25:13
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-11-20 20:25:13 +00:00
parent 9dd4c2c014
commit 4a46b725c7
7 changed files with 16 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+12
View File
@@ -1,5 +1,17 @@
2009-11-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoDAVAuthenticator.m (-init): removed method,
removed the "SOGoAuthenticationMethod" user default, which was
never used.
* SoObjects/SOGo/SOGoWebAuthenticator.m (-init): removed method,
removed the "SOGoAuthenticationMethod" user default, which was
never used.
* SoObjects/SOGo/SOGoProxyAuthenticator.m (-init): removed method,
removed the "SOGoAuthenticationMethod" user default, which was
never used.
* Main/sogod.m (prepareUserDefaults): replaces
"convertOldSOGoDomain", automatically set WOMessageUseUTF8,
WOParsersUseUTF8 and NGUseUTF8AsURLEncoding to YES in the user
SoObjects/SOGo/SOGoDAVAuthenticator.h
-3
View File
@@ -39,9 +39,6 @@
@class SOGoUser;
@interface SOGoDAVAuthenticator : SoHTTPAuthenticator <SOGoAuthenticator>
{
NSString *authMethod;
}
+ (id) sharedSOGoDAVAuthenticator;
SoObjects/SOGo/SOGoDAVAuthenticator.m
+2 -44
View File
@@ -46,53 +46,11 @@
return auth;
}
- (id) init
{
NSUserDefaults *ud;
if ((self = [super init]))
{
ud = [NSUserDefaults standardUserDefaults];
authMethod = [ud stringForKey: @"SOGoAuthenticationMethod"];
if (!authMethod)
authMethod = [ud stringForKey: @"SOGoAuthentificationMethod"];
if (!authMethod)
{
authMethod = @"LDAP";
[self warnWithFormat:
@"authentication method automatically set to '%@'",
authMethod];
}
}
return self;
}
- (void) dealloc
{
[authMethod release];
[super dealloc];
}
- (BOOL) checkLogin: (NSString *) _login
password: (NSString *) _pwd
{
BOOL accept;
SOGoUserManager *um;
if ([authMethod isEqualToString: @"LDAP"])
{
um = [SOGoUserManager sharedUserManager];
accept = [um checkLogin: _login andPassword: _pwd];
}
else
accept = NO;
// accept = ([authMethod isEqualToString: @"bypass"]
// && [_login length] > 0);
return accept;
// || ([_login isEqualToString: @"freebusy"]
// && [_pwd isEqualToString: @"freebusy"]));
return [[SOGoUserManager sharedUserManager] checkLogin: _login
andPassword: _pwd];
}
- (NSString *) passwordInContext: (WOContext *) context
SoObjects/SOGo/SOGoProxyAuthenticator.h
-3
View File
@@ -42,9 +42,6 @@
// @interface SOGoProxyAuthenticator : SoHTTPAuthenticator <SOGoAuthenticator>
@interface SOGoProxyAuthenticator : NSObject
{
NSString *authMethod;
}
+ (id) sharedSOGoProxyAuthenticator;
SoObjects/SOGo/SOGoProxyAuthenticator.m
-28
View File
@@ -48,34 +48,6 @@
return auth;
}
- (id) init
{
NSUserDefaults *ud;
if ((self = [super init]))
{
ud = [NSUserDefaults standardUserDefaults];
authMethod = [ud stringForKey: @"SOGoAuthenticationMethod"];
if (!authMethod)
authMethod = [ud stringForKey: @"SOGoAuthentificationMethod"];
if (!authMethod)
{
authMethod = @"LDAP";
[self warnWithFormat:
@"authentication method automatically set to '%@'",
authMethod];
}
}
return self;
}
- (void) dealloc
{
[authMethod release];
[super dealloc];
}
- (BOOL) checkLogin: (NSString *) _login
password: (NSString *) _pwd
{
SoObjects/SOGo/SOGoWebAuthenticator.h
-3
View File
@@ -31,9 +31,6 @@
@class SOGoUser;
@interface SOGoWebAuthenticator : SoCookieAuthenticator
{
NSString *authMethod;
}
+ (id) sharedSOGoWebAuthenticator;
SoObjects/SOGo/SOGoWebAuthenticator.m
+2 -46
View File
@@ -55,55 +55,11 @@
return auth;
}
- (id) init
{
NSUserDefaults *ud;
if ((self = [super init]))
{
ud = [NSUserDefaults standardUserDefaults];
authMethod = [ud stringForKey: @"SOGoAuthenticationMethod"];
if (!authMethod)
authMethod = [ud stringForKey: @"SOGoAuthentificationMethod"];
if (!authMethod)
{
authMethod = @"LDAP";
[self warnWithFormat:
@"authentication method automatically set to '%@'",
authMethod];
}
[authMethod retain];
}
return self;
}
- (void) dealloc
{
[authMethod release];
[super dealloc];
}
- (BOOL) checkLogin: (NSString *) _login
password: (NSString *) _pwd
{
BOOL accept;
SOGoUserManager *um;
if ([authMethod isEqualToString: @"LDAP"])
{
um = [SOGoUserManager sharedUserManager];
accept = [um checkLogin: _login andPassword: _pwd];
}
else
accept = NO;
// else
// accept = ([authMethod isEqualToString: @"bypass"]
// && [_login length] > 0);
return accept;
// || ([_login isEqualToString: @"freebusy"]
// && [_pwd isEqualToString: @"freebusy"]));
return [[SOGoUserManager sharedUserManager] checkLogin: _login
andPassword: _pwd];
}
- (SOGoUser *) userInContext: (WOContext *)_ctx