- tbb-commits - lists.torproject.org

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.13.0esr-13.5-1] Add CI for Base Browser
by Pier Angelo Vendrame (＠pierov) 11 Jul '24

11 Jul '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.13.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 845b9843 by Beatriz Rizental at 2024-07-11T11:21:30+02:00 Add CI for Base Browser - - - - - 3 changed files: - + .gitlab-ci.yml - + .gitlab/ci/lint.yml - + .gitlab/ci/scripts/run_linters.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -0,0 +1,5 @@ +stages: + - lint + +include: + - local: '.gitlab/ci/lint.yml' ===================================== .gitlab/ci/lint.yml ===================================== @@ -0,0 +1,319 @@ +variables: + # This needs to be kept in sync with the max Python version accepted by ./mach + PYTHON_VERSION: "3.11.7" + +.base: + stage: lint + interruptible: true + variables: + PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" + cache: + paths: + - node_modules + - .cache/pip + +eslint: + extends: .base + image: cimg/python:$PYTHON_VERSION-node + script: + - .gitlab/ci/scripts/run_linters.py eslint + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + # Files that are likely audited. + - '**/*.js' + - '**/*.jsm' + - '**/*.json' + - '**/*.jsx' + - '**/*.mjs' + - '**/*.sjs' + - '**/*.html' + - '**/*.xhtml' + - '**/*.xml' + - 'tools/lint/eslint.yml' + # Run when eslint policies change. + - '**/.eslintignore' + - '**/*eslintrc*' + # The plugin implementing custom checks. + - 'tools/lint/eslint/eslint-plugin-mozilla/**' + - 'tools/lint/eslint/eslint-plugin-spidermonkey-js/**' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +stylelint: + extends: .base + image: cimg/python:$PYTHON_VERSION-node + script: + - .gitlab/ci/scripts/run_linters.py stylelint + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + # Files that are likely audited. + - '**/*.css' + - 'tools/lint/styleint.yml' + # Run when stylelint policies change. + - '**/.stylelintignore' + - '**/*stylelintrc*' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +py-black: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py black + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + # The list of extensions should match tools/lint/black.yml + - '**/*.py' + - '**/moz.build' + - '**/*.configure' + - '**/*.mozbuild' + - 'pyproject.toml' + - 'tools/lint/black.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +py-ruff: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py ruff + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.py' + - '**/*.configure' + - '**/.ruff.toml' + - 'pyproject.toml' + - 'tools/lint/ruff.yml' + - 'tools/lint/python/ruff.py' + - 'tools/lint/python/ruff_requirements.txt' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +yaml: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py yaml + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.yml' + - '**/*.yaml' + - '**/.ymllint' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +shellcheck: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py shellcheck + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.sh' + - 'tools/lint/shellcheck.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +clang-format: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py clang-format + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.cpp' + - '**/*.c' + - '**/*.cc' + - '**/*.h' + - '**/*.m' + - '**/*.mm' + - 'tools/lint/clang-format.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +rustfmt: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py rustfmt + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.rs' + - 'tools/lint/rustfmt.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +fluent-lint: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py fluent-lint + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.ftl' + - 'tools/lint/fluent-lint.yml' + - 'tools/lint/fluent-lint/exclusions.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +localization: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py l10n + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/locales/en-US/**' + - '**/l10n.toml' + - 'third_party/python/compare-locales/**' + - 'third_party/python/fluent/**' + - 'tools/lint/l10n.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +mingw-capitalization: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py mingw-capitalization + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.cpp' + - '**/*.cc' + - '**/*.c' + - '**/*.h' + - 'tools/lint/mingw-capitalization.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +mscom-init: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py mscom-init + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.cpp' + - '**/*.cc' + - '**/*.c' + - '**/*.h' + - 'tools/lint/mscom-init.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +file-whitespace: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py file-whitespace + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.c' + - '**/*.cc' + - '**/*.cpp' + - '**/*.css' + - '**/*.dtd' + - '**/*.idl' + - '**/*.ftl' + - '**/*.h' + - '**/*.html' + - '**/*.md' + - '**/*.properties' + - '**/*.py' + - '**/*.rs' + - '**/*.rst' + - '**/*.webidl' + - '**/*.xhtml' + - 'tools/lint/file-whitespace.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +test-manifest: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py test-manifest-alpha test-manifest-disable test-manifest-skip-if + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.ini' + - 'python/mozlint/**' + - 'tools/lint/**' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +trojan-source: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py trojan-source + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.c' + - '**/*.cc' + - '**/*.cpp' + - '**/*.h' + - '**/*.py' + - '**/*.rs' + - 'tools/lint/trojan-source.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' ===================================== .gitlab/ci/scripts/run_linters.py ===================================== @@ -0,0 +1,110 @@ +#!/usr/bin/env python3 + +import argparse +import os +import re +import shlex +import subprocess +import sys + + +def git(command): + result = subprocess.run( + ["git"] + shlex.split(command), check=True, capture_output=True, text=True + ) + return result.stdout.strip() + + +def get_firefox_tag_from_branch_name(branch_name): + """Extracts the Firefox tag associated with a branch name. + + The "firefox tag" is the tag that marks + the end of the Mozilla commits and the start of the Tor Project commits. + + Know issue: If ever there is more than one tag per Firefox ESR version, + this function may return the incorrect reference number. + + Args: + branch_name: The branch name to extract the tag from. + Expected format is tor-browser-91.2.0esr-11.0-1, + where 91.2.0esr is the Firefox version. + + Returns: + The reference specifier of the matching Firefox tag. + An exception wil be raised if anything goes wrong. + """ + + # Extracts the version number from a branch name. + firefox_version = "" + match = re.search(r"(?<=browser-)([^-]+)", branch_name) + if match: + # TODO: Validate that what we got is actually a valid semver string? + firefox_version = match.group(1) + else: + raise ValueError(f"Failed to extract version from branch name '{branch_name}'.") + + tag = f"FIREFOX_{firefox_version.replace('.', '_')}_" + remote_tags = git("ls-remote --tags") + + # Each line looks like: + # 9edd658bfd03a6b4743ecb75fd4a9ad968603715 refs/tags/FIREFOX_91_9_0esr_BUILD1 + pattern = rf"(.*){re.escape(tag)}(.*)$" + match = re.search(pattern, remote_tags, flags=re.MULTILINE) + if match: + return match.group(0).split()[0] + else: + raise ValueError( + f"Failed to find reference specifier for Firefox tag in branch '{branch_name}'." + ) + + +def get_list_of_changed_files(): + """Gets a list of files changed in the working directory. + + This function is meant to be run inside the Gitlab CI environment. + + When running in a default branch, get the list of changed files since the last Firefox tag. + When running for a new MR commit, get a list of changed files in the current MR. + + Returns: + A list of filenames of changed files (excluding deleted files). + An exception wil be raised if anything goes wrong. + """ + + base_reference = "" + + if os.getenv("CI_PIPELINE_SOURCE") == "merge_request_event": + # For merge requests, the base_reference is the common ancestor between the MR and the target branch. + base_reference = os.getenv("CI_MERGE_REQUEST_DIFF_BASE_SHA") + else: + # When not in merge requests, the base reference is the Firefox tag + base_reference = get_firefox_tag_from_branch_name(os.getenv("CI_COMMIT_BRANCH")) + + if not base_reference: + raise RuntimeError("No base reference found. There might be more errors above.") + + # Fetch the tag reference + git(f"fetch origin {base_reference} --depth=1 --filter=blob:none") + # Return the list of changed files + return git(f"diff --diff-filter=d --name-only {base_reference} HEAD").split("\n") + + +if __name__ == "__main__": + parser = argparse.ArgumentParser( + description="Run ./mach linters in CI. Warning: if you run this in your local environment it might mess up your git history." + ) + parser.add_argument( + "linters", metavar="L", type=str, nargs="+", help="A list of linters to run." + ) + args = parser.parse_args() + + command = [ + "./mach", + "lint", + "-v", + *(s for l in args.linters for s in ("-l", l)), + *get_list_of_changed_files(), + ] + result = subprocess.run(command, text=True) + + sys.exit(result.returncode) View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/845… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/845… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.13.0esr-13.5-1] Add CI for Base Browser
by Pier Angelo Vendrame (＠pierov) 11 Jul '24

11 Jul '24

Pier Angelo Vendrame pushed to branch base-browser-115.13.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 7b915bf9 by Beatriz Rizental at 2024-07-11T11:20:16+02:00 Add CI for Base Browser - - - - - 3 changed files: - + .gitlab-ci.yml - + .gitlab/ci/lint.yml - + .gitlab/ci/scripts/run_linters.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -0,0 +1,5 @@ +stages: + - lint + +include: + - local: '.gitlab/ci/lint.yml' ===================================== .gitlab/ci/lint.yml ===================================== @@ -0,0 +1,319 @@ +variables: + # This needs to be kept in sync with the max Python version accepted by ./mach + PYTHON_VERSION: "3.11.7" + +.base: + stage: lint + interruptible: true + variables: + PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" + cache: + paths: + - node_modules + - .cache/pip + +eslint: + extends: .base + image: cimg/python:$PYTHON_VERSION-node + script: + - .gitlab/ci/scripts/run_linters.py eslint + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + # Files that are likely audited. + - '**/*.js' + - '**/*.jsm' + - '**/*.json' + - '**/*.jsx' + - '**/*.mjs' + - '**/*.sjs' + - '**/*.html' + - '**/*.xhtml' + - '**/*.xml' + - 'tools/lint/eslint.yml' + # Run when eslint policies change. + - '**/.eslintignore' + - '**/*eslintrc*' + # The plugin implementing custom checks. + - 'tools/lint/eslint/eslint-plugin-mozilla/**' + - 'tools/lint/eslint/eslint-plugin-spidermonkey-js/**' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +stylelint: + extends: .base + image: cimg/python:$PYTHON_VERSION-node + script: + - .gitlab/ci/scripts/run_linters.py stylelint + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + # Files that are likely audited. + - '**/*.css' + - 'tools/lint/styleint.yml' + # Run when stylelint policies change. + - '**/.stylelintignore' + - '**/*stylelintrc*' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +py-black: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py black + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + # The list of extensions should match tools/lint/black.yml + - '**/*.py' + - '**/moz.build' + - '**/*.configure' + - '**/*.mozbuild' + - 'pyproject.toml' + - 'tools/lint/black.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +py-ruff: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py ruff + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.py' + - '**/*.configure' + - '**/.ruff.toml' + - 'pyproject.toml' + - 'tools/lint/ruff.yml' + - 'tools/lint/python/ruff.py' + - 'tools/lint/python/ruff_requirements.txt' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +yaml: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py yaml + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.yml' + - '**/*.yaml' + - '**/.ymllint' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +shellcheck: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py shellcheck + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.sh' + - 'tools/lint/shellcheck.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +clang-format: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py clang-format + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.cpp' + - '**/*.c' + - '**/*.cc' + - '**/*.h' + - '**/*.m' + - '**/*.mm' + - 'tools/lint/clang-format.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +rustfmt: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py rustfmt + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.rs' + - 'tools/lint/rustfmt.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +fluent-lint: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py fluent-lint + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.ftl' + - 'tools/lint/fluent-lint.yml' + - 'tools/lint/fluent-lint/exclusions.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +localization: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py l10n + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/locales/en-US/**' + - '**/l10n.toml' + - 'third_party/python/compare-locales/**' + - 'third_party/python/fluent/**' + - 'tools/lint/l10n.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +mingw-capitalization: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py mingw-capitalization + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.cpp' + - '**/*.cc' + - '**/*.c' + - '**/*.h' + - 'tools/lint/mingw-capitalization.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +mscom-init: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py mscom-init + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.cpp' + - '**/*.cc' + - '**/*.c' + - '**/*.h' + - 'tools/lint/mscom-init.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +file-whitespace: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py file-whitespace + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.c' + - '**/*.cc' + - '**/*.cpp' + - '**/*.css' + - '**/*.dtd' + - '**/*.idl' + - '**/*.ftl' + - '**/*.h' + - '**/*.html' + - '**/*.md' + - '**/*.properties' + - '**/*.py' + - '**/*.rs' + - '**/*.rst' + - '**/*.webidl' + - '**/*.xhtml' + - 'tools/lint/file-whitespace.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +test-manifest: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py test-manifest-alpha test-manifest-disable test-manifest-skip-if + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.ini' + - 'python/mozlint/**' + - 'tools/lint/**' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +trojan-source: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py trojan-source + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.c' + - '**/*.cc' + - '**/*.cpp' + - '**/*.h' + - '**/*.py' + - '**/*.rs' + - 'tools/lint/trojan-source.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' ===================================== .gitlab/ci/scripts/run_linters.py ===================================== @@ -0,0 +1,110 @@ +#!/usr/bin/env python3 + +import argparse +import os +import re +import shlex +import subprocess +import sys + + +def git(command): + result = subprocess.run( + ["git"] + shlex.split(command), check=True, capture_output=True, text=True + ) + return result.stdout.strip() + + +def get_firefox_tag_from_branch_name(branch_name): + """Extracts the Firefox tag associated with a branch name. + + The "firefox tag" is the tag that marks + the end of the Mozilla commits and the start of the Tor Project commits. + + Know issue: If ever there is more than one tag per Firefox ESR version, + this function may return the incorrect reference number. + + Args: + branch_name: The branch name to extract the tag from. + Expected format is tor-browser-91.2.0esr-11.0-1, + where 91.2.0esr is the Firefox version. + + Returns: + The reference specifier of the matching Firefox tag. + An exception wil be raised if anything goes wrong. + """ + + # Extracts the version number from a branch name. + firefox_version = "" + match = re.search(r"(?<=browser-)([^-]+)", branch_name) + if match: + # TODO: Validate that what we got is actually a valid semver string? + firefox_version = match.group(1) + else: + raise ValueError(f"Failed to extract version from branch name '{branch_name}'.") + + tag = f"FIREFOX_{firefox_version.replace('.', '_')}_" + remote_tags = git("ls-remote --tags") + + # Each line looks like: + # 9edd658bfd03a6b4743ecb75fd4a9ad968603715 refs/tags/FIREFOX_91_9_0esr_BUILD1 + pattern = rf"(.*){re.escape(tag)}(.*)$" + match = re.search(pattern, remote_tags, flags=re.MULTILINE) + if match: + return match.group(0).split()[0] + else: + raise ValueError( + f"Failed to find reference specifier for Firefox tag in branch '{branch_name}'." + ) + + +def get_list_of_changed_files(): + """Gets a list of files changed in the working directory. + + This function is meant to be run inside the Gitlab CI environment. + + When running in a default branch, get the list of changed files since the last Firefox tag. + When running for a new MR commit, get a list of changed files in the current MR. + + Returns: + A list of filenames of changed files (excluding deleted files). + An exception wil be raised if anything goes wrong. + """ + + base_reference = "" + + if os.getenv("CI_PIPELINE_SOURCE") == "merge_request_event": + # For merge requests, the base_reference is the common ancestor between the MR and the target branch. + base_reference = os.getenv("CI_MERGE_REQUEST_DIFF_BASE_SHA") + else: + # When not in merge requests, the base reference is the Firefox tag + base_reference = get_firefox_tag_from_branch_name(os.getenv("CI_COMMIT_BRANCH")) + + if not base_reference: + raise RuntimeError("No base reference found. There might be more errors above.") + + # Fetch the tag reference + git(f"fetch origin {base_reference} --depth=1 --filter=blob:none") + # Return the list of changed files + return git(f"diff --diff-filter=d --name-only {base_reference} HEAD").split("\n") + + +if __name__ == "__main__": + parser = argparse.ArgumentParser( + description="Run ./mach linters in CI. Warning: if you run this in your local environment it might mess up your git history." + ) + parser.add_argument( + "linters", metavar="L", type=str, nargs="+", help="A list of linters to run." + ) + args = parser.parse_args() + + command = [ + "./mach", + "lint", + "-v", + *(s for l in args.linters for s in ("-l", l)), + *get_list_of_changed_files(), + ] + result = subprocess.run(command, text=True) + + sys.exit(result.returncode) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7b915bf… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7b915bf… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.13.0esr-13.5-1] 3 commits: Revert "Add CI for Tor Browser"
by Pier Angelo Vendrame (＠pierov) 11 Jul '24

11 Jul '24

