- tbb-commits - lists.torproject.org

[tor-browser] annotated tag FIREFOX_91_12_0esr_BUILD1 created (now 8ecdeb5374c28)
by gitolite role 21 Jul '22

21 Jul '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to annotated tag FIREFOX_91_12_0esr_BUILD1 in repository tor-browser. at 8ecdeb5374c28 (tag) tagging 4b4a2e0e61be073ef3ffebd64cc3d0983467cebb (commit) replaces FIREFOX_91_11_0esr_BUILD1 by Pier Angelo Vendrame on Thu Jul 21 12:03:34 2022 +0200 - Log ----------------------------------------------------------------- Hg tag FIREFOX_91_12_0esr_BUILD1 -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQCHOE9KLO2f598e8HwdW0XkBKIkQUCYtkkkQAKCRDwdW0XkBKI kdefAQDfA304qNWL4Iy1HDO4sbHz0GJyINMYYuP/gQDJTJ0MwwEAxw+oevokJqJh er3LQfvNAAN6uEdWq038TzLQVZBNUA0= =j82J -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-91.12.0esr-11.5-1 created (now 4b4a2e0e61be0)
by gitolite role 21 Jul '22

21 Jul '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch tor-browser-91.12.0esr-11.5-1 in repository tor-browser. at 4b4a2e0e61be0 No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings - a=repo-update, r=dmeehan This branch includes the following new commits: new 7e9871e159f91 No bug - Tagging cec32c7ec3acf7e8f2afa89ee287b2c6f5e6db81 with FIREFOX_91_11_0esr_BUILD1 a=release CLOSED TREE DONTBUILD new 2015928f551b2 Bug 1773717, r=dveditz a=pascalc new a23091bb1e780 No bug - Tagging 7ac9b20c412b4641bd732e789a3be532fe3d4c43 with FIREFOX_91_11_0esr_BUILD2 a=release CLOSED TREE DONTBUILD new 5708c45e68cbe Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release new 786e61e0a9fdd No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings - a=repo-update new ec84cf3ffba9b No bug - Tagging 7ac9b20c412b4641bd732e789a3be532fe3d4c43 with FIREFOX_91_11_0esr_RELEASE a=release CLOSED TREE DONTBUILD new d372d7027be85 No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings tld-suffixes - a=repo-update, r=dmeehan new 49f6e7230c712 No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings - a=repo-update, r=dmeehan new 41eb61960e55c Bug 1771774, r=kershaw, a=dmeehan new b2fe222fdbfec No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings - a=repo-update, r=dmeehan new 6d4b6c152c142 Bug 1737722. esr91. r=botond, a=dmeehan new 4b4a2e0e61be0 No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings - a=repo-update, r=dmeehan The 12 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 12

[tor-browser] branch tor-browser-91.11.0esr-11.5-1 updated (b2ffba38205d1 -> aefd06bdc8b69)
by gitolite role 21 Jul '22

21 Jul '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch tor-browser-91.11.0esr-11.5-1 in repository tor-browser. from b2ffba38205d1 Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser new c4471d5950e6f fixup! Bug 40562: Added Tor-related preferences to 000-tor-browser.js new 35c90c8ee95ba fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection new 382f41ec168a3 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection new b8802512aad78 Bug 41050: HTTPS-Only Mode Alert's "Continue to HTTP Site" button doesn't work on IP addresses new 11dff59f1d32a fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection new 7e4d47b3a5cd2 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection new aefd06bdc8b69 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: browser/app/profile/000-tor-browser.js | 2 +- .../torpreferences/content/bridgeQrDialog.xhtml | 10 ++- .../components/torpreferences/content/check.svg | 3 + .../torpreferences/content/connectionPane.js | 33 +++++--- .../torpreferences/content/connectionPane.xhtml | 9 +- .../torpreferences/content/provideBridgeDialog.jsm | 5 +- .../torpreferences/content/torPreferences.css | 98 ++++++++++++++-------- browser/components/torpreferences/jar.mn | 1 + toolkit/actors/AboutHttpsOnlyErrorParent.jsm | 17 +++- 9 files changed, 117 insertions(+), 61 deletions(-) create mode 100644 browser/components/torpreferences/content/check.svg -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 7

[tor-browser] branch tor-browser-91.11.0esr-12.0-1 updated: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
by gitolite role 21 Jul '22

21 Jul '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-91.11.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.11.0esr-12.0-1 by this push: new 4ff5808811ac9 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection 4ff5808811ac9 is described below commit 4ff5808811ac9ab92e3b1634ba9925e393a480a1 Author: WofWca <wofwca(a)protonmail.com> AuthorDate: Tue Jul 19 21:23:25 2022 +0300 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection improvement: "add a bridge manually": populate textarea with exising bridges even if bridges are disabled Otherwsie if there were some bridges already, they would get removed --- browser/components/torpreferences/content/provideBridgeDialog.jsm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/browser/components/torpreferences/content/provideBridgeDialog.jsm b/browser/components/torpreferences/content/provideBridgeDialog.jsm index f20cf9ddd925d..bc6a841138fb6 100644 --- a/browser/components/torpreferences/content/provideBridgeDialog.jsm +++ b/browser/components/torpreferences/content/provideBridgeDialog.jsm @@ -35,10 +35,7 @@ class ProvideBridgeDialog { "placeholder", TorStrings.settings.provideBridgePlaceholder ); - if ( - TorSettings.bridges.enabled && - TorSettings.bridges.source == TorBridgeSource.UserProvided - ) { + if (TorSettings.bridges.source == TorBridgeSource.UserProvided) { this._textarea.value = TorSettings.bridges.bridge_strings.join("\n"); } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch master updated (0ce5e1d -> 9d26ddb)
by gitolite role 21 Jul '22

21 Jul '22

