add openid auth bearer

API/SOGoAPIDispatcher.m

@@ -371,20 +371,20 @@ void handle_api_terminate(int signum)
   }
 
   //Execute action
-  // NS_DURING
-  // {
+  NS_DURING
+  {
     ret = [classAction action: context withParam: paramInjected];
-  // }
-  // NS_HANDLER
-  // {
-  //   error = [NSString stringWithFormat: @"Internal error during: %@", action];
-  //   [self errorWithFormat: error];
-  //   [self _sendAPIErrorResponse: theResponse withMessage: error withStatus: 500];
-  //   RELEASE(context);
-  //   RELEASE(pool);
-  //   return nil;
-  // }
-  // NS_ENDHANDLER;
+  }
+  NS_HANDLER
+  {
+    error = [NSString stringWithFormat: @"Internal error during: %@", action];
+    [self errorWithFormat: error];
+    [self _sendAPIErrorResponse: theResponse withMessage: error withStatus: 500];
+    RELEASE(context);
+    RELEASE(pool);
+    return nil;
+  }
+  NS_ENDHANDLER;
   
 
   //Make the response

API/SOGoAPIUserFolder.m

@@ -5,7 +5,6 @@
 #import <SOGoAPIUserFolder.h>
 
 #import <GDLContentStore/GCSFolderManager.h>
-#import <GDLContentStore/GCSFolder.h>
 
 @implementation SOGoAPIUserFolder
 
@@ -21,34 +20,6 @@
   [super dealloc];
 }
 
-/**
-
-
-
-{
-   "calendar":[
-      {
-         "name":"DidyShared",
-         "url":"http://127.0.0.1/SOGo/dav/sogo-tests1@example.org/Calendar/12509-67F67D00-1-3105AF40"
-      },
-      {
-         "name":"LocalDidy",
-         "url":"http://127.0.0.1/SOGo/dav/sogo-tests1@example.org/Calendar/1BC38-67B60000-1-6E4B6880"
-      },
-      {
-         "name":"Personal Calendar",
-         "url":"http://127.0.0.1/SOGo/dav/sogo-tests1@example.org/Calendar/personal"
-      }
-   ],
-   "username":"sogo-tests1@example.org",
-   "contact":[
-      {
-         "name":"Personal Address Book",
-         "url":"http://127.0.0.1/SOGo/dav/sogo-tests1@example.org/Contacts/personal"
-      }
-   ]
-}
-**/
 
 - (NSDictionary *) action: (WOContext*) ctx withParam: (NSDictionary *) param
 {
@@ -57,8 +28,6 @@
   NSMutableArray *cardavLinks, *caldavLinks;
   NSString *serverUrl, *basePath, *c_uid, *url;
   GCSFolderManager *fm;
-  GCSFolder *folder;
-
   int max, i;
 
   //Should be a user
@@ -67,7 +36,7 @@
   //fetch folders
   fm = [GCSFolderManager defaultFolderManager];
   basePath = [NSString stringWithFormat: @"/Users/%@", c_uid];
-  folders = [fm listSubFoldersAndNamesAtPath: basePath recursive: YES];
+  folders = [fm listSubFoldersAtPath: basePath recursive: YES];
 
   //Generate dav link
   max = [folders count];
@@ -78,21 +47,16 @@
   serverUrl = [[ctx serverURL] absoluteString];
   for (i = 0; i < max; i++)
   {
-    NSMutableDictionary *folderRet;
-    folderRet = [NSMutableDictionary dictionary];
-    folder = [folders objectAtIndex: i];
-    url = [NSString stringWithFormat: @"%@/SOGo/dav/%@/%@", serverUrl, c_uid, [folder objectForKey: @"path"]];
-    [folderRet setObject: url forKey: @"url"];
-    [folderRet setObject: [folder objectForKey: @"name"] forKey: @"name"];
+    url = [NSString stringWithFormat: @"%@/SOGo/dav/%@/%@", serverUrl, c_uid, [folders objectAtIndex: i]];
     if([url rangeOfString:@"/Calendar/"].location == NSNotFound)
     {
       //Contacts
-      [cardavLinks addObject: folderRet];
+      [cardavLinks addObject: url];
     }
     else
     {
       //Calendar
-      [caldavLinks addObject: folderRet];
+      [caldavLinks addObject: url];
     }
   }
 

Documentation/SOGoInstallationGuide.asciidoc

@@ -193,9 +193,6 @@ should apply to all supported operating systems.
 Software Downloads
 ~~~~~~~~~~~~~~~~~~
 
-**In order to access the community build, go to https://www.sogo.nu/download.html[SOGo website]
-and select "Development (nightly builds)" at the bottom of the page.**
-
 [NOTE]
 In order to access the production builds, you need a proper support contract
 from https://sogo.nu/support/index_new.html#support-plans[Alinto]. Continue

SOPE/GDLContentStore/GCSFolderManager.h

@@ -76,7 +76,6 @@
 
 - (BOOL)folderExistsAtPath:(NSString *)_path;
 - (NSArray *)listSubFoldersAtPath:(NSString *)_path recursive:(BOOL)_flag;
-- (NSArray *)listSubFoldersAndNamesAtPath:(NSString *)_path recursive:(BOOL)_recursive;
 
 - (NSDictionary *) recordAtPath: (NSString *) _path;
 - (GCSFolder *)folderAtPath:(NSString *)_path;

SOPE/GDLContentStore/GCSFolderManager.m

@@ -598,27 +598,6 @@ static BOOL       _singleStoreMode           = NO;
   return sql;
 }
 
