feat(login): add parameters to prevent uneccesary connection request when the domain is unknown

chore(packaging): Use pkgconfig to compute cflags for wbxml2 instead of hardcoding them

Documentation/SOGoInstallationGuide.asciidoc

@@ -806,6 +806,16 @@ Default value is `YES`, or enabled.
 authentication and global address books. Multiple sources can be
 specified as an array of dictionaries.
 
+|S |SOGoForbidUnknownDomainsAuth
+|Boolean. If set to `YES`, prevent user that try to connect with an unknown domain.
+The known domains are set in parameter `SOGoDomainAllowed` and/or the domains listed in a <<multi-domains-configuration, Multi-domains Configuration>>. Default value is `NO`.
+
+Obiously, if your users can connect without specifying a domain, let this parameter to `NO`.
+
+|S |SOGoDomainAllowed
+|Parameter used to define which domains SOGo should allowed during a connection request. This parameter is an array of strings.
+
+
 |S |SOGoPasswordRecoveryEnabled
 |Boolean enable password recovery with secret question or secondary e-mail. Default value is `NO`.
 
@@ -2824,6 +2834,8 @@ like this:
 }
 ----
 
+[[multi-domains-configuration]]
+
 Multi-domains Configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

SoObjects/Mailer/SOGoMailAccount.m

@@ -454,19 +454,22 @@ static NSString *inboxFolderName = @"INBOX";
 //
 - (NSString *) _folderType: (NSString *) folderName
                      flags: (NSMutableArray *) flags
+                     folderTypes: (NSDictionary *) folderTypes
 {
   static NSDictionary *metadata = nil;
-  NSString *folderType, *key, *rights;
+  static NSDictionary *folderTypeDict = nil;
+  NSString *folderType, *key, *rights, *flag;
+  NSEnumerator *flagEnum;
   SOGoUserDefaults *ud;
 
   if (!metadata)
-    {
-      ud = [[context activeUser] userDefaults];
-      metadata = [[[self imap4Connection] allFoldersMetadataForURL: [self imap4URL]
-                                             onlySubscribedFolders: [ud mailShowSubscribedFoldersOnly]]
-                   objectForKey: @"list"];
-      [metadata retain];
-    }
+  {
+    ud = [[context activeUser] userDefaults];
+    metadata = [[[self imap4Connection] allFoldersMetadataForURL: [self imap4URL]
+                                           onlySubscribedFolders: [ud mailShowSubscribedFoldersOnly]]
+                  objectForKey: @"list"];
+    [metadata retain];
+  }
 
   key = [NSString stringWithFormat: @"/%@", folderName];
   [flags addObjectsFromArray: [metadata objectForKey: key]];
@@ -474,44 +477,32 @@ static NSString *inboxFolderName = @"INBOX";
   // RFC6154 (https://tools.ietf.org/html/rfc6154) describes special uses for IMAP mailboxes.
   // We do honor them, as long as your SOGo{Drafts,Trash,Sent,Junk}FolderName are properly configured
   // See http://wiki.dovecot.org/MailboxSettings for a Dovecot example.
-  if ([folderName isEqualToString: inboxFolderName])
-    folderType = @"inbox";
-  else if ([flags containsObject: [self draftsFolderNameInContext: context]] ||
-           [folderName isEqualToString: [self draftsFolderNameInContext: context]])
-    folderType = @"draft";
-  else if ([flags containsObject: [self sentFolderNameInContext: context]] ||
-           [folderName isEqualToString: [self sentFolderNameInContext: context]])
-    folderType = @"sent";
-  else if ([flags containsObject: [self trashFolderNameInContext: context]] ||
-           [folderName isEqualToString: [self trashFolderNameInContext: context]])
-    folderType = @"trash";
-  else if ([flags containsObject: [self junkFolderNameInContext: context]] ||
-           [folderName isEqualToString: [self junkFolderNameInContext: context]])
-    folderType = @"junk";
-  else if ([flags containsObject: [self templatesFolderNameInContext: context]] ||
-           [folderName isEqualToString: [self templatesFolderNameInContext: context]])
-    folderType = @"templates";
-  else if ([folderName isEqualToString: otherUsersFolderName])
-    folderType = @"otherUsers";
-  else if ([folderName isEqualToString: sharedFoldersName])
-    folderType = @"shared";
-  else
+  if((folderType = [folderTypes objectForKey: folderName]))
+    return folderType;
+  
+  flagEnum = [flags objectEnumerator];
+  while((flag = [flagEnum nextObject]))
+  {
+    if([flag isEqualToString: inboxFolderName] || [flag isEqualToString: otherUsersFolderName] || [flag isEqualToString: sharedFoldersName])
+      continue;
+    if((folderType = [folderTypes objectForKey: flag]))
+      return folderType;
+  }
+
+  folderType = @"folder";
+  if (([sharedFoldersName length] && [folderName hasPrefix: sharedFoldersName]) ||
+      ([otherUsersFolderName length] && [folderName hasPrefix: otherUsersFolderName]))
+  {
+    rights = [[self imap4Connection] myRightsForMailboxAtURL: [NSURL URLWithString: folderName]];
+    if (![rights isKindOfClass: [NSException class]] &&
+        ([rights rangeOfString: @"r"].location == NSNotFound))
     {
-      folderType = @"folder";
-      if (([sharedFoldersName length] && [folderName hasPrefix: sharedFoldersName]) ||
-          ([otherUsersFolderName length] && [folderName hasPrefix: otherUsersFolderName]))
-        {
-          rights = [[self imap4Connection] myRightsForMailboxAtURL: [NSURL URLWithString: folderName]];
-          if (![rights isKindOfClass: [NSException class]] &&
-              ([rights rangeOfString: @"r"].location == NSNotFound))
-            {
-              [flags addObjectUniquely: @"noselect"];
-              if ([rights rangeOfString: @"i"].location != NSNotFound)
-                // No read but insert = dropbox
-                folderType = @"dropbox";
-            }
-        }
+      [flags addObjectUniquely: @"noselect"];
+      if ([rights rangeOfString: @"i"].location != NSNotFound)
+        // No read but insert = dropbox
+        folderType = @"dropbox";
     }
+  }
 
   return folderType;
 }
@@ -521,6 +512,7 @@ static NSString *inboxFolderName = @"INBOX";
 //
 - (NSMutableDictionary *) _insertFolder: (NSString *) folderPath
                             foldersList: (NSMutableArray *) theFolders
