fix(injection): catch error if iframe is cross origin; #312

sereneblue · Apr 28, 2020 · 94b3c8f · 94b3c8f
1 parent 62062f6
commit 94b3c8f
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 11 deletions.
diff --git a/src/lib/chameleon.ts b/src/lib/chameleon.ts
@@ -439,7 +439,7 @@ export class Chameleon {
 
         wlRule.spoofIP = prev.whitelist.urlList[i].spoofIP;
         wlRule.profile = prev.whitelist.urlList[i].profile === 'default' ? 'default' : mappedProfiles[prev.whitelist.urlList[i].profile];
-        
+
         let tempLang = languages.find(l => l.value === prev.whitelist.urlList[i].lang);
         wlRule.lang = tempLang ? tempLang.code : 'en-US';
 

diff --git a/src/lib/inject.ts b/src/lib/inject.ts
@@ -282,12 +282,27 @@ class Injector {
           contentWindow: {
             get: function() {
               let f = iframeWindow.apply(this);
-              if (f) {
-                f.Date = window.Date;
-                f.Intl.DateTimeFormat = window.Intl.DateTimeFormat;
-                f.screen = window.screen;
-                f.navigator = window.navigator;
-              }
+
+              try {
+                if (f) {
+                  Object.defineProperty(f, 'Date', {
+                    value: window.Date
+                  });
+  
+                  Object.defineProperty(f.Intl, 'DateTimeFormat', {
+                    value: window.Intl.DateTimeFormat
+                  });
+  
+                  Object.defineProperty(f, 'screen', {
+                    value: window.screen
+                  });
+  
+                  Object.defineProperty(f, 'navigator', {
+                    value: window.navigator
+                  });
+                }
+              } catch (e) {}
+              
               return f;
             }
           },
@@ -304,10 +319,23 @@ class Injector {
             get: function() {
               let f = frameWindow.apply(this);
               if (f) {
-                f.Date = window.Date;
-                f.Intl.DateTimeFormat = window.Intl.DateTimeFormat;
-                f.screen = window.screen;
-                f.navigator = window.navigator;
+                try {
+                  Object.defineProperty(f, 'Date', {
+                    value: window.Date
+                  });
+  
+                  Object.defineProperty(f.Intl, 'DateTimeFormat', {
+                    value: window.Intl.DateTimeFormat
+                  });
+  
+                  Object.defineProperty(f, 'screen', {
+                    value: window.screen
+                  });
+  
+                  Object.defineProperty(f, 'navigator', {
+                    value: window.navigator
+                  });
+                } catch (e) {}
               }
               return f;
             }