January 2023 - tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] Bug 1799982 - Remove uses of inline flags from XPIDL regexps. r=xpcom-reviewers, kmag a=RyanVM
by Pier Angelo Vendrame (＠pierov) 30 Jan '23

30 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 9e5dcf54 by Andrew McCreight at 2023-01-30T18:59:35+01:00 Bug 1799982 - Remove uses of inline flags from XPIDL regexps. r=xpcom-reviewers,kmag a=RyanVM Apparently the use of these is being turned into an error in Python 3.11. Fortunately, our uses appears to be rather trivial. For t_multilinecomment and t_LCDATA, I dropped the (?s) flag and just replaced the one use of . with (\n|.). (?s) means DOTALL, which means that dot includes any character, including a newline. Otherwise it means dot includes any character except a newline. I took the new t_singlelinecomment from IPDL's parser.py, so I assume it is reasonable enough. t_multilinecomment is also now the same as in IPDL. Differential Revision: https://phabricator.services.mozilla.com/D161738 - - - - - 1 changed file: - xpcom/idl-parser/xpidl/xpidl.py Changes: ===================================== xpcom/idl-parser/xpidl/xpidl.py ===================================== @@ -1572,13 +1572,13 @@ class IDLParser(object): t_ignore = " \t" def t_multilinecomment(self, t): - r"/\*(?s).*?\*/" + r"/\*(\n|.)*?\*/" t.lexer.lineno += t.value.count("\n") if t.value.startswith("/**"): self._doccomments.append(t.value) def t_singlelinecomment(self, t): - r"(?m)//.*?$" + r"//[^\n]*" def t_IID(self, t): return t @@ -1591,7 +1591,7 @@ class IDLParser(object): return t def t_LCDATA(self, t): - r"(?s)%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?" + r"%\{[ ]*C\+\+[ ]*\n(?P<cdata>(\n|.)*?\n?)%\}[ ]*(C\+\+)?" t.type = "CDATA" t.value = t.lexer.lexmatch.group("cdata") t.lexer.lineno += t.value.count("\n") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9e5dcf5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9e5dcf5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.0-1] Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to...
by Richard Pospesel (＠richard) 30 Jan '23

30 Jan '23

Richard Pospesel pushed to branch tor-browser-102.7.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: eec2b65f by ahochheiden at 2023-01-30T16:23:29+00:00 Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to ensure Python3.11 compatibility r=firefox-build-system-reviewers,glandium a=RyanVM The 'U' flag represents "universal newline". It has been deprecated since Python3.3. Since then "universal newline" is the default when a file is opened in text mode (not bytes). In Python3.11 using the 'U' flag throws errors. There should be no harm in removing 'U' from 'open' everywhere it is used, and doing allows the use of Python3.11. For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api Differential Revision: https://phabricator.services.mozilla.com/D147721 (cherry picked from commit 3bc6973c9f883820d3a3b177263b79deeb51a61f) - - - - - 6 changed files: - dom/base/usecounters.py - python/mozbuild/mozbuild/action/process_define_files.py - python/mozbuild/mozbuild/backend/base.py - python/mozbuild/mozbuild/preprocessor.py - python/mozbuild/mozbuild/util.py - python/mozbuild/mozpack/files.py Changes: ===================================== dom/base/usecounters.py ===================================== @@ -8,7 +8,7 @@ import re def read_conf(conf_filename): # Can't read/write from a single StringIO, so make a new one for reading. - stream = open(conf_filename, "rU") + stream = open(conf_filename, "r") def parse_counters(stream): for line_num, line in enumerate(stream): ===================================== python/mozbuild/mozbuild/action/process_define_files.py ===================================== @@ -36,7 +36,7 @@ def process_define_file(output, input): ) and not config.substs.get("JS_STANDALONE"): config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src")) - with open(path, "rU") as input: + with open(path, "r") as input: r = re.compile( "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U ) ===================================== python/mozbuild/mozbuild/backend/base.py ===================================== @@ -272,7 +272,7 @@ class BuildBackend(LoggingMixin): return status @contextmanager - def _write_file(self, path=None, fh=None, readmode="rU"): + def _write_file(self, path=None, fh=None, readmode="r"): """Context manager to write a file. This is a glorified wrapper around FileAvoidWrite with integration to ===================================== python/mozbuild/mozbuild/preprocessor.py ===================================== @@ -531,7 +531,7 @@ class Preprocessor: if args: for f in args: - with io.open(f, "rU", encoding="utf-8") as input: + with io.open(f, "r", encoding="utf-8") as input: self.processFile(input=input, output=out) if depfile: mk = Makefile() @@ -860,7 +860,7 @@ class Preprocessor: args = self.applyFilters(args) if not os.path.isabs(args): args = os.path.join(self.curdir, args) - args = io.open(args, "rU", encoding="utf-8") + args = io.open(args, "r", encoding="utf-8") except Preprocessor.Error: raise except Exception: @@ -914,7 +914,7 @@ class Preprocessor: def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"): pp = Preprocessor(defines=defines, marker=marker) for f in includes: - with io.open(f, "rU", encoding="utf-8") as input: + with io.open(f, "r", encoding="utf-8") as input: pp.processFile(input=input, output=output) return pp.includes ===================================== python/mozbuild/mozbuild/util.py ===================================== @@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO): still occur, as well as diff capture if requested. """ - def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"): + def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"): BytesIO.__init__(self) self.name = filename assert type(capture_diff) == bool ===================================== python/mozbuild/mozpack/files.py ===================================== @@ -554,7 +554,7 @@ class PreprocessedFile(BaseFile): pp = Preprocessor(defines=self.defines, marker=self.marker) pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) - with _open(self.path, "rU") as input: + with _open(self.path, "r") as input: with _open(os.devnull, "w") as output: pp.processFile(input=input, output=output) @@ -611,7 +611,7 @@ class PreprocessedFile(BaseFile): pp = Preprocessor(defines=self.defines, marker=self.marker) pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) - with _open(self.path, "rU") as input: + with _open(self.path, "r") as input: pp.processFile(input=input, output=dest, depfile=deps_out) dest.close() View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eec2b65… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eec2b65… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.0-1] Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to...
by Richard Pospesel (＠richard) 30 Jan '23