Pier Angelo Vendrame pushed to branch tor-browser-115.13.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 8b8656d6 by Beatriz Rizental at 2024-07-09T19:31:40+02:00 Revert "Add CI for Tor Browser" This reverts commit ec03736019a0337b4a81f7c6566119337c2d53aa. - - - - - e20fbd3e by Beatriz Rizental at 2024-07-11T10:50:01+02:00 Add CI for Base Browser - - - - - 065fd124 by Beatriz Rizental at 2024-07-11T10:50:28+02:00 Add CI for Tor Browser - - - - - 4 changed files: - .gitlab-ci.yml - + .gitlab/ci/lint.yml - + .gitlab/ci/scripts/run_linters.py - + .gitlab/ci/update-translations.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,69 +1,7 @@ stages: + - lint - update-translations -.update-translation-base: - stage: update-translations - rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - changes: - - "**/*.ftl" - - "**/*.properties" - - "**/*.dtd" - - if: $FORCE_UPDATE_TRANSLATIONS == "true" - variables: - TOR_BROWSER_COMBINED_FILES_JSON: "combined-translation-files.json" - - -combine-en-US-translations: - extends: .update-translation-base - image: python - variables: - PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" - TRANSLATION_FILES: ' - tor-browser:tor-browser.ftl - tor-browser:aboutDialog.dtd - tor-browser:aboutTBUpdate.dtd - tor-browser:aboutTor.dtd - tor-browser:torbutton.dtd - tor-browser:browserOnboarding.properties - tor-browser:cryptoSafetyPrompt.properties - tor-browser:onboarding.properties - tor-browser:onionLocation.properties - tor-browser:rulesets.properties - tor-browser:settings.properties - tor-browser:torbutton.properties - tor-browser:torConnect.properties - tor-browser:torlauncher.properties - base-browser:base-browser.ftl - base-browser:newIdentity.properties - base-browser:securityLevel.properties - ' - cache: - paths: - - .cache/pip - # Artifact is for translation project job - artifacts: - paths: - - "$TOR_BROWSER_COMBINED_FILES_JSON" - expire_in: "60 min" - reports: - dotenv: job_id.env - # Don't load artifacts for this job. - dependencies: [] - script: - # Save this CI_JOB_ID to the dotenv file to be used in the variables for the - # push-en-US-translations job. - - echo 'COMBINE_TRANSLATIONS_JOB_ID='"$CI_JOB_ID" >job_id.env - - pip install compare_locales - - python ./tools/torbrowser/l10n/combine-translation-versions.py "$CI_COMMIT_BRANCH" "$TRANSLATION_FILES" "$TOR_BROWSER_COMBINED_FILES_JSON" - -push-en-US-translations: - extends: .update-translation-base - needs: - - job: combine-en-US-translations - variables: - TOR_BROWSER_COMBINED_FILES_JSON_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/jobs/${COMBINE_TRANSLATIONS_JOB_ID}/artifacts/${TOR_BROWSER_COMBINED_FILES_JSON}" - trigger: - strategy: depend - project: tor-browser-translation-bot/translation - branch: tor-browser-ci +include: + - local: '.gitlab/ci/lint.yml' + - local: '.gitlab/ci/update-translations.yml' ===================================== .gitlab/ci/lint.yml ===================================== @@ -0,0 +1,319 @@ +variables: + # This needs to be kept in sync with the max Python version accepted by ./mach + PYTHON_VERSION: "3.11.7" + +.base: + stage: lint + interruptible: true + variables: + PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" + cache: + paths: + - node_modules + - .cache/pip + +eslint: + extends: .base + image: cimg/python:$PYTHON_VERSION-node + script: + - .gitlab/ci/scripts/run_linters.py eslint + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + # Files that are likely audited. + - '**/*.js' + - '**/*.jsm' + - '**/*.json' + - '**/*.jsx' + - '**/*.mjs' + - '**/*.sjs' + - '**/*.html' + - '**/*.xhtml' + - '**/*.xml' + - 'tools/lint/eslint.yml' + # Run when eslint policies change. + - '**/.eslintignore' + - '**/*eslintrc*' + # The plugin implementing custom checks. + - 'tools/lint/eslint/eslint-plugin-mozilla/**' + - 'tools/lint/eslint/eslint-plugin-spidermonkey-js/**' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +stylelint: + extends: .base + image: cimg/python:$PYTHON_VERSION-node + script: + - .gitlab/ci/scripts/run_linters.py stylelint + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + # Files that are likely audited. + - '**/*.css' + - 'tools/lint/styleint.yml' + # Run when stylelint policies change. + - '**/.stylelintignore' + - '**/*stylelintrc*' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +py-black: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py black + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + # The list of extensions should match tools/lint/black.yml + - '**/*.py' + - '**/moz.build' + - '**/*.configure' + - '**/*.mozbuild' + - 'pyproject.toml' + - 'tools/lint/black.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +py-ruff: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py ruff + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.py' + - '**/*.configure' + - '**/.ruff.toml' + - 'pyproject.toml' + - 'tools/lint/ruff.yml' + - 'tools/lint/python/ruff.py' + - 'tools/lint/python/ruff_requirements.txt' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +yaml: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py yaml + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.yml' + - '**/*.yaml' + - '**/.ymllint' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +shellcheck: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py shellcheck + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.sh' + - 'tools/lint/shellcheck.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +clang-format: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py clang-format + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.cpp' + - '**/*.c' + - '**/*.cc' + - '**/*.h' + - '**/*.m' + - '**/*.mm' + - 'tools/lint/clang-format.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +rustfmt: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py rustfmt + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.rs' + - 'tools/lint/rustfmt.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +fluent-lint: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py fluent-lint + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.ftl' + - 'tools/lint/fluent-lint.yml' + - 'tools/lint/fluent-lint/exclusions.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +localization: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py l10n + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/locales/en-US/**' + - '**/l10n.toml' + - 'third_party/python/compare-locales/**' + - 'third_party/python/fluent/**' + - 'tools/lint/l10n.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +mingw-capitalization: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py mingw-capitalization + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.cpp' + - '**/*.cc' + - '**/*.c' + - '**/*.h' + - 'tools/lint/mingw-capitalization.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +mscom-init: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py mscom-init + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.cpp' + - '**/*.cc' + - '**/*.c' + - '**/*.h' + - 'tools/lint/mscom-init.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +file-whitespace: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py file-whitespace + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.c' + - '**/*.cc' + - '**/*.cpp' + - '**/*.css' + - '**/*.dtd' + - '**/*.idl' + - '**/*.ftl' + - '**/*.h' + - '**/*.html' + - '**/*.md' + - '**/*.properties' + - '**/*.py' + - '**/*.rs' + - '**/*.rst' + - '**/*.webidl' + - '**/*.xhtml' + - 'tools/lint/file-whitespace.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +test-manifest: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py test-manifest-alpha test-manifest-disable test-manifest-skip-if + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.ini' + - 'python/mozlint/**' + - 'tools/lint/**' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' + +trojan-source: + extends: .base + image: cimg/python:$PYTHON_VERSION + script: + - .gitlab/ci/scripts/run_linters.py trojan-source + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + changes: + # List copied from: taskcluster/ci/source-test/mozlint.yml + # + - '**/*.c' + - '**/*.cc' + - '**/*.cpp' + - '**/*.h' + - '**/*.py' + - '**/*.rs' + - 'tools/lint/trojan-source.yml' + # Run job whenever a new tag is created + # or whenever a commit is merged to a protected branch + - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' ===================================== .gitlab/ci/scripts/run_linters.py ===================================== @@ -0,0 +1,110 @@ +#!/usr/bin/env python3 + +import argparse +import os +import re +import shlex +import subprocess +import sys + + +def git(command): + result = subprocess.run( + ["git"] + shlex.split(command), check=True, capture_output=True, text=True + ) + return result.stdout.strip() + + +def get_firefox_tag_from_branch_name(branch_name): + """Extracts the Firefox tag associated with a branch name. + + The "firefox tag" is the tag that marks + the end of the Mozilla commits and the start of the Tor Project commits. + + Know issue: If ever there is more than one tag per Firefox ESR version, + this function may return the incorrect reference number. + + Args: + branch_name: The branch name to extract the tag from. + Expected format is tor-browser-91.2.0esr-11.0-1, + where 91.2.0esr is the Firefox version. + + Returns: + The reference specifier of the matching Firefox tag. + An exception wil be raised if anything goes wrong. + """ + + # Extracts the version number from a branch name. + firefox_version = "" + match = re.search(r"(?<=browser-)([^-]+)", branch_name) + if match: + # TODO: Validate that what we got is actually a valid semver string? + firefox_version = match.group(1) + else: + raise ValueError(f"Failed to extract version from branch name '{branch_name}'.") + + tag = f"FIREFOX_{firefox_version.replace('.', '_')}_" + remote_tags = git("ls-remote --tags") + + # Each line looks like: + # 9edd658bfd03a6b4743ecb75fd4a9ad968603715 refs/tags/FIREFOX_91_9_0esr_BUILD1 + pattern = rf"(.*){re.escape(tag)}(.*)$" + match = re.search(pattern, remote_tags, flags=re.MULTILINE) + if match: + return match.group(0).split()[0] + else: + raise ValueError( + f"Failed to find reference specifier for Firefox tag in branch '{branch_name}'." + ) + + +def get_list_of_changed_files(): + """Gets a list of files changed in the working directory. + + This function is meant to be run inside the Gitlab CI environment. + + When running in a default branch, get the list of changed files since the last Firefox tag. + When running for a new MR commit, get a list of changed files in the current MR. + + Returns: + A list of filenames of changed files (excluding deleted files). + An exception wil be raised if anything goes wrong. + """ + + base_reference = "" + + if os.getenv("CI_PIPELINE_SOURCE") == "merge_request_event": + # For merge requests, the base_reference is the common ancestor between the MR and the target branch. + base_reference = os.getenv("CI_MERGE_REQUEST_DIFF_BASE_SHA") + else: + # When not in merge requests, the base reference is the Firefox tag + base_reference = get_firefox_tag_from_branch_name(os.getenv("CI_COMMIT_BRANCH")) + + if not base_reference: + raise RuntimeError("No base reference found. There might be more errors above.") + + # Fetch the tag reference + git(f"fetch origin {base_reference} --depth=1 --filter=blob:none") + # Return the list of changed files + return git(f"diff --diff-filter=d --name-only {base_reference} HEAD").split("\n") + + +if __name__ == "__main__": + parser = argparse.ArgumentParser( + description="Run ./mach linters in CI. Warning: if you run this in your local environment it might mess up your git history." + ) + parser.add_argument( + "linters", metavar="L", type=str, nargs="+", help="A list of linters to run." + ) + args = parser.parse_args() + + command = [ + "./mach", + "lint", + "-v", + *(s for l in args.linters for s in ("-l", l)), + *get_list_of_changed_files(), + ] + result = subprocess.run(command, text=True) + + sys.exit(result.returncode) ===================================== .gitlab/ci/update-translations.yml ===================================== @@ -0,0 +1,66 @@ +.update-translation-base: + stage: update-translations + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + changes: + - "**/*.ftl" + - "**/*.properties" + - "**/*.dtd" + - if: $FORCE_UPDATE_TRANSLATIONS == "true" + variables: + TOR_BROWSER_COMBINED_FILES_JSON: "combined-translation-files.json" + + +combine-en-US-translations: + extends: .update-translation-base + image: python + variables: + PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" + TRANSLATION_FILES: ' + tor-browser:tor-browser.ftl + tor-browser:aboutDialog.dtd + tor-browser:aboutTBUpdate.dtd + tor-browser:aboutTor.dtd + tor-browser:torbutton.dtd + tor-browser:browserOnboarding.properties + tor-browser:cryptoSafetyPrompt.properties + tor-browser:onboarding.properties + tor-browser:onionLocation.properties + tor-browser:rulesets.properties + tor-browser:settings.properties + tor-browser:torbutton.properties + tor-browser:torConnect.properties + tor-browser:torlauncher.properties + base-browser:base-browser.ftl + base-browser:newIdentity.properties + base-browser:securityLevel.properties + ' + cache: + paths: + - .cache/pip + # Artifact is for translation project job + artifacts: + paths: + - "$TOR_BROWSER_COMBINED_FILES_JSON" + expire_in: "60 min" + reports: + dotenv: job_id.env + # Don't load artifacts for this job. + dependencies: [] + script: + # Save this CI_JOB_ID to the dotenv file to be used in the variables for the + # push-en-US-translations job. + - echo 'COMBINE_TRANSLATIONS_JOB_ID='"$CI_JOB_ID" >job_id.env + - pip install compare_locales + - python ./tools/torbrowser/l10n/combine-translation-versions.py "$CI_COMMIT_BRANCH" "$TRANSLATION_FILES" "$TOR_BROWSER_COMBINED_FILES_JSON" + +push-en-US-translations: + extends: .update-translation-base + needs: + - job: combine-en-US-translations + variables: + TOR_BROWSER_COMBINED_FILES_JSON_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/jobs/${COMBINE_TRANSLATIONS_JOB_ID}/artifacts/${TOR_BROWSER_COMBINED_FILES_JSON}" + trigger: + strategy: depend + project: tor-browser-translation-bot/translation + branch: tor-browser-ci View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/dd7037… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/dd7037… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] release: new version, 13.5.1
by boklm (＠boklm) 10 Jul '24

10 Jul '24

boklm pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 4dcdd36b by Nicolas Vigier at 2024-07-10T14:37:43+02:00 release: new version, 13.5.1 - - - - - 30 changed files: - update_3/release/.htaccess - − update_3/release/13.0.14-13.5-linux-i686-ALL.xml - − update_3/release/13.0.14-13.5-linux-x86_64-ALL.xml - − update_3/release/13.0.14-13.5-macos-ALL.xml - − update_3/release/13.0.14-13.5-windows-i686-ALL.xml - − update_3/release/13.0.14-13.5-windows-x86_64-ALL.xml - − update_3/release/13.0.15-13.5-linux-i686-ALL.xml - − update_3/release/13.0.15-13.5-linux-x86_64-ALL.xml - − update_3/release/13.0.15-13.5-macos-ALL.xml - − update_3/release/13.0.15-13.5-windows-i686-ALL.xml - − update_3/release/13.0.15-13.5-windows-x86_64-ALL.xml - + update_3/release/13.0.15-13.5.1-linux-i686-ALL.xml - + update_3/release/13.0.15-13.5.1-linux-x86_64-ALL.xml - + update_3/release/13.0.15-13.5.1-macos-ALL.xml - + update_3/release/13.0.15-13.5.1-windows-i686-ALL.xml - + update_3/release/13.0.15-13.5.1-windows-x86_64-ALL.xml - − update_3/release/13.0.16-13.5-linux-i686-ALL.xml - − update_3/release/13.0.16-13.5-linux-x86_64-ALL.xml - − update_3/release/13.0.16-13.5-macos-ALL.xml - − update_3/release/13.0.16-13.5-windows-i686-ALL.xml - − update_3/release/13.0.16-13.5-windows-x86_64-ALL.xml - + update_3/release/13.0.16-13.5.1-linux-i686-ALL.xml - + update_3/release/13.0.16-13.5.1-linux-x86_64-ALL.xml - + update_3/release/13.0.16-13.5.1-macos-ALL.xml - + update_3/release/13.0.16-13.5.1-windows-i686-ALL.xml - + update_3/release/13.0.16-13.5.1-windows-x86_64-ALL.xml - + update_3/release/13.5-13.5.1-linux-i686-ALL.xml - + update_3/release/13.5-13.5.1-linux-x86_64-ALL.xml - + update_3/release/13.5-13.5.1-macos-ALL.xml - + update_3/release/13.5-13.5.1-windows-i686-ALL.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser-update-responses][main] release: new version, 13.5.1
by boklm (＠boklm) 10 Jul '24

10 Jul '24