This is an automated email from the git hooks/post-receive script. boklm pushed a change to branch master in repository builders/tor-browser-build. from 0ce5e1d Bug 40583: Fix build of goansicolor add 9d26ddb Bug 40292+40467: Remote tools/ansible No new revisions were added by this update. Summary of changes: tools/ansible/Makefile | 5 -- tools/ansible/README | 50 ------------ tools/ansible/ansible-fpcentral.cfg | 2 - tools/ansible/fpcentral.yml | 4 - tools/ansible/inventory | 8 -- tools/ansible/roles/fpcentral/defaults/main.yml | 5 -- tools/ansible/roles/fpcentral/tasks/main.yml | 18 ----- .../roles/fpcentral/templates/fpcentral.wsgi | 14 ---- tools/ansible/roles/mta/tasks/main.yml | 24 ------ .../roles/tbb-builder/files/sudoers-tbb-build | 1 - tools/ansible/roles/tbb-builder/tasks/main.yml | 47 ----------- tools/ansible/roles/tbb-team/defaults/main.yml | 11 --- tools/ansible/roles/tbb-team/files/boklm.pub | 1 - tools/ansible/roles/tbb-team/files/cohosh.pub | 1 - tools/ansible/roles/tbb-team/files/gk.pub | 1 - tools/ansible/roles/tbb-team/files/mikeperry.pub | 1 - tools/ansible/roles/tbb-team/files/pospeselr.pub | 1 - tools/ansible/roles/tbb-team/files/sukhbir.pub | 1 - tools/ansible/roles/tbb-team/tasks/main.yml | 22 ------ .../roles/unattended-upgrades/defaults/main.yml | 2 - .../roles/unattended-upgrades/tasks/main.yml | 18 ----- .../unattended-upgrades/templates/20auto-upgrades | 2 - .../templates/50unattended-upgrades | 92 ---------------------- tools/ansible/roles/useful-packages/tasks/main.yml | 14 ---- tools/ansible/tbb-build.yml | 9 --- 25 files changed, 354 deletions(-) delete mode 100644 tools/ansible/Makefile delete mode 100644 tools/ansible/README delete mode 100644 tools/ansible/ansible-fpcentral.cfg delete mode 100644 tools/ansible/fpcentral.yml delete mode 100644 tools/ansible/inventory delete mode 100644 tools/ansible/roles/fpcentral/defaults/main.yml delete mode 100644 tools/ansible/roles/fpcentral/tasks/main.yml delete mode 100644 tools/ansible/roles/fpcentral/templates/fpcentral.wsgi delete mode 100644 tools/ansible/roles/mta/tasks/main.yml delete mode 100644 tools/ansible/roles/tbb-builder/files/sudoers-tbb-build delete mode 100644 tools/ansible/roles/tbb-builder/tasks/main.yml delete mode 100644 tools/ansible/roles/tbb-team/defaults/main.yml delete mode 100644 tools/ansible/roles/tbb-team/files/boklm.pub delete mode 100644 tools/ansible/roles/tbb-team/files/cohosh.pub delete mode 100644 tools/ansible/roles/tbb-team/files/gk.pub delete mode 100644 tools/ansible/roles/tbb-team/files/mikeperry.pub delete mode 100644 tools/ansible/roles/tbb-team/files/pospeselr.pub delete mode 100644 tools/ansible/roles/tbb-team/files/sukhbir.pub delete mode 100644 tools/ansible/roles/tbb-team/tasks/main.yml delete mode 100644 tools/ansible/roles/unattended-upgrades/defaults/main.yml delete mode 100644 tools/ansible/roles/unattended-upgrades/tasks/main.yml delete mode 100644 tools/ansible/roles/unattended-upgrades/templates/20auto-upgrades delete mode 100644 tools/ansible/roles/unattended-upgrades/templates/50unattended-upgrades delete mode 100644 tools/ansible/roles/useful-packages/tasks/main.yml delete mode 100644 tools/ansible/tbb-build.yml -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 40292+40467: Remote tools/ansible
by gitolite role 21 Jul '22

