Merge branch 'jb50423' into 'master'

[embedlite-components] Upgrade google requests to https. Fixes JB#50423 See merge request mer-core/embedlite-components!90
sailfishos · Nov 2, 2020 · 762b37a · 762b37a
2 parents 77f7e45 + 7438fea
commit 762b37a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/jscomps/UserAgentOverrideHelper.js b/jscomps/UserAgentOverrideHelper.js
@@ -99,6 +99,10 @@ var UserAgent = {
   onModifyRequest(aSubject, aTopic, aData) {
     if (aTopic === "http-on-modify-request") {
       let channel = aSubject.QueryInterface(Ci.nsIHttpChannel);
+      // Cover all google domains
+      if (!channel.URI.schemeIs("https") && channel.URI.asciiHost.indexOf(".google.") !== -1) {
+        channel.upgradeToSecure();
+      }
       let ua = this.onRequest(channel, this.getDefaultUserAgent());
       channel.setRequestHeader("User-Agent", ua, false);
     }