+                            folderTypes: (NSDictionary *) folderTypes
 {
   NSArray *pathComponents;
   NSMutableArray *folders, *flags;
@@ -541,103 +533,99 @@ static NSString *inboxFolderName = @"INBOX";
   // The variable folderPath is something like '/INBOX/Junk' so pathComponents becomes ('/', 'INBOX', 'Junk').
   // That's why we always ignore the first element
   for (i = 1; i < count; i++)
+  {
+    last = ((count - i) == 1);
+    folder = nil;
+    if ([currentPath length])
+      currentPath = [NSString stringWithFormat: @"%@/%@", currentPath, [pathComponents objectAtIndex: i]];
+    else
+      currentPath = [pathComponents objectAtIndex: i];
+
+    // Search for the current path in the children of the parent folder.
+    // For the first iteration, take the parent folder passed as argument.
+    if (parentFolder)
+      folders = [parentFolder objectForKey: @"children"];
+    else
+      folders = theFolders;
+
+    for (j = 0; j < [folders count]; j++)
     {
-      last = ((count - i) == 1);
-      folder = nil;
-      if ([currentPath length])
-        currentPath = [NSString stringWithFormat: @"%@/%@", currentPath, [pathComponents objectAtIndex: i]];
-      else
-        currentPath = [pathComponents objectAtIndex: i];
-
-      // Search for the current path in the children of the parent folder.
-      // For the first iteration, take the parent folder passed as argument.
-      if (parentFolder)
-	folders = [parentFolder objectForKey: @"children"];
-      else
-	folders = theFolders;
-
-      for (j = 0; j < [folders count]; j++)
-        {
-          currentFolder = [folders objectAtIndex: j];
-          if ([currentPath isEqualToString: [currentFolder objectForKey: @"path"]])
-            {
-              folder = currentFolder;
-              // Make sure all branches are ready to receive children
-              if (!last && ![folder objectForKey: @"children"])
-                  [folder setObject: [NSMutableArray array] forKey: @"children"];
-
-	      break;
-            }
-        }
-
-      // Check if the current folder is the "Other users" folder (shared mailboxes)
-      currentFolderName = [[pathComponents objectAtIndex: i] stringByDecodingImap4FolderName];
-      if (otherUsersFolderName
-          && [currentFolderName caseInsensitiveCompare: otherUsersFolderName] == NSOrderedSame)
-	isOtherUsersFolder = YES;
-      else
-	isOtherUsersFolder = NO;
-
-      if (folder == nil)
-        {
-          // Folder was not found; create it and add it to the folders list
-          if (parentIsOtherUsersFolder)
-            {
-              // Parent folder is the "Other users" folder; translate the user's mailbox name
-              // to the full name of the person
-              userManager = [SOGoUserManager sharedUserManager];
-              if ((fullName = [userManager getCNForUID: currentFolderName]) && [fullName length])
-                currentFolderName = fullName;
-	      else if ((fullName = [userManager getEmailForUID: currentFolderName]) && [fullName length])
-		currentFolderName = fullName;
-            }
-          else if (isOtherUsersFolder)
-	    currentFolderName = [self labelForKey: @"OtherUsersFolderName"];
-          else if (sharedFoldersName
-                   && [currentFolderName caseInsensitiveCompare: sharedFoldersName] == NSOrderedSame)
-	    currentFolderName = [self labelForKey: @"SharedFoldersName"];
-
-          flags = [NSMutableArray array];
-
-          if (last)
-            {
-              folderType = [self _folderType: currentPath
-                                       flags: flags];
-            }
-          else
-            {
-              folderType = @"additional";
-              [flags addObject: @"noselect"];
-            }
-
-	  if ([subscribedFolders objectForKey: folderPath])
-	    isSubscribed = YES;
-	  else
-	    isSubscribed = NO;
-
-          folder = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                                          currentPath, @"path",
-                                          folderType, @"type",
-                                          currentFolderName, @"name",
-                                          [NSMutableArray array], @"children",
-					  flags, @"flags",
-					  [NSNumber numberWithBool: isSubscribed], @"subscribed",
-					  nil];
-
-          if (sieveFolderUTF8Encoding)
-            sievePath = [currentPath stringByDecodingImap4FolderName];
-          else
-            sievePath = currentPath;
-          [folder setObject: sievePath forKey: @"sievePath"];
-
-          // Either add this new folder to its parent or the list of root folders
-          [folders addObject: folder];
-        }
-
-      parentFolder = folder;
-      parentIsOtherUsersFolder = isOtherUsersFolder;
+      currentFolder = [folders objectAtIndex: j];
+      if ([currentPath isEqualToString: [currentFolder objectForKey: @"path"]])
+      {
+        folder = currentFolder;
+        // Make sure all branches are ready to receive children
+        if (!last && ![folder objectForKey: @"children"])
+            [folder setObject: [NSMutableArray array] forKey: @"children"];
+        break;
+      }
     }
 
+    // Check if the current folder is the "Other users" folder (shared mailboxes)
+    currentFolderName = [[pathComponents objectAtIndex: i] stringByDecodingImap4FolderName];
+    if (otherUsersFolderName && [currentFolderName caseInsensitiveCompare: otherUsersFolderName] == NSOrderedSame)
+	    isOtherUsersFolder = YES;
+    else
+	    isOtherUsersFolder = NO;
+
+    if (folder == nil)
+    {
+      // Folder was not found; create it and add it to the folders list
+      if (parentIsOtherUsersFolder)
+      {
+        // Parent folder is the "Other users" folder; translate the user's mailbox name
+        // to the full name of the person
+        userManager = [SOGoUserManager sharedUserManager];
+        if ((fullName = [userManager getCNForUID: currentFolderName]) && [fullName length])
+          currentFolderName = fullName;
+        else if ((fullName = [userManager getEmailForUID: currentFolderName]) && [fullName length])
+          currentFolderName = fullName;
+      }
+      else if (isOtherUsersFolder)
+        currentFolderName = [self labelForKey: @"OtherUsersFolderName"];
+      else if (sharedFoldersName && [currentFolderName caseInsensitiveCompare: sharedFoldersName] == NSOrderedSame)
+        currentFolderName = [self labelForKey: @"SharedFoldersName"];
+
+      flags = [NSMutableArray array];
+
+      if (last)
+      {
+        folderType = [self _folderType: currentPath flags: flags folderTypes: folderTypes];
+      }
+      else
+      {
+        folderType = @"additional";
+        [flags addObject: @"noselect"];
+      }
+
+	    if ([subscribedFolders objectForKey: folderPath])
+	      isSubscribed = YES;
+	    else
+	      isSubscribed = NO;
+
+      folder = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                                        currentPath, @"path",
+                                        folderType, @"type",
+                                        currentFolderName, @"name",
+                                        [NSMutableArray array], @"children",
+                                        flags, @"flags",
+                                        [NSNumber numberWithBool: isSubscribed], @"subscribed",
+                                        nil];
+
+      if (sieveFolderUTF8Encoding)
+        sievePath = [currentPath stringByDecodingImap4FolderName];
+      else
+        sievePath = currentPath;
+      [folder setObject: sievePath forKey: @"sievePath"];
+
+      // Either add this new folder to its parent or the list of root folders
+      [folders addObject: folder];
+    }
+
+    parentFolder = folder;
+    parentIsOtherUsersFolder = isOtherUsersFolder;
+  }
+
   return parentFolder;
 }
 