21 Jul '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 9d26ddb Bug 40292+40467: Remote tools/ansible 9d26ddb is described below commit 9d26ddbb0eb7e6d284fc47b1c02f396209202f3d Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Wed Jul 20 18:03:15 2022 +0200 Bug 40292+40467: Remote tools/ansible Since build-sunet-a and fpcentral don't exist anymore, we can remove the tools/ansible directory. Closes #40292 #40467 --- tools/ansible/Makefile | 5 -- tools/ansible/README | 50 ------------ tools/ansible/ansible-fpcentral.cfg | 2 - tools/ansible/fpcentral.yml | 4 - tools/ansible/inventory | 8 -- tools/ansible/roles/fpcentral/defaults/main.yml | 5 -- tools/ansible/roles/fpcentral/tasks/main.yml | 18 ----- .../roles/fpcentral/templates/fpcentral.wsgi | 14 ---- tools/ansible/roles/mta/tasks/main.yml | 24 ------ .../roles/tbb-builder/files/sudoers-tbb-build | 1 - tools/ansible/roles/tbb-builder/tasks/main.yml | 47 ----------- tools/ansible/roles/tbb-team/defaults/main.yml | 11 --- tools/ansible/roles/tbb-team/files/boklm.pub | 1 - tools/ansible/roles/tbb-team/files/cohosh.pub | 1 - tools/ansible/roles/tbb-team/files/gk.pub | 1 - tools/ansible/roles/tbb-team/files/mikeperry.pub | 1 - tools/ansible/roles/tbb-team/files/pospeselr.pub | 1 - tools/ansible/roles/tbb-team/files/sukhbir.pub | 1 - tools/ansible/roles/tbb-team/tasks/main.yml | 22 ------ .../roles/unattended-upgrades/defaults/main.yml | 2 - .../roles/unattended-upgrades/tasks/main.yml | 18 ----- .../unattended-upgrades/templates/20auto-upgrades | 2 - .../templates/50unattended-upgrades | 92 ---------------------- tools/ansible/roles/useful-packages/tasks/main.yml | 14 ---- tools/ansible/tbb-build.yml | 9 --- 25 files changed, 354 deletions(-) diff --git a/tools/ansible/Makefile b/tools/ansible/Makefile deleted file mode 100644 index 608f932..0000000 --- a/tools/ansible/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -ansible-tbb-build: - ansible-playbook -i inventory tbb-build.yml - -fpcentral: - ANSIBLE_CONFIG='$((a)D)/ansible-fpcentral.cfg' ansible-playbook -i inventory --ask-become-pass fpcentral.yml diff --git a/tools/ansible/README b/tools/ansible/README deleted file mode 100644 index 2cdcfcb..0000000 --- a/tools/ansible/README +++ /dev/null @@ -1,50 +0,0 @@ -This directory contains some ansible script that we use to set up some -machines that we use for Tor Browser development. - -To deploy some changes you need the ansible package to be installed on -your machine, and be able to log in with ssh as root on the machine(s) -where the changes need to be deployed. - -You can then use one of the following makefile targets: - -ansible-tbb-build: - Deploy changes to the machine used by Tor Browser team members to do - some Tor Browser builds. See below for more details about adding, - removing and updating users on this machine. - -fpcentral: - Deploy fpcentral to forrestii.torproject.org. To be able to run this - you need to be in the fpcentral tpo ldap group. Your ldap password will - be asked, to sudo to the fpcentral user. - - -Adding, removing, updating users on the Tor Browser team build machine -====================================================================== - -The tbb-build.yml playbook is used to set up the Tor Browser team build -machine (build-sunet-a.torproject.net) - -To add a new user: - - - add the new username to roles/tbb-team/defaults/main.yml - - add the ssh key file to roles/tbb-team/files/${username}.pub - - run "make ansible-tbb-build" - -To update the ssh key for an existing user: - - update roles/tbb-team/files/${username}.pub - - run "make ansible-tbb-build" - -To remove a user and their home directory from the build machine: - - in roles/tbb-team/defaults/main.yml, move the user from - tbb_team_members to tbb_team_alums - - remove roles/tbb-team/files/${username}.pub - - run "make ansible-tbb-build" - -To install additional packages you can add them to -roles/tbb-builder/tasks/main.yml if they are necessary to build -Tor Browser, or to roles/useful-packages/tasks/main.yml otherwise. - -If you don't want to apply the changes directly, but first want to check -what would be the changes done by ansible, you can edit the ansible-playbook -command in the Makefile to add the --check argument. - diff --git a/tools/ansible/ansible-fpcentral.cfg b/tools/ansible/ansible-fpcentral.cfg deleted file mode 100644 index 2ee3fb4..0000000 --- a/tools/ansible/ansible-fpcentral.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[defaults] -allow_world_readable_tmpfiles=True diff --git a/tools/ansible/fpcentral.yml b/tools/ansible/fpcentral.yml deleted file mode 100644 index 80421a3..0000000 --- a/tools/ansible/fpcentral.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- hosts: fpcentral - roles: - - role: fpcentral diff --git a/tools/ansible/inventory b/tools/ansible/inventory deleted file mode 100644 index 32a5805..0000000 --- a/tools/ansible/inventory +++ /dev/null @@ -1,8 +0,0 @@ -build-sunet-a ansible_ssh_user=root ansible_ssh_host=build-sunet-a.torproject.net -fpcentral ansible_become=True ansible_become_method=sudo ansible_become_user=fpcentral ansible_ssh_host=forrestii.torproject.org allow_world_readable_tmpfiles=True - -[tbb-build] -build-sunet-a - -[fpcentral] -fpcentral diff --git a/tools/ansible/roles/fpcentral/defaults/main.yml b/tools/ansible/roles/fpcentral/defaults/main.yml deleted file mode 100644 index e43b348..0000000 --- a/tools/ansible/roles/fpcentral/defaults/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -fpcentral_git_url: https://git.torproject.org/fpcentral.git -fpcentral_git_commit: fc8fc9113e5ee2f84ce30f0b8051772dd9d75447 -fpcentral_rootdir: /srv/fpcentral.tbb.torproject.org -fpcentral_virtualenv: "{{ fpcentral_rootdir }}/fpcentral-virtualenv" diff --git a/tools/ansible/roles/fpcentral/tasks/main.yml b/tools/ansible/roles/fpcentral/tasks/main.yml deleted file mode 100644 index e5a4d2e..0000000 --- a/tools/ansible/roles/fpcentral/tasks/main.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- name: clone fpcentral git repo - git: repo={{ fpcentral_git_url }} dest={{ fpcentral_rootdir }}/fpcentral - version={{ fpcentral_git_commit }} - -- name: create python3 virtual env - command: "python3 -mvirtualenv -p python3 {{ fpcentral_virtualenv }}" - args: - creates: "{{ fpcentral_virtualenv }}" - -- name: install required python modules - command: "{{ fpcentral_virtualenv }}/bin/pip3 install -r {{ fpcentral_rootdir }}/fpcentral/requirements.txt" - -- template: - src: fpcentral.wsgi - dest: "{{ fpcentral_rootdir }}/fpcentral/fpcentral.wsgi" - mode: 0755 - diff --git a/tools/ansible/roles/fpcentral/templates/fpcentral.wsgi b/tools/ansible/roles/fpcentral/templates/fpcentral.wsgi deleted file mode 100644 index d4d7575..0000000 --- a/tools/ansible/roles/fpcentral/templates/fpcentral.wsgi +++ /dev/null @@ -1,14 +0,0 @@ -activate_this = '{{ fpcentral_virtualenv }}/bin/activate_this.py' -with open(activate_this) as file_: - exec(file_.read(), dict(__file__=activate_this)) - -import sys -sys.path.insert(0, '{{ fpcentral_rootdir }}/fpcentral') -import os -os.chdir('{{ fpcentral_rootdir }}/fpcentral') -from run import app as application - -# we include the fpcentral commit as a comment, to make sure the -# fpcentral.wsgi file is modified when the commit is updated, causing -# the process to be restarted: -# {{ fpcentral_git_commit }} diff --git a/tools/ansible/roles/mta/tasks/main.yml b/tools/ansible/roles/mta/tasks/main.yml deleted file mode 100644 index 9c5ac49..0000000 --- a/tools/ansible/roles/mta/tasks/main.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- - -- name: Install dma (DragonFly Mail Agent) - apt: - name: dma - state: present - -- name: create dma auth.conf - copy: - dest: /etc/dma/auth.conf - mode: 0640 - owner: root - group: mail - content: "{{ dma_auth_conf }}" - when: dma_auth_conf is defined - -- name: create dma.conf - copy: - dest: /etc/dma/dma.conf - mode: 0640 - owner: root - group: mail - content: "{{ dma_conf }}" - when: dma_conf is defined diff --git a/tools/ansible/roles/tbb-builder/files/sudoers-tbb-build b/tools/ansible/roles/tbb-builder/files/sudoers-tbb-build deleted file mode 100644 index 5f2e48d..0000000 --- a/tools/ansible/roles/tbb-builder/files/sudoers-tbb-build +++ /dev/null @@ -1 +0,0 @@ -%tbb-build ALL=(ALL) NOPASSWD: ALL diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml b/tools/ansible/roles/tbb-builder/tasks/main.yml deleted file mode 100644 index 92b35e8..0000000 --- a/tools/ansible/roles/tbb-builder/tasks/main.yml +++ /dev/null @@ -1,47 +0,0 @@ ---- - -- name: Install dependencies for Tor Browser build - apt: - name: "{{ item }}" - state: present - with_items: - - git - - sudo - - libyaml-libyaml-perl - - libtemplate-perl - - libio-handle-util-perl - - libio-all-perl - - libio-captureoutput-perl - - libpath-tiny-perl - - libstring-shellquote-perl - - libsort-versions-perl - - libdigest-sha-perl - - libdata-uuid-perl - - libdata-dump-perl - - libfile-copy-recursive-perl - - libfile-slurp-perl - - libgtk2.0-dev - - curl - - runc - - mercurial - -- name: Install dependencies for update_responses script - apt: - name: "{{ item }}" - state: present - with_items: - - libfindbin-libs-perl - - libxml-writer-perl - - libparallel-forkmanager-perl - - libxml-libxml-perl - - libwww-perl - - libjson-perl - - libyaml-perl - -- name: Create the tbb-build group - group: - name: tbb-build - state: present - -- name: Give sudo access to tbb-build group members - copy: src=sudoers-tbb-build dest=/etc/sudoers.d/tbb-build owner=root group=root mode=0440 diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml deleted file mode 100644 index 879c435..0000000 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -tbb_team_members: - - boklm - - cohosh - - gk - - mikeperry - - pospeselr - - sukhbir -tbb_team_alums: - - brade - - mcs diff --git a/tools/ansible/roles/tbb-team/files/boklm.pub b/tools/ansible/roles/tbb-team/files/boklm.pub deleted file mode 100644 index 471f271..0000000 --- a/tools/ansible/roles/tbb-team/files/boklm.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCuY6Clt4tqljhnQAfIAq2RcuB3UgQ1odLtYc+AlnwcgWgYoqByGXT52YnYd44MQ0rPpXGh6M5MeXGF33OOLkBm8QeFHiev4njq/14A5qMIH+xV4T/ft1vEE3PTuarzyhv/Qp1s0dt4/XibzMPND5zFQJUFsTON6WYix0cwBOa80W46P56jPca56kTnL045N8MJNFA4ELby68QaMMK0lEzupgLtzRnqc123paZr3FAgCOxNlYC83ftAsDuVNCzbp0+i3W0ZWBbqVo+wWbty7WJK4TjuQszS2oP+d5xxktXUVyVXu2xm0BV0kXgh6lV4ixDPKQsZrlUYalFN5QIQWwzb q-wo diff --git a/tools/ansible/roles/tbb-team/files/cohosh.pub b/tools/ansible/roles/tbb-team/files/cohosh.pub deleted file mode 100644 index 907a763..0000000 --- a/tools/ansible/roles/tbb-team/files/cohosh.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILDttnqVcCBFEtAfbYM0POVjAt5fBVwNPU3IUPhxLJnw diff --git a/tools/ansible/roles/tbb-team/files/gk.pub b/tools/ansible/roles/tbb-team/files/gk.pub deleted file mode 100644 index a0985d9..0000000 --- a/tools/ansible/roles/tbb-team/files/gk.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDGAn0mJnf4IUiASnXgOHE6zsCtO0P+TFS6YauchrC2knH+kJXyHswHibNO/R16JayyPkgX5c00Z3QAO2gkvYODLO37/lwWyy7/58Zqa6XRz5VnwvJ1eCzHJrBa+ll57GEsBaU9+tSXVnk6mF2d4+/mzAxdBco1N2mAd7KxjRgJFX+UV2aDDWalLiHzqj1ZQIt/4P/z4pLU1fPISy1EygA7pZ/gOGV3T0hpH/yxrOc5cspJb4APA6fWzsFBE2SFWx/+4cvtorIUi55UWbWqen3BDrQxFaGEovWGYsa0ykMbA3TZ/cTGqkneJjFzJuFYwu+x/XMUEUYo7TqXzInz1kOMLep/1MQWX0n3NCUoUMxBlg93YaEnkff0D7pAQsi2Km+6PQXYiHSve61IBVaq6J2deZnrsriI+u3OR5/5OuUnrpbQI4QyDojAF/ZFtKeaLsWQGgjz [...] diff --git a/tools/ansible/roles/tbb-team/files/mikeperry.pub b/tools/ansible/roles/tbb-team/files/mikeperry.pub deleted file mode 100644 index 277f539..0000000 --- a/tools/ansible/roles/tbb-team/files/mikeperry.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6R7SmJ88cNencqZTtUmU8cpVpOJCzEklXNIBF4y44ZO2QY9iqJdbC2vuMV68/XUP1G9rz1BOTvyyO3T4/KlvRlHiQEMOy2FObc5znVOAshEqSm450AjGAjpOClV+EpJrvd7LqGIcR6/rLZym7P4aYHkUW/C5DEvyQZUmiCnFSUv8Zh2PFOATP4Veyi0PbJvEPZ73n9QZXDq4mERa1dvwBnGIlXJwKdf3U0Eyx1rZe8OIMY9Rpn+Gq3iuk+1u4SCMiUQGNJ1diG/t40leXlhN3N2cIEBUISpPtwpmTw988UwKneKCXsdi6Dhu2XWoSHpsQrjPDmh9vbpi2yLvlgGv2Q== user@remote diff --git a/tools/ansible/roles/tbb-team/files/pospeselr.pub b/tools/ansible/roles/tbb-team/files/pospeselr.pub deleted file mode 100644 index 17274a4..0000000 --- a/tools/ansible/roles/tbb-team/files/pospeselr.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDN8+GoMp+QiVpBXK8raB2u+3+BdqCL1CCTRzVu6jr+nqvwF2zFgH6qW6WTz85PEM1Lm66wY3SNwsNoCr3Kt53MQa1g6V9sGudi7kYUoV3u7LxLVMwNKK9K6YZZjDFCWBmhcvw/ntFccShgkv8zSCtcbHp1bLivImFi8MCTHJ/Uul/moi0vd3OPXYWGhPQDnLW7+q3o6DenffvjkdP/88QIJe63b/TesLLiC+Czeuu6sTNftCgBVmMwHyYrFPeIrQsiz2tYNgG9Iyd06ElozouGywFvT/s6zKnQUw7J5Mcv4MLXIj/6n75r/g/lVNT3cwho5RlBkGCC+xUH7+Us2QliuILp1EgaVsqB989j4EyTrYoUxfBhtXlmUXbaydO0cYG2tVwk7QRx6PTPO1xcR/UXo3VPio9/BHCZ1d2CPV0xCaXoCMp09fTSLCBM4o0NoxrFJAfb [...] diff --git a/tools/ansible/roles/tbb-team/files/sukhbir.pub b/tools/ansible/roles/tbb-team/files/sukhbir.pub deleted file mode 100644 index 3277487..0000000 --- a/tools/ansible/roles/tbb-team/files/sukhbir.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCs5gQrS9m8H4qiR+Q0BT85jIHFgSb3ns2l1M1JWgWyI5eZvXCxIq1G9xI+HOp86mHA2XX7uWSCKWiWM1lt4UnM4jHm5thC2MEsKVqHaHF7s+lXq2uhybUma2fxXdYc9AM/TxujKKJ6U5qIkqLsX3HF5tQtEKY2lgPXgXNpldfX/IhtBWOfmRGTH5iu1hBIhhMAz31lTcYR4AOpcSeeMGRhYEka5RrH492OLfCVxphtlRtXm4CtAL4NpNe/cMZnntqprJJAjRJC71gU3OpT5a2zKKctN/5wTwAWpR1URXrQK4Mu37angYhjR/698iTJVAv2XxEgkB+NUCse98cIMUj5 sukhbir.in(a)gmail.com diff --git a/tools/ansible/roles/tbb-team/tasks/main.yml b/tools/ansible/roles/tbb-team/tasks/main.yml deleted file mode 100644 index 8e63416..0000000 --- a/tools/ansible/roles/tbb-team/tasks/main.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- name: Add tbb-team users - user: - name: "{{ item }}" - state: present - groups: tbb-build - shell: /bin/bash - with_items: "{{ tbb_team_members }}" - -- name: Add ssh keys to authorized_keys - authorized_key: - user: "{{ item }}" - state: present - key: "{{ lookup('file', item + '.pub') }}" - with_items: "{{ tbb_team_members }}" - -- name: Remove tbb-team alums users - user: - name: "{{ item }}" - state: absent - remove: yes - with_items: "{{ tbb_team_alums }}" diff --git a/tools/ansible/roles/unattended-upgrades/defaults/main.yml b/tools/ansible/roles/unattended-upgrades/defaults/main.yml deleted file mode 100644 index f6351a7..0000000 --- a/tools/ansible/roles/unattended-upgrades/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -unattended_upgrade_mail: 'boklm(a)mars-attacks.org' diff --git a/tools/ansible/roles/unattended-upgrades/tasks/main.yml b/tools/ansible/roles/unattended-upgrades/tasks/main.yml deleted file mode 100644 index de0892b..0000000 --- a/tools/ansible/roles/unattended-upgrades/tasks/main.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- - -- name: Install unattended-updates - apt: - name: unattended-upgrades - state: present - -- name: Install apt-listchanges - apt: - name: apt-listchanges - state: present - -- name: create /etc/apt/apt.conf.d/50unattended-upgrades - template: src=50unattended-upgrades dest=/etc/apt/apt.conf.d/50unattended-upgrades mode=0644 - -- name: create /etc/apt/apt.conf.d/20auto-upgrades - template: src=20auto-upgrades dest=/etc/apt/apt.conf.d/20auto-upgrades mode=0644 - diff --git a/tools/ansible/roles/unattended-upgrades/templates/20auto-upgrades b/tools/ansible/roles/unattended-upgrades/templates/20auto-upgrades deleted file mode 100644 index 8d6d7c8..0000000 --- a/tools/ansible/roles/unattended-upgrades/templates/20auto-upgrades +++ /dev/null @@ -1,2 +0,0 @@ -APT::Periodic::Update-Package-Lists "1"; -APT::Periodic::Unattended-Upgrade "1"; diff --git a/tools/ansible/roles/unattended-upgrades/templates/50unattended-upgrades b/tools/ansible/roles/unattended-upgrades/templates/50unattended-upgrades deleted file mode 100644 index d4904ab..0000000 --- a/tools/ansible/roles/unattended-upgrades/templates/50unattended-upgrades +++ /dev/null @@ -1,92 +0,0 @@ -// Unattended-Upgrade::Origins-Pattern controls which packages are -// upgraded. -// -// Lines below have the format format is "keyword=value,...". A -// package will be upgraded only if the values in its metadata match -// all the supplied keywords in a line. (In other words, omitted -// keywords are wild cards.) The keywords originate from the Release -// file, but several aliases are accepted. The accepted keywords are: -// a,archive,suite (eg, "stable") -// c,component (eg, "main", "crontrib", "non-free") -// l,label (eg, "Debian", "Debian-Security") -// o,origin (eg, "Debian", "Unofficial Multimedia Packages") -// n,codename (eg, "jessie", "jessie-updates") -// site (eg, "http.debian.net") -// The available values on the system are printed by the command -// "apt-cache policy", and can be debugged by running -// "unattended-upgrades -d" and looking at the log file. -// -// Within lines unattended-upgrades allows 2 macros whose values are -// derived from /etc/debian_version: -// ${distro_id} Installed origin. -// ${distro_codename} Installed codename (eg, "jessie") -Unattended-Upgrade::Origins-Pattern { - // Codename based matching: - // This will follow the migration of a release through different - // archives (e.g. from testing to stable and later oldstable). -// "o=Debian,n=jessie"; -// "o=Debian,n=jessie-updates"; -// "o=Debian,n=jessie-proposed-updates"; -// "o=Debian,n=jessie,l=Debian-Security"; - - // Archive or Suite based matching: - // Note that this will silently match a different release after - // migration to the specified archive (e.g. testing becomes the - // new stable). -// "o=Debian,a=stable"; -// "o=Debian,a=stable-updates"; -// "o=Debian,a=proposed-updates"; - "origin=Debian,codename=${distro_codename},label=Debian-Security"; -}; - -// List of packages to not update (regexp are supported) -Unattended-Upgrade::Package-Blacklist { -// "vim"; -// "libc6"; -// "libc6-dev"; -// "libc6-i686"; -}; - -// This option allows you to control if on a unclean dpkg exit -// unattended-upgrades will automatically run -// dpkg --force-confold --configure -a -// The default is true, to ensure updates keep getting installed -//Unattended-Upgrade::AutoFixInterruptedDpkg "false"; - -// Split the upgrade into the smallest possible chunks so that -// they can be interrupted with SIGUSR1. This makes the upgrade -// a bit slower but it has the benefit that shutdown while a upgrade -// is running is possible (with a small delay) -//Unattended-Upgrade::MinimalSteps "true"; - -// Install all unattended-upgrades when the machine is shuting down -// instead of doing it in the background while the machine is running -// This will (obviously) make shutdown slower -//Unattended-Upgrade::InstallOnShutdown "true"; - -// Send email to this address for problems or packages upgrades -// If empty or unset then no email is sent, make sure that you -// have a working mail setup on your system. A package that provides -// 'mailx' must be installed. E.g. "user(a)example.com" -Unattended-Upgrade::Mail "{{ unattended_upgrade_mail }}"; - -// Set this value to "true" to get emails only on errors. Default -// is to always send a mail if Unattended-Upgrade::Mail is set -//Unattended-Upgrade::MailOnlyOnError "true"; - -// Do automatic removal of new unused dependencies after the upgrade -// (equivalent to apt-get autoremove) -//Unattended-Upgrade::Remove-Unused-Dependencies "false"; - -// Automatically reboot *WITHOUT CONFIRMATION* if -// the file /var/run/reboot-required is found after the upgrade -//Unattended-Upgrade::Automatic-Reboot "false"; - -// If automatic reboot is enabled and needed, reboot at the specific -// time instead of immediately -// Default: "now" -//Unattended-Upgrade::Automatic-Reboot-Time "02:00"; - -// Use apt bandwidth limit feature, this example limits the download -// speed to 70kb/sec -//Acquire::http::Dl-Limit "70"; diff --git a/tools/ansible/roles/useful-packages/tasks/main.yml b/tools/ansible/roles/useful-packages/tasks/main.yml deleted file mode 100644 index 1bb0255..0000000 --- a/tools/ansible/roles/useful-packages/tasks/main.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- - -- name: Install some useful packages - apt: - name: "{{ item }}" - state: present - with_items: - - locales - - vim-nox - - tmux - - tor - - torsocks - - screen - - fail2ban diff --git a/tools/ansible/tbb-build.yml b/tools/ansible/tbb-build.yml deleted file mode 100644 index 3d9f543..0000000 --- a/tools/ansible/tbb-build.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- hosts: tbb-build - roles: - - role: tbb-builder - - role: useful-packages - - role: tbb-team - - role: mta - - role: unattended-upgrades -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-91.11.0esr-12.0-1 updated: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
by gitolite role 20 Jul '22