boklm pushed to branch main at The Tor Project / Applications / mullvad-browser-update-responses Commits: de22fcc9 by Nicolas Vigier at 2024-07-10T10:23:29+02:00 release: new version, 13.5.1 - - - - - 29 changed files: - update_1/release/.htaccess - − update_1/release/13.0.14-13.5-linux-x86_64-ALL.xml - − update_1/release/13.0.14-13.5-macos-ALL.xml - − update_1/release/13.0.14-13.5-windows-x86_64-ALL.xml - − update_1/release/13.0.15-13.5-linux-x86_64-ALL.xml - − update_1/release/13.0.15-13.5-macos-ALL.xml - − update_1/release/13.0.15-13.5-windows-x86_64-ALL.xml - + update_1/release/13.0.15-13.5.1-linux-x86_64-ALL.xml - + update_1/release/13.0.15-13.5.1-macos-ALL.xml - + update_1/release/13.0.15-13.5.1-windows-x86_64-ALL.xml - − update_1/release/13.0.16-13.5-linux-x86_64-ALL.xml - − update_1/release/13.0.16-13.5-macos-ALL.xml - − update_1/release/13.0.16-13.5-windows-x86_64-ALL.xml - + update_1/release/13.0.16-13.5.1-linux-x86_64-ALL.xml - + update_1/release/13.0.16-13.5.1-macos-ALL.xml - + update_1/release/13.0.16-13.5.1-windows-x86_64-ALL.xml - + update_1/release/13.5-13.5.1-linux-x86_64-ALL.xml - + update_1/release/13.5-13.5.1-macos-ALL.xml - + update_1/release/13.5-13.5.1-windows-x86_64-ALL.xml - − update_1/release/13.5-linux-x86_64-ALL.xml - − update_1/release/13.5-macos-ALL.xml - − update_1/release/13.5-windows-x86_64-ALL.xml - + update_1/release/13.5.1-linux-x86_64-ALL.xml - + update_1/release/13.5.1-macos-ALL.xml - + update_1/release/13.5.1-windows-x86_64-ALL.xml - update_1/release/download-linux-x86_64.json - update_1/release/download-macos.json - update_1/release/download-windows-x86_64.json - update_1/release/downloads.json Changes: ===================================== update_1/release/.htaccess ===================================== @@ -1,22 +1,22 @@ RewriteEngine On -RewriteRule ^[^/]+/13.5/ no-update.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.0.14/ALL 13.0.14-13.5-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.0.15/ALL 13.0.15-13.5-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.0.16/ALL 13.0.16-13.5-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 13.5-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/ 13.5-linux-x86_64-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.0.14/ALL 13.0.14-13.5-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.0.15/ALL 13.0.15-13.5-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.0.16/ALL 13.0.16-13.5-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 13.5-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/ 13.5-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.0.14/ALL 13.0.14-13.5-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.0.15/ALL 13.0.15-13.5-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.0.16/ALL 13.0.16-13.5-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 13.5-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/ 13.5-macos-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.0.14/ALL 13.0.14-13.5-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.0.15/ALL 13.0.15-13.5-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.0.16/ALL 13.0.16-13.5-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 13.5-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/ 13.5-windows-x86_64-ALL.xml [last] +RewriteRule ^[^/]+/13.5.1/ no-update.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.0.15/ALL 13.0.15-13.5.1-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.0.16/ALL 13.0.16-13.5.1-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5/ALL 13.5-13.5.1-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 13.5.1-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/ 13.5.1-linux-x86_64-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.0.15/ALL 13.0.15-13.5.1-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.0.16/ALL 13.0.16-13.5.1-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5/ALL 13.5-13.5.1-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 13.5.1-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/ 13.5.1-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.0.15/ALL 13.0.15-13.5.1-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.0.16/ALL 13.0.16-13.5.1-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5/ALL 13.5-13.5.1-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 13.5.1-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/ 13.5.1-macos-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.0.15/ALL 13.0.15-13.5.1-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.0.16/ALL 13.0.16-13.5.1-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5/ALL 13.5-13.5.1-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 13.5.1-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/ 13.5.1-windows-x86_64-ALL.xml [last] ===================================== update_1/release/13.0.14-13.5-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5" appVersion="13.5" platformVersion="115.12.0" buildID="20240611120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-linux-x86_64-13.5_ALL.…" hashFunction="SHA512" hashValue="7114dca55aff53dcb33b8036c7cda51a496b83572a9279c8ea5e3cffa07c80ab5a0c9fc37a81d436ec4007fe3b383fda0775633c808284f06efaf6ece7272214" size="108364839" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-linux-x86_64--13.0.14-…" hashFunction="SHA512" hashValue="047cc49eb0991b4408443209e4fb6e426f3ecaa63bff957f893b00180478d46f49f00ec72e8248d4ce590af1a6ca2bd7073e582e30bbd04aef2d234f99d288d7" size="14637187" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.14-13.5-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5" appVersion="13.5" platformVersion="115.12.0" buildID="20240611120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-macos-13.5_ALL.mar" hashFunction="SHA512" hashValue="1ffd5550bc0c9e2442a2c037d999b070f0c9ed06e15e17785157a9068d03c46472e5684b5d62eb0bb45dde39b4ade76ef0bc8e31a47ff5f6196030508f0215bd" size="115760835" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-macos--13.0.14-13.5_AL…" hashFunction="SHA512" hashValue="bdc9a6e80475d83d2d252bd857c0b654fa4dc160573847c8d8df617656f57946da187f30283badcee29e49c9f6a94a2e2eb6df582cc6f4096c98978fe9b3c443" size="76638836" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.14-13.5-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5" appVersion="13.5" platformVersion="115.12.0" buildID="20240611120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-windows-x86_64-13.5_AL…" hashFunction="SHA512" hashValue="6ad947f9cfed17fbbed6865d803023e3381a4731838b876179c93b4a1b3566e37aff841ba5b135f1c48e7265ad6a74f9f53dc6d4d885c66f73ea728a5240695a" size="90011652" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-windows-x86_64--13.0.1…" hashFunction="SHA512" hashValue="bdf3989cd0fb15a4e6b1517cec8eaae8439489b434396bda0de4a7c6bc2289a527c83588059f29be4c6c8bb32430c2387afcaf582757c4130ce92be66ecb9d07" size="11669804" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.15-13.5-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5" appVersion="13.5" platformVersion="115.12.0" buildID="20240611120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-linux-x86_64-13.5_ALL.…" hashFunction="SHA512" hashValue="7114dca55aff53dcb33b8036c7cda51a496b83572a9279c8ea5e3cffa07c80ab5a0c9fc37a81d436ec4007fe3b383fda0775633c808284f06efaf6ece7272214" size="108364839" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-linux-x86_64--13.0.15-…" hashFunction="SHA512" hashValue="02893811bb76236c06e1faa8fb0582ebf5a2047a41cb0a93d9bae5b54818d7502e57eaecae9d84065564f0642c724ecb379623c80dcfb5b6a2a4941db1d3c17b" size="11051015" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.15-13.5-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5" appVersion="13.5" platformVersion="115.12.0" buildID="20240611120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-macos-13.5_ALL.mar" hashFunction="SHA512" hashValue="1ffd5550bc0c9e2442a2c037d999b070f0c9ed06e15e17785157a9068d03c46472e5684b5d62eb0bb45dde39b4ade76ef0bc8e31a47ff5f6196030508f0215bd" size="115760835" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-macos--13.0.15-13.5_AL…" hashFunction="SHA512" hashValue="412dca9c288862eebe6646b60e7644972cab1919074f27b05c2264cb7d8eff65216af267562d23b6d133ae1bfe0fb7618016490e7dfd8bc0d8c9c61c9a164d4f" size="73223372" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.15-13.5-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5" appVersion="13.5" platformVersion="115.12.0" buildID="20240611120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-windows-x86_64-13.5_AL…" hashFunction="SHA512" hashValue="6ad947f9cfed17fbbed6865d803023e3381a4731838b876179c93b4a1b3566e37aff841ba5b135f1c48e7265ad6a74f9f53dc6d4d885c66f73ea728a5240695a" size="90011652" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-windows-x86_64--13.0.1…" hashFunction="SHA512" hashValue="21a0ff6171d0161462c3c4af413088f0535c565a5fef98a57f396f050ca219d55e470b142d3b4d695a82324e5f0986a94e5d0865bed1ab124f67c1eca4375676" size="7983332" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.15-13.5.1-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.1" appVersion="13.5.1" platformVersion="115.13.0" buildID="20240708120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-linux-x86_64-13.5.1_…" hashFunction="SHA512" hashValue="4178e2bee27fd5b750bc01f3ab21ce497c6c73e0964f4e5d11e79837b5af9adb66855032caac92c9f26d5b2477733c251fdb934202b5b6ff7e5223a99e56b5f2" size="108427747" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-linux-x86_64--13.0.1…" hashFunction="SHA512" hashValue="7b29e08bd21c6e0577ac57e0faf7d48f22b21c8d975b8041c732a4ac41dd0239aeefe2d7d708b602bfceffdf043bda0573c9e1fd8b0c9a3a368549ad95798a96" size="12726139" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.15-13.5.1-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.1" appVersion="13.5.1" platformVersion="115.13.0" buildID="20240708120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-macos-13.5.1_ALL.mar" hashFunction="SHA512" hashValue="0ee852b82e16c64ab10229e17d767aaeb0cf846a2bfe7eee18a445137c78c519d80c433b1ef68daed4ade980e90b85af56d27134ceaae419eff46ed225bfb558" size="115815999" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-macos--13.0.15-13.5.…" hashFunction="SHA512" hashValue="41bf1dbe0242217ab8b1b821209c3db26903f0ba20f12ffc8b747201d044f1d846b812a5cb8749c27c5b0cfc2d1f510729fa626f67f49501980ebb3e52624d9e" size="74834860" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.15-13.5.1-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.1" appVersion="13.5.1" platformVersion="115.13.0" buildID="20240708120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-windows-x86_64-13.5.…" hashFunction="SHA512" hashValue="8158ad21f217fc931bae100b2428d39a00d2dcc08ddb35488dd5345d96861ebb4c7780d7e4eb86e569e4c513122ba106055736611df3b251ccd52a32aaee30ab" size="90058840" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-windows-x86_64--13.0…" hashFunction="SHA512" hashValue="a0af957e4082a7fea1e9a525cec3c22027ef2d4d27b0751fd381ea6bbda4581a0f22b1676332745015045cb37f2fdc6aa98774386ce58d484843325888f4061b" size="9872708" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.16-13.5-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5" appVersion="13.5" platformVersion="115.12.0" buildID="20240611120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-linux-x86_64-13.5_ALL.…" hashFunction="SHA512" hashValue="7114dca55aff53dcb33b8036c7cda51a496b83572a9279c8ea5e3cffa07c80ab5a0c9fc37a81d436ec4007fe3b383fda0775633c808284f06efaf6ece7272214" size="108364839" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-linux-x86_64--13.0.16-…" hashFunction="SHA512" hashValue="2127325c1c9ebce19662c40825e72328b1139fea512e220e550e5b17bf2c6d7a501f2b8246e53131d921069374a1971436b48aaa254c09243cf7c6533c5ef376" size="8490373" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.16-13.5-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5" appVersion="13.5" platformVersion="115.12.0" buildID="20240611120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-macos-13.5_ALL.mar" hashFunction="SHA512" hashValue="1ffd5550bc0c9e2442a2c037d999b070f0c9ed06e15e17785157a9068d03c46472e5684b5d62eb0bb45dde39b4ade76ef0bc8e31a47ff5f6196030508f0215bd" size="115760835" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-macos--13.0.16-13.5_AL…" hashFunction="SHA512" hashValue="a8c555b031e15d42d7326ea65bd31e29bc76f7462db6d68a0953c603ef82fabb794f3080260d8d61d6e189eacb4156341acec36b5ceeda54899241c919bccf52" size="71213099" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.16-13.5-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5" appVersion="13.5" platformVersion="115.12.0" buildID="20240611120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-windows-x86_64-13.5_AL…" hashFunction="SHA512" hashValue="6ad947f9cfed17fbbed6865d803023e3381a4731838b876179c93b4a1b3566e37aff841ba5b135f1c48e7265ad6a74f9f53dc6d4d885c66f73ea728a5240695a" size="90011652" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-windows-x86_64--13.0.1…" hashFunction="SHA512" hashValue="d68c8ebf6a1ce0f0a27d8e286aa2e52d63bb514e375f25d3b07a94f2a5aba7b27f5403d23453a181a7154ce1cdde7feaed96ceeb6c7f219dadd310de61b2cdf0" size="5282110" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.16-13.5.1-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.1" appVersion="13.5.1" platformVersion="115.13.0" buildID="20240708120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-linux-x86_64-13.5.1_…" hashFunction="SHA512" hashValue="4178e2bee27fd5b750bc01f3ab21ce497c6c73e0964f4e5d11e79837b5af9adb66855032caac92c9f26d5b2477733c251fdb934202b5b6ff7e5223a99e56b5f2" size="108427747" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-linux-x86_64--13.0.1…" hashFunction="SHA512" hashValue="a1a399e8e7db770f3ef5da79bd0facc3f051cba75549d0c113a26040719367ef523a04ef42562f2bf046a90cbeff4292e0df33e3433075f7c403cc28be960a2d" size="10518485" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.16-13.5.1-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.1" appVersion="13.5.1" platformVersion="115.13.0" buildID="20240708120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-macos-13.5.1_ALL.mar" hashFunction="SHA512" hashValue="0ee852b82e16c64ab10229e17d767aaeb0cf846a2bfe7eee18a445137c78c519d80c433b1ef68daed4ade980e90b85af56d27134ceaae419eff46ed225bfb558" size="115815999" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-macos--13.0.16-13.5.…" hashFunction="SHA512" hashValue="1bc3d51ecd12056d99112e9349990fcffaa1f79acc5bc309afa9b5d91bdb075cbac8e0588cf4c8fd82564870f7712b81a2a1b1592227307b76bbc6730981e2ef" size="72834927" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.16-13.5.1-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.1" appVersion="13.5.1" platformVersion="115.13.0" buildID="20240708120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-windows-x86_64-13.5.…" hashFunction="SHA512" hashValue="8158ad21f217fc931bae100b2428d39a00d2dcc08ddb35488dd5345d96861ebb4c7780d7e4eb86e569e4c513122ba106055736611df3b251ccd52a32aaee30ab" size="90058840" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-windows-x86_64--13.0…" hashFunction="SHA512" hashValue="2523c3361304284d547fcf04696a0957814d8db52b14a6029b655f08fc1b60773f15ad1e282502870c00e15a8b401ac3453b4c2341b798cc61165cb96d89d029" size="7526402" type="partial"></patch></update></updates> ===================================== update_1/release/13.5-13.5.1-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.1" appVersion="13.5.1" platformVersion="115.13.0" buildID="20240708120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-linux-x86_64-13.5.1_…" hashFunction="SHA512" hashValue="4178e2bee27fd5b750bc01f3ab21ce497c6c73e0964f4e5d11e79837b5af9adb66855032caac92c9f26d5b2477733c251fdb934202b5b6ff7e5223a99e56b5f2" size="108427747" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-linux-x86_64--13.5-1…" hashFunction="SHA512" hashValue="7d76399f1e151d3f5568071c20d03b97df081cfbce868eb2f2e586c9d878b18779e773821c79f7d6edac91d27b04adf12cd036b70402c241232bea5a4882e060" size="6777973" type="partial"></patch></update></updates> ===================================== update_1/release/13.5-13.5.1-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.1" appVersion="13.5.1" platformVersion="115.13.0" buildID="20240708120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-macos-13.5.1_ALL.mar" hashFunction="SHA512" hashValue="0ee852b82e16c64ab10229e17d767aaeb0cf846a2bfe7eee18a445137c78c519d80c433b1ef68daed4ade980e90b85af56d27134ceaae419eff46ed225bfb558" size="115815999" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-macos--13.5-13.5.1_A…" hashFunction="SHA512" hashValue="57f2d191710af4358c6e8d43b1b57e7184a6e43be8e70da8d2abb5d66ce3abdeae3cb4a4be929a8735c0be070c602b3fb6dacd2200b8abfa42ea3bd3c798a7ee" size="72476400" type="partial"></patch></update></updates> ===================================== update_1/release/13.5-13.5.1-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.1" appVersion="13.5.1" platformVersion="115.13.0" buildID="20240708120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-windows-x86_64-13.5.…" hashFunction="SHA512" hashValue="8158ad21f217fc931bae100b2428d39a00d2dcc08ddb35488dd5345d96861ebb4c7780d7e4eb86e569e4c513122ba106055736611df3b251ccd52a32aaee30ab" size="90058840" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="606ee27dd19fbf1d2b2fbfd448cc6e07724f216b738f02172ff704e5ad8c9af6870e3dedcc6a32ed9b65e58232fb8ac0b3a6d683c2ffcc732b696ae85a77c8f5" size="6546837" type="partial"></patch></update></updates> ===================================== update_1/release/13.5-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5" appVersion="13.5" platformVersion="115.12.0" buildID="20240611120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-linux-x86_64-13.5_ALL.…" hashFunction="SHA512" hashValue="7114dca55aff53dcb33b8036c7cda51a496b83572a9279c8ea5e3cffa07c80ab5a0c9fc37a81d436ec4007fe3b383fda0775633c808284f06efaf6ece7272214" size="108364839" type="complete"></patch></update></updates> ===================================== update_1/release/13.5-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5" appVersion="13.5" platformVersion="115.12.0" buildID="20240611120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-macos-13.5_ALL.mar" hashFunction="SHA512" hashValue="1ffd5550bc0c9e2442a2c037d999b070f0c9ed06e15e17785157a9068d03c46472e5684b5d62eb0bb45dde39b4ade76ef0bc8e31a47ff5f6196030508f0215bd" size="115760835" type="complete"></patch></update></updates> ===================================== update_1/release/13.5-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5" appVersion="13.5" platformVersion="115.12.0" buildID="20240611120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5/mullvad-browser-windows-x86_64-13.5_AL…" hashFunction="SHA512" hashValue="6ad947f9cfed17fbbed6865d803023e3381a4731838b876179c93b4a1b3566e37aff841ba5b135f1c48e7265ad6a74f9f53dc6d4d885c66f73ea728a5240695a" size="90011652" type="complete"></patch></update></updates> ===================================== update_1/release/13.5.1-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.1" appVersion="13.5.1" platformVersion="115.13.0" buildID="20240708120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-linux-x86_64-13.5.1_…" hashFunction="SHA512" hashValue="4178e2bee27fd5b750bc01f3ab21ce497c6c73e0964f4e5d11e79837b5af9adb66855032caac92c9f26d5b2477733c251fdb934202b5b6ff7e5223a99e56b5f2" size="108427747" type="complete"></patch></update></updates> ===================================== update_1/release/13.5.1-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.1" appVersion="13.5.1" platformVersion="115.13.0" buildID="20240708120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-macos-13.5.1_ALL.mar" hashFunction="SHA512" hashValue="0ee852b82e16c64ab10229e17d767aaeb0cf846a2bfe7eee18a445137c78c519d80c433b1ef68daed4ade980e90b85af56d27134ceaae419eff46ed225bfb558" size="115815999" type="complete"></patch></update></updates> ===================================== update_1/release/13.5.1-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5.1" appVersion="13.5.1" platformVersion="115.13.0" buildID="20240708120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5.1" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-windows-x86_64-13.5.…" hashFunction="SHA512" hashValue="8158ad21f217fc931bae100b2428d39a00d2dcc08ddb35488dd5345d96861ebb4c7780d7e4eb86e569e4c513122ba106055736611df3b251ccd52a32aaee30ab" size="90058840" type="complete"></patch></update></updates> ===================================== update_1/release/download-linux-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.5/mullvad-browser-linux-x86_64-13.5.tar.…","git_tag":"mb-13.5-build1","sig":"https://cdn.mullvad.net/browser/13.5/mullvad-browser-linux-x86_64-13.5.tar.…","version":"13.5"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-linux-x86_64-13.5.1.…","git_tag":"mb-13.5.1-build3","sig":"https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-linux-x86_64-13.5.1.…","version":"13.5.1"} \ No newline at end of file ===================================== update_1/release/download-macos.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.5/mullvad-browser-macos-13.5.dmg","git_tag":"mb-13.5-build1","sig":"https://cdn.mullvad.net/browser/13.5/mullvad-browser-macos-13.5.dmg.asc","version":"13.5"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-macos-13.5.1.dmg","git_tag":"mb-13.5.1-build3","sig":"https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-macos-13.5.1.dmg.asc","version":"13.5.1"} \ No newline at end of file ===================================== update_1/release/download-windows-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.5/mullvad-browser-windows-x86_64-13.5.exe","git_tag":"mb-13.5-build1","sig":"https://cdn.mullvad.net/browser/13.5/mullvad-browser-windows-x86_64-13.5.ex…","version":"13.5"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-windows-x86_64-13.5.…","git_tag":"mb-13.5.1-build3","sig":"https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-windows-x86_64-13.5.…","version":"13.5.1"} \ No newline at end of file ===================================== update_1/release/downloads.json ===================================== @@ -1 +1 @@ -{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5/mullvad-browser-linux-x86_64-13.5.tar.…","sig":"https://cdn.mullvad.net/browser/13.5/mullvad-browser-linux-x86_64-13.5.tar.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5/mullvad-browser-macos-13.5.dmg","sig":"https://cdn.mullvad.net/browser/13.5/mullvad-browser-macos-13.5.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5/mullvad-browser-windows-x86_64-13.5.exe","sig":"https://cdn.mullvad.net/browser/13.5/mullvad-browser-windows-x86_64-13.5.ex…"}}},"tag":"mb-13.5-build1","version":"13.5"} \ No newline at end of file +{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-linux-x86_64-13.5.1.…","sig":"https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-linux-x86_64-13.5.1.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-macos-13.5.1.dmg","sig":"https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-macos-13.5.1.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-windows-x86_64-13.5.…","sig":"https://cdn.mullvad.net/browser/13.5.1/mullvad-browser-windows-x86_64-13.5.…"}}},"tag":"mb-13.5.1-build3","version":"13.5.1"} \ No newline at end of file View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-13.5.1-build3
by ma1 (＠ma1) 09 Jul '24

