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

[tor-commits] [Git][tpo/applications/tor-browser][base-browser-115.0esrbase-13.0-1] Bug 41854: Allow overriding download spam protection.

Title: GitLab

richard pushed to branch base-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser

Commits:

  • 84e468a9
    by hackademix at 2023-07-11T22:19:11+00:00 
    Bug 41854: Allow overriding download spam protection.

4 changed files:

Changes:

  • browser/components/downloads/DownloadSpamProtection.sys.mjs
    ... ... @@ -94,8 +94,9 @@ class WindowSpamProtection {
    94 94 
        * Add a blocked download to the spamList or increment the count of an
    95 95 
        * existing blocked download, then notify listeners about this.
    96 96 
        * @param {String} url
    97 
    +   * @param {DownloadSpamEnabler} enabler
    97 98 
        */
    98 
    -  addDownloadSpam(url) {
    99 
    +  addDownloadSpam(url, enabler) {
    99 100 
         this._blocking = true;
    100 101 
         // Start listening on registered downloads views, if any exist.
    101 102 
         this._maybeAddViews();
    ... ... @@ -109,7 +110,7 @@ class WindowSpamProtection {
    109 110 
         }
    110 111 
         // Otherwise, create a new DownloadSpam object for the URL, add it to the
    111 112 
         // spamList, and open the downloads panel.
    112 
    -    let downloadSpam = new DownloadSpam(url);
    113 
    +    let downloadSpam = new DownloadSpam(url, enabler);
    113 114 
         this.spamList.add(downloadSpam);
    114 115 
         this._downloadSpamForUrl.set(url, downloadSpam);
    115 116 
         this._notifyDownloadSpamAdded(downloadSpam);
    ... ... @@ -193,6 +194,39 @@ class WindowSpamProtection {
    193 194 
       }
    194 195 
     }
    195 196
    197 
    +/**
    198 
    + * Helper to grant a certain principal permission for automatic downloads
    199 
    + * and to clear its download spam messages from the UI
    200 
    + */
    201 
    +class DownloadSpamEnabler{
    202 
    +  /**
    203 
    +   * Constructs a DownloadSpamEnabler object
    204 
    +   * @param {nsIPrincipal} principal
    205 
    +   * @param {DownloadSpamProtection} downloadSpamProtection
    206 
    +   */
    207 
    +  constructor(principal, downloadSpamProtection) {
    208 
    +    this.principal = principal;
    209 
    +    this.downloadSpamProtection = downloadSpamProtection;
    210 
    +  }
    211 
    +  /**
    212 
    +   * Allows a DownloadSpam item
    213 
    +   * @param {DownloadSpam} downloadSpam
    214 
    +   */
    215 
    +  allow(downloadSpam) {
    216 
    +    const pm = Services.perms;
    217 
    +    pm.addFromPrincipal(
    218 
    +      this.principal,
    219 
    +      "automatic-download",
    220 
    +      pm.ALLOW_ACTION,
    221 
    +      pm.EXPIRE_SESSION
    222 
    +    );
    223 
    +    downloadSpam.hasBlockedData = downloadSpam.hasPartialData = false;
    224 
    +    const {url} = downloadSpam.source;
    225 
    +    for (let window of lazy.BrowserWindowTracker.orderedWindows) {
    226 
    +      this.downloadSpamProtection.removeDownloadSpamForWindow(url, window);
    227 
    +    }
    228 
    +  }
    229 
    +}
    196 230 
     /**
    197 231 
      * Responsible for detecting events related to downloads spam and notifying the
    198 232 
      * relevant window's WindowSpamProtection object. This is a singleton object,
    ... ... @@ -210,9 +244,11 @@ export class DownloadSpamProtection {
    210 244 
        * download was blocked. This is invoked when a download is blocked by
    211 245 
        * nsExternalAppHandler::IsDownloadSpam
    212 246 
        * @param {String} url
    213 
    -   * @param {Window} window
    247 
    +   * @param {nsILoadInfo} loadInfo
    214 248 
        */
    215 
    -  update(url, window) {
    249 
    +  update(url, loadInfo) {
    250 
    +    loadInfo = loadInfo.QueryInterface(Ci.nsILoadInfo);
    251 
    +    const window = loadInfo.browsingContext.topChromeWindow;
    216 252 
         if (window == null) {
    217 253 
           lazy.DownloadsCommon.log(
    218 254 
             "Download spam blocked in a non-chrome window. URL: ",
    ... ... @@ -226,7 +262,7 @@ export class DownloadSpamProtection {
    226 262 
         let wsp =
    227 263 
           this._forWindowMap.get(window) ?? new WindowSpamProtection(window);
    228 264 
         this._forWindowMap.set(window, wsp);
    229 
    -    wsp.addDownloadSpam(url);
    265 
    +    wsp.addDownloadSpam(url, new DownloadSpamEnabler(loadInfo.triggeringPrincipal, this));
    230 266 
       }
    231 267
    232 268 
       /**
    ... ... @@ -285,8 +321,9 @@ export class DownloadSpamProtection {
    285 321 
      * @extends Download
    286 322 
      */
    287 323 
     class DownloadSpam extends Download {
    288 
    -  constructor(url) {
    324 
    +  constructor(url, downloadSpamEnabler) {
    289 325 
         super();
    326 
    +    this._downloadSpamEnabler = downloadSpamEnabler;
    290 327 
         this.hasBlockedData = true;
    291 328 
         this.stopped = true;
    292 329 
         this.error = new DownloadError({
    ... ... @@ -297,4 +334,13 @@ class DownloadSpam extends Download {
    297 334 
         this.source = { url };
    298 335 
         this.blockedDownloadsCount = 1;
    299 336 
       }
    337 
    +
    338 
    +  /**
    339 
    +   * Allows the principal which triggered this download to perform automatic downloads
    340 
    +   * and clears the UI from messages reporting this download spam
    341 
    +   */
    342 
    +  allow() {
    343 
    +    this._downloadSpamEnabler.allow(this);
    344 
    +    this._notifyChange();
    345 
    +  }
    300 346 
     }

  • toolkit/components/downloads/DownloadCore.sys.mjs
    ... ... @@ -713,6 +713,10 @@ Download.prototype = {
    713 713 
         }
    714 714
    715 715 
         this._promiseUnblock = (async () => {
    716 
    +      if (this.allow) {
    717 
    +        this.allow();
    718 
    +        return;
    719 
    +      }
    716 720 
           try {
    717 721 
             await IOUtils.move(this.target.partFilePath, this.target.path);
    718 722 
             await this.target.refresh();
    ... ... @@ -721,7 +725,6 @@ Download.prototype = {
    721 725 
             this._promiseUnblock = null;
    722 726 
             throw ex;
    723 727 
           }
    724 
    -
    725 728 
           this.succeeded = true;
    726 729 
           this.hasBlockedData = false;
    727 730 
           this._notifyChange();
    ... ... @@ -951,7 +954,9 @@ Download.prototype = {
    951 954 
                 await this._promiseCanceled;
    952 955 
               }
    953 956 
               // Ask the saver object to remove any partial data.
    954 
    -          await this.saver.removeData();
    957 
    +          if (this.saver) {
    958 
    +            await this.saver.removeData();
    959 
    +          }
    955 960 
               // For completeness, clear the number of bytes transferred.
    956 961 
               if (this.currentBytes != 0 || this.hasPartialData) {
    957 962 
                 this.currentBytes = 0;

  • toolkit/components/downloads/DownloadIntegration.sys.mjs
    ... ... @@ -1162,7 +1162,7 @@ var DownloadObserver = {
    1162 1162 
               DownloadIntegration._initializeDownloadSpamProtection();
    1163 1163 
               DownloadIntegration.downloadSpamProtection.update(
    1164 1164 
                 aData,
    1165 
    -            aSubject.topChromeWindow
    1165 
    +            aSubject
    1166 1166 
               );
    1167 1167 
             }
    1168 1168 
             break;

  • uriloader/exthandler/nsExternalHelperAppService.cpp
    ... ... @@ -1907,13 +1907,11 @@ bool nsExternalAppHandler::IsDownloadSpam(nsIChannel* aChannel) {
    1907 1907 
         if (capability == nsIPermissionManager::PROMPT_ACTION) {
    1908 1908 
           nsCOMPtr<nsIObserverService> observerService =
    1909 1909 
               mozilla::services::GetObserverService();
    1910 
    -      RefPtr<BrowsingContext> browsingContext;
    1911 
    -      loadInfo->GetBrowsingContext(getter_AddRefs(browsingContext));
    1912 1910
    1913 1911 
           nsAutoCString cStringURI;
    1914 1912 
           loadInfo->TriggeringPrincipal()->GetPrePath(cStringURI);
    1915 1913 
           observerService->NotifyObservers(
    1916 
    -          browsingContext, "blocked-automatic-download",
    1914 
    +          loadInfo, "blocked-automatic-download",
    1917 1915 
               NS_ConvertASCIItoUTF16(cStringURI.get()).get());
    1918 1916 
           // FIXME: In order to escape memory leaks, currently we cancel blocked
    1919 1917 
           // downloads. This is temporary solution, because download data should be

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits