- tbb-commits - lists.torproject.org

[tor-browser-build/master] Move mcs and brade to alumns build machine-wise
by gk＠torproject.org 29 Apr '20

29 Apr '20

commit 895efbcd312083c6da2fc9f9e1c023441e5e97c0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 29 15:20:54 2020 +0000 Move mcs and brade to alumns build machine-wise --- tools/ansible/roles/tbb-team/defaults/main.yml | 6 +++--- tools/ansible/roles/tbb-team/files/brade.pub | 1 - tools/ansible/roles/tbb-team/files/mcs.pub | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index 75a1db5..879c435 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -1,11 +1,11 @@ --- tbb_team_members: - boklm - - brade - cohosh - gk - - mcs - mikeperry - pospeselr - sukhbir -tbb_team_alums: [] +tbb_team_alums: + - brade + - mcs diff --git a/tools/ansible/roles/tbb-team/files/brade.pub b/tools/ansible/roles/tbb-team/files/brade.pub deleted file mode 100644 index 0a83b4d..0000000 --- a/tools/ansible/roles/tbb-team/files/brade.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+p9eNuVj59oHkPe/uM+DFTchAxMsm1F6jsMMQqzcNd2sIVAxftMEu8OTM5/rdz+XemevzE+BYHhNUamW/05rur97AYJB7hsOYBtx0g9tGx/2zot72yU38TjmbhWE1FKct+9zc6ZQnYHXLtWBB6k/zJeQH2CvwDLrHsXxfUvOE9lXrcgFy1ugVC96EknBfqz5LTG2dsQhn+nzpEnb3IZYoaRc0h33BVGLkNyFQEtm+7JzylTX6/854kk1BqwZLl03U6++7XA4SjVOYPCM3K1++dJt3CwnARs7mR3t03FFUj0gyRoPuxB6iwPtaCDIDEhSOMmj8hfbFu1N4jm4XY1H3 diff --git a/tools/ansible/roles/tbb-team/files/mcs.pub b/tools/ansible/roles/tbb-team/files/mcs.pub deleted file mode 100644 index af8dd08..0000000 --- a/tools/ansible/roles/tbb-team/files/mcs.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDipHBalbwyEb0AWwbRPa+pxGGSyFTkoOtyn76AqTD6WZIJKBBe4PkkqkJOI7STWxwVkbzTZoC1UyzUCXc3L/bxt85bopAgg0EucM3z3t6XX3kbaDPEGi+mhA4lFYdpJmWe1wbDhiAMYSAONnVcRgmk6bPkgRBWM5zCshOOS5/hs1HW6/zOzgJX6+B7vLYiccHkRj9YeOln+OyR+ko1nFovBFIeDw5DjZqNHki0/hBe1SpaBKCUWHBwkugmvI3Q/VL5pQhWAcMwqEmEcosmX5SPBsAn8217u0mPLcW2cAx30Yj95lfO3LzOV27dnqYfT0IN4gysm2S9Z0mV7yMgSkgV mcs

1 0

[tor-browser-build/master] Merge remote-tracking branch 'cohoshtpo/ticket/33576'
by sysrqb＠torproject.org 29 Apr '20

29 Apr '20

commit 7464798ed3a34a2d492c55e34673dbe3d4a134d2 Merge: 4d855e7 be5efcc Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 29 14:06:53 2020 +0000 Merge remote-tracking branch 'cohoshtpo/ticket/33576' projects/goxxerrors/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-build/master] Fix git url for goxxerrors project
by sysrqb＠torproject.org 29 Apr '20

29 Apr '20

commit be5efccdf6aeb316a2b8c9888a942e647c544bc9 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Apr 29 13:47:37 2020 +0000 Fix git url for goxxerrors project --- projects/goxxerrors/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/goxxerrors/config b/projects/goxxerrors/config index 08d6777..6733498 100644 --- a/projects/goxxerrors/config +++ b/projects/goxxerrors/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_url: https://golang.org/x/xerrors +git_url: https://go.googlesource.com/xerrors git_hash: 9bdfabe68543c54f90421aeb9a60ef8061b5b544 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'

1 0

[tor-browser-build/master] Add GeKo to nightly build emails
by boklm＠torproject.org 29 Apr '20

29 Apr '20