09 Jul '24

ma1 pushed new tag mb-13.5.1-build3 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.5] fixup! Bug 41174, 41175: Tor, Mullvad Browser 13.5.1 release preparation
by ma1 (＠ma1) 09 Jul '24

09 Jul '24

ma1 pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: a237180b by hackademix at 2024-07-10T01:24:32+02:00 fixup! Bug 41174, 41175: Tor, Mullvad Browser 13.5.1 release preparation Bump tbb to build3 (Fixup for Mullvad Browser backports bustage). - - - - - 1 changed file: - rbm.conf Changes: ===================================== rbm.conf ===================================== @@ -74,7 +74,7 @@ buildconf: var: torbrowser_version: '13.5.1' - torbrowser_build: 'build2' + torbrowser_build: 'build3' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. browser_release_date: '2024/07/08 12:00:00' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.5] fixup! Bug 41174, 41175: Tor, Mullvad Browser 13.5.1 release preparation
by ma1 (＠ma1) 09 Jul '24

09 Jul '24

ma1 pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: f02e0dc8 by hackademix at 2024-07-10T01:02:21+02:00 fixup! Bug 41174, 41175: Tor, Mullvad Browser 13.5.1 release preparation Actually override build number (Fixup for Mullvad Browser backports bustage). - - - - - 1 changed file: - projects/firefox/config Changes: ===================================== projects/firefox/config ===================================== @@ -102,8 +102,8 @@ targets: mullvadbrowser: git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git - browser_build: 3 var: + browser_build: 3 branding_directory_prefix: 'mb' gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser updater_url: 'https://cdn.mullvad.net/browser/update_responses/update_1/' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Deleted tag tbb-13.5.1-build2
by richard (＠richard) 09 Jul '24

09 Jul '24

richard deleted tag tbb-13.5.1-build2 at The Tor Project / Applications / tor-browser-build -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-13.5.1-build2
by richard (＠richard) 09 Jul '24

09 Jul '24

richard pushed new tag mb-13.5.1-build2 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-13.5.1-build2
by ma1 (＠ma1) 09 Jul '24

09 Jul '24

ma1 pushed new tag tbb-13.5.1-build2 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.5] fixup! Bug 41174, 41175: Tor, Mullvad Browser 13.5.1 release preparation
by richard (＠richard) 09 Jul '24

09 Jul '24

richard pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: eb3de3cb by hackademix at 2024-07-09T23:51:49+02:00 fixup! Bug 41174, 41175: Tor, Mullvad Browser 13.5.1 release preparation Fixup for Mullvad Browser backports bustage. - - - - - 2 changed files: - projects/firefox/config - rbm.conf Changes: ===================================== projects/firefox/config ===================================== @@ -102,6 +102,7 @@ targets: mullvadbrowser: git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git + browser_build: 3 var: branding_directory_prefix: 'mb' gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser ===================================== rbm.conf ===================================== @@ -74,7 +74,7 @@ buildconf: var: torbrowser_version: '13.5.1' - torbrowser_build: 'build1' + torbrowser_build: 'build2' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. browser_release_date: '2024/07/08 12:00:00' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-115.13.0esr-13.5-1-build3
by ma1 (＠ma1) 09 Jul '24

09 Jul '24

ma1 pushed new tag base-browser-115.13.0esr-13.5-1-build3 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.13.0esr-13.5-1] fixup! Bug 1743329 - Release pointer lock when xul popup is open; r=smaug,pbz
by ma1 (＠ma1) 09 Jul '24

09 Jul '24