-- (NSString *)generateSQLPathAndNameFetchForInternalNames:(NSArray *)_names
-					exactMatch:(BOOL)_beExact orDirectSubfolderMatch:(BOOL)_directSubs
-{
-  /* fetches the 'path' subset for a given quick-names */
-  NSMutableString *sql;
-  NSString *ws;
-  
-  ws = [self generateSQLWhereForInternalNames:_names 
-	     exactMatch:_beExact orDirectSubfolderMatch:_directSubs];
-  if ([ws length] == 0)
-    return nil;
-  
-  sql = [NSMutableString stringWithCapacity:256];
-  [sql appendString:@"SELECT c_path, c_foldername FROM "];
-  [sql appendString:[self folderInfoTableName]];
-  [sql appendString:@" WHERE "];
-  [sql appendString:ws];
-  if (debugSQLGen) [self logWithFormat:@"PathFetch-SQL: %@", sql];
-  return sql;
-}
-
 /* handling folder names */
 
 - (BOOL)_isStandardizedPath:(NSString *)_path {
@@ -827,72 +806,6 @@ static BOOL       _singleStoreMode           = NO;
   return result;
 }
 
-- (NSArray *)listSubFoldersAndNamesAtPath:(NSString *)_path recursive:(BOOL)_recursive{
-  NSMutableArray *result;
-  NSString *fname;
-  NSArray  *fnames, *records;
-  NSString *sql;
-  unsigned i, count;
-  
-  if ((fnames = [self internalNamesFromPath:_path]) == nil) {
-    [self debugWithFormat:@"got no internal names for path: '%@'", _path];
-    return nil;
-  }
-  
-  sql = [self generateSQLPathAndNameFetchForInternalNames:fnames 
-	      exactMatch:NO orDirectSubfolderMatch:(_recursive ? NO : YES)];
-  if ([sql length] == 0) {
-    [self debugWithFormat:@"got no SQL for names: %@", fnames];
-    return nil;
-  }
-  
-  if ((records = [self performSQL:sql]) == nil) {
-    [self logWithFormat:@"ERROR(%s): executing SQL failed: '%@'", 
-	  __PRETTY_FUNCTION__, sql];
-    return nil;
-  }
-  
-  if ((count = [records count]) == 0)
-    return emptyArray;
-
-  result = [NSMutableArray arrayWithCapacity:(count > 128 ? 128 : count)];
-  
-  fname = [self internalNameFromPath:_path];
-  fname = [fname stringByAppendingString:@"/"]; /* add slash */
-  for (i = 0; i < count; i++) {
-    NSDictionary *record, *folderInfo;
-    NSString *sname, *spath, *foldername;
-    
-    record = [records objectAtIndex:i];
-    sname  = [record objectForKey:GCSPathRecordName];
-    if (![sname hasPrefix:fname]) /* does not match at all ... */
-      continue;
-    
-    /* strip prefix and following slash */
-    sname = [sname substringFromIndex:[fname length]];
-    spath = [self pathPartFromInternalName:sname];
-    
-    if (_recursive) {
-      if ([spath length] > 0){
-        foldername = [record objectForKey: @"c_foldername"];
-        folderInfo = [NSDictionary dictionaryWithObjectsAndKeys: spath, @"path", foldername, @"name", nil];
-	      [result addObject:folderInfo];
-      } 
-    }
-    else {
-      /* direct children only, so exclude everything with a slash */
-      if ([sname rangeOfString:@"/"].length == 0 && [spath length] > 0)
-      {
-        foldername = [record objectForKey: @"c_foldername"];
-        folderInfo = [NSDictionary dictionaryWithObjectsAndKeys: spath, @"path", foldername, @"name", nil];
-	      [result addObject:folderInfo];
-      }
-    }
-  }
-  
-  return result;
-}
-
 - (NSDictionary *) recordAtPath: (NSString *) _path
 {
   NSMutableString *sql;

SOPE/GDLContentStore/GCSOpenIdFolder.m

@@ -303,8 +303,8 @@ static NSString *openIdFolderURLString = nil;
     newRecord = [NSDictionary dictionaryWithObjectsAndKeys: _user_session, @"c_user_session",
                       _old_session, @"c_old_session",
                       [NSNumber numberWithInt:now], @"c_session_started",
-                      [NSNumber numberWithInt:nowExpire] , @"c_access_token_expires_in",
                       _refresh_token, @"c_refresh_token",
+                      [NSNumber numberWithInt:nowExpire] , @"c_access_token_expires_in",
                       [NSNumber numberWithInt:nowRefreshExpire] , @"c_refresh_token_expires_in",
                       nil];
     record = [self recordForSession: _user_session useOldSession: NO];

SOPE/NGCards/iCalDailyRecurrenceCalculator.m

@@ -55,7 +55,7 @@
 - (NSArray *) recurrenceRangesWithinCalendarDateRange: (NGCalendarDateRange *) _r
 {
   NSMutableArray *ranges;
-  NSCalendarDate *firStart, *firEnd, *startDate, *endDate, *currentStartDate, *currentEndDate;
+  NSCalendarDate *firStart, *startDate, *endDate, *currentStartDate, *currentEndDate;
   iCalByDayMask *dayMask;
   long i, count, repeatCount;
   unsigned interval;
@@ -63,7 +63,6 @@
   //[self logWithFormat: @"Recurrence rule is %@", rrule];
 
   firStart = [firstRange startDate];
-  firEnd = [firstRange endDate];
   startDate = [_r startDate];
   endDate = [_r endDate];
   dayMask = nil;
@@ -85,14 +84,13 @@
   // If rule is bound, check the bounds
   if (![rrule isInfinite])
     {
-      NSCalendarDate *until, *lastStartDate, *lastEndDate;
+      NSCalendarDate *until, *lastDate;
 
-      lastStartDate = nil;
-      lastEndDate = nil;
+      lastDate = nil;
       until = [rrule untilDate];
       if (until)
         {
-          lastStartDate = until;
+          lastDate = until;
         }
       else
         {
@@ -100,23 +98,20 @@
           if (dayMask == nil)
             // If there's no day mask, we can compute the date of the last
             // occurrence of the recurrent rule.
-            lastStartDate = [firStart dateByAddingYears: 0 months: 0
-                                              days: (interval
-                                                     * (repeatCount - 1))];
-            lastEndDate = [firEnd dateByAddingYears: 0 months: 0
+            lastDate = [firStart dateByAddingYears: 0 months: 0
                                               days: (interval
                                                      * (repeatCount - 1))];
         }
 
-      if (lastStartDate != nil && lastEndDate != nil)
+      if (lastDate != nil)
         {
-          if ([lastEndDate compare: startDate] == NSOrderedAscending)
+          if ([lastDate compare: startDate] == NSOrderedAscending)
             // Range starts after last occurrence
             return nil;
 
-          if ([lastStartDate compare: endDate] == NSOrderedAscending)
+          if ([lastDate compare: endDate] == NSOrderedAscending)
             // Range ends after last occurence; adjust end date
-            endDate = lastStartDate;
+            endDate = lastDate;
         }
     }
 

SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m

@@ -185,7 +185,7 @@ static inline unsigned iCalDoWForNSDoW (int dow)
   // TODO: check whether this is OK for multiday-events!
   NSMutableArray *ranges;
   NSTimeZone     *timeZone;
-  NSCalendarDate *eventStartDate, *eventEndDate, *rStart, *rEnd, *untilStart, *untilEnd, *referenceDate;
+  NSCalendarDate *eventStartDate, *rStart, *rEnd, *until, *referenceDate;
   int            eventDayOfMonth;
   unsigned       monthIdxInRange, numberOfMonthsInRange, interval, repeatCount;
   int            diff, count;
@@ -199,14 +199,12 @@ static inline unsigned iCalDoWForNSDoW (int dow)
   iCalByDayMask *byDayMask;
   
   eventStartDate  = [firstRange startDate];
-  eventEndDate  = [firstRange endDate];
   eventDayOfMonth = [eventStartDate dayOfMonth];
   timeZone        = [eventStartDate timeZone];
   rStart          = [_r startDate];
   rEnd            = [_r endDate];
   interval        = [rrule repeatInterval];
-  untilStart      = nil;
-  untilEnd        = nil;
+  until           = nil;
   repeatCount     = [rrule repeatCount];
   byMonth         = [rrule byMonth];
   byMonthDay      = [rrule byMonthDay];
@@ -220,27 +218,24 @@ static inline unsigned iCalDoWForNSDoW (int dow)
 	{
 	  // When there's no BYxxx mask, we can find the date of the last
 	  // occurrence.
-	  untilStart = [eventStartDate dateByAddingYears: 0
+	  until = [eventStartDate dateByAddingYears: 0
 					     months: (interval * (repeatCount - 1))
 					       days: 0];
-    untilEnd = [eventEndDate dateByAddingYears: 0
-            months: (interval * (repeatCount - 1))
-              days: 0];
 	}
       else
 	{
-	  untilStart = [rrule untilDate];
+	  until = [rrule untilDate];
 	}
     }
 
-  if (untilStart != nil)
+  if (until != nil)
     {
-      if ([untilEnd compare: rStart] == NSOrderedAscending)
+      if ([until compare: rStart] == NSOrderedAscending)
 	// Range starts after last occurrence
 	return nil;
-      if ([untilStart compare: rEnd] == NSOrderedAscending)
+      if ([until compare: rEnd] == NSOrderedAscending)
 	// Range ends after last occurence; adjust end date
-	rEnd = untilStart;
+	rEnd = until;
     }
   
   if (byMonth && [byMonth count] > 0)
@@ -446,7 +441,7 @@ static inline unsigned iCalDoWForNSDoW (int dow)
 
         start = [cursor dateByAddingYears: 0 months: 0 days: (dom - 1)];
         doCont = [self _addInstanceWithStartDate: start
-                                       limitDate: untilStart
+                                       limitDate: until
                                       limitRange: _r
                                          toArray: ranges];
         //NSLog(@"*** MONTHLY [%i/%i] adding %@%@ (count = %i)", dom, numDaysInMonth, start, (doCont?@"":@" .. NOT!"), count);

SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m

@@ -64,7 +64,7 @@
 - (NSArray *) recurrenceRangesWithinCalendarDateRange: (NGCalendarDateRange *) _r
 {
   NSMutableArray *ranges;
-  NSCalendarDate *firStart, *firEnd, *startDate, *endDate, *currentStartDate, *currentEndDate;
+  NSCalendarDate *firStart, *startDate, *endDate, *currentStartDate, *currentEndDate;
   long i, repeatCount, count;
   unsigned interval;
   iCalByDayMask *dayMask;
@@ -73,7 +73,6 @@
   //[self logWithFormat: @"Recurrence rule is %@", rrule];
 
   firStart = [firstRange startDate];
-  firEnd = [firstRange endDate];
   startDate = [_r startDate];
   endDate = [_r endDate];
   dayMask = nil;
@@ -96,35 +95,31 @@
   // If rule is bound, check the bounds
   if (![rrule isInfinite])
     {
-      NSCalendarDate *until, *lastStartDate, *lastEndDate;
+      NSCalendarDate *until, *lastDate;
 
-      lastStartDate = nil;
-      lastEndDate = nil;
+      lastDate = nil;
       until = [rrule untilDate];
       if (until)
-        lastStartDate = until;
+        lastDate = until;
       else
         {
           repeatCount = [rrule repeatCount];
           if (dayMask == nil)
             // When there's no BYxxx mask, we can find the date of the last
             // occurrence.
-            lastStartDate = [firStart dateByAddingYears: 0 months: 0
-                                              days: (interval
-                                                     * (repeatCount - 1) * 7)];
-            lastEndDate = [firEnd dateByAddingYears: 0 months: 0
+            lastDate = [firStart dateByAddingYears: 0 months: 0
                                               days: (interval
                                                      * (repeatCount - 1) * 7)];
         }
 
-      if (lastStartDate != nil && lastEndDate != nil)
+      if (lastDate != nil)
         {
-          if ([lastEndDate compare: startDate] == NSOrderedAscending)
+          if ([lastDate compare: startDate] == NSOrderedAscending)
             // Range starts after last occurrence
             return nil;
-          if ([lastStartDate compare: endDate] == NSOrderedAscending)
+          if ([lastDate compare: endDate] == NSOrderedAscending)
             // Range ends after last occurence; adjust end date
-            endDate = [lastStartDate addTimeInterval: [firstRange duration]];
+            endDate = [lastDate addTimeInterval: [firstRange duration]];
         }
     }
 

SOPE/NGCards/iCalYearlyRecurrenceCalculator.m

@@ -44,14 +44,13 @@
 {
   NSMutableArray *ranges;
   NSArray *byMonth;
-  NSCalendarDate *firStart, *firEnd, *lastStartDate, *lastEndDate, *rStart, *rEnd, *until, *referenceDate, *rTemp;
+  NSCalendarDate *firStart, *lastDate, *rStart, *rEnd, *until, *referenceDate, *rTemp;
   NSInteger *hoursOfOffset;
   iCalMonthlyRecurrenceCalculator *monthlyCalc;
   unsigned j, yearIdxInRange, numberOfYearsInRange, count, interval, monthDiff;
   int diff, repeatCount, currentMonth, origNbDaysInMonth;
 
   firStart = [firstRange startDate];
-  firEnd = [firstRange endDate];
   rStart = [_r startDate];
   rEnd = [_r endDate];
   interval = [rrule repeatInterval];
@@ -72,37 +71,33 @@
   // If rule is bound, check the bounds
   if (![rrule isInfinite])
     {
-      lastStartDate = nil;
-      lastEndDate = nil;
+      lastDate = nil;
       until = [rrule untilDate];
       repeatCount = [rrule repeatCount];
 
       if (until)
         {
-          lastStartDate = until;
+          lastDate = until;
         }
       if (repeatCount > 0)
         {
-          if (lastStartDate == nil && ![rrule hasByMask])
+          if (lastDate == nil && ![rrule hasByMask])
             // When there's no BYxxx mask, we can find the date of the last
             // occurrence.
-            lastStartDate = [firStart dateByAddingYears: (interval * (repeatCount - 1))
-                                            months: 0
-                                              days: 0];
-            lastEndDate = [firEnd dateByAddingYears: (interval * (repeatCount - 1))
+            lastDate = [firStart dateByAddingYears: (interval * (repeatCount - 1))
                                             months: 0
                                               days: 0];
           referenceDate = firStart;
         }
 
-      if (lastStartDate != nil)
+      if (lastDate != nil)
         {
-          if ([lastEndDate compare: rStart] == NSOrderedAscending)
+          if ([lastDate compare: rStart] == NSOrderedAscending)
             // Range starts after last occurrence
             return nil;
-          if ([lastStartDate compare: rEnd] == NSOrderedAscending)
+          if ([lastDate compare: rEnd] == NSOrderedAscending)
             // Range ends after last occurence; adjust end date
-            rEnd = [lastStartDate addTimeInterval: [firstRange duration]];
+            rEnd = [lastDate addTimeInterval: [firstRange duration]];
         }
     }
 

SoObjects/SOGo/GNUmakefile

@@ -231,7 +231,7 @@ endif
 ADDITIONAL_TOOL_LIBS += -Lobj -lSOGo$(LIBRARY_NAME_SUFFIX)
 ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
-ADDITIONAL_LDFLAGS += -lmemcached -lzip -lytnef -lcurl
+ADDITIONAL_LDFLAGS += -lmemcached -lzip -lytnef
 
 -include GNUmakefile.preamble
 ifneq ($(FHS_INSTALL_ROOT),)

SoObjects/SOGo/SOGoOpenIdSession.h

@@ -33,25 +33,6 @@
 @class NSURL;
 @class NSJSONSerialization;
 
-size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer);
-
-@interface SimpleOpenIdResponse: NSObject
-{
-  unsigned int status;
-  NSString    *content;
-  NSString    *headers;
-}
-
-- (id)initWithResponse: (NSString *)_data andHeaders: (NSString *)_headers andStatus:(unsigned int )_status;
-
-- (void)setStatus:(unsigned int)_status;
-- (unsigned int)status;
-- (void)setContent:(NSString *)_data;
-- (NSString *)contentString;
-- (void)setHearders:(NSString *)_data;
-- (NSString *)headers;
-
-@end
 
 @interface SOGoOpenIdSession : SOGoObject
 {
@@ -66,7 +47,6 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer);
   NSString *openIdClient;
   NSString *openIdClientSecret;
   NSString *openIdEmailParam;
-  NSString *openIdHttpVersion;
   BOOL openIdEnableRefreshToken;
   BOOL sendDomainInfo;
 
@@ -100,12 +80,12 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer);
 - (void) initialize;
 - (void) initializeWithConfig: (NSDictionary *) _config;
 - (BOOL) sessionIsOK;
-- (SimpleOpenIdResponse *) _performOpenIdRequest: (NSString *) endpoint
+- (WOResponse *) _performOpenIdRequest: (NSString *) endpoint
                         method: (NSString *) method
                        headers: (NSDictionary *) headers
                           body: (NSData *) body;
 - (NSMutableDictionary *) fecthConfiguration: (NSString *) _domain;
-- (void) setAccessToken: (NSString* ) token;
+- (void) setAccessToken;
 - (NSString *) getRefreshToken; 
 - (NSString *) getToken;
 - (NSString *) getCurrentToken; 

SoObjects/SOGo/SOGoOpenIdSession.m

@@ -18,11 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-
 #import <Foundation/NSProcessInfo.h>
 
-#import <curl/curl.h>
-
 #import <NGObjWeb/WOHTTPConnection.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
@@ -30,12 +27,12 @@
 
 #import <SOGo/SOGoUser.h>
 
+
 #import <GDLContentStore/GCSOpenIdFolder.h>
 #import <GDLContentStore/GCSFolderManager.h>
 
 #import "NSDictionary+Utilities.h"
-#import <SOGo/NSString+Utilities.h>
-#import <SOGo/NSString+Crypto.h>
+#import "NSString+Utilities.h"
 #import "SOGoCache.h"
 #import "SOGoSystemDefaults.h"
 
@@ -43,88 +40,6 @@
 
 static BOOL SOGoOpenIDDebugEnabled = YES;
 
-
-size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
-{
-  size_t total;
-  
-  total = size * nmemb;
-  [(NSMutableData *)buffer appendBytes: ptr length: total];
-  
-  return total;
-}
-
-
-@implementation SimpleOpenIdResponse
-
-- (id)init {
-  if ((self = [super init])) {
-  }
-  return self;
-}
-
-- (id)initWithResponse: (NSString *)_data andHeaders: (NSString *)_headers andStatus:(unsigned int )_status{
-  if ((self = [self init])) {
-    [self setStatus: _status];
-    [self setContent: _data];
-    [self setHeaders: _headers];
-  }
-  return self;
-}
-
-- (void)setStatus:(unsigned int)_status
-{
-  self->status = _status;
-}
-
-- (unsigned int)status
-{
-  if(self->status)
-    return self->status;
-  return 0;
-}
-
-- (void)setContent:(NSString *)_data
-{
-  self->content = _data;
-}
-
-- (NSString *)contentString
-{
-  if(self->content)
-    return self->content;
-  return nil;
-}
-
-- (void)setHeaders:(NSString *)_data
-{
-  self->headers = _data;
-}
-
-- (NSString *)headers
-{
-  if(self->headers)
-    return self->headers;
-  return nil;
-}
-
-- (NSString*)description {
-    NSString *co, *hd;
-    unsigned int st;
-    st = 0;
-    co = @"nil";
-    hd = @"nil";
-    if(self->status)
-      st = self->status;
-    if(self->headers)
-      hd = self->headers;
-    if(self->content)
-      co = self->content;
-    return [NSString stringWithFormat: @"<SimpleOpenIdResponse> <status: %d>, <headers: %@>, <content: %@>", st, hd, co];
-}
-
-@end
-
 @implementation SOGoOpenIdSession
 
 /// Check if all required parameters to set up a OpenIdSession are in sogo.conf
@@ -164,7 +79,6 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
     openIdClient             = [_config objectForKey: @"SOGoOpenIdClient"];
     openIdClientSecret       = [_config objectForKey: @"SOGoOpenIdClientSecret"];
     openIdEmailParam         = [_config objectForKey: @"SOGoOpenIdEmailParam"];
-    openIdHttpVersion        = [_config objectForKey: @"SOGoOpenIdHttpVersion"];
 
     openIdEnableRefreshToken = NO;
     refreshTokenBool = [_config objectForKey: @"SOGoOpenIdEnableRefreshToken"];
@@ -223,7 +137,6 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
     openIdClient             = [sd openIdClient];
     openIdClientSecret       = [sd openIdClientSecret];
     openIdEmailParam         = [sd openIdEmailParam];
-    openIdHttpVersion        = [sd openIdHttpVersion];
     openIdEnableRefreshToken = [sd openIdEnableRefreshToken];
     userTokenInterval        = [sd openIdTokenCheckInterval];
     sendDomainInfo           = [sd openIdSendDomainInfo];
@@ -243,147 +156,66 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
   }
 }
 
-- (SimpleOpenIdResponse *) _performOpenIdRequest: (NSString *) endpoint
+
+- (WOResponse *) _performOpenIdRequest: (NSString *) endpoint
                         method: (NSString *) method
                        headers: (NSDictionary *) headers
                           body: (NSData *) body
 {
   NSURL *url;
-  NSMutableData *buffer, *buffHeaders;
-  SimpleOpenIdResponse *response;
-  
-  CURL *curl;
-  struct curl_slist *headerlist=NULL;
   NSUInteger status;
-  NSString *content, *headerResp;
-  CURLcode rc;
-  char error[CURL_ERROR_SIZE];
-
+  WORequest *request;
+  WOResponse *response;
+  WOHTTPConnection *httpConnection;
+  
+  
   url = [NSURL URLWithString: endpoint];
-  if(!url)
+  if (url)
   {
-    [self errorWithFormat: @"OpenID can't handle endpoint (not a url): '%@'", endpoint];
-    return nil;
-  }
-
-  if(SOGoOpenIDDebugEnabled)
-  {
-    NSLog(@"OpenId perform request: %@ %@", method, endpoint);
-    NSLog(@"OpenId perform request, headers %@", headers);
-  }
-  if(SOGoOpenIDDebugEnabled)
-    NSLog(@"OpenId perform request, body raw %@", body);
-
-  curl_global_init(CURL_GLOBAL_SSL);
-  curl = curl_easy_init();
-
-  if (curl)
-  {
-    error[0] = 0;
-    curl_easy_setopt(curl, CURLOPT_URL, [endpoint UTF8String]);
-
-    //add form
-    if(body)
+    if(SOGoOpenIDDebugEnabled)
     {
-      //Trick because sometimes NSData bytes don't add the \0 at the end and junk character may be added
-      const char *myBodyTmp = (const char*)[body bytes];
-      char myBody[[body length]+1];
-      strncpy(myBody, myBodyTmp, [body length]);
-      myBody[[body length]]='\0';
-
-      if(SOGoOpenIDDebugEnabled)
-        NSLog(@"OpenId perform request, myBodyTmp %s", myBodyTmp);
-
-      if(SOGoOpenIDDebugEnabled)
-        NSLog(@"OpenId perform request, myBody %s", myBody);
-
-      curl_easy_setopt(curl, CURLOPT_POST, 1);
-      curl_easy_setopt(curl, CURLOPT_COPYPOSTFIELDS, myBody);
+      NSLog(@"OpenId perform request: %@ %@", method, endpoint);
+      NSLog(@"OpenId perform request, headers %@", headers);
+      // if(body)
+      //   NSLog(@"OpenId perform request: content %@", [[NSString alloc] initWithData:body encoding:NSUTF8StringEncoding]);
     }
-    
-    //add headers
-    if(headers)
+      
+    httpConnection = [[WOHTTPConnection alloc] initWithURL: url];
+    [httpConnection autorelease];
+
+    request = [[WORequest alloc] initWithMethod: method
+                                            uri: [endpoint hostlessURL]
+                                    httpVersion: @"HTTP/1.1"
+                                        headers: headers content: body
+                                        userInfo: nil];
+    [request autorelease];
+    [httpConnection sendRequest: request];
+    response = [httpConnection readResponse];
+    status = [response status];
+    if(status >= 200 && status <500 && status != 404)
+      return response;
+    else if (status == 404)
     {
-      NSEnumerator *enumerator = [headers keyEnumerator];
-      NSString *key, *header;
-      while((key = [enumerator nextObject]))
-      {
-        header = [NSString stringWithFormat: @"%@: %@", key, [headers objectForKey: key]];
-        headerlist = curl_slist_append(headerlist, [header UTF8String]);
-      }
-    }
-    if(headerlist != NULL)
-      curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);
-    
-
-    curl_easy_setopt(curl, CURLOPT_TIMEOUT, 60L);
-    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
-    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
-
-    buffer = [NSMutableData data];
-    buffHeaders = [NSMutableData data];
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_body_function);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, buffer);
-    curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, curl_body_function);
-    curl_easy_setopt(curl, CURLOPT_HEADERDATA, buffHeaders);
-    curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, &error);
-
-    // Perform SOAP request
-    rc = curl_easy_perform(curl);
-    if (rc == CURLE_OK)
-    {
-      curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &status);
-
-      response = [SimpleOpenIdResponse alloc];
-      headerResp = [[NSString alloc] initWithData: buffHeaders
-                                        encoding: NSUTF8StringEncoding];
-
-      response = [response initWithResponse: nil andHeaders: headerResp andStatus: status];
-
-      if(status >= 200 && status <500 && status != 404)
-      {
-        content = [[NSString alloc] initWithData: buffer
-                                        encoding: NSUTF8StringEncoding];
-        if (!content)
-          content = [[NSString alloc] initWithData: buffer
-                                          encoding: NSISOLatin1StringEncoding];
-        [response setContent: content];
-
-        if(SOGoOpenIDDebugEnabled)
-          NSLog(@"OpenId perform request: response is: %@", response);
-
-        return [response autorelease];
-      }
-      else if (status == 404)
-      {
-        [self errorWithFormat: @"OpenID endpoint not found (404): %@", endpoint];
-        return nil; 
-      }
-      else
-      {
-        [self errorWithFormat: @"OpenID server internal error during %@: %@", endpoint, response];
-        return nil;
-      }
+      [self errorWithFormat: @"OpenID endpoint not found (404): %@", endpoint];
+      return nil; 
     }
     else
     {
-      [self errorWithFormat: @"CURL error while accessing %@ (%d): %@", endpoint, rc,
-            [NSString stringWithCString: strlen(error) ? error : curl_easy_strerror(rc)]];
+      [self errorWithFormat: @"OpenID server internal error during %@: %@", endpoint, response];
+      return nil;
     }
