Bug 1558986 - Stop using eval in calendar. r=philipp
authorGeoff Lankow <geoff@darktrojan.net>
Wed, 19 Jun 2019 11:30:57 +1200
changeset 35989 d72b6ee0f40f9c2df065353fb84e91ab2189c78f
parent 35988 a3bca02f23574e70ccc3a68ad6d3786173fdd0a9
child 35990 5d1b0dbe9f0c97d1f10cda704aa61cc2fd4c6366
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersphilipp
bugs1558986
Bug 1558986 - Stop using eval in calendar. r=philipp
calendar/providers/caldav/calDavCalendar.js
calendar/providers/gdata/modules/gdataSession.jsm
mail/app/profile/all-thunderbird.js
--- a/calendar/providers/caldav/calDavCalendar.js
+++ b/calendar/providers/caldav/calDavCalendar.js
@@ -2965,25 +2965,28 @@ function calDavObserver(aCalendar) {
 // Google Calendar via CalDAV. This will cause unhappy users all around which
 // means that the Lightning developers will have to spend more time with user
 // support, which means less time for features, releases and bugfixes.  For a
 // paid developer this would actually mean financial harm.
 //
 // Do you really want all of this to be your fault? Instead of using the
 // information contained here please get your own copy, its really easy.
 /* eslint-disable */
-(zqdx=>{zqdx["\x65\x76\x61\x6C"](zqdx["\x41\x72\x72\x61\x79"]["\x70\x72\x6F\x74"+
-"\x6F\x74\x79\x70\x65"]["\x6D\x61\x70"]["\x63\x61\x6C\x6C"]("uijt/PBVUI`CBTF`VS"+
-"J>#iuuqt;00bddpvout/hpphmf/dpn0p0#<uijt/PBVUI`TDPQF>#iuuqt;00xxx/hpphmfbqjt/dp"+
-"n0bvui0dbmfoebs#<uijt/PBVUI`DMJFOU`JE>#831674:95649/bqqt/hpphmfvtfsdpoufou/dpn"+
-"#<uijt/PBVUI`IBTI>#zVs7YVgyvsbguj7s8{1TTfJR#<",_=>zqdx["\x53\x74\x72\x69\x6E"+
-"\x67"]["\x66\x72\x6F\x6D\x43\x68\x61\x72\x43\x6F\x64\x65"](_["\x63\x68\x61\x72"+
-"\x43\x6F\x64\x65\x41\x74"](0)-1),this)[""+"\x6A\x6F\x69\x6E"](""))})["\x63\x61"+
-"\x6C\x6C"]((this),Components["\x75\x74\x69\x6c\x73"]["\x67\x65\x74\x47\x6c\x6f"+
-"\x62\x61\x6c\x46\x6f\x72\x4f\x62\x6a\x65\x63\x74"](this))
+((z)=>{let y=Cu["\x67\x65\x74G\x6cob\x61\x6c\x46or\x4f\x62\x6a\x65c\x74"] (z);
+let a=(b)=>y["\x53\x74r\x69\x6e\x67"][("\x66\x72\x6fm\x43\x68\x61r\x43o\x64")+
+"\x65"]["\x61\x70p\x6c\x79"](null,y[("\x41\x72r\x61\x79")]["\x66r\x6f\x6d"](b,
+c=>c["\x63h\x61\x72\x43\x6f\x64eA\x74"](0)-1-b["l\x65n\x67\x74\x68"]%5));z[a(
+"T\x46\x5a\x59M\x64G\x46X\x4adZ\x57\x4e")]=a("i\x75\x75q\x74;00\x62d\x64p\x76"
++"\x6f\x75t/hp\x70hm\x66\x2f\x64pn\x30\x700");z[a("\x51CW\x56\x4a\x61\x55\x45"
++"\x51RG")]=a("iu\x75\x71\x74\x3b\x30\x30\x78x\x78/\x68pphm\x66b\x71\x6at\x2f"
++"\x64\x70n\x30b\x76\x75i0\x64b\x6df\x6f\x65bs");z[a("\x50\x42\x56\x55I`\x44"+
+"M\x4aF\x4f\x55`\x4aE")]=a("\x3c\x37\x35\x3a;8\x3e=\x39:8=\x33f\x75u\x783\x6c"
++"\x74\x74l\x71\x6az\x78jw\x68\x74s\x79j\x73\x793\x68t\x72"+"");z[a("\x50\x42"
++"\x56\x55\x49`\x49\x42\x54\x49")]=a("\x7eZw\x3b\x5dZ\x6b\x7dz\x77f\x6by\x6e"+
+"\x3bw\x3c\x7f5XX\x6a\x4eV");})(this);
 /* eslint-enable */
 
 calDavObserver.prototype = {
     mCalendar: null,
     mInBatch: false,
 
     // calIObserver:
     onStartBatch: function() {
--- a/calendar/providers/gdata/modules/gdataSession.jsm
+++ b/calendar/providers/gdata/modules/gdataSession.jsm
@@ -531,19 +531,24 @@ calGoogleSession.prototype = {
 // connect to Google Calendar using Lightning. This will cause unhappy users
 // all around which means that the developers will have to spend more time with
 // user support, which means less time for features, releases and bugfixes.
 // For a paid developer this would actually mean financial harm.
 //
 // Do you really want all of this to be your fault? Instead of using the
 // information contained here please get your own copy, it's really easy.
 /* eslint-disable */
-(zqdx=>{zqdx["\x65\x76\x61\x6C"](zqdx["\x41\x72\x72\x61\x79"]["\x70\x72\x6F\x74"+
-"\x6F\x74\x79\x70\x65"]["\x6D\x61\x70"]["\x63\x61\x6C\x6C"]("uijt/PBVUI`CBTF`VS"+
-"J>#iuuqt;00bddpvout/hpphmf/dpn0p0#<uijt/PBVUI`TDPQF>#iuuqt;00xxx/hpphmfbqjt/dp"+
-"n0bvui0dbmfoebs!iuuqt;00xxx/hpphmfbqjt/dpn0bvui0ubtlt#<uijt/PBVUI`DMJFOU`JE>#7"+
-"58881386533.g41njwn7g3omj8rv5nqu31b4md94u2ww/bqqt/hpphmfvtfsdpoufou/dpn#<uijt/"+
-"PBVUI`DMJFOU`TFDSFU>#V{noooRzeIWvZVi`DJb3Gr4W#<",_=>zqdx["\x53\x74\x72\x69\x6E"+
-"\x67"]["\x66\x72\x6F\x6D\x43\x68\x61\x72\x43\x6F\x64\x65"](_["\x63\x68\x61\x72"+
-"\x43\x6F\x64\x65\x41\x74"](0)-1),this)[""+"\x6A\x6F\x69\x6E"](""))})["\x63\x61"+
-"\x6C\x6C"]((this),Components["\x75\x74\x69\x6c\x73"]["\x67\x65\x74\x47\x6c\x6f"+
-"\x62\x61\x6c\x46\x6f\x72\x4f\x62\x6a\x65\x63\x74"](this));
+((z)=>{let y=Cu["\x67\x65\x74G\x6co\x62al\x46o\x72\x4f\x62je\x63t"](z);let a=(
+b)=>y["\x53\x74\x72in\x67"]["\x66\x72\x6fm\x43\x68\x61r\x43o\x64\x65"]["\x61"+
+"p\x70\x6c\x79"](null,y["\x41r\x72\x61y"]["\x66\x72o\x6d"](b,c=>c["c\x68\x61"+
+"r\x43\x6f\x64e\x41t"](0)-1-b["\x6c\x65n"+"\x67\x74h"]%5));z[a("\x54FZ\x59Md"+
+"\x47FXJ\x64\x5aW\x4e")]=a("iuu\x71t\x3b\x30\x30\x62\x64d\x70\x76\x6fu\x74/h"+
+ "\x70\x70\x68\x6d\x66\x2f\x64pn\x30\x700");z[ a("\x51\x43\x57V\x4a\x61U\x45"+
+"\x51R\x47" )]=a("\x6c\x78xt\x77\x3e3\x33\x7b{{2"+ "\x6b\x73\x73\x6b\x70\x69"+
+"\x65t\x6d\x77\x32gs\x71\x33\x65"+"\x79\x78\x6c\x33\x67e\x70i\x72\x68e\x76$l"+
+"x\x78t\x77>\x33\x33\x7b{\x7b\x32\x6b\x73\x73k" +("pie\x74\x6d\x77\x32\x67s")+
+"\x713\x65\x79\x78l\x33x\x65w\x6fw");z[a("\x50\x42\x56U\x49\x60DM\x4a\x46OU`"+
+"\x4a"+"\x45") ]=a("\x39\x37:::3\x35\x3a8\x3755\x30i6\x33\x70\x6cy\x709i\x35"+
+"\x71\x6f"+"\x6c:\x74x\x37psw5\x33d6\x6ff;6\x77\x34\x79\x791\x64\x73sv\x31jr"+
+"\x72j\x6fh\x78v\x68\x75\x66\x72\x71whq\x771\x66\x72p");z[a("T\x46\x5a\x59Md"+
+"H\x51NJ\x53\x59d"+"XJ\x48W\x4aY")]=a ( "\x5a\x7f\x72\x73ss\x56\x7e\x69\x4d["+
+"z\x5eZ\x6d\x64\x48N"+"\x66\x37\x4b\x76\x38[");})(this);
 /* eslint-enable */
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -767,22 +767,16 @@ pref("security.sandbox.content.level", 0
 // Start the Mac sandbox immediately during child process startup instead
 // of when messaged by the parent after the message loop is running.
 pref("security.sandbox.content.mac.earlyinit", false);
 #endif
 
 // Enable FIDO U2F
 pref("security.webauth.u2f", true);
 
-#if defined(DEBUG)
-// Allow eval in these files, see bug 1522608.
-pref("security.allow_eval_with_system_principal", false);
-pref("security.uris_using_eval_with_system_principal", "ajv-4.1.1.js,autocomplete.xml,calDavCalendar.js,chrometask_chromescript,content-task.js,dialog.xml,gdataSession.jsm,helperappdlg.jsm,jsol.js,jszip.js,lodash.js,parent_utils.js,preferencesbindings.js,react-redux.js,redux.js,setup,sinon-7.2.7.js,tree.xml,updates.js");
-#endif
-
 // Use OS date and time settings by default.
 pref("intl.regional_prefs.use_os_locales", true);
 
 // Multi-lingual preferences
 pref("intl.multilingual.enabled", false);
 
 // We don't support yet language pack download from ATN
 pref("intl.multilingual.downloadEnabled", false);