ma1 pushed to branch base-browser-115.13.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 11896db5 by hackademix at 2024-07-09T23:23:54+02:00 fixup! Bug 1743329 - Release pointer lock when xul popup is open; r=smaug,pbz Bug 42693: Backport security fixes from Firefox 128, base/mullvad browser fixup. - - - - - 1 changed file: - dom/ipc/PBrowser.ipdl Changes: ===================================== dom/ipc/PBrowser.ipdl ===================================== @@ -563,6 +563,11 @@ parent: async RequestPointerCapture(uint32_t aPointerId) returns (bool aSuccess); async ReleasePointerCapture(uint32_t aPointerId); + /** + * Child informs the parent that a pointer lock has requested. + */ + async RequestPointerLock() returns (nsCString error); + both: /** * informs that a pointer lock has released. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/11896db… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/11896db… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-115.13.0esr-13.5-1-build3
by ma1 (＠ma1) 09 Jul '24

09 Jul '24

ma1 pushed new tag mullvad-browser-115.13.0esr-13.5-1-build3 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.13.0esr-13.5-1] fixup! Bug 1743329 - Release pointer lock when xul popup is open; r=smaug,pbz
by ma1 (＠ma1) 09 Jul '24

09 Jul '24

ma1 pushed to branch mullvad-browser-115.13.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: d1fb6919 by hackademix at 2024-07-09T22:49:05+02:00 fixup! Bug 1743329 - Release pointer lock when xul popup is open; r=smaug,pbz Bug 42693: Backport security fixes from Firefox 128, base/mullvad browser fixup. - - - - - 1 changed file: - dom/ipc/PBrowser.ipdl Changes: ===================================== dom/ipc/PBrowser.ipdl ===================================== @@ -563,6 +563,11 @@ parent: async RequestPointerCapture(uint32_t aPointerId) returns (bool aSuccess); async ReleasePointerCapture(uint32_t aPointerId); + /** + * Child informs the parent that a pointer lock has requested. + */ + async RequestPointerLock() returns (nsCString error); + both: /** * informs that a pointer lock has released. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/d1f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/d1f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41166: Use the GitHub repository for firefox-l10n.
by Pier Angelo Vendrame (＠pierov) 09 Jul '24

09 Jul '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: a82df901 by Pier Angelo Vendrame at 2024-07-09T18:23:49+02:00 Bug 41166: Use the GitHub repository for firefox-l10n. Mozilla uplifted Bug 1900421 to 115 to 128, so we have to switch to the new GitHub repository immediately as well. - - - - - 2 changed files: - README - projects/firefox-l10n/config Changes: ===================================== README ===================================== @@ -10,7 +10,7 @@ etc ...). You will need to install the uidmap package, providing the newuidmap and newgidmap commands. The sources of most components are downloaded using git, which needs to -be installed. The mercurial package is also needed. +be installed. Zstandard (zstd) is used to compress some tarballs and needs to be installed. You'll also need tar >= 1.31, for zstd support. @@ -46,7 +46,7 @@ If you are running Debian or Ubuntu, you can install them with: libparallel-forkmanager-perl libpath-tiny-perl \ libsort-versions-perl libstring-shellquote-perl \ libtemplate-perl libxml-libxml-perl libxml-writer-perl \ - libyaml-libyaml-perl git mercurial uidmap zstd + libyaml-libyaml-perl git uidmap zstd If you are running Fedora, CentOS or RHEL, you can install them with: @@ -57,7 +57,7 @@ If you are running Fedora, CentOS or RHEL, you can install them with: "perl(File::Copy::Recursive)" "perl(String::ShellQuote)" \ "perl(Sort::Versions)" "perl(Digest::SHA)" "perl(Data::UUID)" \ "perl(Data::Dump)" "perl(DateTime)" "perl(XML::Writer)" \ - "perl(Parallel::ForkManager)" perl-ph mercurial git zstd + "perl(Parallel::ForkManager)" perl-ph git zstd If you are running an Arch based system, you should be able to install them with: ===================================== projects/firefox-l10n/config ===================================== @@ -2,15 +2,22 @@ version: '[% pc("firefox", "abbrev") %]' filename: '[% project %]-[% c("var/osname") %]-[% c("version") %]-[% c("var/build_id") %]' link_input_files: 1 +# We need to specify git_url in the root to make this project recognized as a +# git project, we canoot specify the git_url only in the step. +# However, once we specify a git_url, we need to specify a valid git_hash for +# the final stage, even though we are not going to use it. +# Any hash will work, as long as we can run git archive on it. +git_url: https://github.com/mozilla-l10n/firefox-l10n.git +git_hash: c1523924f0e10259e1a80b8268556f6f7a0b29bf steps: fetch_locale: - filename: 'l10n-[% c("input_file_var/locale") %]-[% c("hg_hash") %]-[% c("var/build_id") %].tar.xz' - version: '[% c("hg_hash") %]' + filename: 'l10n-[% c("input_file_var/locale") %]-[% c("abbrev") %]-[% c("var/build_id") %].tar.xz' + version: '[% c("git_hash") %]' fetch_locale: | [% c("var/set_default_env") -%] tar xf '[% project %]-[% c("version") %].tar.[% c("compress_tar") %]' - mv [% project %]-[% c("version") %] [% c("input_file_var/locale") %] + cd [% project %]-[% c("version") %] tar caf '[% dest_dir %]/[% c("filename") %]' [% c("input_file_var/locale") %] input_files: [] --- | @@ -38,9 +45,7 @@ steps: name => $locale, project => 'firefox-l10n', pkg_type => 'fetch_locale', - hg_hash => $revision, - hg_url => "https://hg.mozilla.org/l10n-central/$locale", - hg_clone_subdir => $locale, + git_hash => $revision, input_file_var => { locale => $locale, }, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-13.5.1-build1
by Pier Angelo Vendrame (＠pierov) 09 Jul '24

09 Jul '24

Pier Angelo Vendrame pushed new tag mb-13.5.1-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-13.5.1-build1
by Pier Angelo Vendrame (＠pierov) 09 Jul '24

09 Jul '24

Pier Angelo Vendrame pushed new tag tbb-13.5.1-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.5] 2 commits: Bug 41166: Use the GitHub repository for firefox-l10n.
by Pier Angelo Vendrame (＠pierov) 09 Jul '24

09 Jul '24

Pier Angelo Vendrame pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: abe0d0a3 by Pier Angelo Vendrame at 2024-07-09T17:44:19+02:00 Bug 41166: Use the GitHub repository for firefox-l10n. Mozilla uplifted Bug 1900421 to 115 to 128, so we have to switch to the new GitHub repository immediately as well. - - - - - 902b2dbe by Pier Angelo Vendrame at 2024-07-09T17:44:23+02:00 Bug 41174, 41175: Tor, Mullvad Browser 13.5.1 release preparation - - - - - 12 changed files: - README - projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/allowed_addons.json - projects/firefox-android/config - projects/firefox-l10n/config - projects/firefox/config - projects/geckoview/config - projects/go/config - projects/manual/config - projects/translation/config - rbm.conf Changes: ===================================== README ===================================== @@ -10,7 +10,7 @@ etc ...). You will need to install the uidmap package, providing the newuidmap and newgidmap commands. The sources of most components are downloaded using git, which needs to -be installed. The mercurial package is also needed. +be installed. Zstandard (zstd) is used to compress some tarballs and needs to be installed. You'll also need tar >= 1.31, for zstd support. @@ -46,7 +46,7 @@ If you are running Debian or Ubuntu, you can install them with: libparallel-forkmanager-perl libpath-tiny-perl \ libsort-versions-perl libstring-shellquote-perl \ libtemplate-perl libxml-libxml-perl libxml-writer-perl \ - libyaml-libyaml-perl git mercurial uidmap zstd + libyaml-libyaml-perl git uidmap zstd If you are running Fedora, CentOS or RHEL, you can install them with: @@ -57,7 +57,7 @@ If you are running Fedora, CentOS or RHEL, you can install them with: "perl(File::Copy::Recursive)" "perl(String::ShellQuote)" \ "perl(Sort::Versions)" "perl(Digest::SHA)" "perl(Data::UUID)" \ "perl(Data::Dump)" "perl(DateTime)" "perl(XML::Writer)" \ - "perl(Parallel::ForkManager)" perl-ph mercurial git zstd + "perl(Parallel::ForkManager)" perl-ph git zstd If you are running an Arch based system, you should be able to install them with: ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -1,3 +1,17 @@ +Mullvad Browser 13.5.1 - July 09 2024 + * All Platforms + * Updated Firefox to 115.13.0esr + * Bug 317: Rebase Mullvad Browser stable onto 115.13.0esr [mullvad-browser] + * Bug 42693: Backports security fixes from Firefox 128 [tor-browser] + * Linux + * Bug 314: Mullvad Browser is not listed as a possible default browser application for Gnome on Ubuntu / Fedora [mullvad-browser] + * Build System + * All Platforms + * Bug 41166: Use the GitHub repository for firefox-l10n [tor-browser-build] + * Bug 41173: Fix permission issue on files in the debian directory [tor-browser-build] + * Windows + * Bug 41177: Include Windows installer without -portable- in download json files [tor-browser-build] + Mullvad Browser 13.5 - June 17 2024 * All Platforms * Bug 222: Hide "List all tabs" when the tabs don't overflow [mullvad-browser] ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,18 @@ +Tor Browser 13.5.1 - July 09 2024 + * All Platforms + * Bug 42689: Rebase Tor Browser onto 115.13.0esr [tor-browser] + * Bug 42693: Backports security fixes from Firefox 128 [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 115.13.0esr + * Android + * Updated GeckoView to 115.13.0esr + * Build System + * All Platforms + * Updated Go to 1.21.12 + * Bug 41166: Use the GitHub repository for firefox-l10n [tor-browser-build] + * Windows + * Bug 41177: Include Windows installer without -portable- in download json files [tor-browser-build] + Tor Browser 13.5 - June 17 2024 * All Platforms * Bug 40856: Add a default for preferences in TorSettings [tor-browser] ===================================== projects/browser/allowed_addons.json ===================================== Binary files a/projects/browser/allowed_addons.json and b/projects/browser/allowed_addons.json differ ===================================== projects/firefox-android/config ===================================== @@ -16,7 +16,7 @@ container: var: fenix_version: 115.2.1 browser_branch: 13.5-1 - browser_build: 12 + browser_build: 13 variant: Beta # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 1 ===================================== projects/firefox-l10n/config ===================================== @@ -2,15 +2,22 @@ version: '[% pc("firefox", "abbrev") %]' filename: '[% project %]-[% c("var/osname") %]-[% c("version") %]-[% c("var/build_id") %]' link_input_files: 1 +# We need to specify git_url in the root to make this project recognized as a +# git project, we canoot specify the git_url only in the step. +# However, once we specify a git_url, we need to specify a valid git_hash for +# the final stage, even though we are not going to use it. +# Any hash will work, as long as we can run git archive on it. +git_url: https://github.com/mozilla-l10n/firefox-l10n.git +git_hash: c1523924f0e10259e1a80b8268556f6f7a0b29bf steps: fetch_locale: - filename: 'l10n-[% c("input_file_var/locale") %]-[% c("hg_hash") %]-[% c("var/build_id") %].tar.xz' - version: '[% c("hg_hash") %]' + filename: 'l10n-[% c("input_file_var/locale") %]-[% c("abbrev") %]-[% c("var/build_id") %].tar.xz' + version: '[% c("git_hash") %]' fetch_locale: | [% c("var/set_default_env") -%] tar xf '[% project %]-[% c("version") %].tar.[% c("compress_tar") %]' - mv [% project %]-[% c("version") %] [% c("input_file_var/locale") %] + cd [% project %]-[% c("version") %] tar caf '[% dest_dir %]/[% c("filename") %]' [% c("input_file_var/locale") %] input_files: [] --- | @@ -38,9 +45,7 @@ steps: name => $locale, project => 'firefox-l10n', pkg_type => 'fetch_locale', - hg_hash => $revision, - hg_url => "https://hg.mozilla.org/l10n-central/$locale", - hg_clone_subdir => $locale, + git_hash => $revision, input_file_var => { locale => $locale, }, ===================================== projects/firefox/config ===================================== @@ -14,12 +14,12 @@ container: use_container: 1 var: - firefox_platform_version: 115.12.0 + firefox_platform_version: 115.13.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '13.5' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 3 + browser_build: 2 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' ===================================== projects/geckoview/config ===================================== @@ -14,9 +14,9 @@ container: use_container: 1 var: - geckoview_version: 115.12.0esr + geckoview_version: 115.13.0esr browser_branch: 13.5-1 - browser_build: 3 + browser_build: 2 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]' ===================================== projects/go/config ===================================== @@ -7,7 +7,7 @@ container: var: use_go_1_20: 0 - go_1_21: 1.21.11 + go_1_21: 1.21.12 go_1_20: 1.20.14 no_crosscompile: 1 setup: | @@ -131,7 +131,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://go.dev/dl/go[% c("var/go_1_21") %].src.tar.gz' name: go - sha256sum: 42aee9bf2b6956c75a7ad6aa3f0a51b5821ffeac57f5a2e733a2d6eae1e6d9d2 + sha256sum: 30e68af27bc1f1df231e3ab74f3d17d3b8d52a089c79bcaab573b4f1b807ed4f enable: '[% !c("var/use_go_1_20") %]' - URL: 'https://go.dev/dl/go[% c("var/go_1_20") %].src.tar.gz' name: go ===================================== projects/manual/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 # To update, see doc/how-to-update-the-manual.txt # Remember to update also the package's hash, with the version! -version: 172720 +version: 179205 filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -23,6 +23,6 @@ input_files: - project: container-image - URL: 'https://build-sources.tbb.torproject.org/manual_[% c("version") %].zip' name: manual - sha256sum: f2abffe1471ae63046cff06b853685c6614e117cc67bdf51228dc0792344441c + sha256sum: ca3489c12f3de44f7ae93eae4d50fb2bc36265f7a319d5046efb760c19658250 - filename: packagemanual.py name: package_script ===================================== projects/translation/config ===================================== @@ -12,13 +12,13 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: dc59db634f066298e903142227834da483ec197d + git_hash: 6ff73b6f7a6cec4849c2cd1e1ee1dc6fc8894169 targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: de4f91a5020d637ab5d66459718525a5f9207be2 + git_hash: 427819f80eaca95645bf0c1876d6a728d6ce7093 targets: nightly: git_hash: 'tor-browser' @@ -32,7 +32,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: 53faf8718484be3f90c8e7532981f068da76135c + git_hash: 09ba85f8320b264467a8a7b2bfbfccd1fea61f86 compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -73,18 +73,18 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.5' - torbrowser_build: 'build2' + torbrowser_version: '13.5.1' + torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2024/06/11 12:00:00' + browser_release_date: '2024/07/08 12:00:00' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' updater_enabled: 1 build_mar: 1 torbrowser_incremental_from: + - '13.5' - 13.0.16 - 13.0.15 - - 13.0.14 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' # By default, we sort the list of installed packages. This allows sharing View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android] Pushed new tag firefox-android-115.2.1-13.5-1-build13
by ma1 (＠ma1) 09 Jul '24

09 Jul '24

ma1 pushed new tag firefox-android-115.2.1-13.5-1-build13 at The Tor Project / Applications / firefox-android -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/tree/firef… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-115.13.0esr-13.5-1-build2
by ma1 (＠ma1) 09 Jul '24

09 Jul '24

ma1 pushed new tag base-browser-115.13.0esr-13.5-1-build2 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.13.0esr-13.5-1] 11 commits: Bug 1743329 - Handle ESC key to release pointer lock in parent process; r=smaug
by ma1 (＠ma1) 09 Jul '24

09 Jul '24

ma1 pushed to branch base-browser-115.13.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 7c8b558c by Edgar Chen at 2024-07-09T16:34:24+02:00 Bug 1743329 - Handle ESC key to release pointer lock in parent process; r=smaug Differential Revision: https://phabricator.services.mozilla.com/D211621 - - - - - bdf856f3 by Edgar Chen at 2024-07-09T16:34:24+02:00 Bug 1743329 - Release pointer lock when xul popup is open; r=smaug,pbz Differential Revision: https://phabricator.services.mozilla.com/D211620 - - - - - 0dd2cc3a by Edgar Chen at 2024-07-09T16:34:25+02:00 Bug 1743329 - Use nsMenuPopupFrame in GetVisiblePopups(); r=smaug Differential Revision: https://phabricator.services.mozilla.com/D211619 A further change was needed in nsCaret.cpp, see https://gitlab.torproject.org/tpo/applications/tor-browser/-/merge_requests… - - - - - 27ce49d5 by Otto Länd at 2024-07-09T16:34:25+02:00 Bug 1743329: apply code formatting via Lando # ignore-this-changeset - - - - - bad880b6 by edgul at 2024-07-09T16:34:26+02:00 Bug 1879952 - Fix test expectations with samesite=lax turned on r=tschuster Differential Revision: https://phabricator.services.mozilla.com/D201639 - - - - - 0165eb24 by edgul at 2024-07-09T16:34:26+02:00 Bug 1844827 - Added checks for sub-document navigations from cross-site to same-site in third-party checks when setting a cookie. r=cookie-reviewers,valentin,bvandersloot a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D204074 - - - - - c310d435 by Ed at 2024-07-09T16:34:26+02:00 Bug 1844827 - Update the cookie test expectations for iframe samesite r=cookie-reviewers,valentin a=RyanVM Depends on D199770 Differential Revision: https://phabricator.services.mozilla.com/D199772 - - - - - 44cac309 by Julian Descottes at 2024-07-09T16:34:27+02:00 Bug 1880374 - Disable DNS prefetching if document nodePrincipal is systemPrincipal r=valentin Differential Revision: https://phabricator.services.mozilla.com/D210830 - - - - - 537f4dc7 by Edgar Chen at 2024-07-09T16:34:27+02:00 Bug 1883396 - Exit fullscreen when two Escape keyup events occur in a short time; r=smaug Differential Revision: https://phabricator.services.mozilla.com/D209667 - - - - - 4f428345 by Jan de Mooij at 2024-07-09T16:34:28+02:00 Bug 1900523 - Don't use bailout data for JSJitToWasm frames. r=iain Differential Revision: https://phabricator.services.mozilla.com/D212554 - - - - - ff246121 by Jan de Mooij at 2024-07-09T16:34:28+02:00 Bug 1902983 - Don't use bailout data after iterating Wasm frames. a=RyanVM This is similar to bug 1900523, but the fix there was incomplete because the `JSJitToWasm` frame type is only used when we go through the Wasm JIT entry trampoline. Ion can also call Wasm functions directly and in that case the type will be `FrameType::Exit`. Original Revision: https://phabricator.services.mozilla.com/D214098 Differential Revision: https://phabricator.services.mozilla.com/D214375 - - - - - 22 changed files: - browser/base/content/test/popupNotifications/browser_popupNotification_security_delay.js - dom/base/PointerLockManager.cpp - dom/base/PointerLockManager.h - dom/html/HTMLDNSPrefetch.cpp - dom/ipc/BrowserChild.cpp - dom/ipc/BrowserChild.h - dom/ipc/BrowserParent.cpp - dom/ipc/PBrowser.ipdl - + js/src/jit-test/tests/ion/bug1900523.js - + js/src/jit-test/tests/ion/bug1902983.js - js/src/jit/JSJitFrameIter.cpp - js/src/jit/JSJitFrameIter.h - layout/base/PresShell.cpp - layout/base/PresShell.h - layout/base/nsCaret.cpp - layout/base/nsLayoutUtils.cpp - layout/xul/nsXULPopupManager.cpp - layout/xul/nsXULPopupManager.h - modules/libpref/init/StaticPrefList.yaml - netwerk/cookie/CookieService.cpp - netwerk/cookie/CookieServiceChild.cpp - testing/web-platform/meta/cookies/samesite/setcookie-navigation.https.html.ini Changes: ===================================== browser/base/content/test/popupNotifications/browser_popupNotification_security_delay.js ===================================== @@ -558,5 +558,7 @@ add_task(async function test_notificationDuringFullScreenTransition() { info("Wait for full screen transition end."); await promiseFullScreenTransitionEnd; info("Full screen transition end"); + + await SpecialPowers.popPrefEnv(); }); }); ===================================== dom/base/PointerLockManager.cpp ===================================== @@ -17,8 +17,10 @@ #include "mozilla/dom/BrowsingContext.h" #include "mozilla/dom/Document.h" #include "mozilla/dom/Element.h" +#include "mozilla/dom/PointerEventHandler.h" #include "mozilla/dom/WindowContext.h" #include "nsCOMPtr.h" +#include "nsMenuPopupFrame.h" #include "nsSandboxFlags.h" namespace mozilla { @@ -86,6 +88,25 @@ static void DispatchPointerLockError(Document* aTarget, const char* aMessage) { aMessage); } +static bool IsPopupOpened() { + // Check if any popup is open. + nsXULPopupManager* pm = nsXULPopupManager::GetInstance(); + if (!pm) { + return false; + } + + nsTArray<nsMenuPopupFrame*> popups; + pm->GetVisiblePopups(popups, true); + + for (nsMenuPopupFrame* popup : popups) { + if (popup->GetPopupType() != widget::PopupType::Tooltip) { + return true; + } + } + + return false; +} + static const char* GetPointerLockError(Element* aElement, Element* aCurrentLock, bool aNoFocusCheck = false) { // Check if pointer lock pref is enabled @@ -136,6 +157,10 @@ static const char* GetPointerLockError(Element* aElement, Element* aCurrentLock, } } + if (IsPopupOpened()) { + return "PointerLockDeniedFailedToLock"; + } + return nullptr; } @@ -167,6 +192,14 @@ void PointerLockManager::RequestLock(Element* aElement, /* static */ void PointerLockManager::Unlock(Document* aDoc) { + if (sLockedRemoteTarget) { + MOZ_ASSERT(XRE_IsParentProcess()); + MOZ_ASSERT(!sIsLocked); + Unused << sLockedRemoteTarget->SendReleasePointerLock(); + sLockedRemoteTarget = nullptr; + return; + } + if (!sIsLocked) { return; } @@ -311,14 +344,24 @@ bool PointerLockManager::IsInLockContext(BrowsingContext* aContext) { } /* static */ -bool PointerLockManager::SetLockedRemoteTarget(BrowserParent* aBrowserParent) { +void PointerLockManager::SetLockedRemoteTarget(BrowserParent* aBrowserParent, + nsACString& aError) { MOZ_ASSERT(XRE_IsParentProcess()); if (sLockedRemoteTarget) { - return sLockedRemoteTarget == aBrowserParent; + if (sLockedRemoteTarget != aBrowserParent) { + aError = "PointerLockDeniedInUse"_ns; + } + return; + } + + // Check if any popup is open. + if (IsPopupOpened()) { + aError = "PointerLockDeniedFailedToLock"_ns; + return; } sLockedRemoteTarget = aBrowserParent; - return true; + PointerEventHandler::ReleaseAllPointerCaptureRemoteTarget(); } /* static */ ===================================== dom/base/PointerLockManager.h ===================================== @@ -47,7 +47,8 @@ class PointerLockManager final { // Set/release pointer lock remote target. Should only be called in parent // process. - static bool SetLockedRemoteTarget(dom::BrowserParent* aBrowserParent); + static void SetLockedRemoteTarget(dom::BrowserParent* aBrowserParent, + nsACString& aError); static void ReleaseLockedRemoteTarget(dom::BrowserParent* aBrowserParent); private: ===================================== dom/html/HTMLDNSPrefetch.cpp ===================================== @@ -180,6 +180,13 @@ static bool EnsureDNSService() { } bool HTMLDNSPrefetch::IsAllowed(Document* aDocument) { + // Do not use prefetch if the document's node principal is the system + // principal. + nsCOMPtr<nsIPrincipal> principal = aDocument->NodePrincipal(); + if (principal->IsSystemPrincipal()) { + return false; + } + // There is no need to do prefetch on non UI scenarios such as XMLHttpRequest. return aDocument->IsDNSPrefetchAllowed() && aDocument->GetWindow(); } ===================================== dom/ipc/BrowserChild.cpp ===================================== @@ -39,6 +39,7 @@ #include "mozilla/MouseEvents.h" #include "mozilla/NativeKeyBindingsType.h" #include "mozilla/NullPrincipal.h" +#include "mozilla/PointerLockManager.h" #include "mozilla/Preferences.h" #include "mozilla/PresShell.h" #include "mozilla/ProcessHangMonitor.h" @@ -3184,6 +3185,11 @@ mozilla::ipc::IPCResult BrowserChild::RecvReleaseAllPointerCapture() { return IPC_OK(); } +mozilla::ipc::IPCResult BrowserChild::RecvReleasePointerLock() { + PointerLockManager::Unlock(); + return IPC_OK(); +} + PPaymentRequestChild* BrowserChild::AllocPPaymentRequestChild() { MOZ_CRASH( "We should never be manually allocating PPaymentRequestChild actors"); ===================================== dom/ipc/BrowserChild.h ===================================== @@ -696,6 +696,8 @@ class BrowserChild final : public nsMessageManagerScriptExecutor, mozilla::ipc::IPCResult RecvReleaseAllPointerCapture(); + mozilla::ipc::IPCResult RecvReleasePointerLock(); + private: void HandleDoubleTap(const CSSPoint& aPoint, const Modifiers& aModifiers, const ScrollableLayerGuid& aGuid); ===================================== dom/ipc/BrowserParent.cpp ===================================== @@ -4067,15 +4067,14 @@ static BrowserParent* GetTopLevelBrowserParent(BrowserParent* aBrowserParent) { mozilla::ipc::IPCResult BrowserParent::RecvRequestPointerLock( RequestPointerLockResolver&& aResolve) { - nsCString error; if (sTopLevelWebFocus != GetTopLevelBrowserParent(this)) { - error = "PointerLockDeniedNotFocused"; - } else if (!PointerLockManager::SetLockedRemoteTarget(this)) { - error = "PointerLockDeniedInUse"; - } else { - PointerEventHandler::ReleaseAllPointerCaptureRemoteTarget(); + aResolve("PointerLockDeniedNotFocused"_ns); + return IPC_OK(); } - aResolve(error); + + nsCString error; + PointerLockManager::SetLockedRemoteTarget(this, error); + aResolve(std::move(error)); return IPC_OK(); } ===================================== dom/ipc/PBrowser.ipdl ===================================== @@ -557,18 +557,18 @@ parent: async ImageLoadComplete(nsresult aResult); - /** - * Child informs the parent that a pointer lock has requested/released. - */ - async RequestPointerLock() returns (nsCString error); - async ReleasePointerLock(); - /** * Child informs the parent that a pointer capture has requested/released. */ async RequestPointerCapture(uint32_t aPointerId) returns (bool aSuccess); async ReleasePointerCapture(uint32_t aPointerId); +both: + /** + * informs that a pointer lock has released. + */ + async ReleasePointerLock(); + child: async NativeSynthesisResponse(uint64_t aObserverId, nsCString aResponse); async UpdateSHistory(); ===================================== js/src/jit-test/tests/ion/bug1900523.js ===================================== @@ -0,0 +1,28 @@ +// |jit-test| --fast-warmup; --no-threads; skip-if: !wasmIsSupported() +function f1() { + Promise.allSettled().catch(e => null); + do { + f2(10n, -1n); + try { + f2(-2147483648n); + } catch {} + } while (!inIon()); +} +function f2(x, y) { + const z = x >> x; + z <= z ? z : z; + y ^ y; +} +const binary = wasmTextToBinary(` + (module + (import "m" "f" (func $f)) + (func (export "test") + (call $f) + ) + ) +`); +const mod = new WebAssembly.Module(binary); +const inst = new WebAssembly.Instance(mod, {"m": {"f": f1}}); +for (let i = 0; i < 6; i++) { + inst.exports.test(); +} ===================================== js/src/jit-test/tests/ion/bug1902983.js ===================================== @@ -0,0 +1,24 @@ +// |jit-test| --fast-warmup; --gc-zeal=21,100; skip-if: !wasmIsSupported() +let counter = 0; +function g() { + counter++; + const y = BigInt.asIntN(counter, -883678545n); + const z = y >> y; + BigInt.asUintN(2 ** counter, 883678545n); + try { g(); } catch (e) { } +} +function f() { + for (let i = 0; i < 5; i++) { + for (let j = 0; j < 30; j++) { } + Promise.allSettled().catch(e => null); + counter = 0; + g(); + } +} +const binary = wasmTextToBinary(`(module (import "m" "f" (func $f)) (func (export "test") (call $f)))`); +const mod = new WebAssembly.Module(binary); +const inst = new WebAssembly.Instance(mod, { m: { f: f } }); +for (let i = 0; i < 100; i++) { } +for (let i = 0; i < 5; i++) { + inst.exports.test(); +} ===================================== js/src/jit/JSJitFrameIter.cpp ===================================== @@ -26,22 +26,29 @@ using namespace js; using namespace js::jit; JSJitFrameIter::JSJitFrameIter(const JitActivation* activation) - : JSJitFrameIter(activation, FrameType::Exit, activation->jsExitFP()) {} - -JSJitFrameIter::JSJitFrameIter(const JitActivation* activation, - FrameType frameType, uint8_t* fp) - : current_(fp), - type_(frameType), - resumePCinCurrentFrame_(nullptr), - cachedSafepointIndex_(nullptr), + : current_(activation->jsExitFP()), + type_(FrameType::Exit), activation_(activation) { - MOZ_ASSERT(type_ == FrameType::JSJitToWasm || type_ == FrameType::Exit); + // If we're currently performing a bailout, we have to use the activation's + // bailout data when we start iterating over the activation's frames. if (activation_->bailoutData()) { current_ = activation_->bailoutData()->fp(); type_ = FrameType::Bailout; - } else { - MOZ_ASSERT(!TlsContext.get()->inUnsafeCallWithABI); } + MOZ_ASSERT(!TlsContext.get()->inUnsafeCallWithABI); +} + +JSJitFrameIter::JSJitFrameIter(const JitActivation* activation, + FrameType frameType, uint8_t* fp) + : current_(fp), type_(frameType), activation_(activation) { + // This constructor is only used when resuming iteration after iterating Wasm + // frames in the same JitActivation so ignore activation_->bailoutData(). + // + // Note: FrameType::JSJitToWasm is used for JIT => Wasm calls through the Wasm + // JIT entry trampoline. FrameType::Exit is used for direct Ion => Wasm calls. + MOZ_ASSERT(fp > activation->jsOrWasmExitFP()); + MOZ_ASSERT(type_ == FrameType::JSJitToWasm || type_ == FrameType::Exit); + MOZ_ASSERT(!TlsContext.get()->inUnsafeCallWithABI); } bool JSJitFrameIter::checkInvalidation() const { ===================================== js/src/jit/JSJitFrameIter.h ===================================== @@ -111,14 +111,14 @@ class JSJitFrameIter { protected: uint8_t* current_; FrameType type_; - uint8_t* resumePCinCurrentFrame_; + uint8_t* resumePCinCurrentFrame_ = nullptr; // Size of the current Baseline frame. Equivalent to // BaselineFrame::debugFrameSize_ in debug builds. mozilla::Maybe<uint32_t> baselineFrameSize_; private: - mutable const SafepointIndex* cachedSafepointIndex_; + mutable const SafepointIndex* cachedSafepointIndex_ = nullptr; const JitActivation* activation_; void dumpBaseline() const; ===================================== layout/base/PresShell.cpp ===================================== @@ -8463,24 +8463,46 @@ void PresShell::EventHandler::MaybeHandleKeyboardEventBeforeDispatch( // The event listeners in chrome can prevent this ESC behavior by // calling prevent default on the preceding keydown/press events. - if (!mPresShell->mIsLastChromeOnlyEscapeKeyConsumed && - aKeyboardEvent->mMessage == eKeyUp) { - // ESC key released while in DOM fullscreen mode. - // Fully exit all browser windows and documents from - // fullscreen mode. - Document::AsyncExitFullscreen(nullptr); + if (aKeyboardEvent->mMessage == eKeyUp) { + bool shouldExitFullscreen = + !mPresShell->mIsLastChromeOnlyEscapeKeyConsumed; + if (!shouldExitFullscreen) { + if (mPresShell->mLastConsumedEscapeKeyUpForFullscreen && + (aKeyboardEvent->mTimeStamp - + mPresShell->mLastConsumedEscapeKeyUpForFullscreen) <= + TimeDuration::FromMilliseconds( + StaticPrefs:: + dom_fullscreen_force_exit_on_multiple_escape_interval())) { + shouldExitFullscreen = true; + mPresShell->mLastConsumedEscapeKeyUpForFullscreen = TimeStamp(); + } else { + mPresShell->mLastConsumedEscapeKeyUpForFullscreen = + aKeyboardEvent->mTimeStamp; + } + } + + if (shouldExitFullscreen) { + // ESC key released while in DOM fullscreen mode. + // Fully exit all browser windows and documents from + // fullscreen mode. + Document::AsyncExitFullscreen(nullptr); + } } } - nsCOMPtr<Document> pointerLockedDoc = PointerLockManager::GetLockedDocument(); - if (!mPresShell->mIsLastChromeOnlyEscapeKeyConsumed && pointerLockedDoc) { - // XXX See above comment to understand the reason why this needs - // to claim that the Escape key event is consumed by content - // even though it will be dispatched only into chrome. - aKeyboardEvent->PreventDefaultBeforeDispatch(CrossProcessForwarding::eStop); - aKeyboardEvent->mFlags.mOnlyChromeDispatch = true; - if (aKeyboardEvent->mMessage == eKeyUp) { - PointerLockManager::Unlock(); + if (XRE_IsParentProcess() && + !mPresShell->mIsLastChromeOnlyEscapeKeyConsumed) { + if (PointerLockManager::GetLockedRemoteTarget() || + PointerLockManager::IsLocked()) { + // XXX See above comment to understand the reason why this needs + // to claim that the Escape key event is consumed by content + // even though it will be dispatched only into chrome. + aKeyboardEvent->PreventDefaultBeforeDispatch( + CrossProcessForwarding::eStop); + aKeyboardEvent->mFlags.mOnlyChromeDispatch = true; + if (aKeyboardEvent->mMessage == eKeyUp) { + PointerLockManager::Unlock(); + } } } } ===================================== layout/base/PresShell.h ===================================== @@ -3209,6 +3209,10 @@ class PresShell final : public nsStubDocumentObserver, bool mProcessingReflowCommands : 1; bool mPendingDidDoReflow : 1; + // The last TimeStamp when the keyup event did not exit fullscreen because it + // was consumed. + TimeStamp mLastConsumedEscapeKeyUpForFullscreen; + struct CapturingContentInfo final { CapturingContentInfo() : mRemoteTarget(nullptr), ===================================== layout/base/nsCaret.cpp ===================================== @@ -855,7 +855,7 @@ size_t nsCaret::SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const { bool nsCaret::IsMenuPopupHidingCaret() { // Check if there are open popups. nsXULPopupManager* popMgr = nsXULPopupManager::GetInstance(); - nsTArray<nsIFrame*> popups; + nsTArray<nsMenuPopupFrame*> popups; popMgr->GetVisiblePopups(popups); if (popups.Length() == 0) @@ -873,7 +873,7 @@ bool nsCaret::IsMenuPopupHidingCaret() { // If there's a menu popup open before the popup with // the caret, don't show the caret. for (uint32_t i = 0; i < popups.Length(); i++) { - nsMenuPopupFrame* popupFrame = static_cast<nsMenuPopupFrame*>(popups[i]); + nsMenuPopupFrame* popupFrame = popups[i]; nsIContent* popupContent = popupFrame->GetContent(); if (caretContent->IsInclusiveDescendantOf(popupContent)) { ===================================== layout/base/nsLayoutUtils.cpp ===================================== @@ -138,6 +138,7 @@ #include "nsIScrollableFrame.h" #include "nsIWidget.h" #include "nsListControlFrame.h" +#include "nsMenuPopupFrame.h" #include "nsPIDOMWindow.h" #include "nsPlaceholderFrame.h" #include "nsPresContext.h" @@ -1757,10 +1758,10 @@ nsIFrame* nsLayoutUtils::GetPopupFrameForPoint( if (!pm) { return nullptr; } - nsTArray<nsIFrame*> popups; + nsTArray<nsMenuPopupFrame*> popups; pm->GetVisiblePopups(popups); // Search from top to bottom - for (nsIFrame* popup : popups) { + for (nsMenuPopupFrame* popup : popups) { if (popup->PresContext()->GetRootPresContext() != aRootPresContext) { continue; } ===================================== layout/xul/nsXULPopupManager.cpp ===================================== @@ -53,6 +53,7 @@ #include "mozilla/EventStateManager.h" #include "mozilla/LookAndFeel.h" #include "mozilla/MouseEvents.h" +#include "mozilla/PointerLockManager.h" #include "mozilla/PresShell.h" #include "mozilla/Services.h" #include "mozilla/StaticPrefs_layout.h" @@ -987,6 +988,7 @@ bool nsXULPopupManager::ShowPopupAsNativeMenu(Element* aPopup, int32_t aXPos, EventStateManager::ClearGlobalActiveContent(activeESM); activeESM->StopTrackingDragGesture(true); } + PointerLockManager::Unlock(); PresShell::ReleaseCapturingContent(); return true; @@ -1201,6 +1203,10 @@ void nsXULPopupManager::ShowPopupCallback(Element* aPopup, // Caret visibility may have been affected, ensure that // the caret isn't now drawn when it shouldn't be. CheckCaretDrawingState(); + + if (popupType != PopupType::Tooltip) { + PointerLockManager::Unlock(); + } } nsMenuChainItem* nsXULPopupManager::FindPopup(Element* aPopup) const { @@ -1851,8 +1857,17 @@ nsIContent* nsXULPopupManager::GetTopActiveMenuItemContent() { return nullptr; } -void nsXULPopupManager::GetVisiblePopups(nsTArray<nsIFrame*>& aPopups) { +void nsXULPopupManager::GetVisiblePopups(nsTArray<nsMenuPopupFrame*>& aPopups, + bool aIncludeNativeMenu) { aPopups.Clear(); + if (aIncludeNativeMenu && mNativeMenu) { + nsCOMPtr<nsIContent> popup = mNativeMenu->Element(); + nsMenuPopupFrame* popupFrame = GetPopupFrameForContent(popup, true); + if (popupFrame && popupFrame->IsVisible() && + !popupFrame->IsMouseTransparent()) { + aPopups.AppendElement(popupFrame); + } + } for (nsMenuChainItem* item = mPopups.get(); item; item = item->GetParent()) { // Skip panels which are not visible as well as popups that are transparent // to mouse events. ===================================== layout/xul/nsXULPopupManager.h ===================================== @@ -184,10 +184,10 @@ using HidePopupOptions = mozilla::EnumSet<HidePopupOption>; */ extern const nsNavigationDirection DirectionFromKeyCodeTable[2][6]; -#define NS_DIRECTION_FROM_KEY_CODE(frame, keycode) \ - (DirectionFromKeyCodeTable[static_cast<uint8_t>( \ - (frame)->StyleVisibility()->mDirection)][( \ - keycode)-mozilla::dom::KeyboardEvent_Binding::DOM_VK_END]) +#define NS_DIRECTION_FROM_KEY_CODE(frame, keycode) \ + (DirectionFromKeyCodeTable \ + [static_cast<uint8_t>((frame)->StyleVisibility()->mDirection)] \ + [(keycode) - mozilla::dom::KeyboardEvent_Binding::DOM_VK_END]) // Used to hold information about a popup that is about to be opened. struct PendingPopup { @@ -601,8 +601,10 @@ class nsXULPopupManager final : public nsIDOMEventListener, /** * Return an array of all the open and visible popup frames for * menus, in order from top to bottom. + * XXX should we always include native menu? */ - void GetVisiblePopups(nsTArray<nsIFrame*>& aPopups); + void GetVisiblePopups(nsTArray<nsMenuPopupFrame*>& aPopups, + bool aIncludeNativeMenu = false); /** * Get the node that last triggered a popup or tooltip in the document ===================================== modules/libpref/init/StaticPrefList.yaml ===================================== @@ -2701,6 +2701,13 @@ value: false mirror: always +# The interval in milliseconds between two Escape key events where the second +# key event will exit fullscreen, even if it is consumed. +- name: dom.fullscreen.force_exit_on_multiple_escape_interval + type: uint32_t + value: 500 + mirror: always + # Whether fullscreen should make the rest of the document inert. # This matches other browsers but historically not Gecko. - name: dom.fullscreen.modal @@ -11417,6 +11424,11 @@ value: false mirror: always +- name: network.cookie.sameSite.crossSiteIframeSetCheck + type: bool + value: true + mirror: always + - name: network.cookie.thirdparty.sessionOnly type: bool value: false ===================================== netwerk/cookie/CookieService.cpp ===================================== @@ -675,6 +675,18 @@ CookieService::SetCookieStringFromHttp(nsIURI* aHostURI, if (!addonAllowsLoad) { mThirdPartyUtil->IsThirdPartyChannel(aChannel, aHostURI, &isForeignAndNotAddon); + + // include sub-document navigations from cross-site to same-site + // wrt top-level in our check for thirdparty-ness + if (StaticPrefs::network_cookie_sameSite_crossSiteIframeSetCheck() && + !isForeignAndNotAddon && + loadInfo->GetExternalContentPolicyType() == + ExtContentPolicy::TYPE_SUBDOCUMENT) { + bool triggeringPrincipalIsThirdParty = false; + BasePrincipal::Cast(loadInfo->TriggeringPrincipal()) + ->IsThirdPartyURI(channelURI, &triggeringPrincipalIsThirdParty); + isForeignAndNotAddon |= triggeringPrincipalIsThirdParty; + } } nsCString cookieHeader(aCookieHeader); ===================================== netwerk/cookie/CookieServiceChild.cpp ===================================== @@ -517,6 +517,18 @@ CookieServiceChild::SetCookieStringFromHttp(nsIURI* aHostURI, if (!addonAllowsLoad) { mThirdPartyUtil->IsThirdPartyChannel(aChannel, aHostURI, &isForeignAndNotAddon); + + // include sub-document navigations from cross-site to same-site + // wrt top-level in our check for thirdparty-ness + if (StaticPrefs::network_cookie_sameSite_crossSiteIframeSetCheck() && + !isForeignAndNotAddon && + loadInfo->GetExternalContentPolicyType() == + ExtContentPolicy::TYPE_SUBDOCUMENT) { + bool triggeringPrincipalIsThirdParty = false; + BasePrincipal::Cast(loadInfo->TriggeringPrincipal()) + ->IsThirdPartyURI(finalChannelURI, &triggeringPrincipalIsThirdParty); + isForeignAndNotAddon |= triggeringPrincipalIsThirdParty; + } } bool moreCookies; ===================================== testing/web-platform/meta/cookies/samesite/setcookie-navigation.https.html.ini ===================================== @@ -1,11 +1,4 @@ [setcookie-navigation.https.html] + prefs: [network.cookie.sameSite.laxByDefault:true, network.cookie.sameSite.noneRequiresSecure:true] expected: if (os == "android") and fission: [OK, TIMEOUT] - [Cross-site to same-site iframe navigation should only be able to set SameSite=None cookies.] - expected: FAIL - - [Same-site to cross-site-site iframe navigation should only be able to set SameSite=None cookies.] - expected: FAIL - - [Cross-site to cross-site iframe navigation should only be able to set SameSite=None cookies.] - expected: FAIL View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9d5f7f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9d5f7f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-115.13.0esr-13.5-1-build2
by ma1 (＠ma1) 09 Jul '24

09 Jul '24

ma1 pushed new tag mullvad-browser-115.13.0esr-13.5-1-build2 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.13.0esr-13.5-1] 11 commits: Bug 1743329 - Handle ESC key to release pointer lock in parent process; r=smaug
by ma1 (＠ma1) 09 Jul '24

09 Jul '24

ma1 pushed to branch mullvad-browser-115.13.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 55b8abf1 by Edgar Chen at 2024-07-09T16:29:04+02:00 Bug 1743329 - Handle ESC key to release pointer lock in parent process; r=smaug Differential Revision: https://phabricator.services.mozilla.com/D211621 - - - - - 0019972d by Edgar Chen at 2024-07-09T16:31:30+02:00 Bug 1743329 - Release pointer lock when xul popup is open; r=smaug,pbz Differential Revision: https://phabricator.services.mozilla.com/D211620 - - - - - 84063db0 by Edgar Chen at 2024-07-09T16:31:36+02:00 Bug 1743329 - Use nsMenuPopupFrame in GetVisiblePopups(); r=smaug Differential Revision: https://phabricator.services.mozilla.com/D211619 A further change was needed in nsCaret.cpp, see https://gitlab.torproject.org/tpo/applications/tor-browser/-/merge_requests… - - - - - f77f91b1 by Otto Länd at 2024-07-09T16:31:37+02:00 Bug 1743329: apply code formatting via Lando # ignore-this-changeset - - - - - d2415441 by edgul at 2024-07-09T16:31:37+02:00 Bug 1879952 - Fix test expectations with samesite=lax turned on r=tschuster Differential Revision: https://phabricator.services.mozilla.com/D201639 - - - - - 4f7651bf by edgul at 2024-07-09T16:31:38+02:00 Bug 1844827 - Added checks for sub-document navigations from cross-site to same-site in third-party checks when setting a cookie. r=cookie-reviewers,valentin,bvandersloot a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D204074 - - - - - 2e663f7b by Ed at 2024-07-09T16:31:38+02:00 Bug 1844827 - Update the cookie test expectations for iframe samesite r=cookie-reviewers,valentin a=RyanVM Depends on D199770 Differential Revision: https://phabricator.services.mozilla.com/D199772 - - - - - bb413ac1 by Julian Descottes at 2024-07-09T16:31:39+02:00 Bug 1880374 - Disable DNS prefetching if document nodePrincipal is systemPrincipal r=valentin Differential Revision: https://phabricator.services.mozilla.com/D210830 - - - - - 4e320ce3 by Edgar Chen at 2024-07-09T16:31:39+02:00 Bug 1883396 - Exit fullscreen when two Escape keyup events occur in a short time; r=smaug Differential Revision: https://phabricator.services.mozilla.com/D209667 - - - - - 0c986a88 by Jan de Mooij at 2024-07-09T16:31:40+02:00 Bug 1900523 - Don't use bailout data for JSJitToWasm frames. r=iain Differential Revision: https://phabricator.services.mozilla.com/D212554 - - - - - 3716357a by Jan de Mooij at 2024-07-09T16:31:40+02:00 Bug 1902983 - Don't use bailout data after iterating Wasm frames. a=RyanVM This is similar to bug 1900523, but the fix there was incomplete because the `JSJitToWasm` frame type is only used when we go through the Wasm JIT entry trampoline. Ion can also call Wasm functions directly and in that case the type will be `FrameType::Exit`. Original Revision: https://phabricator.services.mozilla.com/D214098 Differential Revision: https://phabricator.services.mozilla.com/D214375 - - - - - 22 changed files: - browser/base/content/test/popupNotifications/browser_popupNotification_security_delay.js - dom/base/PointerLockManager.cpp - dom/base/PointerLockManager.h - dom/html/HTMLDNSPrefetch.cpp - dom/ipc/BrowserChild.cpp - dom/ipc/BrowserChild.h - dom/ipc/BrowserParent.cpp - dom/ipc/PBrowser.ipdl - + js/src/jit-test/tests/ion/bug1900523.js - + js/src/jit-test/tests/ion/bug1902983.js - js/src/jit/JSJitFrameIter.cpp - js/src/jit/JSJitFrameIter.h - layout/base/PresShell.cpp - layout/base/PresShell.h - layout/base/nsCaret.cpp - layout/base/nsLayoutUtils.cpp - layout/xul/nsXULPopupManager.cpp - layout/xul/nsXULPopupManager.h - modules/libpref/init/StaticPrefList.yaml - netwerk/cookie/CookieService.cpp - netwerk/cookie/CookieServiceChild.cpp - testing/web-platform/meta/cookies/samesite/setcookie-navigation.https.html.ini Changes: ===================================== browser/base/content/test/popupNotifications/browser_popupNotification_security_delay.js ===================================== @@ -558,5 +558,7 @@ add_task(async function test_notificationDuringFullScreenTransition() { info("Wait for full screen transition end."); await promiseFullScreenTransitionEnd; info("Full screen transition end"); + + await SpecialPowers.popPrefEnv(); }); }); ===================================== dom/base/PointerLockManager.cpp ===================================== @@ -17,8 +17,10 @@ #include "mozilla/dom/BrowsingContext.h" #include "mozilla/dom/Document.h" #include "mozilla/dom/Element.h" +#include "mozilla/dom/PointerEventHandler.h" #include "mozilla/dom/WindowContext.h" #include "nsCOMPtr.h" +#include "nsMenuPopupFrame.h" #include "nsSandboxFlags.h" namespace mozilla { @@ -86,6 +88,25 @@ static void DispatchPointerLockError(Document* aTarget, const char* aMessage) { aMessage); } +static bool IsPopupOpened() { + // Check if any popup is open. + nsXULPopupManager* pm = nsXULPopupManager::GetInstance(); + if (!pm) { + return false; + } + + nsTArray<nsMenuPopupFrame*> popups; + pm->GetVisiblePopups(popups, true); + + for (nsMenuPopupFrame* popup : popups) { + if (popup->GetPopupType() != widget::PopupType::Tooltip) { + return true; + } + } + + return false; +} + static const char* GetPointerLockError(Element* aElement, Element* aCurrentLock, bool aNoFocusCheck = false) { // Check if pointer lock pref is enabled @@ -136,6 +157,10 @@ static const char* GetPointerLockError(Element* aElement, Element* aCurrentLock, } } + if (IsPopupOpened()) { + return "PointerLockDeniedFailedToLock"; + } + return nullptr; } @@ -167,6 +192,14 @@ void PointerLockManager::RequestLock(Element* aElement, /* static */ void PointerLockManager::Unlock(Document* aDoc) { + if (sLockedRemoteTarget) { + MOZ_ASSERT(XRE_IsParentProcess()); + MOZ_ASSERT(!sIsLocked); + Unused << sLockedRemoteTarget->SendReleasePointerLock(); + sLockedRemoteTarget = nullptr; + return; + } + if (!sIsLocked) { return; } @@ -311,14 +344,24 @@ bool PointerLockManager::IsInLockContext(BrowsingContext* aContext) { } /* static */ -bool PointerLockManager::SetLockedRemoteTarget(BrowserParent* aBrowserParent) { +void PointerLockManager::SetLockedRemoteTarget(BrowserParent* aBrowserParent, + nsACString& aError) { MOZ_ASSERT(XRE_IsParentProcess()); if (sLockedRemoteTarget) { - return sLockedRemoteTarget == aBrowserParent; + if (sLockedRemoteTarget != aBrowserParent) { + aError = "PointerLockDeniedInUse"_ns; + } + return; + } + + // Check if any popup is open. + if (IsPopupOpened()) { + aError = "PointerLockDeniedFailedToLock"_ns; + return; } sLockedRemoteTarget = aBrowserParent; - return true; + PointerEventHandler::ReleaseAllPointerCaptureRemoteTarget(); } /* static */ ===================================== dom/base/PointerLockManager.h ===================================== @@ -47,7 +47,8 @@ class PointerLockManager final { // Set/release pointer lock remote target. Should only be called in parent // process. - static bool SetLockedRemoteTarget(dom::BrowserParent* aBrowserParent); + static void SetLockedRemoteTarget(dom::BrowserParent* aBrowserParent, + nsACString& aError); static void ReleaseLockedRemoteTarget(dom::BrowserParent* aBrowserParent); private: ===================================== dom/html/HTMLDNSPrefetch.cpp ===================================== @@ -180,6 +180,13 @@ static bool EnsureDNSService() { } bool HTMLDNSPrefetch::IsAllowed(Document* aDocument) { + // Do not use prefetch if the document's node principal is the system + // principal. + nsCOMPtr<nsIPrincipal> principal = aDocument->NodePrincipal(); + if (principal->IsSystemPrincipal()) { + return false; + } + // There is no need to do prefetch on non UI scenarios such as XMLHttpRequest. return aDocument->IsDNSPrefetchAllowed() && aDocument->GetWindow(); } ===================================== dom/ipc/BrowserChild.cpp ===================================== @@ -39,6 +39,7 @@ #include "mozilla/MouseEvents.h" #include "mozilla/NativeKeyBindingsType.h" #include "mozilla/NullPrincipal.h" +#include "mozilla/PointerLockManager.h" #include "mozilla/Preferences.h" #include "mozilla/PresShell.h" #include "mozilla/ProcessHangMonitor.h" @@ -3184,6 +3185,11 @@ mozilla::ipc::IPCResult BrowserChild::RecvReleaseAllPointerCapture() { return IPC_OK(); } +mozilla::ipc::IPCResult BrowserChild::RecvReleasePointerLock() { + PointerLockManager::Unlock(); + return IPC_OK(); +} + PPaymentRequestChild* BrowserChild::AllocPPaymentRequestChild() { MOZ_CRASH( "We should never be manually allocating PPaymentRequestChild actors"); ===================================== dom/ipc/BrowserChild.h ===================================== @@ -696,6 +696,8 @@ class BrowserChild final : public nsMessageManagerScriptExecutor, mozilla::ipc::IPCResult RecvReleaseAllPointerCapture(); + mozilla::ipc::IPCResult RecvReleasePointerLock(); + private: void HandleDoubleTap(const CSSPoint& aPoint, const Modifiers& aModifiers, const ScrollableLayerGuid& aGuid); ===================================== dom/ipc/BrowserParent.cpp ===================================== @@ -4067,15 +4067,14 @@ static BrowserParent* GetTopLevelBrowserParent(BrowserParent* aBrowserParent) { mozilla::ipc::IPCResult BrowserParent::RecvRequestPointerLock( RequestPointerLockResolver&& aResolve) { - nsCString error; if (sTopLevelWebFocus != GetTopLevelBrowserParent(this)) { - error = "PointerLockDeniedNotFocused"; - } else if (!PointerLockManager::SetLockedRemoteTarget(this)) { - error = "PointerLockDeniedInUse"; - } else { - PointerEventHandler::ReleaseAllPointerCaptureRemoteTarget(); + aResolve("PointerLockDeniedNotFocused"_ns); + return IPC_OK(); } - aResolve(error); + + nsCString error; + PointerLockManager::SetLockedRemoteTarget(this, error); + aResolve(std::move(error)); return IPC_OK(); } ===================================== dom/ipc/PBrowser.ipdl ===================================== @@ -557,18 +557,18 @@ parent: async ImageLoadComplete(nsresult aResult); - /** - * Child informs the parent that a pointer lock has requested/released. - */ - async RequestPointerLock() returns (nsCString error); - async ReleasePointerLock(); - /** * Child informs the parent that a pointer capture has requested/released. */ async RequestPointerCapture(uint32_t aPointerId) returns (bool aSuccess); async ReleasePointerCapture(uint32_t aPointerId); +both: + /** + * informs that a pointer lock has released. + */ + async ReleasePointerLock(); + child: async NativeSynthesisResponse(uint64_t aObserverId, nsCString aResponse); async UpdateSHistory(); ===================================== js/src/jit-test/tests/ion/bug1900523.js ===================================== @@ -0,0 +1,28 @@ +// |jit-test| --fast-warmup; --no-threads; skip-if: !wasmIsSupported() +function f1() { + Promise.allSettled().catch(e => null); + do { + f2(10n, -1n); + try { + f2(-2147483648n); + } catch {} + } while (!inIon()); +} +function f2(x, y) { + const z = x >> x; + z <= z ? z : z; + y ^ y; +} +const binary = wasmTextToBinary(` + (module + (import "m" "f" (func $f)) + (func (export "test") + (call $f) + ) + ) +`); +const mod = new WebAssembly.Module(binary); +const inst = new WebAssembly.Instance(mod, {"m": {"f": f1}}); +for (let i = 0; i < 6; i++) { + inst.exports.test(); +} ===================================== js/src/jit-test/tests/ion/bug1902983.js ===================================== @@ -0,0 +1,24 @@ +// |jit-test| --fast-warmup; --gc-zeal=21,100; skip-if: !wasmIsSupported() +let counter = 0; +function g() { + counter++; + const y = BigInt.asIntN(counter, -883678545n); + const z = y >> y; + BigInt.asUintN(2 ** counter, 883678545n); + try { g(); } catch (e) { } +} +function f() { + for (let i = 0; i < 5; i++) { + for (let j = 0; j < 30; j++) { } + Promise.allSettled().catch(e => null); + counter = 0; + g(); + } +} +const binary = wasmTextToBinary(`(module (import "m" "f" (func $f)) (func (export "test") (call $f)))`); +const mod = new WebAssembly.Module(binary); +const inst = new WebAssembly.Instance(mod, { m: { f: f } }); +for (let i = 0; i < 100; i++) { } +for (let i = 0; i < 5; i++) { + inst.exports.test(); +} ===================================== js/src/jit/JSJitFrameIter.cpp ===================================== @@ -26,22 +26,29 @@ using namespace js; using namespace js::jit; JSJitFrameIter::JSJitFrameIter(const JitActivation* activation) - : JSJitFrameIter(activation, FrameType::Exit, activation->jsExitFP()) {} - -JSJitFrameIter::JSJitFrameIter(const JitActivation* activation, - FrameType frameType, uint8_t* fp) - : current_(fp), - type_(frameType), - resumePCinCurrentFrame_(nullptr), - cachedSafepointIndex_(nullptr), + : current_(activation->jsExitFP()), + type_(FrameType::Exit), activation_(activation) { - MOZ_ASSERT(type_ == FrameType::JSJitToWasm || type_ == FrameType::Exit); + // If we're currently performing a bailout, we have to use the activation's + // bailout data when we start iterating over the activation's frames. if (activation_->bailoutData()) { current_ = activation_->bailoutData()->fp(); type_ = FrameType::Bailout; - } else { - MOZ_ASSERT(!TlsContext.get()->inUnsafeCallWithABI); } + MOZ_ASSERT(!TlsContext.get()->inUnsafeCallWithABI); +} + +JSJitFrameIter::JSJitFrameIter(const JitActivation* activation, + FrameType frameType, uint8_t* fp) + : current_(fp), type_(frameType), activation_(activation) { + // This constructor is only used when resuming iteration after iterating Wasm + // frames in the same JitActivation so ignore activation_->bailoutData(). + // + // Note: FrameType::JSJitToWasm is used for JIT => Wasm calls through the Wasm + // JIT entry trampoline. FrameType::Exit is used for direct Ion => Wasm calls. + MOZ_ASSERT(fp > activation->jsOrWasmExitFP()); + MOZ_ASSERT(type_ == FrameType::JSJitToWasm || type_ == FrameType::Exit); + MOZ_ASSERT(!TlsContext.get()->inUnsafeCallWithABI); } bool JSJitFrameIter::checkInvalidation() const { ===================================== js/src/jit/JSJitFrameIter.h ===================================== @@ -111,14 +111,14 @@ class JSJitFrameIter { protected: uint8_t* current_; FrameType type_; - uint8_t* resumePCinCurrentFrame_; + uint8_t* resumePCinCurrentFrame_ = nullptr; // Size of the current Baseline frame. Equivalent to // BaselineFrame::debugFrameSize_ in debug builds. mozilla::Maybe<uint32_t> baselineFrameSize_; private: - mutable const SafepointIndex* cachedSafepointIndex_; + mutable const SafepointIndex* cachedSafepointIndex_ = nullptr; const JitActivation* activation_; void dumpBaseline() const; ===================================== layout/base/PresShell.cpp ===================================== @@ -8463,24 +8463,46 @@ void PresShell::EventHandler::MaybeHandleKeyboardEventBeforeDispatch( // The event listeners in chrome can prevent this ESC behavior by // calling prevent default on the preceding keydown/press events. - if (!mPresShell->mIsLastChromeOnlyEscapeKeyConsumed && - aKeyboardEvent->mMessage == eKeyUp) { - // ESC key released while in DOM fullscreen mode. - // Fully exit all browser windows and documents from - // fullscreen mode. - Document::AsyncExitFullscreen(nullptr); + if (aKeyboardEvent->mMessage == eKeyUp) { + bool shouldExitFullscreen = + !mPresShell->mIsLastChromeOnlyEscapeKeyConsumed; + if (!shouldExitFullscreen) { + if (mPresShell->mLastConsumedEscapeKeyUpForFullscreen && + (aKeyboardEvent->mTimeStamp - + mPresShell->mLastConsumedEscapeKeyUpForFullscreen) <= + TimeDuration::FromMilliseconds( + StaticPrefs:: + dom_fullscreen_force_exit_on_multiple_escape_interval())) { + shouldExitFullscreen = true; + mPresShell->mLastConsumedEscapeKeyUpForFullscreen = TimeStamp(); + } else { + mPresShell->mLastConsumedEscapeKeyUpForFullscreen = + aKeyboardEvent->mTimeStamp; + } + } + + if (shouldExitFullscreen) { + // ESC key released while in DOM fullscreen mode. + // Fully exit all browser windows and documents from + // fullscreen mode. + Document::AsyncExitFullscreen(nullptr); + } } } - nsCOMPtr<Document> pointerLockedDoc = PointerLockManager::GetLockedDocument(); - if (!mPresShell->mIsLastChromeOnlyEscapeKeyConsumed && pointerLockedDoc) { - // XXX See above comment to understand the reason why this needs - // to claim that the Escape key event is consumed by content - // even though it will be dispatched only into chrome. - aKeyboardEvent->PreventDefaultBeforeDispatch(CrossProcessForwarding::eStop); - aKeyboardEvent->mFlags.mOnlyChromeDispatch = true; - if (aKeyboardEvent->mMessage == eKeyUp) { - PointerLockManager::Unlock(); + if (XRE_IsParentProcess() && + !mPresShell->mIsLastChromeOnlyEscapeKeyConsumed) { + if (PointerLockManager::GetLockedRemoteTarget() || + PointerLockManager::IsLocked()) { + // XXX See above comment to understand the reason why this needs + // to claim that the Escape key event is consumed by content + // even though it will be dispatched only into chrome. + aKeyboardEvent->PreventDefaultBeforeDispatch( + CrossProcessForwarding::eStop); + aKeyboardEvent->mFlags.mOnlyChromeDispatch = true; + if (aKeyboardEvent->mMessage == eKeyUp) { + PointerLockManager::Unlock(); + } } } } ===================================== layout/base/PresShell.h ===================================== @@ -3209,6 +3209,10 @@ class PresShell final : public nsStubDocumentObserver, bool mProcessingReflowCommands : 1; bool mPendingDidDoReflow : 1; + // The last TimeStamp when the keyup event did not exit fullscreen because it + // was consumed. + TimeStamp mLastConsumedEscapeKeyUpForFullscreen; + struct CapturingContentInfo final { CapturingContentInfo() : mRemoteTarget(nullptr), ===================================== layout/base/nsCaret.cpp ===================================== @@ -855,7 +855,7 @@ size_t nsCaret::SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const { bool nsCaret::IsMenuPopupHidingCaret() { // Check if there are open popups. nsXULPopupManager* popMgr = nsXULPopupManager::GetInstance(); - nsTArray<nsIFrame*> popups; + nsTArray<nsMenuPopupFrame*> popups; popMgr->GetVisiblePopups(popups); if (popups.Length() == 0) @@ -873,7 +873,7 @@ bool nsCaret::IsMenuPopupHidingCaret() { // If there's a menu popup open before the popup with // the caret, don't show the caret. for (uint32_t i = 0; i < popups.Length(); i++) { - nsMenuPopupFrame* popupFrame = static_cast<nsMenuPopupFrame*>(popups[i]); + nsMenuPopupFrame* popupFrame = popups[i]; nsIContent* popupContent = popupFrame->GetContent(); if (caretContent->IsInclusiveDescendantOf(popupContent)) { ===================================== layout/base/nsLayoutUtils.cpp ===================================== @@ -138,6 +138,7 @@ #include "nsIScrollableFrame.h" #include "nsIWidget.h" #include "nsListControlFrame.h" +#include "nsMenuPopupFrame.h" #include "nsPIDOMWindow.h" #include "nsPlaceholderFrame.h" #include "nsPresContext.h" @@ -1757,10 +1758,10 @@ nsIFrame* nsLayoutUtils::GetPopupFrameForPoint( if (!pm) { return nullptr; } - nsTArray<nsIFrame*> popups; + nsTArray<nsMenuPopupFrame*> popups; pm->GetVisiblePopups(popups); // Search from top to bottom - for (nsIFrame* popup : popups) { + for (nsMenuPopupFrame* popup : popups) { if (popup->PresContext()->GetRootPresContext() != aRootPresContext) { continue; } ===================================== layout/xul/nsXULPopupManager.cpp ===================================== @@ -53,6 +53,7 @@ #include "mozilla/EventStateManager.h" #include "mozilla/LookAndFeel.h" #include "mozilla/MouseEvents.h" +#include "mozilla/PointerLockManager.h" #include "mozilla/PresShell.h" #include "mozilla/Services.h" #include "mozilla/StaticPrefs_layout.h" @@ -987,6 +988,7 @@ bool nsXULPopupManager::ShowPopupAsNativeMenu(Element* aPopup, int32_t aXPos, EventStateManager::ClearGlobalActiveContent(activeESM); activeESM->StopTrackingDragGesture(true); } + PointerLockManager::Unlock(); PresShell::ReleaseCapturingContent(); return true; @@ -1201,6 +1203,10 @@ void nsXULPopupManager::ShowPopupCallback(Element* aPopup, // Caret visibility may have been affected, ensure that // the caret isn't now drawn when it shouldn't be. CheckCaretDrawingState(); + + if (popupType != PopupType::Tooltip) { + PointerLockManager::Unlock(); + } } nsMenuChainItem* nsXULPopupManager::FindPopup(Element* aPopup) const { @@ -1851,8 +1857,17 @@ nsIContent* nsXULPopupManager::GetTopActiveMenuItemContent() { return nullptr; } -void nsXULPopupManager::GetVisiblePopups(nsTArray<nsIFrame*>& aPopups) { +void nsXULPopupManager::GetVisiblePopups(nsTArray<nsMenuPopupFrame*>& aPopups, + bool aIncludeNativeMenu) { aPopups.Clear(); + if (aIncludeNativeMenu && mNativeMenu) { + nsCOMPtr<nsIContent> popup = mNativeMenu->Element(); + nsMenuPopupFrame* popupFrame = GetPopupFrameForContent(popup, true); + if (popupFrame && popupFrame->IsVisible() && + !popupFrame->IsMouseTransparent()) { + aPopups.AppendElement(popupFrame); + } + } for (nsMenuChainItem* item = mPopups.get(); item; item = item->GetParent()) { // Skip panels which are not visible as well as popups that are transparent // to mouse events. ===================================== layout/xul/nsXULPopupManager.h ===================================== @@ -184,10 +184,10 @@ using HidePopupOptions = mozilla::EnumSet<HidePopupOption>; */ extern const nsNavigationDirection DirectionFromKeyCodeTable[2][6]; -#define NS_DIRECTION_FROM_KEY_CODE(frame, keycode) \ - (DirectionFromKeyCodeTable[static_cast<uint8_t>( \ - (frame)->StyleVisibility()->mDirection)][( \ - keycode)-mozilla::dom::KeyboardEvent_Binding::DOM_VK_END]) +#define NS_DIRECTION_FROM_KEY_CODE(frame, keycode) \ + (DirectionFromKeyCodeTable \ + [static_cast<uint8_t>((frame)->StyleVisibility()->mDirection)] \ + [(keycode) - mozilla::dom::KeyboardEvent_Binding::DOM_VK_END]) // Used to hold information about a popup that is about to be opened. struct PendingPopup { @@ -601,8 +601,10 @@ class nsXULPopupManager final : public nsIDOMEventListener, /** * Return an array of all the open and visible popup frames for * menus, in order from top to bottom. + * XXX should we always include native menu? */ - void GetVisiblePopups(nsTArray<nsIFrame*>& aPopups); + void GetVisiblePopups(nsTArray<nsMenuPopupFrame*>& aPopups, + bool aIncludeNativeMenu = false); /** * Get the node that last triggered a popup or tooltip in the document ===================================== modules/libpref/init/StaticPrefList.yaml ===================================== @@ -2701,6 +2701,13 @@ value: false mirror: always +# The interval in milliseconds between two Escape key events where the second +# key event will exit fullscreen, even if it is consumed. +- name: dom.fullscreen.force_exit_on_multiple_escape_interval + type: uint32_t + value: 500 + mirror: always + # Whether fullscreen should make the rest of the document inert. # This matches other browsers but historically not Gecko. - name: dom.fullscreen.modal @@ -11417,6 +11424,11 @@ value: false mirror: always +- name: network.cookie.sameSite.crossSiteIframeSetCheck + type: bool + value: true + mirror: always + - name: network.cookie.thirdparty.sessionOnly type: bool value: false ===================================== netwerk/cookie/CookieService.cpp ===================================== @@ -675,6 +675,18 @@ CookieService::SetCookieStringFromHttp(nsIURI* aHostURI, if (!addonAllowsLoad) { mThirdPartyUtil->IsThirdPartyChannel(aChannel, aHostURI, &isForeignAndNotAddon); + + // include sub-document navigations from cross-site to same-site + // wrt top-level in our check for thirdparty-ness + if (StaticPrefs::network_cookie_sameSite_crossSiteIframeSetCheck() && + !isForeignAndNotAddon && + loadInfo->GetExternalContentPolicyType() == + ExtContentPolicy::TYPE_SUBDOCUMENT) { + bool triggeringPrincipalIsThirdParty = false; + BasePrincipal::Cast(loadInfo->TriggeringPrincipal()) + ->IsThirdPartyURI(channelURI, &triggeringPrincipalIsThirdParty); + isForeignAndNotAddon |= triggeringPrincipalIsThirdParty; + } } nsCString cookieHeader(aCookieHeader); ===================================== netwerk/cookie/CookieServiceChild.cpp ===================================== @@ -517,6 +517,18 @@ CookieServiceChild::SetCookieStringFromHttp(nsIURI* aHostURI, if (!addonAllowsLoad) { mThirdPartyUtil->IsThirdPartyChannel(aChannel, aHostURI, &isForeignAndNotAddon); + + // include sub-document navigations from cross-site to same-site + // wrt top-level in our check for thirdparty-ness + if (StaticPrefs::network_cookie_sameSite_crossSiteIframeSetCheck() && + !isForeignAndNotAddon && + loadInfo->GetExternalContentPolicyType() == + ExtContentPolicy::TYPE_SUBDOCUMENT) { + bool triggeringPrincipalIsThirdParty = false; + BasePrincipal::Cast(loadInfo->TriggeringPrincipal()) + ->IsThirdPartyURI(finalChannelURI, &triggeringPrincipalIsThirdParty); + isForeignAndNotAddon |= triggeringPrincipalIsThirdParty; + } } bool moreCookies; ===================================== testing/web-platform/meta/cookies/samesite/setcookie-navigation.https.html.ini ===================================== @@ -1,11 +1,4 @@ [setcookie-navigation.https.html] + prefs: [network.cookie.sameSite.laxByDefault:true, network.cookie.sameSite.noneRequiresSecure:true] expected: if (os == "android") and fission: [OK, TIMEOUT] - [Cross-site to same-site iframe navigation should only be able to set SameSite=None cookies.] - expected: FAIL - - [Same-site to cross-site-site iframe navigation should only be able to set SameSite=None cookies.] - expected: FAIL - - [Cross-site to cross-site iframe navigation should only be able to set SameSite=None cookies.] - expected: FAIL View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/0b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/0b… You're receiving this email because of your account on gitlab.torproject.org.

1 0