├── LICENSE
├── dont_reserve_keys.patch
└── fix-webextension-websocket-upgrades.patch


/LICENSE:
--------------------------------------------------------------------------------
 1 | MIT License
 2 | 
 3 | Copyright (c) 2019 
 4 | 
 5 | Permission is hereby granted, free of charge, to any person obtaining a copy
 6 | of this software and associated documentation files (the "Software"), to deal
 7 | in the Software without restriction, including without limitation the rights
 8 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 9 | copies of the Software, and to permit persons to whom the Software is
10 | furnished to do so, subject to the following conditions:
11 | 
12 | The above copyright notice and this permission notice shall be included in all
13 | copies or substantial portions of the Software.
14 | 
15 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21 | SOFTWARE.
22 | 


--------------------------------------------------------------------------------
/dont_reserve_keys.patch:
--------------------------------------------------------------------------------
 1 | diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
 2 | --- a/browser/base/content/browser-sets.inc
 3 | +++ b/browser/base/content/browser-sets.inc
 4 | @@ -123,9 +123,9 @@
 5 |      <key id="key_newNavigator"
 6 |           data-l10n-id="window-new-shortcut"
 7 |           command="cmd_newNavigator"
 8 | -         modifiers="accel" reserved="true"/>
 9 | +         modifiers="accel"/>
10 |      <key id="key_newNavigatorTab" data-l10n-id="tab-new-shortcut" modifiers="accel"
11 | -         command="cmd_newNavigatorTabNoEvent" reserved="true"/>
12 | +         command="cmd_newNavigatorTabNoEvent"/>
13 |      <key id="focusURLBar" data-l10n-id="location-open-shortcut" command="Browser:OpenLocation"
14 |           modifiers="accel"/>
15 |  #ifndef XP_MACOSX
16 | @@ -172,8 +172,8 @@
17 |      <key id="openFileKb" data-l10n-id="file-open-shortcut" command="Browser:OpenFile"  modifiers="accel"/>
18 |      <key id="key_savePage" data-l10n-id="save-page-shortcut" command="Browser:SavePage" modifiers="accel"/>
19 |      <key id="printKb" data-l10n-id="print-shortcut" command="cmd_print"  modifiers="accel"/>
20 | -    <key id="key_close" data-l10n-id="close-shortcut" command="cmd_close" modifiers="accel" reserved="true"/>
21 | -    <key id="key_closeWindow" data-l10n-id="close-shortcut" command="cmd_closeWindow" modifiers="accel,shift" reserved="true"/>
22 | +    <key id="key_close" data-l10n-id="close-shortcut" command="cmd_close" modifiers="accel"/>
23 | +    <key id="key_closeWindow" data-l10n-id="close-shortcut" command="cmd_closeWindow" modifiers="accel,shift"/>
24 |      <key id="key_toggleMute" data-l10n-id="mute-toggle-shortcut" command="cmd_toggleMute" modifiers="control"/>
25 |      <key id="key_undo"
26 |           data-l10n-id="text-action-undo-shortcut"
27 | @@ -302,7 +302,7 @@
28 |      <key id="key_switchTextDirection" data-l10n-id="bidi-switch-direction-shortcut" command="cmd_switchTextDirection" modifiers="accel,shift" />
29 |  
30 |      <key id="key_privatebrowsing" command="Tools:PrivateBrowsing" data-l10n-id="private-browsing-shortcut"
31 | -         modifiers="accel,shift" reserved="true"/>
32 | +         modifiers="accel,shift"/>
33 |      <key id="key_sanitize" command="Tools:Sanitize" keycode="VK_DELETE" modifiers="accel,shift"/>
34 |  #ifdef XP_MACOSX
35 |      <key id="key_sanitize_mac" command="Tools:Sanitize" keycode="VK_BACK" modifiers="accel,shift"/>
36 | @@ -319,7 +319,7 @@
37 |  #ifndef XP_MACOSX
38 |           command="cmd_quitApplication"
39 |  #endif
40 | -         reserved="true"/>
41 | +         />
42 |  
43 |      <key id="key_undoCloseTab" command="History:UndoCloseTab" data-l10n-id="tab-new-shortcut" modifiers="accel,shift"/>
44 |      <key id="key_undoCloseWindow" command="History:UndoCloseWindow" data-l10n-id="window-new-shortcut" modifiers="accel,shift"/>
45 | 


--------------------------------------------------------------------------------
/fix-webextension-websocket-upgrades.patch:
--------------------------------------------------------------------------------
 1 | # HG changeset patch
 2 | # User Ghjuvan Lacambre <code@lacamb.re>
 3 | # Date 1604849733 -3600
 4 | #      Sun Nov 08 16:35:33 2020 +0100
 5 | # Node ID 57984ccfdba5628e2d4e68933599b25eaf4054fc
 6 | # Parent  0e95e169ef40f27ae4de839644c63249acd3b5b1
 7 | Don't upgrade webextension websockets to wss:// behind their back
 8 | 
 9 | diff --git a/dom/websocket/WebSocket.cpp b/dom/websocket/WebSocket.cpp
10 | --- a/dom/websocket/WebSocket.cpp
11 | +++ b/dom/websocket/WebSocket.cpp
12 | @@ -1553,7 +1553,8 @@
13 |  
14 |    // If the HTTPS-Only mode is enabled, we need to upgrade the websocket
15 |    // connection from ws:// to wss:// and mark it as secure.
16 | -  if (!mIsServerSide && !mSecure && originDoc) {
17 | +  if (!mIsServerSide && !mSecure && originDoc &&
18 | +      !originDoc->GetDocumentURI()->SchemeIs("moz-extension")) {
19 |      nsCOMPtr<nsIURI> uri;
20 |      nsresult rv = NS_NewURI(getter_AddRefs(uri), mURI);
21 |      NS_ENSURE_SUCCESS(rv, rv);
22 | @@ -1578,6 +1579,7 @@
23 |    // to wss: before performing content policy checks because CSP needs to
24 |    // send reports in case the scheme is about to be upgraded.
25 |    if (!mIsServerSide && !mSecure && originDoc &&
26 | +      !originDoc->GetDocumentURI()->SchemeIs("moz-extension") &&
27 |        originDoc->GetUpgradeInsecureRequests(false)) {
28 |      // let's use the old specification before the upgrade for logging
29 |      AutoTArray<nsString, 2> params;
30 | 


--------------------------------------------------------------------------------