30 Jan '23

Richard Pospesel pushed to branch base-browser-102.7.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 2e3559a1 by ahochheiden at 2023-01-30T16:22:58+00:00 Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to ensure Python3.11 compatibility r=firefox-build-system-reviewers,glandium a=RyanVM The 'U' flag represents "universal newline". It has been deprecated since Python3.3. Since then "universal newline" is the default when a file is opened in text mode (not bytes). In Python3.11 using the 'U' flag throws errors. There should be no harm in removing 'U' from 'open' everywhere it is used, and doing allows the use of Python3.11. For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api Differential Revision: https://phabricator.services.mozilla.com/D147721 (cherry picked from commit 3bc6973c9f883820d3a3b177263b79deeb51a61f) - - - - - 6 changed files: - dom/base/usecounters.py - python/mozbuild/mozbuild/action/process_define_files.py - python/mozbuild/mozbuild/backend/base.py - python/mozbuild/mozbuild/preprocessor.py - python/mozbuild/mozbuild/util.py - python/mozbuild/mozpack/files.py Changes: ===================================== dom/base/usecounters.py ===================================== @@ -8,7 +8,7 @@ import re def read_conf(conf_filename): # Can't read/write from a single StringIO, so make a new one for reading. - stream = open(conf_filename, "rU") + stream = open(conf_filename, "r") def parse_counters(stream): for line_num, line in enumerate(stream): ===================================== python/mozbuild/mozbuild/action/process_define_files.py ===================================== @@ -36,7 +36,7 @@ def process_define_file(output, input): ) and not config.substs.get("JS_STANDALONE"): config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src")) - with open(path, "rU") as input: + with open(path, "r") as input: r = re.compile( "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U ) ===================================== python/mozbuild/mozbuild/backend/base.py ===================================== @@ -272,7 +272,7 @@ class BuildBackend(LoggingMixin): return status @contextmanager - def _write_file(self, path=None, fh=None, readmode="rU"): + def _write_file(self, path=None, fh=None, readmode="r"): """Context manager to write a file. This is a glorified wrapper around FileAvoidWrite with integration to ===================================== python/mozbuild/mozbuild/preprocessor.py ===================================== @@ -531,7 +531,7 @@ class Preprocessor: if args: for f in args: - with io.open(f, "rU", encoding="utf-8") as input: + with io.open(f, "r", encoding="utf-8") as input: self.processFile(input=input, output=out) if depfile: mk = Makefile() @@ -860,7 +860,7 @@ class Preprocessor: args = self.applyFilters(args) if not os.path.isabs(args): args = os.path.join(self.curdir, args) - args = io.open(args, "rU", encoding="utf-8") + args = io.open(args, "r", encoding="utf-8") except Preprocessor.Error: raise except Exception: @@ -914,7 +914,7 @@ class Preprocessor: def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"): pp = Preprocessor(defines=defines, marker=marker) for f in includes: - with io.open(f, "rU", encoding="utf-8") as input: + with io.open(f, "r", encoding="utf-8") as input: pp.processFile(input=input, output=output) return pp.includes ===================================== python/mozbuild/mozbuild/util.py ===================================== @@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO): still occur, as well as diff capture if requested. """ - def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"): + def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"): BytesIO.__init__(self) self.name = filename assert type(capture_diff) == bool ===================================== python/mozbuild/mozpack/files.py ===================================== @@ -554,7 +554,7 @@ class PreprocessedFile(BaseFile): pp = Preprocessor(defines=self.defines, marker=self.marker) pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) - with _open(self.path, "rU") as input: + with _open(self.path, "r") as input: with _open(os.devnull, "w") as output: pp.processFile(input=input, output=output) @@ -611,7 +611,7 @@ class PreprocessedFile(BaseFile): pp = Preprocessor(defines=self.defines, marker=self.marker) pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) - with _open(self.path, "rU") as input: + with _open(self.path, "r") as input: pp.processFile(input=input, output=dest, depfile=deps_out) dest.close() View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2e3559a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2e3559a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.5-1] Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to...
by Pier Angelo Vendrame (＠pierov) 30 Jan '23

