Bug 1410364 - Don't consider opener when calculating IsSecureContext.…

… r=bz, r=dveditz Per w3c/webappsec-secure-contexts#42, the section considering the window opener when calculating secure context is to be dropped. Firefox already uses "isSecureContextIfOpenerIgnored" in most places as this is the actual behavior we want. This patch aligns with the upcoming spec changes by ignoring the window opener. We also no longer have to keep information about whether our opener was secure as that no longer factors in our calculations. UltraBlame original commit: 681fece780aef771f1c6b56cddf4e52c8c800cb2
marco-c · Oct 2, 2019 · 6cf548b · 6cf548b
1 parent 18e303b
commit 6cf548b
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 440 deletions.
diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp
@@ -2819,10 +2819,6 @@ mHadOriginalOpener
 (
 false
 )
-mOriginalOpenerWasSecureContext
-(
-false
-)
 mIsPopupSpam
 (
 false
@@ -10583,30 +10579,6 @@ IsSecureContext
 )
 ;
 }
-bool
-nsPIDOMWindowInner
-:
-:
-IsSecureContextIfOpenerIgnored
-(
-)
-const
-{
-return
-nsGlobalWindowInner
-:
-:
-Cast
-(
-this
-)
--
->
-IsSecureContextIfOpenerIgnored
-(
-)
-;
-}
 void
 nsPIDOMWindowInner
 :
@@ -38699,26 +38671,6 @@ GetWrapperPreserveColor
 )
 ;
 }
-bool
-nsGlobalWindowInner
-:
-:
-IsSecureContextIfOpenerIgnored
-(
-)
-const
-{
-MOZ_RELEASE_ASSERT
-(
-IsInnerWindow
-(
-)
-)
-;
-return
-mIsSecureContextIfOpenerIgnored
-;
-}
 already_AddRefed
 <
 External

diff --git a/dom/base/nsGlobalWindowInner.h b/dom/base/nsGlobalWindowInner.h
@@ -4508,12 +4508,6 @@ IsSecureContext
 )
 const
 ;
-bool
-IsSecureContextIfOpenerIgnored
-(
-)
-const
-;
 void
 GetSidebar
 (
@@ -8919,16 +8913,6 @@ mHadOriginalOpener
 1
 ;
 bool
-mOriginalOpenerWasSecureContext
-:
-1
-;
-bool
-mIsSecureContextIfOpenerIgnored
-:
-1
-;
-bool
 mIsPopupSpam
 :
 1

diff --git a/dom/base/nsGlobalWindowOuter.cpp b/dom/base/nsGlobalWindowOuter.cpp
@@ -4330,10 +4330,6 @@ mHadOriginalOpener
 (
 false
 )
-mOriginalOpenerWasSecureContext
-(
-false
-)
 mIsPopupSpam
 (
 false
@@ -9197,17 +9193,6 @@ state
 "
 )
 ;
-if
-(
-aFlags
-!
-=
-SecureContextFlags
-:
-:
-eIgnoreOpener
-)
-{
 hadNonSecureContextCreator
 =
 !
@@ -9219,44 +9204,6 @@ IsSecureContext
 )
 ;
 }
-else
-{
-hadNonSecureContextCreator
-=
-!
-parentWin
--
->
-IsSecureContextIfOpenerIgnored
-(
-)
-;
-}
-}
-else
-if
-(
-mHadOriginalOpener
-)
-{
-if
-(
-aFlags
-!
-=
-SecureContextFlags
-:
-:
-eIgnoreOpener
-)
-{
-hadNonSecureContextCreator
-=
-!
-mOriginalOpenerWasSecureContext
-;
-}
-}
 if
 (
 hadNonSecureContextCreator
@@ -10675,20 +10622,6 @@ global
 "
 )
 ;
-newInnerWindow
--
->
-mIsSecureContextIfOpenerIgnored
-=
-ComputeIsSecureContext
-(
-aDocument
-SecureContextFlags
-:
-:
-eIgnoreOpener
-)
-;
 mCreatingInnerWindow
 =
 false
@@ -13743,20 +13676,6 @@ mHadOriginalOpener
 =
 true
 ;
-mOriginalOpenerWasSecureContext
-=
-aOpener
--
->
-GetCurrentInnerWindow
-(
-)
--
->
-IsSecureContext
-(
-)
-;
 }
 #
 ifdef

diff --git a/dom/base/nsGlobalWindowOuter.h b/dom/base/nsGlobalWindowOuter.h
@@ -7169,16 +7169,6 @@ mHadOriginalOpener
 1
 ;
 bool
-mOriginalOpenerWasSecureContext
-:
-1
-;
-bool
-mIsSecureContextIfOpenerIgnored
-:
-1
-;
-bool
 mIsPopupSpam
 :
 1

diff --git a/dom/base/nsPIDOMWindow.h b/dom/base/nsPIDOMWindow.h
@@ -5051,12 +5051,6 @@ IsSecureContext
 )
 const
 ;
-bool
-IsSecureContextIfOpenerIgnored
-(
-)
-const
-;
 /
 /
 Calling

diff --git a/dom/geolocation/nsGeolocation.cpp b/dom/geolocation/nsGeolocation.cpp
@@ -5905,7 +5905,7 @@ win
 )
 -
 >
-IsSecureContextIfOpenerIgnored
+IsSecureContext
 (
 )
 )

diff --git a/dom/webidl/Window.webidl b/dom/webidl/Window.webidl
@@ -3724,115 +3724,6 @@ IdleDeadline
 deadline
 )
 ;
-/
-*
-*
-*
-Similar
-to
-|
-isSecureContext
-|
-but
-doesn
-'
-t
-pay
-attention
-to
-whether
-the
-*
-window
-'
-s
-opener
-(
-if
-any
-)
-is
-a
-secure
-context
-or
-not
-.
-*
-*
-WARNING
-:
-Do
-not
-use
-this
-unless
-you
-are
-familiar
-with
-the
-issues
-that
-*
-taking
-opener
-state
-into
-account
-is
-designed
-to
-address
-(
-or
-else
-you
-may
-*
-introduce
-security
-issues
-)
-.
-If
-in
-doubt
-use
-|
-isSecureContext
-|
-.
-In
-*
-particular
-do
-not
-use
-this
-to
-gate
-access
-to
-JavaScript
-APIs
-.
-*
-/
-partial
-interface
-Window
-{
-[
-ChromeOnly
-]
-readonly
-attribute
-boolean
-isSecureContextIfOpenerIgnored
-;
-}
-;
 partial
 interface
 Window