commit 4d855e74585ac099e4c5526c83c04302093305d2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 29 15:02:28 2020 +0200 Add GeKo to nightly build emails --- tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml index 8e4bc05..6addb1d 100644 --- a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -2,5 +2,5 @@ nightly_build_hostname: f4amtbsowhix7rrf.onion nightly_build_url: 'http://{{ nightly_build_hostname }}' nightly_build_email_from: "'Tor Browser Nightly Builds (boklm) <boklm-tbb-nightly(a)riseup.net>'," -nightly_build_email_to: "[ 'boklm(a)torproject.org', 'sysrqb(a)torproject.org', ]," +nightly_build_email_to: "[ 'boklm(a)torproject.org', 'gk(a)torproject.org', 'sysrqb(a)torproject.org', ]," nightly_build_sign_build: 1

1 0

[tor-browser-build/master] Bug 33573: Update pion-webrtc version to 2.2.3
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit 02a73e328b08882cff7a20cedac446aad423de35 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Mar 12 16:28:32 2020 +0000 Bug 33573: Update pion-webrtc version to 2.2.3 --- projects/agouti/config | 17 +++++++++++++++++ projects/goerrors/config | 2 +- projects/goxcrypto/config | 2 +- projects/goxxerrors/config | 17 +++++++++++++++++ projects/pion-datachannel/config | 2 +- projects/pion-dtls/config | 8 +++++++- projects/pion-ice/config | 8 ++++---- projects/pion-rtp/config | 6 +++++- projects/pion-sctp/config | 2 +- projects/pion-sdp/config | 2 +- projects/pion-srtp/config | 5 +---- projects/pion-turn/config | 14 +------------- projects/pion-webrtc/config | 8 ++++---- projects/testify/config | 2 +- 14 files changed, 62 insertions(+), 33 deletions(-) diff --git a/projects/agouti/config b/projects/agouti/config new file mode 100644 index 0000000..086aa86 --- /dev/null +++ b/projects/agouti/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/sclevine/agouti +git_hash: e3f6c97a4077ad821daab49db8172cf9f6690faf #v3.0.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/sclevine/agouti + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goerrors/config b/projects/goerrors/config index c9a34e8..626f7d5 100644 --- a/projects/goerrors/config +++ b/projects/goerrors/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pkg/errors -git_hash: ba968bfe8b2f7e042a574c888954fccecfa385b4 # v0.8.1 +git_hash: 614d223910a179a466c1767a985424175c39b465 # v0.9.1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/goxcrypto/config b/projects/goxcrypto/config index 698f94b..1e23034 100644 --- a/projects/goxcrypto/config +++ b/projects/goxcrypto/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/crypto -git_hash: ff983b9c42bc9fbf91556e191cc8efb585c16908 +git_hash: 69ecbb4d6d5dab05e49161c6e77ea40a030884e1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/goxxerrors/config b/projects/goxxerrors/config new file mode 100644 index 0000000..08d6777 --- /dev/null +++ b/projects/goxxerrors/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://golang.org/x/xerrors +git_hash: 9bdfabe68543c54f90421aeb9a60ef8061b5b544 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: golang.org/x/xerrors + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/pion-datachannel/config b/projects/pion-datachannel/config index b8a521c..c36a0bb 100644 --- a/projects/pion-datachannel/config +++ b/projects/pion-datachannel/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/datachannel -git_hash: 58b4a51d48764c2cb19e0c7ced43640a87857c69 # v1.4.13 +git_hash: a245abfdaab4a9406cc2e18ad303b5d0717d43af # v1.4.16 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-dtls/config b/projects/pion-dtls/config index 244c764..0ee19b4 100644 --- a/projects/pion-dtls/config +++ b/projects/pion-dtls/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/dtls -git_hash: 8748e4ac8bf7960bbf399e6f23a9bf4dd30d4e92 # v2.0.0-rc.3 +git_hash: 147774b64b6a8ac9bd0af5a7efff69ee8e0fd4a8 # v2.0.0-rc.7 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -12,6 +12,8 @@ var: go_lib: github.com/pion/dtls go_lib_deps: - goxcrypto + - goxnet + - goxxerrors - pion-logging - pion-transport @@ -21,6 +23,10 @@ input_files: project: go - name: goxcrypto project: goxcrypto + - name: goxnet + project: goxnet + - name: goxxerrors + project: goxxerrors - name: pion-logging project: pion-logging - name: pion-transport diff --git a/projects/pion-ice/config b/projects/pion-ice/config index 56d0a03..042c014 100644 --- a/projects/pion-ice/config +++ b/projects/pion-ice/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/ice -git_hash: 57e7b93a4bac70ee2fd3b38cc2fdf3c6d586ed27 # v0.7.6 +git_hash: 5b6a2756ccaa173bd14050acf3d6e5d5d371bae8 # v0.7.10 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -12,7 +12,7 @@ var: go_lib: github.com/pion/ice go_lib_deps: - goxnet - - goxsys + - pion-dtls - pion-logging - pion-mdns - pion-stun @@ -26,8 +26,8 @@ input_files: project: go - name: goxnet project: goxnet - - name: goxsys - project: goxsys + - name: pion-dtls + project: pion-dtls - name: pion-logging project: pion-logging - name: pion-mdns diff --git a/projects/pion-rtp/config b/projects/pion-rtp/config index 5e63b29..b926612 100644 --- a/projects/pion-rtp/config +++ b/projects/pion-rtp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/rtp -git_hash: 94055aff4ae00d46f218eab6949fa713d48306af # v1.1.4 +git_hash: f7a712d0fb41baeacb3e2ef9ed68ed1aa42afb82 # v1.3.2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -10,8 +10,12 @@ var: container: use_container: 1 go_lib: github.com/pion/rtp + go_lib_deps: + - testify input_files: - project: container-image - name: go project: go + - name: testify + project: testify diff --git a/projects/pion-sctp/config b/projects/pion-sctp/config index a81911c..89da952 100644 --- a/projects/pion-sctp/config +++ b/projects/pion-sctp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/sctp -git_hash: ced24b2276cf7991920a301ce5f0735cabafaf3e # v1.7.3 +git_hash: 9e890a28db4990b61ba414e35f79108c19e0a7db # v1.7.6 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-sdp/config b/projects/pion-sdp/config index 1a865d4..ed2dbdc 100644 --- a/projects/pion-sdp/config +++ b/projects/pion-sdp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/sdp -git_hash: 9b824fbb8047370a0073ef4b9ebae356e7536502 # v2.3.1 +git_hash: 06fd9e503a8f545f663a757afb09b1e1833c7b2d # v2.3.4 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-srtp/config b/projects/pion-srtp/config index eac420c..310cf75 100644 --- a/projects/pion-srtp/config +++ b/projects/pion-srtp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/srtp -git_hash: 0741c018e441a3502045133280347b9deba1e9d8 # v1.2.6 +git_hash: 57349fe0710b65080a26d8855aa18689364560c3 # v1.2.7 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -12,7 +12,6 @@ var: go_lib: github.com/pion/srtp go_lib_deps: - go-spew - - goerrors - pion-logging - pion-rtcp - pion-rtp @@ -25,8 +24,6 @@ input_files: project: go - name: go-spew project: go-spew - - name: goerrors - project: goerrors - name: pion-logging project: pion-logging - name: pion-rtcp diff --git a/projects/pion-turn/config b/projects/pion-turn/config index 2cbef46..44d81c0 100644 --- a/projects/pion-turn/config +++ b/projects/pion-turn/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/turn -git_hash: bac88c5c692a9826c9703b2950dc52093ae1779a # v1.4.0 +git_hash: b54907e0b25fb5eea5d860ac61f1bf41ea8a6b01 # v2.0.3 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,32 +11,20 @@ var: use_container: 1 go_lib: github.com/pion/turn go_lib_deps: - - go-spew - - gocheck - - goerrors - pion-logging - pion-stun - pion-transport - - pretty - testify input_files: - project: container-image - name: go project: go - - name: go-spew - project: go-spew - - name: gocheck - project: gocheck - - name: goerrors - project: goerrors - name: pion-logging project: pion-logging - name: pion-stun project: pion-stun - name: pion-transport project: pion-transport - - name: pretty - project: pretty - name: testify project: testify diff --git a/projects/pion-webrtc/config b/projects/pion-webrtc/config index c27a3df..f4bde82 100644 --- a/projects/pion-webrtc/config +++ b/projects/pion-webrtc/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/webrtc -git_hash: 77c6e3b827e40175572fcf2894bb81ab1e8fd2c9 # v2.1.18 +git_hash: 1f448413f22d6c32d690db594748d8ad5d3812f5 # v2.2.3 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,7 +11,7 @@ var: use_container: 1 go_lib: github.com/pion/webrtc go_lib_deps: - - goxcrypto + - agouti - pion-datachannel - pion-dtls - pion-ice @@ -28,8 +28,8 @@ input_files: - project: container-image - name: go project: go - - name: goxcrypto - project: goxcrypto + - name: agouti + project: agouti - name: pion-datachannel project: pion-datachannel - name: pion-dtls diff --git a/projects/testify/config b/projects/testify/config index 9b20867..bbb82c3 100644 --- a/projects/testify/config +++ b/projects/testify/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/stretchr/testify -git_hash: 221dbe5ed46703ee255b1da0dec05086f5035f62 # v1.4.0 +git_hash: 3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9 # v1.5.1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]'

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] fixup! Bug 28005: Implement .onion alias urlbar rewrites
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit 0052c74b743756dafa4f3614f559dd8f8d1645c2 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Apr 28 18:25:36 2020 +0200 fixup! Bug 28005: Implement .onion alias urlbar rewrites --- browser/components/onionservices/HttpsEverywhereControl.jsm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/components/onionservices/HttpsEverywhereControl.jsm b/browser/components/onionservices/HttpsEverywhereControl.jsm index 87954461bab1..60c3b5fca282 100644 --- a/browser/components/onionservices/HttpsEverywhereControl.jsm +++ b/browser/components/onionservices/HttpsEverywhereControl.jsm @@ -16,9 +16,9 @@ const SECUREDROP_TOR_ONION_CHANNEL = { kty: "RSA", e: "AQAB", n: - "y0iWTVev1uYDVhLdc5uSHWke-9JlbxzqIsGkS95Pk5NsxdlkdbHpqaPr-5xL5FspX8QGo3HAT5hrUcPV_kz8x-HwGEm2-p9BQ6-yEPtr5QXQGGzNoizmj7HH-b0y5qx8iUFwAJ__PJWK4IwSgjIQqHMjmkOLc9N4bmRPULi6ZZMb-97FdeZsh34dVy2tpIzZaijRfRQSfeZkwRXZzOY-siGfOAzY_UcrHFli5zroTZAyDaetFm1z2-TdFLOvN8fi0o3mBbCB9SqhOUImPwSTNWTp2D6bHhI91mt7gr6fLnzHMGrTMh2DQ4vjt_98pe7WTUzuRCLa9Awb6JJgbYA4ySV1akAU0_iq6oCAE9PZbUgUw9UAH1ctRFml87F3HORUMMj5ZCLwRIrEXqrCJbV4f-Ius-ZO2wwlYTsEv8TmUzISpMwVjGOIpXwFIb65R_EX3_vIopauSoyZkvk3klly0Qe6KTy_gg1CZ_h2ZXPpLMwqlfFTDBPv2q8gyuzgkYXQes3FX-PbJ9Dsl5QO4icuEjV2NQ7iPwwIPAtj9cpqCD8-p9TqTKaZjOFC9-ryJpWsivGCbvN2JotmJ5Ax9rmnAMvQM09muCetFj_ZIgllcpeahaw6gxVXlSYIhb0J9V878KNuRJ2yPJFlBmgpFexvCcz8Jqs6JUfIrmUAGUXG9nE", + "p10BbUVc5Xj2S_-MH3bACNBaISo_r9e3PVPyTTjsGsdg2qSXvqUO42fBtpFAy0zUzIGS83v4JjiRdvKJaZTIvbC8AcpymzdsTqujMm8RPTSy3hO_8mXzGa4DEsIB1uNLnUWRBKXvSGCmT9kFyxhTpkYqokNBzafVihTU34tN2Md1xFHnmZGqfYtPtbJLWAa5Z1M11EyR4lIyUxIiPTV9t1XstDbWr3iS83REJrGEFmjG1-BAgx8_lDUTa41799N2yYEhgZud7bL0M3ei8s5OERjiion5uANkUV3-s2QqUZjiVA-XR_HizXjciaUWNd683KqekpNOZ_0STh_UGwpcwU-KwG07QyiCrLrRpz8S_vH8CqGrrcWY3GSzYe9dp34jJdO65oA-G8tK6fMXtvTCFDZI6oNNaXJH71F5J0YbqO2ZqwKYc2WSi0gKVl2wd9roOVjaBmkJqvocntYuNM7t38fDEWHn5KUkmrTbiG68Cy56tDUfpKl3D9Uj4LaMvxJ1tKGvzQ4k_60odT7gIxu6DqYjXUHZpwPsSGBq3njaD7boe4CUXF2K7ViOc87BsKxRNCzDD8OklRjjXzOTOBH3PqFJ93CJ-4ECE5t9STU20aZ8E-2zKB8vjKyCySE4-kcIvBBsnkwVaJTPy9Ft1qYybo-soXEWVEZATANNWklBt8k", }, - update_path_prefix: "https://redshiftzero.github.io/securedrop-httpse/", + update_path_prefix: "https://securedrop.org/https-everywhere/", scope: "^https?:\\/\\/[a-z0-9-]+(?:\\.[a-z0-9-]+)*\\.securedrop\\.tor\\.onion\\/", replaces_default_rulesets: false,

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] Revert "Bug 30575: Don't allow enterprise policies in Tor Browser"
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit 7d0d47db46531a32c88db85323cd771761b8bb5d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Apr 15 14:09:53 2020 -0400 Revert "Bug 30575: Don't allow enterprise policies in Tor Browser" This reverts commit d362cff17d44a82534ea553cbf50fa76906cc218. --- .../enterprisepolicies/EnterprisePolicies.js | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/toolkit/components/enterprisepolicies/EnterprisePolicies.js b/toolkit/components/enterprisepolicies/EnterprisePolicies.js index dd43d31cb3b0..db77b4717736 100644 --- a/toolkit/components/enterprisepolicies/EnterprisePolicies.js +++ b/toolkit/components/enterprisepolicies/EnterprisePolicies.js @@ -88,9 +88,25 @@ EnterprisePoliciesManager.prototype = { ), _initialize() { - // We don't want to have any enterprise policies in Tor Browser enabled as - // those can affect proxy settings etc. See: e.g. #30575. - this.status = Ci.nsIEnterprisePolicies.INACTIVE; + let provider = this._chooseProvider(); + + if (!provider) { + this.status = Ci.nsIEnterprisePolicies.INACTIVE; + return; + } + + if (provider.failed) { + this.status = Ci.nsIEnterprisePolicies.FAILED; + return; + } + + this.status = Ci.nsIEnterprisePolicies.ACTIVE; + this._parsedPolicies = {}; + Services.telemetry.scalarSet( + "policies.count", + Object.keys(provider.policies).length + ); + this._activatePolicies(provider.policies); }, _chooseProvider() {

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] Merge remote-tracking branch 'acatgh/34032' into tor-browser-68.7.0esr-9.5-1
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit f5bf259fa2f16c68f3dc12bf9e6d28f43ff8d7e1 Merge: f81583b0d6d7 0052c74b7437 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Apr 28 20:42:31 2020 +0000 Merge remote-tracking branch 'acatgh/34032' into tor-browser-68.7.0esr-9.5-1 browser/components/onionservices/HttpsEverywhereControl.jsm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] Merge branch 'bradetpo/bug32418-01' into tor-browser-68.7.0esr-9.5-1
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit f81583b0d6d7eefd4b7384e8ee95d528ea4fb303 Merge: 5a8128b566fa e577d655d204 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Apr 28 20:04:14 2020 +0000 Merge branch 'bradetpo/bug32418-01' into tor-browser-68.7.0esr-9.5-1 .../enterprisepolicies/EnterprisePolicies.js | 32 ++++++++++++++++++++-- toolkit/components/enterprisepolicies/moz.build | 4 ++- toolkit/mozapps/update/UpdateService.jsm | 20 ++++++++++++++ 3 files changed, 52 insertions(+), 4 deletions(-)

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] Bug 32418: Allow updates to be disabled via an enterprise policy.
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit e577d655d2044e3b6636b0bccfbb5bd776148582 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Apr 16 17:07:09 2020 -0400 Bug 32418: Allow updates to be disabled via an enterprise policy. Restrict the Enterprise Policies mechanism to only consult a policies.json file (avoiding the Windows Registry and macOS's file system attributes). Add a few disabledByPolicy() checks to the update service to avoid extraneous (and potentially confusing) log messages when updates are disabled by policy. Sample content for distribution/policies.json: { "policies": { "DisableAppUpdate": true } } --- .../enterprisepolicies/EnterprisePolicies.js | 10 ++++++++++ toolkit/components/enterprisepolicies/moz.build | 4 +++- toolkit/mozapps/update/UpdateService.jsm | 20 ++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/toolkit/components/enterprisepolicies/EnterprisePolicies.js b/toolkit/components/enterprisepolicies/EnterprisePolicies.js index db77b4717736..bc0171867dfa 100644 --- a/toolkit/components/enterprisepolicies/EnterprisePolicies.js +++ b/toolkit/components/enterprisepolicies/EnterprisePolicies.js @@ -2,6 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +// To avoid accessing the Windows Registry or macOS' file system attributes, +// Tor Browser only supports policies.json. +#define JSON_POLICIES_ONLY MOZ_PROXY_BYPASS_PROTECTION + const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); @@ -11,9 +15,11 @@ const { AppConstants } = ChromeUtils.import( ); XPCOMUtils.defineLazyModuleGetters(this, { +#ifndef JSON_POLICIES_ONLY WindowsGPOParser: "resource://gre/modules/policies/WindowsGPOParser.jsm", macOSPoliciesParser: "resource://gre/modules/policies/macOSPoliciesParser.jsm", +#endif Policies: "resource:///modules/policies/Policies.jsm", JsonSchemaValidator: "resource://gre/modules/components-utils/JsonSchemaValidator.jsm", @@ -111,6 +117,7 @@ EnterprisePoliciesManager.prototype = { _chooseProvider() { let provider = null; +#ifndef JSON_POLICIES_ONLY if (AppConstants.platform == "win") { provider = new WindowsGPOPoliciesProvider(); } else if (AppConstants.platform == "macosx") { @@ -119,6 +126,7 @@ EnterprisePoliciesManager.prototype = { if (provider && provider.hasPolicies) { return provider; } +#endif provider = new JSONPoliciesProvider(); if (provider.hasPolicies) { @@ -547,6 +555,7 @@ class JSONPoliciesProvider { } } +#ifndef JSON_POLICIES_ONLY class WindowsGPOPoliciesProvider { constructor() { this._policies = null; @@ -608,6 +617,7 @@ class macOSPoliciesProvider { return this._failed; } } +#endif var components = [EnterprisePoliciesManager]; this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components); diff --git a/toolkit/components/enterprisepolicies/moz.build b/toolkit/components/enterprisepolicies/moz.build index 8f7d7d8cfed7..7528f569bb3e 100644 --- a/toolkit/components/enterprisepolicies/moz.build +++ b/toolkit/components/enterprisepolicies/moz.build @@ -19,10 +19,12 @@ TEST_DIRS += [ if CONFIG['MOZ_WIDGET_TOOLKIT'] != "android": EXTRA_COMPONENTS += [ - 'EnterprisePolicies.js', 'EnterprisePolicies.manifest', 'EnterprisePoliciesContent.js', ] + EXTRA_PP_COMPONENTS += [ + 'EnterprisePolicies.js', + ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': EXTRA_JS_MODULES.policies += [ diff --git a/toolkit/mozapps/update/UpdateService.jsm b/toolkit/mozapps/update/UpdateService.jsm index 282e1aecc5e8..5fbcc1536540 100644 --- a/toolkit/mozapps/update/UpdateService.jsm +++ b/toolkit/mozapps/update/UpdateService.jsm @@ -2772,6 +2772,10 @@ UpdateService.prototype = { _checkForBackgroundUpdates: function AUS__checkForBackgroundUpdates( isNotify ) { + if (this.disabledByPolicy) { + return; + } + this._isNotify = isNotify; // Histogram IDs: @@ -3293,6 +3297,14 @@ UpdateService.prototype = { * See nsIUpdateService.idl */ get canApplyUpdates() { + if (this.disabledByPolicy) { + LOG( + "UpdateService.canApplyUpdates - unable to apply updates, " + + "the option has been disabled by the administrator." + ); + return false; + } + return getCanApplyUpdates() && hasUpdateMutex(); }, @@ -3300,6 +3312,14 @@ UpdateService.prototype = { * See nsIUpdateService.idl */ get canStageUpdates() { + if (this.disabledByPolicy) { + LOG( + "UpdateService.canStageUpdates - unable to stage updates, " + + "the option has been disabled by the administrator." + ); + return false; + } + return getCanStageUpdates(); },

1 0