30 Jan '23

Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 19713031 by ahochheiden at 2023-01-30T17:21:13+01:00 Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to ensure Python3.11 compatibility r=firefox-build-system-reviewers,glandium a=RyanVM The 'U' flag represents "universal newline". It has been deprecated since Python3.3. Since then "universal newline" is the default when a file is opened in text mode (not bytes). In Python3.11 using the 'U' flag throws errors. There should be no harm in removing 'U' from 'open' everywhere it is used, and doing allows the use of Python3.11. For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api Differential Revision: https://phabricator.services.mozilla.com/D147721 - - - - - 6 changed files: - dom/base/usecounters.py - python/mozbuild/mozbuild/action/process_define_files.py - python/mozbuild/mozbuild/backend/base.py - python/mozbuild/mozbuild/preprocessor.py - python/mozbuild/mozbuild/util.py - python/mozbuild/mozpack/files.py Changes: ===================================== dom/base/usecounters.py ===================================== @@ -8,7 +8,7 @@ import re def read_conf(conf_filename): # Can't read/write from a single StringIO, so make a new one for reading. - stream = open(conf_filename, "rU") + stream = open(conf_filename, "r") def parse_counters(stream): for line_num, line in enumerate(stream): ===================================== python/mozbuild/mozbuild/action/process_define_files.py ===================================== @@ -36,7 +36,7 @@ def process_define_file(output, input): ) and not config.substs.get("JS_STANDALONE"): config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src")) - with open(path, "rU") as input: + with open(path, "r") as input: r = re.compile( "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U ) ===================================== python/mozbuild/mozbuild/backend/base.py ===================================== @@ -272,7 +272,7 @@ class BuildBackend(LoggingMixin): return status @contextmanager - def _write_file(self, path=None, fh=None, readmode="rU"): + def _write_file(self, path=None, fh=None, readmode="r"): """Context manager to write a file. This is a glorified wrapper around FileAvoidWrite with integration to ===================================== python/mozbuild/mozbuild/preprocessor.py ===================================== @@ -531,7 +531,7 @@ class Preprocessor: if args: for f in args: - with io.open(f, "rU", encoding="utf-8") as input: + with io.open(f, "r", encoding="utf-8") as input: self.processFile(input=input, output=out) if depfile: mk = Makefile() @@ -860,7 +860,7 @@ class Preprocessor: args = self.applyFilters(args) if not os.path.isabs(args): args = os.path.join(self.curdir, args) - args = io.open(args, "rU", encoding="utf-8") + args = io.open(args, "r", encoding="utf-8") except Preprocessor.Error: raise except Exception: @@ -914,7 +914,7 @@ class Preprocessor: def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"): pp = Preprocessor(defines=defines, marker=marker) for f in includes: - with io.open(f, "rU", encoding="utf-8") as input: + with io.open(f, "r", encoding="utf-8") as input: pp.processFile(input=input, output=output) return pp.includes ===================================== python/mozbuild/mozbuild/util.py ===================================== @@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO): still occur, as well as diff capture if requested. """ - def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"): + def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"): BytesIO.__init__(self) self.name = filename assert type(capture_diff) == bool ===================================== python/mozbuild/mozpack/files.py ===================================== @@ -554,7 +554,7 @@ class PreprocessedFile(BaseFile): pp = Preprocessor(defines=self.defines, marker=self.marker) pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) - with _open(self.path, "rU") as input: + with _open(self.path, "r") as input: with _open(os.devnull, "w") as output: pp.processFile(input=input, output=output) @@ -611,7 +611,7 @@ class PreprocessedFile(BaseFile): pp = Preprocessor(defines=self.defines, marker=self.marker) pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) - with _open(self.path, "rU") as input: + with _open(self.path, "r") as input: pp.processFile(input=input, output=dest, depfile=deps_out) dest.close() View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1971303… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1971303… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to...
by Richard Pospesel (＠richard) 30 Jan '23