@@ -651,11 +639,25 @@ static NSString *inboxFolderName = @"INBOX";
   NSEnumerator *rawFolders;
   NSAutoreleasePool *pool;
   NSArray *allFolderPaths;
+  NSMutableDictionary *folderTypes;
 
   allFolderPaths = [self allFolderPaths: theListingMode];
   rawFolders = [allFolderPaths objectEnumerator];
   folders = [NSMutableArray array];
 
+  folderTypes = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                                      @"inbox", inboxFolderName,
+                                      @"draft", [self draftsFolderNameInContext: context],
+                                      @"sent",  [self sentFolderNameInContext: context],
+                                      @"trash", [self trashFolderNameInContext: context],
+                                      @"junk",  [self junkFolderNameInContext: context],
+                                      @"templates",  [self templatesFolderNameInContext: context],
+                                      nil];
+  if(otherUsersFolderName && [otherUsersFolderName length] > 0)
+    [folderTypes setObject: @"otherUsers" forKey: otherUsersFolderName];
+  if(sharedFoldersName && [sharedFoldersName length] > 0)
+    [folderTypes setObject: @"shared" forKey: sharedFoldersName];
+
   while ((currentFolder = [rawFolders nextObject]))
     {
       // Using a local pool to avoid using too many file descriptors. This could
@@ -666,7 +668,8 @@ static NSString *inboxFolderName = @"INBOX";
 
       // Insert folder into folders tree
       [self _insertFolder: currentFolder
-              foldersList: folders];
+              foldersList: folders
+              folderTypes: folderTypes];
 
       [pool release];
     }
@@ -1119,11 +1122,10 @@ static NSString *inboxFolderName = @"INBOX";
   folderName = [[account objectForKey: @"specialMailboxes"]
                  objectForKey: purpose];
   if (!folderName && accountIdx > 0)
-    {
-      account = [accounts objectAtIndex: 0];
-      folderName = [[account objectForKey: @"specialMailboxes"]
-                     objectForKey: purpose];
-    }
+  {
+    account = [accounts objectAtIndex: 0];
+    folderName = [[account objectForKey: @"specialMailboxes"] objectForKey: purpose];
+  }
 
   return folderName;
 }

SoObjects/SOGo/SOGoSieveManager.m

@@ -1243,12 +1243,10 @@ static NSString *sieveScriptName = @"sogo";
           if (v && [v length] > 0)
             {
               notify = @"if header :matches \"subject\" \"*\" {\r\n  set \"subject\" \"${1}\";\r\n}\r\n";
+              notify = [notify stringByAppendingString: @"if header :matches \"From\" \"*<*>\" {\r\n  set \"from\" \"${1} ${2}\";\r\n}\r\n"];
               notify = [notify stringByAppendingFormat: @"set :encodeurl \"body_param\" \"%@\";\r\n", message];
-              notify = [notify stringByAppendingFormat: @"notify :message \"%@: ${subject}\" \"mailto:%@?body=${body_param}\";\r\n", notificationTranslated, v];
+              notify = [notify stringByAppendingFormat: @"notify :message \"%@: '${subject}' from: ${from}\" \"mailto:%@?body=${body_param}\";\r\n", notificationTranslated, v];
 
-              // if (alwaysSend)
-              //   [script insertString: notify  atIndex: 0];
-              // else
               [script appendString: notify];
             }
         }

SoObjects/SOGo/SOGoSystemDefaults.h

@@ -36,6 +36,8 @@ static const NSString *kDisableSharingCalendar = @"Calendar";
 + (SOGoSystemDefaults *) sharedSystemDefaults;
 
 - (NSArray *) domainIds;
+- (BOOL) forbidUnknownDomainsAuth;
+- (NSArray *) domainsAllowed;
 - (BOOL) enableDomainBasedUID;
 - (NSArray *) loginDomains;
 - (NSArray *) visibleDomainsForDomain: (NSString *) domain;

SoObjects/SOGo/SOGoSystemDefaults.m