20 Jul '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-91.11.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.11.0esr-12.0-1 by this push: new 1919f10f7bce9 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection 1919f10f7bce9 is described below commit 1919f10f7bce95efc69748afac19b9d74cb2c22c Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Wed Jul 20 10:58:57 2022 +0200 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41054: Improve color contrast of purple elements in connection settings in dark theme Bug 41058: Hide `currentBridges` description when the section itself is hidden Also, adjust the height of bridge cards when updating the connected status. Changed substr with substring and removed some unnecessary async. Updated the connected bridge check to the proton one. Fixed the refresh icon in the BridgeDB modal. Fixed the color of the trash icon in the dark mode. --- .../torpreferences/content/connectionPane.js | 33 +++++++++++++++------- .../torpreferences/content/connectionPane.xhtml | 4 +-- .../torpreferences/content/torPreferences.css | 30 ++++++++++++++++---- 3 files changed, 50 insertions(+), 17 deletions(-) diff --git a/browser/components/torpreferences/content/connectionPane.js b/browser/components/torpreferences/content/connectionPane.js index 6162ca37e8faf..e3125c850708e 100644 --- a/browser/components/torpreferences/content/connectionPane.js +++ b/browser/components/torpreferences/content/connectionPane.js @@ -110,7 +110,8 @@ const gConnectionPane = (function() { chooseForMe: "#torPreferences-bridges-buttonChooseBridgeForMe", currentHeader: "#torPreferences-currentBridges-header", currentHeaderText: "#torPreferences-currentBridges-headerText", - currentDescriptionText: "#torPreferences-currentBridges-description", + currentDescription: "#torPreferences-currentBridges-description", + currentDescriptionText: "#torPreferences-currentBridges-descriptionText", switch: "#torPreferences-currentBridges-switch", cards: "#torPreferences-currentBridges-cards", cardTemplate: "#torPreferences-bridgeCard-template", @@ -259,7 +260,7 @@ const gConnectionPane = (function() { "label", TorStrings.settings.statusInternetTest ); - internetTest.addEventListener("command", async () => { + internetTest.addEventListener("command", () => { this.onInternetTest(); }); const internetIcon = prefpane.querySelector( @@ -435,7 +436,10 @@ const gConnectionPane = (function() { this._populateBridgeCards(); }); }); - prefpane.querySelector( + const bridgeDescription = prefpane.querySelector( + selectors.bridges.currentDescription + ); + bridgeDescription.querySelector( selectors.bridges.currentDescriptionText ).textContent = TorStrings.settings.bridgeCurrentDescription; const bridgeTemplate = prefpane.querySelector( @@ -596,8 +600,8 @@ const gConnectionPane = (function() { try { const container = card.querySelector(selectors.bridges.cardQr); const style = getComputedStyle(container); - const width = style.width.substr(0, style.width.length - 2); - const height = style.height.substr(0, style.height.length - 2); + const width = style.width.substring(0, style.width.length - 2); + const height = style.height.substring(0, style.height.length - 2); new QRCode(container, { text: bridgeString, width, @@ -621,7 +625,10 @@ const gConnectionPane = (function() { // Expanded cards have the height set manually to their details for // the CSS animation. However, when resizing the window, we may need // to adjust their height. - if (card.classList.contains("expanded")) { + if ( + card.classList.contains("expanded") || + card.classList.contains("currently-connected") + ) { const grid = card.querySelector(selectors.bridges.cardQrGrid); // Reset it first, to avoid having a height that is higher than // strictly needed. Also, remove the to-animate class, because the @@ -644,13 +651,14 @@ const gConnectionPane = (function() { removeAll.addEventListener("command", () => { this._confirmBridgeRemoval(); }); - this._populateBridgeCards = async () => { + this._populateBridgeCards = () => { const collapseThreshold = 4; let newStrings = new Set(TorSettings.bridges.bridge_strings); const numBridges = newStrings.size; if (!newStrings.size) { bridgeHeader.setAttribute("hidden", "true"); + bridgeDescription.setAttribute("hidden", "true"); bridgeCards.setAttribute("hidden", "true"); showAll.setAttribute("hidden", "true"); removeAll.setAttribute("hidden", "true"); @@ -658,6 +666,7 @@ const gConnectionPane = (function() { return; } bridgeHeader.removeAttribute("hidden"); + bridgeDescription.removeAttribute("hidden"); bridgeCards.removeAttribute("hidden"); bridgeSwitch.checked = TorSettings.bridges.enabled; bridgeCards.classList.toggle("disabled", !TorSettings.bridges.enabled); @@ -731,7 +740,7 @@ const gConnectionPane = (function() { const annotations = await res.json(); const bcp47 = Services.locale.appLocaleAsBCP47; const dash = bcp47.indexOf("-"); - const lang = dash !== -1 ? bcp47.substr(dash) : bcp47; + const lang = dash !== -1 ? bcp47.substring(dash) : bcp47; if (bcp47 in annotations) { emojiAnnotations = annotations[bcp47]; } else if (lang in annotations) { @@ -765,6 +774,7 @@ const gConnectionPane = (function() { const placeholder = document.createElement("span"); bridgeCards.prepend(placeholder); placeholder.replaceWith(...cards); + this._checkBridgeCardsHeight(); }; try { const { controller } = ChromeUtils.import( @@ -798,7 +808,7 @@ const gConnectionPane = (function() { for (const status of circuitStatuses) { if (status.id === event.CircuitID && status.circuit.length) { // The id in the circuit begins with a $ sign - const bridgeId = status.circuit[0][0].substr(1); + const bridgeId = status.circuit[0][0].substring(1); if (bridgeId !== this._currentBridge) { this._currentBridge = bridgeId; this._updateConnectedBridges(); @@ -916,7 +926,7 @@ const gConnectionPane = (function() { init() { this._populateXUL(); - let onUnload = () => { + const onUnload = () => { window.removeEventListener("unload", onUnload); gConnectionPane.uninit(); }; @@ -925,6 +935,9 @@ const gConnectionPane = (function() { window.addEventListener("resize", () => { this._checkBridgeCardsHeight(); }); + window.addEventListener("hashchange", () => { + this._checkBridgeCardsHeight(); + }) }, uninit() { diff --git a/browser/components/torpreferences/content/connectionPane.xhtml b/browser/components/torpreferences/content/connectionPane.xhtml index 3479ac0fcdbf9..82738723ae21a 100644 --- a/browser/components/torpreferences/content/connectionPane.xhtml +++ b/browser/components/torpreferences/content/connectionPane.xhtml @@ -94,8 +94,8 @@ <html:span id="torPreferences-currentBridges-headerText"/> <html:input type="checkbox" id="torPreferences-currentBridges-switch" class="toggle-button"/> </html:h2> - <description flex="1"> - <html:span id="torPreferences-currentBridges-description"/> + <description flex="1" id="torPreferences-currentBridges-description"> + <html:span id="torPreferences-currentBridges-descriptionText"/> </description> <menupopup id="torPreferences-bridgeCard-menu"/> <vbox id="torPreferences-bridgeCard-template" class="torPreferences-bridgeCard"> diff --git a/browser/components/torpreferences/content/torPreferences.css b/browser/components/torpreferences/content/torPreferences.css index 6638db1293b2a..b13cbec1603be 100644 --- a/browser/components/torpreferences/content/torPreferences.css +++ b/browser/components/torpreferences/content/torPreferences.css @@ -149,6 +149,12 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { fill: var(--purple-60); } +@media (-moz-toolbar-prefers-color-scheme: dark) { + #torPreferences-status-internet-statusIcon.online, #torPreferences-status-tor-statusIcon.connected { + fill: var(--purple-30); + } +} + #torPreferences-status-internet-status { margin-inline-end: 32px; } @@ -274,12 +280,16 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { .torPreferences-bridgeCard-connectedBadge { display: none; - padding: 8px 12px; - border-radius: 16px; - background: rgba(128, 0, 215, 0.1); + margin-inline-end: 12px; color: var(--purple-60); } +@media (-moz-toolbar-prefers-color-scheme: dark) { + .torPreferences-bridgeCard-connectedBadge { + color: var(--purple-30); + } +} + .currently-connected .torPreferences-bridgeCard-connectedBadge { display: flex; } @@ -287,9 +297,9 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { .torPreferences-bridgeCard-connectedIcon { margin-inline-start: 1px; margin-inline-end: 7px; - list-style-image: url("chrome://devtools/skin/images/check.svg"); + list-style-image: url("chrome://browser/content/torpreferences/check.svg"); -moz-context-properties: fill; - fill: var(--purple-60); + fill: currentColor; } .torPreferences-bridgeCard-options { @@ -306,6 +316,11 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { -moz-context-properties: fill; } +#torPreferences-bridgeCard-menu menuitem { + fill: currentColor; + -moz-context-properties: fill; +} + .torPreferences-bridgeCard-qrWrapper { grid-area: bridge-qr; display: block; /* So it doesn't stretch the child vertically. */ @@ -445,6 +460,11 @@ button#torPreferences-requestBridge-refreshCaptchaButton { min-width: initial; } +#torPreferences-requestBridge-refreshCaptchaButton image { + -moz-context-properties: fill; + fill: currentColor; +} + dialog#torPreferences-requestBridge-dialog > hbox { margin-bottom: 1em; } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-91.11.0esr-12.0-1 updated: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
by gitolite role 20 Jul '22