30 Jan '23

Richard Pospesel pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 3bc6973c by ahochheiden at 2023-01-30T17:13:50+01:00 Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to ensure Python3.11 compatibility r=firefox-build-system-reviewers,glandium a=RyanVM The 'U' flag represents "universal newline". It has been deprecated since Python3.3. Since then "universal newline" is the default when a file is opened in text mode (not bytes). In Python3.11 using the 'U' flag throws errors. There should be no harm in removing 'U' from 'open' everywhere it is used, and doing allows the use of Python3.11. For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api Differential Revision: https://phabricator.services.mozilla.com/D147721 - - - - - 6 changed files: - dom/base/usecounters.py - python/mozbuild/mozbuild/action/process_define_files.py - python/mozbuild/mozbuild/backend/base.py - python/mozbuild/mozbuild/preprocessor.py - python/mozbuild/mozbuild/util.py - python/mozbuild/mozpack/files.py Changes: ===================================== dom/base/usecounters.py ===================================== @@ -8,7 +8,7 @@ import re def read_conf(conf_filename): # Can't read/write from a single StringIO, so make a new one for reading. - stream = open(conf_filename, "rU") + stream = open(conf_filename, "r") def parse_counters(stream): for line_num, line in enumerate(stream): ===================================== python/mozbuild/mozbuild/action/process_define_files.py ===================================== @@ -36,7 +36,7 @@ def process_define_file(output, input): ) and not config.substs.get("JS_STANDALONE"): config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src")) - with open(path, "rU") as input: + with open(path, "r") as input: r = re.compile( "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U ) ===================================== python/mozbuild/mozbuild/backend/base.py ===================================== @@ -272,7 +272,7 @@ class BuildBackend(LoggingMixin): return status @contextmanager - def _write_file(self, path=None, fh=None, readmode="rU"): + def _write_file(self, path=None, fh=None, readmode="r"): """Context manager to write a file. This is a glorified wrapper around FileAvoidWrite with integration to ===================================== python/mozbuild/mozbuild/preprocessor.py ===================================== @@ -531,7 +531,7 @@ class Preprocessor: if args: for f in args: - with io.open(f, "rU", encoding="utf-8") as input: + with io.open(f, "r", encoding="utf-8") as input: self.processFile(input=input, output=out) if depfile: mk = Makefile() @@ -860,7 +860,7 @@ class Preprocessor: args = self.applyFilters(args) if not os.path.isabs(args): args = os.path.join(self.curdir, args) - args = io.open(args, "rU", encoding="utf-8") + args = io.open(args, "r", encoding="utf-8") except Preprocessor.Error: raise except Exception: @@ -914,7 +914,7 @@ class Preprocessor: def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"): pp = Preprocessor(defines=defines, marker=marker) for f in includes: - with io.open(f, "rU", encoding="utf-8") as input: + with io.open(f, "r", encoding="utf-8") as input: pp.processFile(input=input, output=output) return pp.includes ===================================== python/mozbuild/mozbuild/util.py ===================================== @@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO): still occur, as well as diff capture if requested. """ - def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"): + def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"): BytesIO.__init__(self) self.name = filename assert type(capture_diff) == bool ===================================== python/mozbuild/mozpack/files.py ===================================== @@ -554,7 +554,7 @@ class PreprocessedFile(BaseFile): pp = Preprocessor(defines=self.defines, marker=self.marker) pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) - with _open(self.path, "rU") as input: + with _open(self.path, "r") as input: with _open(os.devnull, "w") as output: pp.processFile(input=input, output=output) @@ -611,7 +611,7 @@ class PreprocessedFile(BaseFile): pp = Preprocessor(defines=self.defines, marker=self.marker) pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) - with _open(self.path, "rU") as input: + with _open(self.path, "r") as input: pp.processFile(input=input, output=dest, depfile=deps_out) dest.close() View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3bc6973… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3bc6973… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] 2 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 30 Jan '23

