Updated for the 2.2.9a release

Simplified even more -safeString
Fixed sanitization char skipping and #2936
2014-09-29 15:20:22 -04:00 · 2014-09-29 15:17:05 -04:00 · 2014-09-29 15:15:30 -04:00 · 2014-09-29 15:15:23 -04:00 · 2014-09-26 14:32:47 -04:00 · 2014-09-10 14:17:14 -04:00
5 changed files with 11 additions and 12 deletions
@@ -80,7 +80,7 @@ https://addons.mozilla.org/en-US/thunderbird/addon/lightning/
 When using version 17 ESR of Thunderbird, you can use Mozilla Lightning
 version 1.9.1. In order to download the extension, please visit:

-https://addons.mozilla.org/en-US/thunderbird/addon/lightning/versions/?page=1#version-1.9.1
+https://addons.mozilla.org/en-US/thunderbird/addon/lightning/versions/1.9.1

 For Thunderbird 2 and 3.1, you need the _Inverse Edition_of Mozilla
 Lightning. It provides back ported features, bug fixes and security
@@ -1,3 +1,9 @@
+2.2.9a (2014-09-29)
+-------------------
+
+Bug fixes
+ - correctly skip unallowed characters (#2936)
+
 2.2.9 (2014-09-26)
 ------------------

@@ -46,9 +46,6 @@ static NSString **cssEscapingStrings = NULL;
 static unichar *cssEscapingCharacters = NULL;
 static int cssEscapingCount;

-static NSString *controlCharString = nil;
-static NSCharacterSet *controlCharSet = nil;
-
@implementation NSString (SOGoURLExtension)

 - (NSString *) composeURLWithAction: (NSString *) action
@@ -308,13 +305,9 @@ static NSCharacterSet *controlCharSet = nil;
          (c >= 0x20 && c <= 0xD7FF) ||
          (c >= 0xE000 && c <= 0xFFFD) ||
          (c >= 0x10000 && c <= 0x10FFFF))
-        j++;
-      else
        {
-          if (i+1 < len)
-            {
-              *(start+j) = *buf;
-            }
+          *(start+j) = c;
+          j++;
        }

      buf++;
@@ -186,7 +186,7 @@
  if (![subject length])
    subject = @"";

-  return [subject stringByEscapingHTMLString];
+  return [[subject safeString] stringByEscapingHTMLString];
 }

 - (BOOL) showToAddress 
@@ -4,4 +4,4 @@

 MAJOR_VERSION=2
 MINOR_VERSION=2
-SUBMINOR_VERSION=9
+SUBMINOR_VERSION=9a
Author	SHA1	Message	Date
Ludovic Marcotte	74cfb901fd	Updated for the 2.2.9a release	2014-09-29 15:20:22 -04:00
Ludovic Marcotte	065fd5d9b5	Simplified even more -safeString	2014-09-29 15:17:05 -04:00
Ludovic Marcotte	bf547dd3fe	Fixed sanitization char skipping and #2936	2014-09-29 15:15:30 -04:00
Francis Lachapelle	81e47c59cd	Fix URL in documentation	2014-09-29 15:15:23 -04:00
Ludovic Marcotte	7862cda661	Merge to 2.2.9	2014-09-26 14:32:47 -04:00
Ludovic Marcotte	329552030b	Merge to 2.2.8	2014-09-10 14:17:14 -04:00
Ludovic Marcotte	04904d8c61	Merge to 2.2.6	2014-07-02 11:41:46 -04:00
Francis Lachapelle	f0b4a05c70	Merge to 2.2.5	2014-06-05 13:35:45 -04:00
Francis Lachapelle	95d6911f1a	Merge to 2.2.4	2014-05-29 11:17:46 -04:00
Francis Lachapelle	48f98ef34e	Merge to 2.2.3	2014-04-03 10:06:08 -04:00
Francis Lachapelle	ae0c5eae77	Merge to 2.2.2	2014-03-21 15:39:00 -04:00
Francis Lachapelle	0c2d727057	Merge to 2.2.2	2014-03-21 15:33:55 -04:00
Francis Lachapelle	072f5f5a15	Merge to 2.2.1	2014-03-07 14:03:41 -05:00
Francis Lachapelle	1db85743a0	Merge to 2.2.0	2014-02-24 16:54:11 -05:00
Jean Raby	2cf66e037d	Merge to 2.1.1	2013-11-19 14:00:22 -05:00
Francis Lachapelle	449d838dc2	Merge to 2.1.0	2013-11-07 14:43:19 -05:00
Francis Lachapelle	c4bc215a47	Merge to 2.0.7	2013-07-23 10:02:39 -04:00
Francis Lachapelle	c9936d7ecf	Merge to 2.0.7	2013-07-23 08:38:44 -04:00
Francis Lachapelle	885e59a2af	Merge to 2.0.7	2013-07-19 13:46:37 -04:00
Jean Raby	bf398889bf	Merge to 2.0.6b	2013-06-27 11:36:30 -04:00
Ludovic Marcotte	e26e3d7307	Revert "Properly escape the foldername to avoid XSS issues" This reverts commit `045b275b27`.	2013-06-27 11:15:41 -04:00
Ludovic Marcotte	045b275b27	Properly escape the foldername to avoid XSS issues	2013-06-27 11:06:07 -04:00
Jean Raby	7ec1973e0f	Merge to 2.0.6a	2013-06-25 09:22:35 -04:00
Ludovic Marcotte	a79a9c4eff	Merge to 2.0.6 Conflicts: Documentation/SOGo Installation Guide.odt	2013-06-21 12:44:35 -04:00
Jean Raby	f049e2430a	Added ldap attribute mapping table	2013-04-22 12:25:22 -04:00
Jean Raby	59b3219f2d	Merge to 2.05a	2013-04-16 15:20:19 -04:00
Francis Lachapelle	e9eb8bdc86	Merge to 2.0.5	2013-04-11 12:56:34 -04:00
Francis Lachapelle	5e0c7ae4f2	Merge to 2.0.4b	2013-02-04 14:24:46 -05:00
Francis Lachapelle	c1c0c1ab44	Merge to 2.0.4a	2013-01-30 08:54:00 -05:00
Francis Lachapelle	a59fff785b	Merge to 2.0.4	2013-01-25 14:01:10 -05:00
Francis Lachapelle	6a70db80e6	Merge to 2.0.3a	2012-12-07 09:35:03 -05:00
Francis Lachapelle	d610630c8d	Merge to 2.0.3 (again)	2012-12-06 13:08:47 -05:00
Francis Lachapelle	4dc7790015	Merge to 2.0.3	2012-12-06 10:40:33 -05:00
Francis Lachapelle	9dd000a2ca	Merge to 2.0.2 Merge commit '1080bee3ba9749aad0dc28625081fc6a496f7280' into maint Conflicts: OpenChange/MAPIStoreContext.h OpenChange/MAPIStoreContext.m	2012-11-15 10:10:48 -05:00
Wolfgang Sourdeau	ce4084e528	getNewChangeNumbers: new wrapper for openchangedb_get_new_changeNumbers	2012-10-12 16:55:27 -04:00