20 Jul '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-91.11.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.11.0esr-12.0-1 by this push: new a460fcd3fa858 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection a460fcd3fa858 is described below commit a460fcd3fa858179ba0b990f5773ea47b687abca Author: WofWca <wofwca(a)protonmail.com> AuthorDate: Tue Jul 19 20:11:38 2022 +0300 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection fix: don't invert bridges' QRs' colors in dark theme Fixes https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41049 + a pinch of refactoring --- .../torpreferences/content/bridgeQrDialog.xhtml | 10 ++-- .../torpreferences/content/connectionPane.xhtml | 5 +- .../torpreferences/content/torPreferences.css | 64 +++++++++++++--------- 3 files changed, 45 insertions(+), 34 deletions(-) diff --git a/browser/components/torpreferences/content/bridgeQrDialog.xhtml b/browser/components/torpreferences/content/bridgeQrDialog.xhtml index 2a49e4c0e7d9e..5411c963ba490 100644 --- a/browser/components/torpreferences/content/bridgeQrDialog.xhtml +++ b/browser/components/torpreferences/content/bridgeQrDialog.xhtml @@ -7,10 +7,12 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"> <dialog id="bridgeQr-dialog" buttons="accept"> - <html:div id="bridgeQr-container"> - <html:div id="bridgeQr-target"/> - <html:div id="bridgeQr-onionBox"/> - <html:div id="bridgeQr-onion"/> + <html:div> + <html:div id="bridgeQr"> + <html:div id="bridgeQr-target"/> + <html:div id="bridgeQr-onionBox"/> + <html:div id="bridgeQr-onion"/> + </html:div> </html:div> <script type="application/javascript"><![CDATA[ "use strict"; diff --git a/browser/components/torpreferences/content/connectionPane.xhtml b/browser/components/torpreferences/content/connectionPane.xhtml index 860f3c233cb6c..3479ac0fcdbf9 100644 --- a/browser/components/torpreferences/content/connectionPane.xhtml +++ b/browser/components/torpreferences/content/connectionPane.xhtml @@ -112,12 +112,11 @@ </hbox> <box class="torPreferences-bridgeCard-grid"> <box class="torPreferences-bridgeCard-qrWrapper"> - <box class="torPreferences-bridgeCard-qr stop-click"> + <html:div class="torPreferences-bridgeCard-qr stop-click"> <html:div class="torPreferences-bridgeCard-qrCode"/> <html:div class="torPreferences-bridgeCard-qrOnionBox"/> <html:div class="torPreferences-bridgeCard-qrOnion"/> - </box> - <html:div class="torPreferences-bridgeCard-filler"/> + </html:div> </box> <description class="torPreferences-bridgeCard-share"></description> <hbox class="torPreferences-bridgeCard-addrBox"> diff --git a/browser/components/torpreferences/content/torPreferences.css b/browser/components/torpreferences/content/torPreferences.css index 964fca1590afc..6638db1293b2a 100644 --- a/browser/components/torpreferences/content/torPreferences.css +++ b/browser/components/torpreferences/content/torPreferences.css @@ -308,56 +308,56 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { .torPreferences-bridgeCard-qrWrapper { grid-area: bridge-qr; - display: flex; - flex-direction: column; + display: block; /* So it doesn't stretch the child vertically. */ + margin-inline-end: 14px; } .torPreferences-bridgeCard-qr { - width: 126px; + --qr-one: black; + --qr-zero: white; + background: var(--qr-zero); position: relative; + padding: 4px; + border-radius: 2px; } .torPreferences-bridgeCard-qrCode { width: 112px; height: 112px; /* Define these colors, as they will be passed to the QR code library */ - background: var(--in-content-box-background); - color: var(--in-content-text-color); + background: var(--qr-zero); + color: var(--qr-one); } .torPreferences-bridgeCard-qrOnionBox { width: 28px; height: 28px; position: absolute; - top: 42px; - inset-inline-start: 42px; - background: var(--in-content-box-background); + top: calc(50% - 14px); + inset-inline-start: calc(50% - 14px); + background: var(--qr-zero); } .torPreferences-bridgeCard-qrOnion { width: 16px; height: 16px; position: absolute; - top: 48px; - inset-inline-start: 48px; + top: calc(50% - 8px); + inset-inline-start: calc(50% - 8px); mask: url("chrome://browser/skin/onion.svg"); mask-repeat: no-repeat; mask-size: 16px; - background: var(--in-content-text-color); + background: var(--qr-one); } .torPreferences-bridgeCard-qr:hover .torPreferences-bridgeCard-qrOnionBox { - background: var(--in-content-text-color); + background: var(--qr-one); } .torPreferences-bridgeCard-qr:hover .torPreferences-bridgeCard-qrOnion { mask: url("chrome://global/skin/icons/search-glass.svg"); - background: var(--in-content-box-background); -} - -.torPreferences-bridgeCard-filler { - flex: 1; + background: var(--qr-zero); } .torPreferences-bridgeCard-grid { @@ -458,39 +458,49 @@ dialog#torPreferences-requestBridge-dialog > hbox { } /* Show bridge QR dialog */ -#bridgeQr-container { +#bridgeQr { + /* Some readers don't recognize QRs with inverted colors, so let's make + the ones are darker than zeroes. See + https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41049 */ + --qr-one: black; + --qr-zero: white; + background: var(--qr-zero); position: relative; - height: 300px; + /* Padding is needed in case the dark theme is used so the bits don't blend + with whatever the default background color is. */ + padding: 10px; + margin: auto; + margin-bottom: 20px; + max-width: max-content; + border-radius: 5px; } #bridgeQr-target { - position: absolute; width: 300px; height: 300px; - left: calc(50% - 150px); - background: var(--in-content-box-background); - color: var(--in-content-text-color); + background: var(--qr-zero); + color: var(--qr-one); } #bridgeQr-onionBox { position: absolute; width: 70px; height: 70px; - top: 115px; + top: calc(50% - 35px); left: calc(50% - 35px); - background-color: var(--in-content-box-background); + background-color: var(--qr-zero); } #bridgeQr-onion { position: absolute; width: 38px; height: 38px; - top: 131px; + top: calc(50% - 19px); left: calc(50% - 19px); mask: url("chrome://browser/skin/onion.svg"); mask-repeat: no-repeat; mask-size: 38px; - background: var(--in-content-text-color); + background: var(--qr-one); } /* Builtin bridge dialog */ -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-91.11.0esr-12.0-1 updated: Bug 41050: HTTPS-Only Mode Alert's "Continue to HTTP Site" button doesn't work on IP addresses
by gitolite role 19 Jul '22

