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

Monotone-Parent: 05ac214876f464bdf1a7fd94fc6ee88c41f8f7a6

Browse Source 
Monotone-Revision: ab81a2b3344ce13069fdc2f4762e128a13136bb3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-07-24T18:00:21
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-07-24 18:00:21 +00:00
parent 26f98cccb8
commit 8a17179ab1
5 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -1,3 +1,15 @@
2008-07-24 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoWebAuthenticator.m ([SOGoWebAuthenticator -checkLogin:_loginpassword:_pwd]),
SoObjects/SOGo/SOGoDAVAuthenticator.m ([SOGoDAVAuthenticator -checkLogin:_loginpassword:_pwd]):
disable "bypass" authentification method, since it doesn't work anyway.
* SoObjects/SOGo/SOGoWebAuthenticator.m ([SOGoWebAuthenticator -init]),
SoObjects/SOGo/SOGoDAVAuthenticator.m ([SOGoDAVAuthenticator
-init]): use "SOGoAuthenticationMethod" first, since
"SOGoAuthentificationMethod" was a typo. If none are specified,
fallback on "LDAP".
2008-07-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoCalendarComponent.m

1
NEWS
View File

@@ -16,6 +16,7 @@ address book in the Address Book module
- the events are now computed in the server code again, in order to speedup the drawing of events as well as to fix the bug where events would be shifted back or forth of one day, depending on how their start time would be compared to UTC time
- implemented the handling of exceptional occurences of recurrent events
- all the calendar preferences are now taken into account
- the user defaults variable "SOGoAuthentificationMethod" has been renamed to "SOGoAuthenticationMethod"
0.9.0-20080520 (1.0 rc6)
------------------------

22
SoObjects/SOGo/SOGoDAVAuthenticator.m
View File

@@ -25,6 +25,7 @@
#import <NGObjWeb/WOContext.h>
#import <NGObjWeb/WOResponse.h>
#import <NGExtensions/NSObject+Logs.h>
#import <NGLdap/NGLdapConnection.h>
#import "LDAPUserManager.h"
@@ -47,11 +48,21 @@
- (id) init
{
NSUserDefaults *ud;
if ((self = [super init]))
{
authMethod = [[NSUserDefaults standardUserDefaults]
stringForKey: @"SOGoAuthentificationMethod"];
[authMethod retain];
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;
@@ -75,8 +86,9 @@
accept = [um checkLogin: _login andPassword: _pwd];
}
else
accept = ([authMethod isEqualToString: @"bypass"]
&& [_login length] > 0);
accept = NO;
// accept = ([authMethod isEqualToString: @"bypass"]
// && [_login length] > 0);
return accept;
// || ([_login isEqualToString: @"freebusy"]

11
SoObjects/SOGo/SOGoUser.m
View File

@@ -51,7 +51,7 @@ static BOOL fallbackIsConfigured = NO;
static NSString *defaultLanguage = nil;
static NSArray *superUsernames = nil;
static NSURL *AgenorProfileURL = nil;
static BOOL acceptAnyUser = NO;
// static BOOL acceptAnyUser = NO;
static int sogoFirstDayOfWeek = -1;
static int defaultDayStartTime = -1;
static int defaultDayEndTime = -1;
@@ -148,8 +148,8 @@ _timeValue (NSString *key)
if (!superUsernames)
ASSIGN (superUsernames, [ud arrayForKey: @"SOGoSuperUsernames"]);
acceptAnyUser = ([[ud stringForKey: @"SOGoAuthentificationMethod"]
isEqualToString: @"bypass"]);
// acceptAnyUser = ([[ud stringForKey: @"SOGoAuthentificationMethod"]
// isEqualToString: @"bypass"]);
}
+ (NSString *) language
@@ -218,8 +218,9 @@ _timeValue (NSString *key)
LDAPUserManager *um;
NSString *realUID;
if (acceptAnyUser
|| [newLogin isEqualToString: @"anonymous"]
if (// acceptAnyUser
// ||
[newLogin isEqualToString: @"anonymous"]
|| [newLogin isEqualToString: @"freebusy"])
realUID = newLogin;
else

22
SoObjects/SOGo/SOGoWebAuthenticator.m
View File

@@ -32,6 +32,7 @@
#import <NGObjWeb/WORequest.h>
#import <NGObjWeb/WOResponse.h>
#import <NGExtensions/NSCalendarDate+misc.h>
#import <NGExtensions/NSObject+Logs.h>
#import <NGLdap/NGLdapConnection.h>
#import <UI/MainUI/SOGoRootPage.h>
@@ -56,10 +57,21 @@
- (id) init
{
NSUserDefaults *ud;
if ((self = [super init]))
{
authMethod = [[NSUserDefaults standardUserDefaults]
stringForKey: @"SOGoAuthentificationMethod"];
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];
}
@@ -84,8 +96,10 @@
accept = [um checkLogin: _login andPassword: _pwd];
}
else
accept = ([authMethod isEqualToString: @"bypass"]
&& [_login length] > 0);
accept = NO;
// else
// accept = ([authMethod isEqualToString: @"bypass"]
// && [_login length] > 0);
return accept;
// || ([_login isEqualToString: @"freebusy"]