Merge branch 'esr68' of github.com:mozilla/gecko-dev into current

trman · Apr 24, 2020 · 640006a · 640006a
2 parents b180ee5 + 3c47f2c
commit 640006a
Show file tree

Hide file tree

Showing 74 changed files with 3,442 additions and 2,833 deletions.
diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml
diff --git a/browser/components/enterprisepolicies/Policies.jsm b/browser/components/enterprisepolicies/Policies.jsm
@@ -392,6 +392,38 @@ var Policies = {
     },
   },
 
+  DisabledCiphers: {
+    onBeforeAddons(manager, param) {
+      if ("TLS_DHE_RSA_WITH_AES_128_CBC_SHA" in param) {
+        setAndLockPref("security.ssl3.dhe_rsa_aes_128_sha", false);
+      }
+      if ("TLS_DHE_RSA_WITH_AES_256_CBC_SHA" in param) {
+        setAndLockPref("security.ssl3.dhe_rsa_aes_256_sha", false);
+      }
+      if ("TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA" in param) {
+        setAndLockPref("security.ssl3.ecdhe_rsa_aes_128_sha", false);
+      }
+      if ("TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA" in param) {
+        setAndLockPref("security.ssl3.ecdhe_rsa_aes_256_sha", false);
+      }
+      if ("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256" in param) {
+        setAndLockPref("security.ssl3.ecdhe_rsa_aes_128_gcm_sha256", false);
+      }
+      if ("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" in param) {
+        setAndLockPref("security.ssl3.ecdhe_ecdsa_aes_128_gcm_sha256", false);
+      }
+      if ("TLS_RSA_WITH_AES_128_CBC_SHA" in param) {
+        setAndLockPref("security.ssl3.rsa_aes_128_sha", false);
+      }
+      if ("TLS_RSA_WITH_AES_256_CBC_SHA" in param) {
+        setAndLockPref("security.ssl3.rsa_aes_256_sha", false);
+      }
+      if ("TLS_RSA_WITH_3DES_EDE_CBC_SHA" in param) {
+        setAndLockPref("security.ssl3.rsa_des_ede3_sha", false);
+      }
+    },
+  },
+
   DisableDeveloperTools: {
     onBeforeAddons(manager, param) {
       if (param) {

diff --git a/browser/components/enterprisepolicies/schemas/policies-schema.json b/browser/components/enterprisepolicies/schemas/policies-schema.json
@@ -195,6 +195,39 @@
       "type": "boolean"
     },
 
+    "DisabledCiphers": {
+      "type": "object",
+      "properties": {
+        "TLS_DHE_RSA_WITH_AES_128_CBC_SHA": {
+          "type": "boolean"
+        },
+        "TLS_DHE_RSA_WITH_AES_256_CBC_SHA": {
+          "type": "boolean"
+        },
+        "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA": {
+          "type": "boolean"
+        },
+        "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA": {
+          "type": "boolean"
+        },
+        "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256": {
+          "type": "boolean"
+        },
+        "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256": {
+          "type": "boolean"
+        },
+        "TLS_RSA_WITH_AES_128_CBC_SHA": {
+          "type": "boolean"
+        },
+        "TLS_RSA_WITH_AES_256_CBC_SHA": {
+          "type": "boolean"
+        },
+        "TLS_RSA_WITH_3DES_EDE_CBC_SHA": {
+          "type": "boolean"
+        }
+      }
+    },
+
     "DisableDeveloperTools": {
       "type": "boolean"
     },

diff --git a/browser/components/preferences/connection.js b/browser/components/preferences/connection.js
@@ -216,7 +216,8 @@ var gConnectionsDialog = {
     var proxyTypePref = Preferences.get("network.proxy.type");
     var isDefinitelySocks4 =
       !socksVersionPref.disabled && socksVersionPref.value == 4;
-    socksDNSPref.disabled = isDefinitelySocks4 || proxyTypePref.value == 0;
+    socksDNSPref.disabled =
+      isDefinitelySocks4 || proxyTypePref.value == 0 || socksDNSPref.locked;
     return undefined;
   },
 

diff --git a/browser/extensions/webcompat/about-compat/aboutCompat.css b/browser/extensions/webcompat/about-compat/aboutCompat.css
@@ -28,8 +28,7 @@
   .wide-button {
     display: block;
     min-height: 32px;
-    padding-left: 30px;
-    padding-right: 30px;
+    padding-inline: 30px;
   }
 
   .submitting {
@@ -69,12 +68,8 @@
     font-weight: lighter;
   }
 
-  html[dir="ltr"] th {
-    text-align: left;
-  }
-
-  html[dir="rtl"] th {
-    text-align: right;
+  th {
+    text-align: start;
   }
 }
 
@@ -152,12 +147,7 @@
   td {
     display: block;
     position: relative;
-  }
-  td:dir(ltr) {
-    padding-right: 6.5em;
-  }
-  td:dir(rtl) {
-    padding-left: 6.5em;
+    padding-inline-end: 6.5em;
   }
 
   td[colspan="4"] {
@@ -183,18 +173,13 @@
     position: absolute;
     top: 0;
     bottom: 0;
+    inset-inline-end: 0;
     width: 6em;
     border: 0;
-    border-left: 1px solid #d7d9db;
+    border-inline-start: 1px solid #d7d9db;
     -moz-appearance: none;
     color: #000;
   }
-  button:dir(ltr) {
-    right: 0;
-  }
-  button:dir(rtl) {
-    left: 0;
-  }
 
   button::-moz-focus-inner {
     border: 0;

diff --git a/browser/extensions/webcompat/about-compat/aboutCompat.html b/browser/extensions/webcompat/about-compat/aboutCompat.html
@@ -1,3 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!DOCTYPE HTML>
 <html>
 <head>

diff --git a/browser/extensions/webcompat/about-compat/aboutPage.json b/browser/extensions/webcompat/about-compat/aboutPage.json
@@ -1,4 +1,6 @@
-[{
+[
+  {
     "namespace": "aboutCompat",
     "description": "Enables the about:compat page"
-}]
+  }
+]