[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-128.13.0esr-14.5-1] 6 commits: Bug 1791322 - GeckoView should call classifyDownloads to sandbox downloads...

Title: GitLab

ma1 pushed to branch tor-browser-128.13.0esr-14.5-1 at The Tor Project / Applications / Tor Browser

Commits:

  • b387860f
    by Cathy Lu at 2025-07-19T00:13:27+02:00 
    Bug 1791322 - GeckoView should call classifyDownloads to sandbox downloads r=geckoview-reviewers,nika

Differential Revision: https://phabricator.services.mozilla.com/D249683
  • c338e49d
    by Tom Schuster at 2025-07-19T00:17:17+02:00 
    Bug 1808979 - WPT for frame-src path matching after replacing the URL. r=freddyb

Differential Revision: https://phabricator.services.mozilla.com/D253638
  • 3f70bb78
    by Tom Schuster at 2025-07-19T00:21:26+02:00 
    Bug 1808979 - Disable security.csp.truncate_blocked_uri_for_frame_navigations by default. r=freddyb

Differential Revision: https://phabricator.services.mozilla.com/D253304
  • 7aefbd90
    by Andreas Pehrson at 2025-07-21T23:26:01+02:00 
    Bug 1971116 - For global mute events, iterate on copies of containers. r=dbaker

Mute/unmute events are fired synchronously to content, which if it stops an
(event target) track in the event handler, may call back into and mutate the
containers we're iterating over.

Differential Revision: https://phabricator.services.mozilla.com/D254352
  • 6263c64d
    by Tom Schuster at 2025-07-22T00:19:48+02:00 
    Bug 1971704 - Cleanup nsContentSecurityUtils::ClassifyDownload. r=smaug

Differential Revision: https://phabricator.services.mozilla.com/D253491
  • d485473e
    by Pier Angelo Vendrame at 2025-07-22T00:33:48+02:00 
    Bug 1972282 - Check for spoof English in xsl:sort. r=smaug

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

9 changed files:

