Allow cookies by default when cookie filter browser is NULL

Author: linesight

src/handlers/cookie_access_filter.pyx

@@ -21,10 +21,6 @@ cdef public cpp_bool CookieAccessFilter_CanSendCookie(
     cdef py_bool retval
     try:
         Debug("CookieAccessFilter_CanSendCookie")
-        # Issue #455: CefRequestHandler callbacks still executed after
-        # browser was closed.
-        if IsBrowserClosed(cef_browser):
-            return False
         # This callback runs on the IO thread, where CefFrame::GetBrowser()
         # may return NULL (observed for cross-origin subresource requests). CEF
         # also documents browser/frame as optional ("may be NULL for requests
@@ -34,10 +30,15 @@ cdef public cpp_bool CookieAccessFilter_CanSendCookie(
         # and allow the cookie by default (CEF's own default is true). The app
         # therefore cannot filter these cookies - documented as a limitation in
         # api/RequestHandler.md.
-        if not cef_frame.get() or not cef_frame.get().GetBrowser().get():
+        if not cef_browser.get() or not cef_frame.get() \
+                or not cef_frame.get().GetBrowser().get():
             Debug("CanSendCookie: no resolvable browser for the request"
                   " (IO-thread / service-worker request); allowing by default")
             return True
+        # Issue #455: CefRequestHandler callbacks still executed after
+        # browser was closed.
+        if IsBrowserClosed(cef_browser):
+            return False
 
         browser = GetPyBrowser(cef_browser, "CanSendCookie")
         frame = GetPyFrame(cef_frame)
@@ -73,19 +74,20 @@ cdef public cpp_bool CookieAccessFilter_CanSaveCookie(
     cdef object callback
     cdef py_bool retval
     try:
-        # Issue #455: CefRequestHandler callbacks still executed after
-        # browser was closed.
-        if IsBrowserClosed(cef_browser):
-            return False
         # See CanSendCookie above. On the IO thread CefFrame::GetBrowser() may
         # be NULL (and CEF documents browser/frame as optional). Without a
         # resolvable browser we cannot build a PyFrame, so log and allow the
         # cookie by default; the app cannot filter these cookies (see
         # api/RequestHandler.md).
-        if not cef_frame.get() or not cef_frame.get().GetBrowser().get():
+        if not cef_browser.get() or not cef_frame.get() \
+                or not cef_frame.get().GetBrowser().get():
             Debug("CanSaveCookie: no resolvable browser for the request"
                   " (IO-thread / service-worker request); allowing by default")
             return True
+        # Issue #455: CefRequestHandler callbacks still executed after
+        # browser was closed.
+        if IsBrowserClosed(cef_browser):
+            return False
 
         browser = GetPyBrowser(cef_browser, "CanSaveCookie")
         frame = GetPyFrame(cef_frame)