-    curl_easy_cleanup (curl);
   }
   else
   {
-    [self errorWithFormat: @"OpenID error when setting curl request for: %@", endpoint];
-    return nil; 
+    [self errorWithFormat: @"OpenID can't handle endpoint (not a url): '%@'", endpoint];
+    return nil;
   }
 }
 
 - (NSMutableDictionary *) fecthConfiguration: (NSString*) _domain
 {
   NSString *content;
-  SimpleOpenIdResponse *response;
-  // WOResponse * response;
+  WOResponse * response;
   NSUInteger status;
   NSMutableDictionary *result;
   NSDictionary *config, *headers;
@@ -673,8 +505,7 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
 - (NSMutableDictionary *) fetchToken: (NSString * ) code redirect: (NSString *) oldLocation
 {
   NSString *location, *form, *content;
-  SimpleOpenIdResponse *response;
-  // WOResponse *response;
+  WOResponse *response;
   NSUInteger status;
   NSMutableDictionary *result;
   NSDictionary *headers;
@@ -699,10 +530,7 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
                                                                 self->forDomain, @"sogo-user-domain", nil];
     else
       headers = [NSDictionary dictionaryWithObject: @"application/x-www-form-urlencoded"  forKey: @"content-type"];
-
-    if(SOGoOpenIDDebugEnabled)
-      NSLog(@"OpenId fetch token, form %@", form);
-
+    
     response = [self _performOpenIdRequest: location
                       method: @"POST"
                       headers: headers
@@ -745,8 +573,7 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
 - (NSMutableDictionary *) refreshToken: (NSString * ) userRefreshToken
 {
   NSString *location, *form, *content;
-  SimpleOpenIdResponse *response;
-  // WOResponse *response;
+  WOResponse *response;
   NSUInteger status;
   NSMutableDictionary *result;
   NSDictionary *headers;
@@ -819,8 +646,7 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
 - (NSMutableDictionary *) fetchUserInfo
 {
   NSString *location, *auth, *content;
-  SimpleOpenIdResponse *response;
-  // WOResponse *response;
+  WOResponse *response;
   NSUInteger status;
   NSMutableDictionary *result;
   NSDictionary *profile, *headers;
@@ -876,7 +702,7 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
         }
         else
         {
-          [self logWithFormat: @"Error fetching userInfo (status %d), response: %@", status, response];
+          [self logWithFormat: @"Error during fetching the token (status %d), response: %@", status, response];
           [result setObject: @"http-error" forKey: @"error"];
         }
     }

SoObjects/SOGo/SOGoSession.m

@@ -162,23 +162,11 @@
 
   // Get the key length and its bytes
   data = [theKey dataByDecodingBase64];
+  key = (char *)[data bytes];
   klen = [data length];
 
-
-  //value longer than the key, concatenate the key with itself until long enough
   if (klen < [theValue length])
-  {
-    NSMutableData *concatenatedData = [NSMutableData data];
-    int j;
-    int nbDuplication = [theValue length]/klen;
-    for(j=0; j <= nbDuplication; j++)
-      [concatenatedData appendData:data];
-    
-    data = [NSData dataWithData: concatenatedData];
-    klen = [data length];
-  }
-
-  key = (char *)[data bytes];
+    [self errorWithFormat: @"Value to be secured is too big (%i > %i) -- secured value will be corrupted", [theValue length], klen, [theKey length]];
 
   // Get the key - padding it with 0 with key length
   pass = (char *) calloc(klen, sizeof(char));
@@ -213,6 +201,7 @@
 
   // Get the key length and its bytes
   dataKey = [theKey dataByDecodingBase64];
+  key = (char *)[dataKey bytes];
   klen = [dataKey length];
 
   // Get the secured value length and its bytes
@@ -220,20 +209,6 @@
   value = (char *)[dataValue bytes];
   vlen = [dataValue length];
 
-  //If the key is shorer than the value, duplicate it with itself.
-  if(klen < vlen)
-  {
-    NSMutableData *concatenatedData = [NSMutableData data];
-    int j;
-    int nbDuplication = [dataValue length]/klen;
-    for(j=0; j <= nbDuplication; j++)
-      [concatenatedData appendData:dataKey];
-    
-    dataKey = [NSData dataWithData: concatenatedData];
-    klen = [dataKey length];
-  }
-  key = (char *)[dataKey bytes];
-
   // Target buffer
   buf = (char *) calloc(klen, sizeof(char));
 

SoObjects/SOGo/SOGoSieveManager.m

@@ -496,7 +496,6 @@ static NSString *sieveScriptName = @"sogo";
 }
 
 - (NSString *) _extractSieveAction: (NSDictionary *) action
-                         withReq: (NSMutableDictionary *) req
                          delimiter: (NSString *) delimiter
 {
   NSString *sieveAction, *method, *requirement, *argument, *flag, *mailbox;
@@ -549,9 +548,7 @@ static NSString *sieveScriptName = @"sogo";
               {
                 argument = [NSString stringWithFormat: @"mailto:%@", argument];
                 sieveAction = [NSString stringWithFormat: @"%@ %@",
-                                        method, [argument asSieveQuotedString]];  
-                [req addObjectUniquely: @"enotify"];
-                [req addObjectUniquely: @"variables"];   
+                                        method, [argument asSieveQuotedString]];     
               }                                   
               else if ([method isEqualToString: @"reject"])
                 sieveAction = [NSString stringWithFormat: @"%@ %@",
@@ -578,7 +575,6 @@ static NSString *sieveScriptName = @"sogo";
 }
 
 - (NSArray *) _extractSieveActions: (NSArray *) actions
-                         withReq: (NSMutableDictionary *) req
                          delimiter: (NSString *) delimiter
 {
   NSMutableArray *sieveActions;
@@ -590,7 +586,6 @@ static NSString *sieveScriptName = @"sogo";
   for (count = 0; !scriptError && count < max; count++)
     {
       sieveAction = [self _extractSieveAction: [actions objectAtIndex: count]
-                                    withReq: req
                                     delimiter: delimiter];
       if (!scriptError)
         [sieveActions addObject: sieveAction];
@@ -600,7 +595,6 @@ static NSString *sieveScriptName = @"sogo";
 }
 
 - (NSString *) _convertScriptToSieve: (NSDictionary *) newScript
-                           withReq: (NSMutableDictionary *) req
                            delimiter: (NSString *) delimiter
 {
   NSMutableString *sieveText;
@@ -630,7 +624,6 @@ static NSString *sieveScriptName = @"sogo";
         scriptError = [NSString stringWithFormat: @"Bad test: %@", match];
     }
   sieveActions = [self _extractSieveActions: [newScript objectForKey: @"actions"]
-                                  withReq: req
                                   delimiter: delimiter];
   if ([sieveActions count])
     [sieveText appendFormat: @"    %@;\r\n",
@@ -667,7 +660,6 @@ static NSString *sieveScriptName = @"sogo";
           if ([[currentScript objectForKey: @"active"] boolValue])
             {
               sieveText = [self _convertScriptToSieve: currentScript
-                                            withReq: newRequirements
                                             delimiter: delimiter];
               [sieveScript appendString: sieveText];
             }

SoObjects/SOGo/SOGoSystemDefaults.h

@@ -107,7 +107,6 @@ NSComparisonResult languageSort(id el1, id el2, void *context);
 - (NSString *) openIdClient;
 - (NSString *) openIdClientSecret;
 - (NSString *) openIdEmailParam;
-- (NSString *) openIdHttpVersion;
 - (BOOL) openIdEnableRefreshToken;
 - (BOOL) openIdLogoutEnabled: (NSString *) _domain;
 - (int) openIdTokenCheckInterval;

SoObjects/SOGo/SOGoSystemDefaults.m

@@ -784,15 +784,6 @@ NSComparisonResult languageSort(id el1, id el2, void *context)
   return emailParam;
 }
 
-- (NSString *) openIdHttpVersion
-{
-  NSString *httpVersion;
-  httpVersion = [self stringForKey: @"SOGoOpenIdHttpVersion"];
-  if(!httpVersion)
-    httpVersion = @"HTTP/1.1";
-  return httpVersion;
-}
-
 - (BOOL) openIdLogoutEnabled: (NSString *) _domain
 {
   if(_domain && [self doesLoginTypeByDomain])

UI/Templates/PreferencesUI/UIxPreferences.wox

@@ -748,7 +748,7 @@
               </div>
             </div>
 
-            <div layout="row" layout-align="start center" flex="50" flex-xs="100">
+            <div class="hide-xs" layout="row" layout-align="start center" flex="50">
               <md-checkbox
                   class="md-align-top-left"
                   ng-model="app.preferences.defaults.SOGoMailComposeWindowEnabled"
@@ -756,7 +756,7 @@
                 <!-- SOGoMailComposeWindow -->
               </md-checkbox>
 
-              <md-input-container class="md-block md-flex">
+              <md-input-container class="md-block md-flex hide-xs">
                 <label><var:string label:value="Always open mail composer"/></label>
                 <md-select
                     ng-disabled="!app.preferences.defaults.SOGoMailComposeWindowEnabled"

UI/WebServerResources/js/vendor/punycode.js

@@ -422,7 +422,7 @@ const punycode = {
 	 * @memberOf punycode
 	 * @type String
 	 */
-	'version': '2.3.1',
+	'version': '2.1.0',
 	/**
 	 * An object of methods to convert from JavaScript's internal character
 	 * representation (UCS-2) to Unicode code points, and back.

packaging/rhel/sogo.spec

@@ -220,7 +220,6 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/sogo/libSOGoUI.so*
 %{_libdir}/GNUstep/SOGo/AdministrationUI.SOGo
 %{_libdir}/GNUstep/SOGo/Appointments.SOGo
-%{_libdir}/GNUstep/SOGo/API.SOGo
 %{_libdir}/GNUstep/SOGo/CommonUI.SOGo
 %{_libdir}/GNUstep/SOGo/Contacts.SOGo
 %{_libdir}/GNUstep/SOGo/ContactsUI.SOGo