OLD | NEW |
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-2017 eyeo GmbH | 3 * Copyright (C) 2006-2017 eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
559 } | 559 } |
560 }); | 560 }); |
561 }); | 561 }); |
562 }); | 562 }); |
563 | 563 |
564 chrome.webRequest.onBeforeRequest.addListener(details => | 564 chrome.webRequest.onBeforeRequest.addListener(details => |
565 { | 565 { |
566 // The high-level code isn't interested in requests that aren't | 566 // The high-level code isn't interested in requests that aren't |
567 // related to a tab or requests loading a top-level document, | 567 // related to a tab or requests loading a top-level document, |
568 // those should never be blocked. | 568 // those should never be blocked. |
569 if (details.tabId == -1 || details.type == "main_frame") | 569 if (details.type == "main_frame") |
570 return; | 570 return; |
571 | 571 |
572 // Filter out requests from non web protocols. Ideally, we'd explicitly | 572 // Filter out requests from non web protocols. Ideally, we'd explicitly |
573 // specify the protocols we are interested in (i.e. http://, https://, | 573 // specify the protocols we are interested in (i.e. http://, https://, |
574 // ws:// and wss://) with the url patterns, given below, when adding this | 574 // ws:// and wss://) with the url patterns, given below, when adding this |
575 // listener. But unfortunately, Chrome <=57 doesn't support the WebSocket | 575 // listener. But unfortunately, Chrome <=57 doesn't support the WebSocket |
576 // protocol and is causing an error if it is given. | 576 // protocol and is causing an error if it is given. |
577 let url = new URL(details.url); | 577 let url = new URL(details.url); |
578 if (url.protocol != "http:" && url.protocol != "https:" && | 578 if (url.protocol != "http:" && url.protocol != "https:" && |
579 url.protocol != "ws:" && url.protocol != "wss:") | 579 url.protocol != "ws:" && url.protocol != "wss:") |
580 return; | 580 return; |
581 | 581 |
582 // We are looking for the frame that contains the element which | 582 // We are looking for the frame that contains the element which |
583 // has triggered this request. For most requests (e.g. images) we | 583 // has triggered this request. For most requests (e.g. images) we |
584 // can just use the request's frame ID, but for subdocument requests | 584 // can just use the request's frame ID, but for subdocument requests |
585 // (e.g. iframes) we must instead use the request's parent frame ID. | 585 // (e.g. iframes) we must instead use the request's parent frame ID. |
586 let {frameId, type} = details; | 586 let {frameId, type} = details; |
587 if (type == "sub_frame") | 587 if (type == "sub_frame") |
588 { | 588 { |
589 frameId = details.parentFrameId; | 589 frameId = details.parentFrameId; |
590 type = "SUBDOCUMENT"; | 590 type = "SUBDOCUMENT"; |
591 } | 591 } |
592 | 592 |
593 let frame = ext.getFrame(details.tabId, frameId); | 593 // Sometimes requests are not associated with a browser tab and |
594 if (frame) | 594 // in this case we want to still be able to view the url being called. |
| 595 let frame = null; |
| 596 let page = null; |
| 597 if (details.tabId != -1) |
595 { | 598 { |
596 let results = ext.webRequest.onBeforeRequest._dispatch( | 599 frame = ext.getFrame(details.tabId, frameId); |
597 url, type.toUpperCase(), new Page({id: details.tabId}), frame | 600 page = new Page({id: details.tabId}); |
598 ); | 601 } |
599 | 602 |
600 if (results.indexOf(false) != -1) | 603 if (ext.webRequest.onBeforeRequest._dispatch( |
601 return {cancel: true}; | 604 url, type.toUpperCase(), page, frame).includes(false)) |
602 } | 605 return {cancel: true}; |
603 }, {urls: ["<all_urls>"]}, ["blocking"]); | 606 }, {urls: ["<all_urls>"]}, ["blocking"]); |
604 | 607 |
605 | 608 |
606 /* Message passing */ | 609 /* Message passing */ |
607 | 610 |
608 chrome.runtime.onMessage.addListener((message, rawSender, sendResponse) => | 611 chrome.runtime.onMessage.addListener((message, rawSender, sendResponse) => |
609 { | 612 { |
610 let sender = {}; | 613 let sender = {}; |
611 | 614 |
612 // Add "page" and "frame" if the message was sent by a content script. | 615 // Add "page" and "frame" if the message was sent by a content script. |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
731 ext.windows = { | 734 ext.windows = { |
732 create(createData, callback) | 735 create(createData, callback) |
733 { | 736 { |
734 chrome.windows.create(createData, createdWindow => | 737 chrome.windows.create(createData, createdWindow => |
735 { | 738 { |
736 afterTabLoaded(callback)(createdWindow.tabs[0]); | 739 afterTabLoaded(callback)(createdWindow.tabs[0]); |
737 }); | 740 }); |
738 } | 741 } |
739 }; | 742 }; |
740 }()); | 743 }()); |
OLD | NEW |