Bug 1874801 - Check that HTTPS-Only is disabled when checking if HTTP…

…S-First is enabled in nsHTTPSOnlyUtils r=freddyb

Differential Revision: https://phabricator.services.mozilla.com/D198780

UltraBlame original commit: 7d35b1612c9f80b1ce49a6f7f8adc8b90621969d

dom/security/nsHTTPSOnlyUtils.cpp

@@ -206,6 +206,18 @@ aFromPrivateWindow
 {
 if
 (
+IsHttpsOnlyModeEnabled
+(
+aFromPrivateWindow
+)
+)
+{
+return
+false
+;
+}
+if
+(
 mozilla
 :
 :
@@ -533,13 +545,6 @@ dom_security_https_first_schemeless
 )
 )
 )
-&
-&
-!
-IsHttpsOnlyModeEnabled
-(
-isPrivateWin
-)
 )
 {
 int32_t

dom/security/test/https-only/browser.toml

@@ -34,6 +34,29 @@ sjs
 ]
 [
 "
+browser_bug1874801
+.
+js
+"
+]
+support
+-
+files
+=
+[
+"
+file_bug1874801
+.
+sjs
+"
+"
+file_bug1874801
+.
+html
+"
+]
+[
+"
 browser_console_logging
 .
 js

dom/security/test/https-only/browser_bug1874801.js

@@ -0,0 +1,230 @@
+"
+use
+strict
+"
+;
+const
+TAB_URL
+=
+"
+https
+:
+/
+/
+example
+.
+com
+/
+browser
+/
+dom
+/
+security
+/
+test
+/
+https
+-
+only
+/
+file_bug1874801
+.
+html
+"
+;
+function
+assertImageLoaded
+(
+tab
+)
+{
+return
+ContentTask
+.
+spawn
+(
+tab
+.
+linkedBrowser
+{
+}
+(
+)
+=
+>
+{
+const
+img
+=
+content
+.
+document
+.
+getElementsByTagName
+(
+"
+img
+"
+)
+[
+0
+]
+;
+ok
+(
+!
+!
+img
+"
+Image
+tag
+should
+exist
+"
+)
+;
+ok
+(
+img
+.
+complete
+&
+&
+img
+.
+naturalWidth
+>
+0
+"
+Image
+should
+have
+loaded
+"
+)
+;
+}
+)
+;
+}
+add_task
+(
+async
+function
+test_bug1874801
+(
+)
+{
+await
+SpecialPowers
+.
+pushPrefEnv
+(
+{
+set
+:
+[
+[
+"
+security
+.
+mixed_content
+.
+upgrade_display_content
+"
+false
+]
+[
+"
+dom
+.
+security
+.
+https_first
+"
+true
+]
+[
+"
+dom
+.
+security
+.
+https_only_mode
+"
+true
+]
+]
+}
+)
+;
+const
+tabToClose
+=
+await
+BrowserTestUtils
+.
+openNewForegroundTab
+(
+gBrowser
+TAB_URL
+true
+)
+;
+await
+assertImageLoaded
+(
+tabToClose
+)
+;
+const
+tabClosePromise
+=
+BrowserTestUtils
+.
+waitForSessionStoreUpdate
+(
+tabToClose
+)
+;
+BrowserTestUtils
+.
+removeTab
+(
+tabToClose
+)
+;
+await
+tabClosePromise
+;
+const
+restoredTabPromise
+=
+BrowserTestUtils
+.
+waitForNewTab
+(
+gBrowser
+TAB_URL
+true
+)
+;
+undoCloseTab
+(
+)
+;
+const
+restoredTab
+=
+await
+restoredTabPromise
+;
+await
+assertImageLoaded
+(
+restoredTab
+)
+;
+}
+)
+;

dom/security/test/https-only/file_bug1874801.html

@@ -0,0 +1,104 @@
+<
+!
+DOCTYPE
+html
+>
+<
+html
+lang
+=
+"
+en
+"
+>
+<
+head
+>
+<
+meta
+charset
+=
+"
+UTF
+-
+8
+"
+>
+<
+meta
+name
+=
+"
+viewport
+"
+content
+=
+"
+width
+=
+device
+-
+width
+initial
+-
+scale
+=
+1
+.
+0
+"
+>
+<
+title
+>
+Bug
+1874801
+<
+/
+title
+>
+<
+/
+head
+>
+<
+body
+>
+<
+img
+src
+=
+"
+http
+:
+/
+/
+example
+.
+com
+/
+browser
+/
+dom
+/
+security
+/
+test
+/
+https
+-
+only
+/
+file_bug1874801
+.
+sjs
+"
+>
+<
+/
+body
+>
+<
+/
+html
+>