19 Jul '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-91.11.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.11.0esr-12.0-1 by this push: new c1066fbb756be Bug 41050: HTTPS-Only Mode Alert's "Continue to HTTP Site" button doesn't work on IP addresses c1066fbb756be is described below commit c1066fbb756be8096dfed2cc902b97e6a40fc65d Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon Jul 18 18:56:13 2022 +0200 Bug 41050: HTTPS-Only Mode Alert's "Continue to HTTP Site" button doesn't work on IP addresses This bug has already been fixed upstream, so we should drop this patch when we update to 102. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1697866. --- toolkit/actors/AboutHttpsOnlyErrorParent.jsm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/toolkit/actors/AboutHttpsOnlyErrorParent.jsm b/toolkit/actors/AboutHttpsOnlyErrorParent.jsm index 407e014ff6574..5b6bc94ab88ff 100644 --- a/toolkit/actors/AboutHttpsOnlyErrorParent.jsm +++ b/toolkit/actors/AboutHttpsOnlyErrorParent.jsm @@ -87,6 +87,19 @@ class AboutHttpsOnlyErrorParent extends JSWindowActorParent { const oldOriginAttributes = aBrowser.contentPrincipal.originAttributes; const hasFpiAttribute = !!oldOriginAttributes.firstPartyDomain.length; + let firstPartyDomain = ""; + if (hasFpiAttribute) { + // This try-catch to check whether a host is an IP address is used also in + // other parts of Firefox + try { + firstPartyDomain = Services.eTLD.getBaseDomain(newURI); + } catch (e) { + if (e.result == Cr.NS_ERROR_HOST_IS_IP_ADDRESS) { + firstPartyDomain = newURI.host; + } + } + } + // Create new content principal for the permission. If first-party isolation // is enabled, we have to replace the about-page first-party domain with the // one from the exempt website. @@ -94,9 +107,7 @@ class AboutHttpsOnlyErrorParent extends JSWindowActorParent { newURI, { ...oldOriginAttributes, - firstPartyDomain: hasFpiAttribute - ? Services.eTLD.getBaseDomain(newURI) - : "", + firstPartyDomain, } ); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-91.11.0esr-12.0-1 updated: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
by gitolite role 19 Jul '22