30 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 43da6d54 by Pier Angelo Vendrame at 2023-01-30T14:40:42+01:00 fixup! Firefox preference overrides. Bug 40788: Disable AS's calls to home. We now also disable more AS tasks, but we could see it as a part of the preferences we set to be sure it stays disabled. - - - - - e8921475 by Pier Angelo Vendrame at 2023-01-30T14:41:32+01:00 Bug 40788: Prevent nsIURLQueryStrippingListService from calling home when it is not enabled. The URL query stripping service is enabled only in nightly builds, still it is initialized and remote settings are downloaded. This adds a condition that prevents the service from being initialized if disabled. Upstream Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1812594 We should remove this patch if Mozilla decides that this is a problem also for them, or if they do not but we decide to use the feature. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - browser/components/BrowserGlue.jsm Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -178,6 +178,15 @@ pref("browser.newtabpage.activity-stream.default.sites", ""); pref("browser.newtabpage.activity-stream.feeds.telemetry", false); pref("browser.newtabpage.activity-stream.telemetry", false); +// tor-browser#40788: disable AS's calls to home. +// Notice that null is between quotes because it is a JSON string. +// Keep checked firefox.js to see if new entries are added. +pref("browser.newtabpage.activity-stream.asrouter.providers.cfr", "null"); +pref("browser.newtabpage.activity-stream.asrouter.providers.whats-new-panel", "null"); +pref("browser.newtabpage.activity-stream.asrouter.providers.message-groups", "null"); +pref("browser.newtabpage.activity-stream.asrouter.providers.snippets", "null"); +pref("browser.newtabpage.activity-stream.asrouter.providers.messaging-experiments", "null"); + // Disable fetching asrouter.ftl and related console errors (tor-browser#40763). pref("browser.newtabpage.activity-stream.asrouter.useRemoteL10n", false); ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -2698,11 +2698,23 @@ BrowserGlue.prototype = { { task: () => { - // Init the url query stripping list. - let urlQueryStrippingListService = Cc[ - "@mozilla.org/query-stripping-list-service;1" - ].getService(Ci.nsIURLQueryStrippingListService); - urlQueryStrippingListService.init(); + // tor-browser#40788: Do not initialize + // nsIURLQueryStrippingListService to prevent it from initializing + // its remote settings if it's disabled. + // See also https://bugzilla.mozilla.org/show_bug.cgi?id=1812594 + let enabledPref = "privacy.query_stripping.enabled"; + let enabledPBMPref = "privacy.query_stripping.enabled.pbmode"; + + if ( + Services.prefs.getBoolPref(enabledPref, false) || + Services.prefs.getBoolPref(enabledPBMPref, false) + ) { + // Init the url query stripping list. + let urlQueryStrippingListService = Cc[ + "@mozilla.org/query-stripping-list-service;1" + ].getService(Ci.nsIURLQueryStrippingListService); + urlQueryStrippingListService.init(); + } }, }, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/31831f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/31831f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 30 Jan '23

30 Jan '23

Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 073b5c5d by Pier Angelo Vendrame at 2023-01-30T13:13:30+00:00 fixup! Firefox preference overrides. Bug 41595: Disable page thumbnails (cherry picked from commit 31831ff2e86470fced54745acc28fd0cbfcea23e) - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -55,6 +55,9 @@ pref("media.memory_cache_max_size", 16384); // Disable restore in case of crash (tor-browser#41503) // This should not be needed in PBM, but we added it anyway like other options. pref("browser.sessionstore.resume_from_crash", false); +// Disable capturing thumbnails (tor-browser#41595) +// Also not needed in PBM at the moment. +pref("browser.pagethumbnails.capturing_disabled", true); // Enable HTTPS-Only mode (tor-browser#19850) pref("dom.security.https_only_mode", true); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/073b5c5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/073b5c5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 30 Jan '23

