git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1106 d1b88da0-ebda-0310...

diff --git a/ChangeLog b/ChangeLog
index 2b35e80878f6d3fb441416f2660e739ec1321a8d..cfc4cf35c1df426ac0d47a2b90c7e3b461fe105c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-07-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+       * SoObjects/SOGo/SOGoUser.m ([SOGoUser +initialize]): set
+       acceptAnyUser to YES only when the SOGoAuthentificationMethod user
+       default is set to "bypass".
+
+       * SoObjects/SOGo/SOGoAuthenticator.m ([SOGoAuthenticator
+       -checkLogin:_loginpassword:_pwd]): accepts unverified connections
+       when authMethod is set to "bypass" from now on. This would avoid a
+       security concern with a default installation of SOGo.
+       AuthentificationMethod is now prefixed with "SOGo" for better
+       clarity.
+
 2007-07-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
        * UI/MailerUI/UIxMailFolderActions.m ([UIxMailFolderActions

diff --git a/SoObjects/SOGo/SOGoAuthenticator.m b/SoObjects/SOGo/SOGoAuthenticator.m
index edf368fb99afa866313a09111863ae1197929ffa..20856a419cc80ea9c6f8e187cc9cfd1c9600db59 100644 (file)
--- a/SoObjects/SOGo/SOGoAuthenticator.m
+++ b/SoObjects/SOGo/SOGoAuthenticator.m
@@ -50,7 +50,7 @@
   if ((self = [super init]))
     {
       authMethod = [[NSUserDefaults standardUserDefaults]
-                    stringForKey: @"AuthentificationMethod"];
+                    stringForKey: @"SOGoAuthentificationMethod"];
       [authMethod retain];
     }
 
@@ -75,7 +75,8 @@
       accept = [um checkLogin: _login andPassword: _pwd];
     }
   else
-    accept = ([_login length] > 0);
+    accept = ([authMethod isEqualToString: @"bypass"]
+             && [_login length] > 0);
 
   return accept;
 //       || ([_login isEqualToString: @"freebusy"]

diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index 17f20876d605725647bce9988ae45db911ec8479..00d9b3f3eb79cc260a4028ac5dbc32a7cd90b452 100644 (file)
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -92,7 +92,8 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
        ASSIGN (superUsername, nsUsername);
     }
 
-  acceptAnyUser = (![ud stringForKey: @"AuthentificationMethod"]);
+  acceptAnyUser = ([[ud stringForKey: @"SOGoAuthentificationMethod"]
+                    isEqualToString: @"bypass"]);
 }
 
 + (SOGoUser *) userWithLogin: (NSString *) newLogin