19 Jul '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-91.11.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.11.0esr-12.0-1 by this push: new b8951156a17d6 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection b8951156a17d6 is described below commit b8951156a17d61e6eb3ce85810c091d29884ebf9 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon Jul 18 17:51:44 2022 +0200 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41055: Icon fix from #40834 is missing in 11.5 stable --- browser/components/torpreferences/content/check.svg | 3 +++ browser/components/torpreferences/content/torPreferences.css | 4 ++-- browser/components/torpreferences/jar.mn | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/browser/components/torpreferences/content/check.svg b/browser/components/torpreferences/content/check.svg new file mode 100644 index 0000000000000..34b90800c71b9 --- /dev/null +++ b/browser/components/torpreferences/content/check.svg @@ -0,0 +1,3 @@ +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M6.02301 13L1.18301 8.16099C1.07063 8.04262 1.00892 7.88505 1.01104 7.72185C1.01316 7.55865 1.07893 7.40273 1.19434 7.28732C1.30975 7.17191 1.46567 7.10613 1.62887 7.10402C1.79207 7.1019 1.94964 7.16361 2.06801 7.27599L6.37501 11.584L13.934 4.02299C14.0517 3.90617 14.2107 3.84061 14.3765 3.84061C14.5423 3.84061 14.7014 3.90617 14.819 4.02299C14.9358 4.14063 15.0014 4.29969 15.0014 4.46549C15.0014 4.63128 14.9358 4.79034 14.819 4.90799L6.72901 12.998L6.02301 13Z" fill="context-fill"/> +</svg> diff --git a/browser/components/torpreferences/content/torPreferences.css b/browser/components/torpreferences/content/torPreferences.css index a39bd4b4767cb..964fca1590afc 100644 --- a/browser/components/torpreferences/content/torPreferences.css +++ b/browser/components/torpreferences/content/torPreferences.css @@ -133,7 +133,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { } #torPreferences-status-internet-icon { - list-style-image: url("chrome://devtools/skin/images/globe.svg"); + list-style-image: url("chrome://browser/content/torpreferences/network.svg"); } #torPreferences-status-internet-statusIcon.online, @@ -144,7 +144,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { } #torPreferences-status-internet-statusIcon.online, #torPreferences-status-tor-statusIcon.connected { - list-style-image: url("chrome://devtools/skin/images/check.svg"); + list-style-image: url("chrome://browser/content/torpreferences/check.svg"); -moz-context-properties: fill; fill: var(--purple-60); } diff --git a/browser/components/torpreferences/jar.mn b/browser/components/torpreferences/jar.mn index 4d82268f3c8d6..b54373ae7bc23 100644 --- a/browser/components/torpreferences/jar.mn +++ b/browser/components/torpreferences/jar.mn @@ -3,6 +3,7 @@ browser.jar: content/browser/torpreferences/bridgeQrDialog.jsm (content/bridgeQrDialog.jsm) content/browser/torpreferences/builtinBridgeDialog.xhtml (content/builtinBridgeDialog.xhtml) content/browser/torpreferences/builtinBridgeDialog.jsm (content/builtinBridgeDialog.jsm) + content/browser/torpreferences/check.svg (content/check.svg) content/browser/torpreferences/connectionSettingsDialog.xhtml (content/connectionSettingsDialog.xhtml) content/browser/torpreferences/connectionSettingsDialog.jsm (content/connectionSettingsDialog.jsm) content/browser/torpreferences/network.svg (content/network.svg) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0