30 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 31831ff2 by Pier Angelo Vendrame at 2023-01-30T10:34:17+01:00 fixup! Firefox preference overrides. Bug 41595: Disable page thumbnails - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -55,6 +55,9 @@ pref("media.memory_cache_max_size", 16384); // Disable restore in case of crash (tor-browser#41503) // This should not be needed in PBM, but we added it anyway like other options. pref("browser.sessionstore.resume_from_crash", false); +// Disable capturing thumbnails (tor-browser#41595) +// Also not needed in PBM at the moment. +pref("browser.pagethumbnails.capturing_disabled", true); // Enable HTTPS-Only mode (tor-browser#19850) pref("dom.security.https_only_mode", true); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/31831ff… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/31831ff… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.5-1] 5 commits: fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 26 Jan '23

26 Jan '23

Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 0ee79644 by cypherpunks1 at 2023-01-26T19:25:07+01:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Disable activity stream - - - - - ca88729a by cypherpunks1 at 2023-01-26T19:25:15+01:00 fixup! Bug 40002: Remove about:ion Remove this._monitorIonPref() and this._monitorIonStudies() from BrowserGlue - - - - - 125e7f8f by cypherpunks1 at 2023-01-26T19:25:15+01:00 fixup! Firefox preference overrides. Disable toolkit.telemetry.enabled on all builds, set webextensions.storage.sync.enabled to false - - - - - 84ab5401 by cypherpunks1 at 2023-01-26T19:25:34+01:00 Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING - - - - - de007ee5 by Pier Angelo Vendrame at 2023-01-26T19:25:34+01:00 fixup! Firefox preference overrides. Document why we are locking toolkit.telemetry.enabled. - - - - - 5 changed files: - browser/app/profile/001-base-profile.js - browser/base/content/browser.js - browser/components/BrowserGlue.jsm - toolkit/components/telemetry/app/TelemetryEnvironment.jsm - toolkit/xre/nsAppRunner.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -119,7 +119,8 @@ pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); // Make sure Unified Telemetry is really disabled, see: #18738. pref("toolkit.telemetry.unified", false); -pref("toolkit.telemetry.enabled", false); +// This needs to be locked, or nightly builds will automatically lock it to true +pref("toolkit.telemetry.enabled", false, locked); pref("toolkit.telemetry.server", "data:,"); pref("toolkit.telemetry.archive.enabled", false); pref("toolkit.telemetry.updatePing.enabled", false); // Make sure updater telemetry is disabled; see #25909. @@ -422,6 +423,8 @@ pref("extensions.postDownloadThirdPartyPrompt", false); // Therefore, do not allow download of additional language packs. They are not a // privacy/security threat, we are disabling them for UX reasons. See bug 41377. pref("intl.multilingual.downloadEnabled", false); +// Disk activity: Disable storage.sync (tor-browser#41424) +pref("webextensions.storage.sync.enabled", false); // Toolbar layout pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"security-level-button\",\"new-identity-button\",\"downloads-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"currentVersion\":14,\"newElementCount\":1}"); ===================================== browser/base/content/browser.js ===================================== @@ -6004,6 +6004,7 @@ var TabsProgressListener = { onStateChange(aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) { // Collect telemetry data about tab load times. if ( + AppConstants.MOZ_TELEMETRY_REPORTING && aWebProgress.isTopLevel && (!aRequest.originalURI || aRequest.originalURI.scheme != "about") ) { ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -22,9 +22,6 @@ XPCOMUtils.defineLazyModuleGetters(this, { ActorManagerParent: "resource://gre/modules/ActorManagerParent.jsm", AddonManager: "resource://gre/modules/AddonManager.jsm", AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm", - ASRouterDefaultConfig: - "resource://activity-stream/lib/ASRouterDefaultConfig.jsm", - ASRouterNewTabHook: "resource://activity-stream/lib/ASRouterNewTabHook.jsm", ASRouter: "resource://activity-stream/lib/ASRouter.jsm", AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm", BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.jsm", @@ -717,27 +714,6 @@ let JSWINDOWACTORS = { matches: ["about:studies*"], }, - ASRouter: { - parent: { - moduleURI: "resource:///actors/ASRouterParent.jsm", - }, - child: { - moduleURI: "resource:///actors/ASRouterChild.jsm", - events: { - // This is added so the actor instantiates immediately and makes - // methods available to the page js on load. - DOMDocElementInserted: {}, - }, - }, - matches: [ - "about:home*", - "about:newtab*", - "about:welcome*", - "about:privatebrowsing", - ], - remoteTypes: ["privilegedabout"], - }, - SwitchDocumentDirection: { child: { moduleURI: "resource:///actors/SwitchDocumentDirectionChild.jsm", @@ -1693,7 +1669,9 @@ BrowserGlue.prototype = { this._firstWindowTelemetry(aWindow); this._firstWindowLoaded(); - this._collectStartupConditionsTelemetry(); + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + this._collectStartupConditionsTelemetry(); + } // Set the default favicon size for UI views that use the page-icon protocol. PlacesUtils.favicons.setDefaultIconURIPreferredSize( @@ -2006,7 +1984,6 @@ BrowserGlue.prototype = { () => NewTabUtils.uninit(), () => Normandy.uninit(), () => RFPHelper.uninit(), - () => ASRouterNewTabHook.destroy(), () => UpdateListener.reset(), ]; @@ -2347,8 +2324,6 @@ BrowserGlue.prototype = { this._monitorScreenshotsPref(); this._monitorWebcompatReporterPref(); this._monitorHTTPSOnlyPref(); - this._monitorIonPref(); - this._monitorIonStudies(); this._setupSearchDetection(); this._monitorGPCPref(); @@ -2717,12 +2692,6 @@ BrowserGlue.prototype = { }, }, - { - task: () => { - ASRouterNewTabHook.createInstance(ASRouterDefaultConfig()); - }, - }, - { condition: AppConstants.MOZ_UPDATE_AGENT, task: () => { @@ -2877,13 +2846,21 @@ BrowserGlue.prototype = { } }, - () => BrowserUsageTelemetry.reportProfileCount(), + () => { + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + BrowserUsageTelemetry.reportProfileCount(); + } + }, () => OsEnvironment.reportAllowedAppSources(), () => Services.search.runBackgroundChecks(), - () => BrowserUsageTelemetry.reportInstallationTelemetry(), + () => { + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + BrowserUsageTelemetry.reportInstallationTelemetry(); + } + }, ]; for (let task of idleTasks) { ===================================== toolkit/components/telemetry/app/TelemetryEnvironment.jsm ===================================== @@ -973,7 +973,9 @@ function EnvironmentCache() { p.push(this._addonBuilder.init()); this._currentEnvironment.profile = {}; - p.push(this._updateProfile()); + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + p.push(this._updateProfile()); + } if (AppConstants.MOZ_BUILD_APP == "browser") { p.push(this._loadAttributionAsync()); } ===================================== toolkit/xre/nsAppRunner.cpp ===================================== @@ -2800,7 +2800,9 @@ static ReturnAbortOnError ProfileLockedDialog(nsIFile* aProfileDir, rv = xpcom.Initialize(); NS_ENSURE_SUCCESS(rv, rv); +#if defined(MOZ_TELEMETRY_REPORTING) if (aProfileDir) mozilla::Telemetry::WriteFailedProfileLock(aProfileDir); +#endif rv = xpcom.SetWindowCreator(aNative); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/69be75… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/69be75… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 26 Jan '23

26 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 933d8c65 by Pier Angelo Vendrame at 2023-01-26T09:55:06+01:00 fixup! Firefox preference overrides. Document why we are locking toolkit.telemetry.enabled. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -119,6 +119,7 @@ pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); // Make sure Unified Telemetry is really disabled, see: #18738. pref("toolkit.telemetry.unified", false); +// This needs to be locked, or nightly builds will automatically lock it to true pref("toolkit.telemetry.enabled", false, locked); pref("toolkit.telemetry.server", "data:,"); pref("toolkit.telemetry.archive.enabled", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/933d8c6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/933d8c6… You're receiving this email because of your account on gitlab.torproject.org.

1 0