@@ -258,7 +258,8 @@ _injectConfigurationFromFile (NSMutableDictionary *defaultsDict,
 
 - (NSArray *) domainIds
 {
-  return [[self dictionaryForKey: @"domains"] allKeys];
+  NSDictionary *domains = [self dictionaryForKey: @"domains"];
+  return [domains allKeys];
 }
 
 - (BOOL) enableDomainBasedUID
@@ -266,6 +267,16 @@ _injectConfigurationFromFile (NSMutableDictionary *defaultsDict,
   return [self boolForKey: @"SOGoEnableDomainBasedUID"];
 }
 
+- (BOOL) forbidUnknownDomainsAuth
+{
+  return [self boolForKey: @"SOGoForbidUnknownDomainsAuth"];
+}
+
+- (NSArray *) domainsAllowed
+{
+  return [NSMutableArray arrayWithArray: [self stringArrayForKey: @"SOGoDomainAllowed"]];
+}
+
 - (NSArray *) loginDomains
 {
   NSMutableArray *filteredLoginDomains;

SoObjects/SOGo/SOGoUserManager.m

@@ -607,10 +607,48 @@ static const NSString *kObfuscatedSecondaryEmailKey = @"obfuscatedSecondaryEmail
         {
           *_domain = [username substringFromIndex: r.location+1];
 
-          if (![[[SOGoSystemDefaults sharedSystemDefaults] domainIds] containsObject: *_domain])
+          if (![[sd domainIds] containsObject: *_domain])
             *_domain = nil;
         }
     }
+  
+  // If the domains is unknwon we reject the auth
+  if([sd forbidUnknownDomainsAuth])
+  {
+    NSArray *domainsAllowed, *domainsKnown;
+    NSString *userDomain;
+    NSRange  r;
+    BOOL allowed = NO;
+    if(!*_domain)
+    {
+      r = [username rangeOfString: @"@"];
+      if(r.location != NSNotFound)
+        userDomain = [username substringFromIndex: r.location+1];
+      else
+        userDomain = nil;
+    }
+    else
+      userDomain = *_domain;
+
+    if(!userDomain)
+    {
+      [self errorWithFormat: @"User attempt to login without domain"];
+      return allowed;
+    }
+
+
+    if((domainsAllowed = [sd domainsAllowed]) && [domainsAllowed containsObject: userDomain])
+      allowed = YES;
+    if((domainsKnown = [sd domainIds]) && [domainsKnown containsObject: userDomain])
+      allowed = YES;
+
+    if([domainsKnown length] == 0 && [domainsAllowed length] == 0)
+      [self errorWithFormat: @"SOGoForbidUnknownDomainsAuth is set but sogo don't know any domains"];
+    else if(!allowed)
+      [self errorWithFormat: @"User domain is unknown or not allowed: %@", userDomain];
+    
+    return allowed;
+  }
 
   // We check the fail count per user in memcache (per server). If the
   // fail count reaches X in Y minutes, we deny immediately the

Tests/spec/CalDAVPreventInvitationsSpec.js

@@ -13,6 +13,10 @@ let utility, user, attendee1, attendee1Delegate
 let userCalendar, attendee1Calendar, attendee1DelegateCalendar
 let icsName, icsList, vcalendar
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('PreventInvitations', function() {
 
   const _getEvent = async function(client, calendarName, filename, expectedCode = 200) {

Tests/spec/CalDAVPropertiesSpec.js

@@ -2,6 +2,10 @@ import config from '../lib/config'
 import WebDAV from '../lib/WebDAV'
 import TestUtility from '../lib/utilities'
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('read and set calendar properties', function() {
   const webdav = new WebDAV(config.username, config.password)
   const utility = new TestUtility(webdav)

Tests/spec/CalDAVSchedulingSpec.js

@@ -3,6 +3,10 @@ import WebDAV from '../lib/WebDAV'
 import TestUtility from '../lib/utilities'
 import ICAL from 'ical.js'
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('CalDAV Scheduling', function() {
   const webdav = new WebDAV(config.username, config.password)
   const webdav_su = new WebDAV(config.superuser, config.superuser_password)
@@ -933,5 +937,5 @@ describe('CalDAV Scheduling', function() {
 
     vcalendarInvitationAttendee = await _getEvent(webdavAttendee1, attendee1Calendar, icsName, 404)
     vcalendarInvitationDelegate = await _getEvent(webdavAttendee1Delegate, attendee1DelegateCalendar, icsName, 404)
-  }, 10000) // increase timeout for this long test
+  }) // increase timeout for this long test
 })

Tests/spec/CardDAVSpec.js

@@ -70,6 +70,10 @@ X-AIM:pseudo aim
 END:VCARD`
 }
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('CardDAV extensions', function() {
   const webdav = new WebDAV(config.username, config.password)
   const webdav_su = new WebDAV(config.superuser, config.superuser_password)
@@ -232,7 +236,7 @@ describe('CardDAV extensions', function() {
     expect(emails)
       .withContext(`Returned vCard has email of ${config.attendee1_username} (${config.attendee1})`)
       .toContain(config.attendee1)
-  }, 10000) // increase timeout for this long test
+  }) // increase timeout for this long test
 
   // CARDDAV:addressbook-multiget Report
   // https://datatracker.ietf.org/doc/html/rfc6352#section-8.7

Tests/spec/ConfigSpec.js

@@ -1,5 +1,9 @@
 import config from '../lib/config'
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('config tests', function() {
 
   it('required configuration parameters', async function() {

Tests/spec/DAVAddressBookAclSpec.js

@@ -2,6 +2,10 @@ import config from '../lib/config'
 import WebDAV from '../lib/WebDAV'
 import TestUtility from '../lib/utilities'
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('create, read, modify, delete tasks for regular user', function() {
   const webdav = new WebDAV(config.username, config.password)
   const webdav_su = new WebDAV(config.superuser, config.superuser_password)

Tests/spec/DAVCalendarAclSpec.js

@@ -2,6 +2,10 @@ import config from '../lib/config'
 import WebDAV from '../lib/WebDAV'
 import TestUtility from '../lib/utilities'
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('create, read, modify, delete events for regular user', function() {
   const webdav = new WebDAV(config.username, config.password)
   const webdav_su = new WebDAV(config.superuser, config.superuser_password)

Tests/spec/DAVCalendarAppleiCalSpec.js

@@ -10,6 +10,10 @@ import TestUtility from '../lib/utilities'
  * additional calendars.
  */
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('Apple iCal', function() {
   const webdav = new WebDAV(config.username, config.password)
   const webdav_su = new WebDAV(config.superuser, config.superuser_password)
@@ -229,5 +233,5 @@ describe('Apple iCal', function() {
       .toBe(0)
 
     await webdav_su.deleteObject(otherResource)
-  }, 10000) // increase timeout for this long test
+  }) // increase timeout for this long test
 })

Tests/spec/DAVCalendarClassificationSpec.js

@@ -1,6 +1,10 @@
 import config from '../lib/config'
 import { default as WebDAV, DAVInverse } from '../lib/WebDAV'
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('calendar classification', function() {
   const webdav = new WebDAV(config.username, config.password)
 
@@ -35,7 +39,7 @@ describe('calendar classification', function() {
       expect(status)
           .withContext('Setting an invalid classification')
           .toBe(403)
-    })
+  })
 
   it('setting a valid classification', async function() {
     for (let component of ['events', 'tasks']) {

Tests/spec/DAVCalendarPublicAclSpec.js

@@ -2,6 +2,10 @@ import config from '../lib/config'
 import WebDAV from '../lib/WebDAV'
 import TestUtility from '../lib/utilities'
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('public access', function() {
   const webdav = new WebDAV(config.username, config.password)
   const webdav_anon = new WebDAV()

Tests/spec/DAVCalendarSuperUserAclSpec.js

@@ -2,6 +2,10 @@ import config from '../lib/config'
 import WebDAV from '../lib/WebDAV'
 import TestUtility from '../lib/utilities'
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('DAVCalendarSuperUserAcl', function() {
   const webdav = new WebDAV(config.username, config.password)
   const webdav_su = new WebDAV(config.superuser, config.superuser_password)

Tests/spec/DAVContactsCategoriesSpec.js

@@ -1,6 +1,10 @@
 import config from '../lib/config'
 import { default as WebDAV, DAVInverse } from '../lib/WebDAV'
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('contacts categories', function() {
   const webdav = new WebDAV(config.username, config.password)
 

Tests/spec/DAVPublicAccessSpec.js

@@ -1,6 +1,10 @@
 import config from '../lib/config'
 import WebDAV from '../lib/WebDAV'
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('public access', function() {
   const webdav_anon = new WebDAV()
 

Tests/spec/HTTPCalendarSpec.js

@@ -3,6 +3,10 @@ import WebDAV from '../lib/WebDAV'
 
 let webdav, resource
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('HTTP Calendar', function() {
 
   beforeAll(async function() {

Tests/spec/HTTPPreferencesSpec.js

@@ -3,6 +3,10 @@ import Preferences from '../lib/Preferences'
 
 const prefs = new Preferences(config.username, config.password)
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('preferences', function() {
 
   // preferencesTest

Tests/spec/MailDAVSpec.js

@@ -152,6 +152,10 @@ let msg3Size = 720
 let webdav, utility
 let user, resource, mailboxesList
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 // DAVMailCollectionTest
 
 describe('MailDAV', function() {

Tests/spec/SieveSpec.js

@@ -6,6 +6,10 @@ import ManageSieve from '../lib/ManageSieve'
 
 let prefs, webdav, utility, manageSieve, user
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('Sieve', function() {
 
   async function _getSogoSieveScript() {

Tests/spec/SogoToolSpec.js

@@ -5,6 +5,10 @@ const os = require('os')
 const path = require('path')
 const { execSync } = require('child_process')
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('sogo-tool tests', function() {
   let tmpdir, isRoot
 

Tests/spec/WebDAVSpec.js

@@ -2,6 +2,10 @@ import config from '../lib/config'
 import WebDAV from '../lib/WebDAV'
 import TestUtility from '../lib/utilities'
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('WebDAV', function() {
   var webdav
   var utility

Tests/spec/WebDavSyncSpec.js

@@ -3,6 +3,10 @@ import WebDAV from '../lib/WebDAV'
 import { DAVNamespace, DAVNamespaceShorthandMap } from 'tsdav'
 import convert from 'xml-js'
 
+beforeAll(function () {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = config.timeout || 10000;
+});
+
 describe('webdav sync', function() {
   const webdav = new WebDAV(config.username, config.password)
   const webdav_su = new WebDAV(config.superuser, config.superuser_password)

Tools/SOGoToolRestore.m

@@ -419,6 +419,7 @@
       max = [records count];
       for (count = 0; count < max; count++)
         {
+          version = 0;
           if (count > 0 && count%100 == 0)
             {
               DESTROY(pool);
@@ -428,7 +429,7 @@
           cName = [currentRecord objectForKey: @"c_name"];
           if (![existingRecords objectForKey: cName])
             {
-              NSLog (@"restoring record '%@'", cName);
+              NSLog (@"restoring record '%@' with version %d", cName, version);
               cContent = [currentRecord objectForKey: @"c_content"];
               [gcsFolder writeContent: cContent
                         fromComponent: [[self parsingClassForContent: cContent] parseSingleFromSource: cContent]

UI/MailerUI/UIxMailEditor.m

@@ -722,12 +722,14 @@ static NSArray *infoKeys = nil;
 
               if ([[mime encoding] isEqualToString: @"base64"] && contentId) {
                 if ([text rangeOfString: contentId].location != NSNotFound) {
-                  lText = [text stringByReplacingOccurrencesOfString: contentId 
+                  if (nil != [[mime body] bytes]) {
+                    lText = [text stringByReplacingOccurrencesOfString: contentId 
                     withString: [NSString stringWithFormat: @"data:%@;base64,%@", 
                     [[mime contentType] stringValue], 
                     [NSString stringWithUTF8String: [[mime body] bytes]]]];
-                  [self setText: lText];
-                  [draft deleteAttachmentWithName: [draftFileAttachement objectForKey:@"filename"]];
+                    [self setText: lText];
+                    [draft deleteAttachmentWithName: [draftFileAttachement objectForKey:@"filename"]];
+                  }
                 } else {
                   // This is an attachment with no CID in message body
                   if ([draft inReplyTo]) {

UI/PreferencesUI/UIxPreferences.m

@@ -1742,9 +1742,12 @@ static NSArray *reminderValues = nil;
 - (id <WOActionResults>) saveAction
 {
   id <WOActionResults> results;
+  NSString *requestStr;
   id o, v;
 
-  o = [[[context request] contentAsString] objectFromJSONString];
+  requestStr = [[context request] contentAsString];
+  requestStr = [requestStr stringWithoutHTMLInjection: NO];
+  o = [requestStr objectFromJSONString];
   results = nil;
 
   // Proceed with data sanitization of the "defaults"

UI/WebServerResources/js/Preferences.js

@@ -1,2 +1,2 @@
-!function(){"use strict";function e(e,t){e.state("preferences",{abstract:!0,views:{preferences:{templateUrl:"preferences.html",controller:"PreferencesController",controllerAs:"app"}}}).state("preferences.general",{url:"/general",views:{module:{templateUrl:"generalPreferences.html"}}}).state("preferences.calendars",{url:"/calendars",views:{module:{templateUrl:"calendarsPreferences.html"}}}).state("preferences.addressbooks",{url:"/addressbooks",views:{module:{templateUrl:"addressbooksPreferences.html"}}}).state("preferences.mailer",{url:"/mailer",views:{module:{templateUrl:"mailerPreferences.html"}}}),t.rules.otherwise("/general")}function t(e,t,i,s){e.DebugEnabled||s.defaultErrorHandler(function(){}),i.onError({to:"preferences.**"},function(e){"preferences"==e.to().name||e.ignored()||(t.error("transition error to "+e.to().name+": "+e.error().detail),s.go({state:"preferences"}))})}angular.module("SOGo.PreferencesUI",["ui.router","sgCkeditor","angularFileUpload","SOGo.Common","SOGo.MailerUI","SOGo.ContactsUI","SOGo.Authentication","as.sortable"]).config(e).run(t),e.$inject=["$stateProvider","$urlServiceProvider"],t.$inject=["$window","$log","$transitions","$state"]}(),function(){"use strict";function e(a,e,t,i,r,s,n,o,c,d,f){var u=this,h=e.usesCASAuthentication||e.usesSAML2Authentication;function p(){u.account.security&&u.account.security.hasCertificate&&u.account.$certificate().then(function(e){u.certificate=e},function(){delete u.account.security.hasCertificate})}function m(e){e=0<e.type.indexOf("pkcs12")||/\.(p12|pfx)$/.test(e.name);return u.form.certificateFilename.$setValidity("fileformat",e),e}this.defaultPort=143,this.smtpDefaultPort=25,this.defaults=n,this.account=o,this.maxSize=f,this.accountId=c,this.hostnameRE=h&&0<c?/^(?!(127\.0\.0\.1|localhost(?:\.localdomain)?)$)/:/./,this.emailRE=String.emailRE,this.addressesSearchText="",this.ckConfig={autoGrow_minHeight:70,toolbar:{items:["bold","italic","|","fontColor","fontFamily","fontSize","|","link","|","specialCharacters","imageUpload","|","sourceEditing","htmlEmbed"],shouldNotGroupWhenFull:!0},language:n.ckLocaleCode},this.account.encryption?"ssl"==this.account.encryption&&(this.defaultPort=993):this.account.encryption="none",this.account.smtpEncryption?this.smtpDefaultPort=465:this.account.smtpEncryption="none",p(),this.uploader=new i({url:[s.activeUser("folderURL")+"Mail",c,"importCertificate"].join("/"),autoUpload:!1,queueLimit:1,filters:[{name:m,fn:m}],onAfterAddingFile:function(e){u.certificateFilename=e.file.name},onSuccessItem:function(e,t,i,s){this.clearQueue(),a(function(){_.assign(u.account,{security:{hasCertificate:!0},$$certificate:t})}),p()},onErrorItem:function(e,t,i,s){r.alert(l("Error"),l("An error occurred while importing the certificate. Verify your password."))}}),this.hasIdentities=function(){return 0<_.filter(this.account.identities,this.isEditableIdentity).length},this.isEditableIdentity=function(e){return!e.isReadOnly},this.selectIdentity=function(e){this.selectedIdentity==e?this.selectedIdentity=null:this.selectedIdentity=e},this.hasDefaultIdentity=function(){return 0<=_.findIndex(this.account.identities,function(e){return!!e.isDefault})},this.setDefaultIdentity=function(e,i){return _.forEach(this.account.identities,function(e,t){t==i?e.isDefault=!e.isDefault:delete e.isDefault}),e.stopPropagation(),!1},this.canRemoveIdentity=function(e){return e==this.selectedIdentity&&this.hasIdentities()},this.removeIdentity=function(e){this.account.identities.splice(e,1),this.selectedIdentity=null},this.addIdentity=function(){var e=_.findIndex(this.account.identities,{isReadOnly:1}),t={};e<0&&(e=this.account.identities.length),this.customFromIsReadonly()&&(t.fullName=this.account.identities[0].fullName),this.account.identities.splice(Math.max(e,0),0,t),this.selectedIdentity=e},this.showCkEditor=function(e){return this.selectedIdentity==e&&"html"==this.defaults.SOGoMailComposeMessageType},this.filterEmailAddresses=function(t){return _.filter(e.defaultEmailAddresses,function(e){return 0<=e.toLowerCase().indexOf(t.toLowerCase())})},this.customFromIsReadonly=function(){return!(0<c||d)},this.importCertificate=function(){this.uploader.queue[0].formData=[{password:this.certificatePassword}],this.uploader.uploadItem(0)},this.onBeforeUploadCertificate=function(e){this.form=e,this.uploader.clearQueue()},this.removeCertificate=function(){this.account.$removeCertificate()},this.cancel=function(){t.cancel()},this.save=function(){JSON.stringify(this.account).length>this.maxSize?r.alert(l("Error"),l("Data too big. Please contact technical support.")):t.hide()}}e.$inject=["$timeout","$window","$mdDialog","FileUploader","Dialog","sgSettings","defaults","account","accountId","mailCustomFromEnabled","maxSize"],angular.module("SOGo.PreferencesUI").controller("AccountDialogController",e)}(),function(){"use strict";function e(e,t,i,s,a,r,n,o,c){var d=t.sieveCapabilities,f=t.forwardEnabled,u=t.notificationEnabled;t.vacationEnabled;this.filter=a,this.mailboxes=r,thLine truncated
+!function(){"use strict";function e(e,t){e.state("preferences",{abstract:!0,views:{preferences:{templateUrl:"preferences.html",controller:"PreferencesController",controllerAs:"app"}}}).state("preferences.general",{url:"/general",views:{module:{templateUrl:"generalPreferences.html"}}}).state("preferences.calendars",{url:"/calendars",views:{module:{templateUrl:"calendarsPreferences.html"}}}).state("preferences.addressbooks",{url:"/addressbooks",views:{module:{templateUrl:"addressbooksPreferences.html"}}}).state("preferences.mailer",{url:"/mailer",views:{module:{templateUrl:"mailerPreferences.html"}}}),t.rules.otherwise("/general")}function t(e,t,i,s){e.DebugEnabled||s.defaultErrorHandler(function(){}),i.onError({to:"preferences.**"},function(e){"preferences"==e.to().name||e.ignored()||(t.error("transition error to "+e.to().name+": "+e.error().detail),s.go({state:"preferences"}))})}angular.module("SOGo.PreferencesUI",["ui.router","sgCkeditor","angularFileUpload","SOGo.Common","SOGo.MailerUI","SOGo.ContactsUI","SOGo.Authentication","as.sortable"]).config(e).run(t),e.$inject=["$stateProvider","$urlServiceProvider"],t.$inject=["$window","$log","$transitions","$state"]}(),function(){"use strict";function e(a,e,t,i,r,s,n,o,c,d,f){var u=this,h=e.usesCASAuthentication||e.usesSAML2Authentication;function p(){u.account.security&&u.account.security.hasCertificate&&u.account.$certificate().then(function(e){u.certificate=e},function(){delete u.account.security.hasCertificate})}function m(e){e=0<e.type.indexOf("pkcs12")||/\.(p12|pfx)$/.test(e.name);return u.form.certificateFilename.$setValidity("fileformat",e),e}this.defaultPort=143,this.smtpDefaultPort=25,this.defaults=n,this.account=o,this.maxSize=f,this.accountId=c,this.hostnameRE=h&&0<c?/^(?!(127\.0\.0\.1|localhost(?:\.localdomain)?)$)/:/./,this.emailRE=String.emailRE,this.addressesSearchText="",this.ckConfig={autoGrow_minHeight:70,toolbar:{items:["bold","italic","|","fontColor","fontFamily","fontSize","|","link","|","specialCharacters","imageUpload","|","sourceEditing","htmlEmbed"],shouldNotGroupWhenFull:!0},language:n.ckLocaleCode},this.account.encryption?"ssl"==this.account.encryption&&(this.defaultPort=993):this.account.encryption="none",this.account.smtpEncryption?this.smtpDefaultPort=465:this.account.smtpEncryption="none",p(),this.uploader=new i({url:[s.activeUser("folderURL")+"Mail",c,"importCertificate"].join("/"),autoUpload:!1,queueLimit:1,filters:[{name:m,fn:m}],onAfterAddingFile:function(e){u.certificateFilename=e.file.name},onSuccessItem:function(e,t,i,s){this.clearQueue(),a(function(){_.assign(u.account,{security:{hasCertificate:!0},$$certificate:t})}),p()},onErrorItem:function(e,t,i,s){r.alert(l("Error"),l("An error occurred while importing the certificate. Verify your password."))}}),this.hasIdentities=function(){return 0<_.filter(this.account.identities,this.isEditableIdentity).length},this.isEditableIdentity=function(e){return!e.isReadOnly},this.selectIdentity=function(e){this.selectedIdentity==e?this.selectedIdentity=null:this.selectedIdentity=e},this.hasDefaultIdentity=function(){return 0<=_.findIndex(this.account.identities,function(e){return!!e.isDefault})},this.setDefaultIdentity=function(e,i){return _.forEach(this.account.identities,function(e,t){t==i?e.isDefault=!e.isDefault:delete e.isDefault}),e.stopPropagation(),!1},this.canRemoveIdentity=function(e){return e==this.selectedIdentity&&this.hasIdentities()},this.removeIdentity=function(e){this.account.identities.splice(e,1),this.selectedIdentity=null},this.addIdentity=function(){var e=_.findIndex(this.account.identities,{isReadOnly:1}),t={};e<0&&(e=this.account.identities.length),this.customFromIsReadonly()&&(t.fullName=this.account.identities[0].fullName),this.account.identities.splice(Math.max(e,0),0,t),this.selectedIdentity=e},this.showCkEditor=function(e){return this.selectedIdentity==e&&"html"==this.defaults.SOGoMailComposeMessageType},this.filterEmailAddresses=function(t){return _.filter(e.defaultEmailAddresses,function(e){return 0<=e.toLowerCase().indexOf(t.toLowerCase())})},this.customFromIsReadonly=function(){return!(0<c||d)},this.importCertificate=function(){this.uploader.queue[0].formData=[{password:this.certificatePassword}],this.uploader.uploadItem(0)},this.onBeforeUploadCertificate=function(e){this.form=e,this.uploader.clearQueue()},this.removeCertificate=function(){this.account.$removeCertificate()},this.cancel=function(){t.cancel()},this.save=function(){JSON.stringify(this.account).length>this.maxSize?r.alert(l("Error"),l("Data too big. Please contact technical support.")):t.hide()}}e.$inject=["$timeout","$window","$mdDialog","FileUploader","Dialog","sgSettings","defaults","account","accountId","mailCustomFromEnabled","maxSize"],angular.module("SOGo.PreferencesUI").controller("AccountDialogController",e)}(),function(){"use strict";function e(e,t,i,s,a,r,n,o,c){var d=t.sieveCapabilities,f=t.forwardEnabled,u=t.notificationEnabled;t.vacationEnabled;this.filter=a,this.mailboxes=r,thLine truncated
 //# sourceMappingURL=Preferences.js.map

UI/WebServerResources/js/Preferences.js.map

@@ -1 +1 @@
-{"version":3,"file":"Preferences.js","sources":["Preferences/Preferences.app.js","Preferences/AccountDialogController.js","Preferences/FiltersDialogController.js","Preferences/PreferencesController.js"],"names":["configure","$stateProvider","$urlServiceProvider","state","abstract","views","preferences","templateUrl","controller","controllerAs","url","module","rules","otherwise","runBlock","$window","$log","$transitions","$state","DebugEnabled","defaultErrorHandler","onError","to","transition","name","ignored","error","detail","go","angular","config","run","$inject","AccountDialogController","$timeout","$mdDialog","FileUploader","Dialog","Settings","defaults","account","accountId","mailCustomFromEnabled","maxSize","vm","this","usesSSO","usesCASAuthentication","usesSAML2Authentication","_loadCertificate","security","hasCertificate","$certificate","then","crt","certificate","filterByExtension","item","isP12File","type","indexOf","test","form","certificateFilename","$setValidity","defaultPort","smtpDefaultPort","hostnameRE","emailRE","String","addressesSearchText","ckConfig","autoGrow_minHeight","toolbar","items","shouldNotGroupWhenFull","language","ckLocaleCode","encryption","smtpEncryption","uploader","activeUser","join","autoUpload","queueLimit","filters","fn","onAfterAddingFile","file","onSuccessItem","response","status","headers","clearQueue","_","assign","$$certificate","onErrorItem","alert","l","hasIdentities","filter","identities","isEditableIdentity","length","identity","isReadOnly","selectIdentity","index","selectedIdentity","hasDefaultIdentity","findIndex","isDefault","setDefaultIdentity","$event","$index","forEach","i","stopPropagation","canRemoveIdentity","removeIdentity","splice","addIdentity","firstReadonlyIndex","customFromIsReadonly","fullName","Math","max","showCkEditor","SOGoMailComposeMessageType","filterEmailAddresses","$query","defaultEmailAddresses","address","toLowerCase","importCertificate","queue","formData","password","certificatePassword","uploadItem","onBeforeUploadCertificate","removeCertificate","$removeCertificate","cancel","save","JSON","stringify","hide","FiltersDialogController","$scope","mailboxes","labels","validateForwardAddress","Preferences","sieveCapabilities","forwardEnabled","notificationEnabled","vacationEnabled","fieldLabels","subject","from","cc","to_or_cc","size","header","body","methodLabels","discard","keep","stop","redirect","notify","reject","fileinto","addflag","methods","intersection","keys","numberOperatorLabels","under","over","textOperatorLabels","is","is_not","contains","contains_not","matches","matches_not","regex","regex_not","hasRulesAndActions","requirements","actions","match","push","every","a","invalid","method","action","argument","err","message","addMailFilterRule","event","field","operator","removeMailFilterRule","addMailFilterAction","removeMailFilterAction","PreferencesController","$q","$mdMedia","$mdSidenav","$mdToast","sgSettings","focus","User","Account","Authentication","AddressBook","Date","beginOfDay","_loadAllMailboxes","mail","id","$getMailboxes","allMailboxes","$flattenMailboxes","all","domain","domains","forwardConstraints","defaultAddresses","adr","split","Error","forwardConstraintsDomains","$onInit","passwords","newPassword","newPasswordConfirmation","oldPassword","timeZonesList","timeZonesSearchText","autocomplete","forward","notification","mailLabelKeyRE","RegExp","emailSeparatorKeys","Notification","notificationMessage","notificationTranslated","SOGoMailAutoMarkAsReadMode","mailAutoMarkAsReadDelay","SOGoMailAutoMarkAsReadDelay","SOGoAlternateAvatar","$alternateAvatar","sieveVariablesCapability","hasActiveExternalSieveScripts","updateVacationDates","$valid","close","onLanguageChange","confirm","ok","quick","location","reload","onDesktopNotificationsChange","SOGoDesktopNotifications","authorizeNotifications","resetContactsCategories","SOGoContactsCategories","defaultContactsCategories","slice","$setDirty","resetCalendarCategories","SOGoCalendarCategories","defaultCalendarCategories","SOGoCalendarCategoriesColorsValues","values","addCalendarCategory","resetCalendarCategoryValidity","removeCalendarCategory","addContactCategory","removeContactCategory","onMailAutoMarkAsReadDelay","addMailAccount","ev","AuxiliaryMailAccounts","isNew","email","receipts","receiptAction","receiptNonRecipientAction","receiptOutsideDomainAction","receiptAnyAction","show","targetEvent","locals","CDefaultsSize","isArray","settings","Mail","ExpandedFolders","$omit","editMailAccount","data","cloneDeep","catch","noop","removeMailAccount","resetMailLabelValidity","addMailLabel","guid","SOGoMailLabelsColorsKeys","SOGoMailLabelsColorsValues","removeMailLabel","addMailFilter","active","SOGoMailLabelsColors","SOGoSieveFilters","editMailFilter","copy","removeMailFilter","onFiltersOrderChanged","_onFiltersOrderChanged","difference","Vacation","autoReplyEmailAddresses","addDefaultEmailAddresses","v","isDefined","union","userFilter","search","excludedUsers","minimumSearLine truncated
+{"version":3,"file":"Preferences.js","sources":["Preferences/Preferences.app.js","Preferences/AccountDialogController.js","Preferences/FiltersDialogController.js","Preferences/PreferencesController.js"],"names":["configure","$stateProvider","$urlServiceProvider","state","abstract","views","preferences","templateUrl","controller","controllerAs","url","module","rules","otherwise","runBlock","$window","$log","$transitions","$state","DebugEnabled","defaultErrorHandler","onError","to","transition","name","ignored","error","detail","go","angular","config","run","$inject","AccountDialogController","$timeout","$mdDialog","FileUploader","Dialog","Settings","defaults","account","accountId","mailCustomFromEnabled","maxSize","vm","this","usesSSO","usesCASAuthentication","usesSAML2Authentication","_loadCertificate","security","hasCertificate","$certificate","then","crt","certificate","filterByExtension","item","isP12File","type","indexOf","test","form","certificateFilename","$setValidity","defaultPort","smtpDefaultPort","hostnameRE","emailRE","String","addressesSearchText","ckConfig","autoGrow_minHeight","toolbar","items","shouldNotGroupWhenFull","language","ckLocaleCode","encryption","smtpEncryption","uploader","activeUser","join","autoUpload","queueLimit","filters","fn","onAfterAddingFile","file","onSuccessItem","response","status","headers","clearQueue","_","assign","$$certificate","onErrorItem","alert","l","hasIdentities","filter","identities","isEditableIdentity","length","identity","isReadOnly","selectIdentity","index","selectedIdentity","hasDefaultIdentity","findIndex","isDefault","setDefaultIdentity","$event","$index","forEach","i","stopPropagation","canRemoveIdentity","removeIdentity","splice","addIdentity","firstReadonlyIndex","customFromIsReadonly","fullName","Math","max","showCkEditor","SOGoMailComposeMessageType","filterEmailAddresses","$query","defaultEmailAddresses","address","toLowerCase","importCertificate","queue","formData","password","certificatePassword","uploadItem","onBeforeUploadCertificate","removeCertificate","$removeCertificate","cancel","save","JSON","stringify","hide","FiltersDialogController","$scope","mailboxes","labels","validateForwardAddress","Preferences","sieveCapabilities","forwardEnabled","notificationEnabled","vacationEnabled","fieldLabels","subject","from","cc","to_or_cc","size","header","body","methodLabels","discard","keep","stop","redirect","notify","reject","fileinto","addflag","methods","intersection","keys","numberOperatorLabels","under","over","textOperatorLabels","is","is_not","contains","contains_not","matches","matches_not","regex","regex_not","hasRulesAndActions","requirements","actions","match","push","every","a","invalid","method","action","argument","err","message","addMailFilterRule","event","field","operator","removeMailFilterRule","addMailFilterAction","removeMailFilterAction","PreferencesController","$q","$mdMedia","$mdSidenav","$mdToast","sgSettings","focus","User","Account","Authentication","AddressBook","Date","beginOfDay","_loadAllMailboxes","mail","id","$getMailboxes","allMailboxes","$flattenMailboxes","all","domain","domains","forwardConstraints","defaultAddresses","adr","split","Error","forwardConstraintsDomains","$onInit","passwords","newPassword","newPasswordConfirmation","oldPassword","timeZonesList","timeZonesSearchText","autocomplete","forward","notification","mailLabelKeyRE","RegExp","emailSeparatorKeys","Notification","notificationMessage","notificationTranslated","SOGoMailAutoMarkAsReadMode","mailAutoMarkAsReadDelay","SOGoMailAutoMarkAsReadDelay","SOGoAlternateAvatar","$alternateAvatar","sieveVariablesCapability","hasActiveExternalSieveScripts","updateVacationDates","$valid","close","onLanguageChange","confirm","ok","quick","location","reload","onDesktopNotificationsChange","SOGoDesktopNotifications","authorizeNotifications","resetContactsCategories","SOGoContactsCategories","defaultContactsCategories","slice","$setDirty","resetCalendarCategories","SOGoCalendarCategories","defaultCalendarCategories","SOGoCalendarCategoriesColorsValues","values","addCalendarCategory","resetCalendarCategoryValidity","removeCalendarCategory","addContactCategory","removeContactCategory","onMailAutoMarkAsReadDelay","addMailAccount","ev","AuxiliaryMailAccounts","isNew","email","receipts","receiptAction","receiptNonRecipientAction","receiptOutsideDomainAction","receiptAnyAction","show","targetEvent","locals","CDefaultsSize","isArray","settings","Mail","ExpandedFolders","$omit","editMailAccount","data","cloneDeep","catch","noop","removeMailAccount","resetMailLabelValidity","addMailLabel","guid","SOGoMailLabelsColorsKeys","SOGoMailLabelsColorsValues","removeMailLabel","addMailFilter","active","SOGoMailLabelsColors","SOGoSieveFilters","editMailFilter","copy","removeMailFilter","onFiltersOrderChanged","_onFiltersOrderChanged","difference","Vacation","autoReplyEmailAddresses","addDefaultEmailAddresses","v","isDefined","union","userFilter","search","excludedUsers","minimumSearLine truncated

UI/WebServerResources/js/Preferences/PreferencesController.js

@@ -22,7 +22,7 @@
       this.emailSeparatorKeys = Preferences.defaults.emailSeparatorKeys;
       if(this.preferences.defaults.Notification) {
         if (!this.preferences.defaults.Notification.notificationMessage)
-          this.preferences.defaults.Notification.notificationMessage = l('Notification Message', $window.defaultEmailAddresses);
+          this.preferences.defaults.Notification.notificationMessage = l('Notification Message', $window.defaultEmailAddresses[0]);
         this.preferences.defaults.Notification.notificationTranslated = l('Notification');
       }
       if (Preferences.defaults.SOGoMailAutoMarkAsReadMode == 'delay')

packaging/debian/rules

@@ -73,6 +73,11 @@ ifeq ($(DIST_CODENAME), noble)
 MFA_CONFIG=--enable-mfa
 endif
 
+# All other cases
+ifeq ($(MFA_CONFIG),)
+MFA_CONFIG=--enable-mfa
+endif
+
 include /etc/GNUstep/GNUstep.conf
 include /usr/share/GNUstep/Makefiles/common.make