Changes:

  • dom/media/MediaManager.cpp
    ... ... @@ -3513,7 +3513,9 @@ void MediaManager::OnCameraMute(bool aMute) {
    3513 3513 
       mCamerasMuted = aMute;
    3514 3514 
       // This is safe since we're on main-thread, and the windowlist can only
    3515 3515 
       // be added to from the main-thread
    3516 
    -  for (const auto& window : mActiveWindows.Values()) {
    3516 
    +  for (const auto& window :
    3517 
    +       ToTArray<AutoTArray<RefPtr<GetUserMediaWindowListener>, 2>>(
    3518 
    +           mActiveWindows.Values())) {
    3517 3519 
         window->MuteOrUnmuteCameras(aMute);
    3518 3520 
       }
    3519 3521 
     }
    ... ... @@ -3524,7 +3526,9 @@ void MediaManager::OnMicrophoneMute(bool aMute) {
    3524 3526 
       mMicrophonesMuted = aMute;
    3525 3527 
       // This is safe since we're on main-thread, and the windowlist can only
    3526 3528 
       // be added to from the main-thread
    3527 
    -  for (const auto& window : mActiveWindows.Values()) {
    3529 
    +  for (const auto& window :
    3530 
    +       ToTArray<AutoTArray<RefPtr<GetUserMediaWindowListener>, 2>>(
    3531 
    +           mActiveWindows.Values())) {
    3528 3532 
         window->MuteOrUnmuteMicrophones(aMute);
    3529 3533 
       }
    3530 3534 
     }
    ... ... @@ -4698,7 +4702,7 @@ void GetUserMediaWindowListener::MuteOrUnmuteCameras(bool aMute) {
    4698 4702 
       }
    4699 4703 
       mCamerasAreMuted = aMute;
    4700 4704
    4701 
    -  for (auto& l : mActiveListeners) {
    4705 
    +  for (auto& l : mActiveListeners.Clone()) {
    4702 4706 
         if (l->GetDevice()->Kind() == MediaDeviceKind::Videoinput) {
    4703 4707 
           l->MuteOrUnmuteCamera(aMute);
    4704 4708 
         }
    ... ... @@ -4713,7 +4717,7 @@ void GetUserMediaWindowListener::MuteOrUnmuteMicrophones(bool aMute) {
    4713 4717 
       }
    4714 4718 
       mMicrophonesAreMuted = aMute;
    4715 4719
    4716 
    -  for (auto& l : mActiveListeners) {
    4720 
    +  for (auto& l : mActiveListeners.Clone()) {
    4717 4721 
         if (l->GetDevice()->Kind() == MediaDeviceKind::Audioinput) {
    4718 4722 
           l->MuteOrUnmuteMicrophone(aMute);
    4719 4723 
         }

  • dom/security/nsContentSecurityUtils.cpp
    ... ... @@ -1666,11 +1666,17 @@ void nsContentSecurityUtils::LogMessageToConsole(nsIHttpChannel* aChannel,
    1666 1666 
     }
    1667 1667
    1668 1668 
     /* static */
    1669 
    -long nsContentSecurityUtils::ClassifyDownload(
    1670 
    -    nsIChannel* aChannel, const nsAutoCString& aMimeTypeGuess) {
    1669 
    +long nsContentSecurityUtils::ClassifyDownload(nsIChannel* aChannel) {
    1671 1670 
       MOZ_ASSERT(aChannel, "IsDownloadAllowed without channel?");
    1672 1671
    1673 1672 
       nsCOMPtr<nsILoadInfo> loadInfo = aChannel->LoadInfo();
    1673 
    +  if ((loadInfo->GetTriggeringSandboxFlags() & SANDBOXED_ALLOW_DOWNLOADS) ||
    1674 
    +      (loadInfo->GetSandboxFlags() & SANDBOXED_ALLOW_DOWNLOADS)) {
    1675 
    +    if (nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(aChannel)) {
    1676 
    +      LogMessageToConsole(httpChannel, "IframeSandboxBlockedDownload");
    1677 
    +    }
    1678 
    +    return nsITransfer::DOWNLOAD_FORBIDDEN;
    1679 
    +  }
    1674 1680
    1675 1681 
       nsCOMPtr<nsIURI> contentLocation;
    1676 1682 
       aChannel->GetURI(getter_AddRefs(contentLocation));
    ... ... @@ -1701,27 +1707,11 @@ long nsContentSecurityUtils::ClassifyDownload(
    1701 1707
    1702 1708 
       if (StaticPrefs::dom_block_download_insecure() &&
    1703 1709 
           decission != nsIContentPolicy::ACCEPT) {
    1704 
    -    nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(aChannel);
    1705 
    -    if (httpChannel) {
    1710 
    +    if (nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(aChannel)) {
    1706 1711 
           LogMessageToConsole(httpChannel, "MixedContentBlockedDownload");
    1707 1712 
         }
    1708 1713 
         return nsITransfer::DOWNLOAD_POTENTIALLY_UNSAFE;
    1709 1714 
       }
    1710 1715
    1711 
    -  if (loadInfo->TriggeringPrincipal()->IsSystemPrincipal()) {
    1712 
    -    return nsITransfer::DOWNLOAD_ACCEPTABLE;
    1713 
    -  }
    1714 
    -
    1715 
    -  uint32_t triggeringFlags = loadInfo->GetTriggeringSandboxFlags();
    1716 
    -  uint32_t currentflags = loadInfo->GetSandboxFlags();
    1717 
    -
    1718 
    -  if ((triggeringFlags & SANDBOXED_ALLOW_DOWNLOADS) ||
    1719 
    -      (currentflags & SANDBOXED_ALLOW_DOWNLOADS)) {
    1720 
    -    nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(aChannel);
    1721 
    -    if (httpChannel) {
    1722 
    -      LogMessageToConsole(httpChannel, "IframeSandboxBlockedDownload");
    1723 
    -    }
    1724 
    -    return nsITransfer::DOWNLOAD_FORBIDDEN;
    1725 
    -  }
    1726 1716 
       return nsITransfer::DOWNLOAD_ACCEPTABLE;
    1727 1717 
     }

  • dom/security/nsContentSecurityUtils.h
    ... ... @@ -75,8 +75,7 @@ class nsContentSecurityUtils {
    75 75 
           const mozilla::dom::Element& aElement);
    76 76
    77 77 
       // Helper function to Check if a Download is allowed;
    78 
    -  static long ClassifyDownload(nsIChannel* aChannel,
    79 
    -                               const nsAutoCString& aMimeTypeGuess);
    78 
    +  static long ClassifyDownload(nsIChannel* aChannel);
    80 79
    81 80 
       // Public only for testing
    82 81 
       static FilenameTypeAndDetails FilenameToFilenameType(

  • dom/xslt/xpath/txXPathNode.h
    ... ... @@ -66,6 +66,8 @@ class txXPathNode {
    66 66 
       bool operator!=(const txXPathNode& aNode) const { return !(*this == aNode); }
    67 67 
       ~txXPathNode() { MOZ_COUNT_DTOR(txXPathNode); }
    68 68
    69 
    +  mozilla::dom::Document* OwnerDoc() const { return mNode->OwnerDoc(); }
    70 
    +
    69 71 
      private:
    70 72 
       friend class txXPathNativeNode;
    71 73 
       friend class txXPathNodeUtils;

  • dom/xslt/xslt/txNodeSorter.cpp
    ... ... @@ -13,10 +13,13 @@
    13 13
    14 14 
     #include "mozilla/CheckedInt.h"
    15 15 
     #include "mozilla/UniquePtrExtensions.h"
    16 
    +#include "nsRFPService.h"
    16 17
    17 18 
     using mozilla::CheckedUint32;
    18 19 
     using mozilla::MakeUnique;
    19 20 
     using mozilla::MakeUniqueFallible;
    21 
    +using mozilla::nsRFPService;
    22 
    +using mozilla::RFPTarget;
    20 23 
     using mozilla::UniquePtr;
    21 24
    22 25 
     /*
    ... ... @@ -74,6 +77,10 @@ nsresult txNodeSorter::addSortElement(Expr* aSelectExpr, Expr* aLangExpr,
    74 77 
         if (aLangExpr) {
    75 78 
           rv = aLangExpr->evaluateToString(aContext, lang);
    76 79 
           NS_ENSURE_SUCCESS(rv, rv);
    80 
    +    } else if (aContext->getContextNode()
    81 
    +                   .OwnerDoc()
    82 
    +                   ->ShouldResistFingerprinting(RFPTarget::JSLocale)) {
    83 
    +      CopyUTF8toUTF16(nsRFPService::GetSpoofedJSLocale(), lang);
    77 84 
         }
    78 85
    79 86 
         // Case-order

  • mobile/android/components/geckoview/GeckoViewStreamListener.cpp
    ... ... @@ -16,6 +16,8 @@
    16 16 
     #include "nsIWebProgressListener.h"
    17 17 
     #include "nsIX509Cert.h"
    18 18 
     #include "nsPrintfCString.h"
    19 
    +#include "nsContentSecurityUtils.h"
    20 
    +#include "nsITransfer.h"
    19 21
    20 22 
     #include "nsNetUtil.h"
    21 23
    ... ... @@ -85,6 +87,16 @@ GeckoViewStreamListener::OnStartRequest(nsIRequest* aRequest) {
    85 87 
         return NS_OK;
    86 88 
       }
    87 89
    90 
    +  nsCOMPtr<nsIChannel> channel = do_QueryInterface(aRequest);
    91 
    +  if (channel) {
    92 
    +    int32_t classification = nsContentSecurityUtils::ClassifyDownload(channel);
    93 
    +    if (classification == nsITransfer::DOWNLOAD_FORBIDDEN) {
    94 
    +      channel->Cancel(NS_ERROR_ABORT);
    95 
    +      CompleteWithError(NS_ERROR_ABORT, channel);
    96 
    +      return NS_OK;
    97 
    +    }
    98 
    +  }
    99 
    +
    88 100 
       // We're expecting data later via OnDataAvailable, so create the stream now.
    89 101 
       InitializeStreamSupport(aRequest);
    90 102

  • modules/libpref/init/StaticPrefList.yaml
    ... ... @@ -14666,7 +14666,7 @@
    14666 14666
    14667 14667 
     - name: security.csp.truncate_blocked_uri_for_frame_navigations
    14668 14668 
       type: bool
    14669 
    -  value: true
    14669 
    +  value: false
    14670 14670 
       mirror: always
    14671 14671
    14672 14672 
     # Limit the number of CSP reports that are send in a specific timespan.

  • testing/web-platform/tests/content-security-policy/frame-src/frame-src-blocked-path-matching.sub.html
    1 
    +<!DOCTYPE html>
    2 
    +<html>
    3 
    +<head>
    4 
    +    <!-- Make sure frame-src does path matching -->
    5 
    +    <meta http-equiv="Content-Security-Policy" content="frame-src data: https://{{hosts[][www1]}}:{{ports[https][0]}}/content-security-policy/support/;">
    6 
    +    <title>frame-src-blocked-path-matching</title>
    7 
    +    <script src="">"/resources/testharness.js"></script>
    8 
    +    <script src="">"/resources/testharnessreport.js"></script>
    9 
    +</head>
    10 
    +<body>
    11 
    +    <script>
    12 
    +      async_test(t => {
    13 
    +        let frame = document.createElement("iframe");
    14 
    +        frame.src = "https://{{hosts[][www1]}}:{{ports[https][0]}}/content-security-policy/support/postmessage-pass.html";
    15 
    +
    16 
    +        window.addEventListener('message', t.step_func(e => {
    17 
    +          if (e.source === frame.contentWindow) {
    18 
    +            assert_equals(e.data, "PASS");
    19 
    +            t.done();
    20 
    +          }
    21 
    +        }));
    22 
    +
    23 
    +        document.body.append(frame);
    24 
    +      }, "Cross-origin frame with allowed path loads");
    25 
    +
    26 
    +      async_test(t => {
    27 
    +        let frame = document.createElement("iframe");
    28 
    +        frame.src = "https://{{hosts[][www1]}}:{{ports[https][0]}}/content-security-policy/resource/";
    29 
    +
    30 
    +        window.addEventListener('securitypolicyviolation', t.step_func_done(e => {
    31 
    +          assert_equals(e.blockedURI, "https://{{hosts[][www1]}}:{{ports[https][0]}}");
    32 
    +          assert_equals(e.effectiveDirective, "frame-src");
    33 
    +        }), { once: true });
    34 
    +
    35 
    +        document.body.append(frame);
    36 
    +      }, "Cross-origin frame with other path is blocked");
    37 
    +
    38 
    +      async_test(t => {
    39 
    +        let frame = document.createElement("iframe");
    40 
    +        frame.src = "data:text/html,<h1>Hello World</h1>"
    41 
    +        frame.onload = t.step_func(() => {
    42 
    +          frame.src = "https://{{hosts[][www1]}}:{{ports[https][0]}}/content-security-policy/resource/";
    43 
    +
    44 
    +          window.addEventListener('securitypolicyviolation', t.step_func_done(e => {
    45 
    +            assert_equals(e.blockedURI, "https://{{hosts[][www1]}}:{{ports[https][0]}}");
    46 
    +            assert_equals(e.effectiveDirective, "frame-src");
    47 
    +          }), { once: true });
    48 
    +        });
    49 
    +        document.body.append(frame);
    50 
    +      }, "Cross-origin frame with other path is blocked even after replacing the already loaded URL");
    51 
    +    </script>
    52 
    +  </body>
    53 
    +</html>

  • uriloader/exthandler/nsExternalHelperAppService.cpp
    ... ... @@ -1584,8 +1584,7 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) {
    1584 1584 
         return NS_OK;
    1585 1585 
       }
    1586 1586
    1587 
    -  mDownloadClassification =
    1588 
    -      nsContentSecurityUtils::ClassifyDownload(aChannel, MIMEType);
    1587 
    +  mDownloadClassification = nsContentSecurityUtils::ClassifyDownload(aChannel);
    1589 1588
    1590 1589 
       if (mDownloadClassification == nsITransfer::DOWNLOAD_FORBIDDEN) {
    1591 1590 
         // If the download is rated as forbidden,

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5385b73692d4a3a34bf103373c93983e52405618...d485473ebd6ae0d661e7394de9c6419233f068d4 at 1753141626 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx