Disable tor by group policy on Windows. #3692

simonhong · 2019-10-14T19:51:55Z

Introduce TorDisabled group policy for disabling tor feature.
also disable Tor.
This should be merged with brave/brave-browser#6475.

Fix brave/brave-browser#454
Fix brave/brave-browser#6044

When TorDisabled policy is set to registry (HKCU|HKLM\\Software\\Policies\\BraveSoftware\\Brave),
new menu item is visible in app menu like below.

brave branding brave://management webui page that can be opened by above menu item.

Submitter Checklist:

Test Plan:

yarn test brave_browser_tests --filter=*TorDisabled*
also see Add a way to disable Tor via admin policy brave-browser#454

Reviewer Checklist:

New files have MPL-2.0 license header.
Request a security/privacy review as needed.
Adequate test coverage exists to prevent regressions
Verify test plan is specified in PR before merging to source

After-merge Checklist:

The associated issue milestone is set to the smallest version that the
changes has landed on.
All relevant documentation has been updated.

simonhong · 2019-10-15T13:41:12Z

I think all entry point for tor window are disabled and hidden. Also, tor component updater is not registered when tor is disabled by gpo.
According to the spec(https://docs.google.com/document/d/1xlfgDbk95aPmLNOQWwqIQtpvYuqACGVUgOg0nv4opZw), one last thing I should do is deleting tor binary if exists.
For this, I need help from tor expert. (I don't know what tor binary is)
cc @bsclifton @darkdh @yrliou

=> pushed commit that deletes tor binaries also.

simonhong · 2019-10-16T09:13:56Z

patches/components-policy-tools-generate_policy_source.py.patch

+
+ CHROME_POLICY_KEY = 'SOFTWARE\\\\Policies\\\\Google\\\\Chrome'
+-CHROMIUM_POLICY_KEY = 'SOFTWARE\\\\Policies\\\\Chromium'
+CHROMIUM_POLICY_KEY = 'SOFTWARE\\\\Policies\\\\Brave'


Or this should be SOFTWARE\\\\Policies\\\\BraveSoftware\\\\Brave ?

Changed to use SOFTWARE\\\\Policies\\\\BraveSoftware\\\\Brave because omaha updater uses SOFTWARE\\\\Policies\\\\BraveSoftware\\\\Update for its policy.

simonhong · 2019-10-16T11:57:19Z

This PR is ready to review.

common/pref_names.h

simonhong · 2019-10-28T05:24:02Z

Kindly ping to reviewers :)

SOFTWARE\\Policies\\BraveSoftware\Brave should be better because we already use SOFTWARE\\Policies\\BraveSoftware\Update for update policy.

* Fix trivial var naming and refactoring * Delete un-related header including * Add BraveTorClientUpdater::Cleanup() instead of deleting tor extension directly from BraveExtensionManagement.

With this, we don't need to rebase policy_templates.json.

Also, patching of CHROMIUM_POLICY_KEY is deleted. We can override it by importing from other file.

Also, tor-specific code for tor component is moved to tor client updater.

simonhong · 2019-11-05T23:09:35Z

CI seems not success but some fails are not related with this PR(audit and ios failure).
ios failure occured at the early stage maybe some internal error and it was also success in previous ci build.

Disable tor by group policy on Windows.

The crash happens due to dereferencing an unintialized pointer. This is fixed on master as part of #3692, specifically in 054fd5a but I don't think we should be uplifting all that just for a unit test crash. So, instead just added a pointer null check.

tildelowengrimm · 2019-12-05T00:21:38Z

This should cover brave/brave-browser#6584 too.

simonhong self-assigned this Oct 14, 2019

simonhong force-pushed the group_policy_for_tor branch from 644ddcd to 4dc5dac Compare October 15, 2019 05:02

simonhong added this to the 0.72.x - Nightly milestone Oct 15, 2019

simonhong marked this pull request as ready for review October 15, 2019 06:30

simonhong requested a review from bridiver as a code owner October 15, 2019 06:30

simonhong force-pushed the group_policy_for_tor branch from f30440d to 7cc4db3 Compare October 15, 2019 06:31

simonhong requested review from yrliou and bsclifton October 15, 2019 06:31

simonhong force-pushed the group_policy_for_tor branch 2 times, most recently from 3650fe2 to 27df30d Compare October 15, 2019 10:21

simonhong added the CI/skip Do not run CI builds (except noplatform) label Oct 15, 2019

simonhong changed the title ~~Add group policy for tor on Windows~~ Add group policy for tor on Windows and disable tor feature. Oct 15, 2019

simonhong changed the title ~~Add group policy for tor on Windows and disable tor feature.~~ Disable tor by group policy on Windows. Oct 15, 2019

simonhong requested a review from darkdh October 15, 2019 13:25

simonhong removed the CI/skip Do not run CI builds (except noplatform) label Oct 15, 2019

simonhong mentioned this pull request Oct 15, 2019

Replace chrome branding strings in management_strings.grdp brave/brave-browser#6475

Merged

28 tasks

simonhong force-pushed the group_policy_for_tor branch 2 times, most recently from 3704b53 to 8aefc2c Compare October 16, 2019 03:50

simonhong modified the milestones: 0.72.x - Dev, 0.73.x - Nightly Oct 16, 2019

simonhong commented Oct 16, 2019

View reviewed changes

simonhong requested a review from riastradh-brave October 16, 2019 11:56

simonhong force-pushed the group_policy_for_tor branch from 38f534b to 9312473 Compare October 16, 2019 14:01

darkdh reviewed Oct 16, 2019

View reviewed changes

common/pref_names.h Outdated Show resolved Hide resolved

simonhong force-pushed the group_policy_for_tor branch from 9312473 to 638b1cd Compare October 17, 2019 14:18

simonhong force-pushed the group_policy_for_tor branch from 1d89fb6 to 7b269c1 Compare October 28, 2019 02:47

bsclifton mentioned this pull request Oct 28, 2019

Add the possibility to remove Tor brave/brave-browser#6584

Closed

simonhong added 10 commits November 5, 2019 10:36

Add tests cases to app menu test for tor disabled

336fe9f

Change group policy registry path on Win

a04ca93

SOFTWARE\\Policies\\BraveSoftware\Brave should be better because we already use SOFTWARE\\Policies\\BraveSoftware\Update for update policy.

Delete tor binaries if tor is disabled by gpo

014d46f

Move kTorDisabled prefs to local state.

3c2d2b6

Move some more codes into ENABLE_TOR build flag

29c0084

Address review comments

58d429d

* Fix trivial var naming and refactoring * Delete un-related header including * Add BraveTorClientUpdater::Cleanup() instead of deleting tor extension directly from BraveExtensionManagement.

Add brave policy definitions by scripts instead of modifying json

85bc3cb

With this, we don't need to rebase policy_templates.json.

Fix python script lint error

8ff4423

Add some targets directly into deps list if it is used directly

aca4e5c

Also, patching of CHROMIUM_POLICY_KEY is deleted. We can override it by importing from other file.

Fix unitest failure due to access null browser_process object

054fd5a

Also, tor-specific code for tor component is moved to tor client updater.

simonhong force-pushed the group_policy_for_tor branch from 81bae87 to 054fd5a Compare November 5, 2019 01:44

simonhong requested review from bridiver and darkdh November 5, 2019 01:45

bridiver approved these changes Nov 5, 2019

View reviewed changes

Add more missing deps

abb65fe

darkdh approved these changes Nov 5, 2019

View reviewed changes

simonhong merged commit b56e7c5 into master Nov 5, 2019

simonhong deleted the group_policy_for_tor branch November 5, 2019 23:09

simonhong modified the milestones: 0.73.x - Dev, 0.74.x - Nightly Nov 6, 2019

simonhong added a commit that referenced this pull request Nov 7, 2019

Merge pull request #3692 from brave/group_policy_for_tor

f73f085

Disable tor by group policy on Windows.

simonhong mentioned this pull request Nov 7, 2019

uplift group policy for tor to 0.73.x(#3692) #3919

Closed

4 tasks

simonhong added a commit that referenced this pull request Nov 7, 2019

Merge pull request #3692 from brave/group_policy_for_tor

5a6f465

Disable tor by group policy on Windows.

simonhong mentioned this pull request Nov 7, 2019

Uplift group policy for tor to 0.72.x(#3692) #3920

Closed

4 tasks

simonhong added a commit that referenced this pull request Nov 11, 2019

Merge pull request #3692 from brave/group_policy_for_tor

a4dfd66

Disable tor by group policy on Windows.

bsclifton mentioned this pull request Dec 9, 2019

Brave read wrong registrykeys. brave/brave-browser#7264

Closed

jonathansampson mentioned this pull request Sep 21, 2020

Option to disable Rewards, Wallets, and Widgets brave/brave-browser#11778

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Disable tor by group policy on Windows. #3692

Disable tor by group policy on Windows. #3692

simonhong commented Oct 14, 2019 •

edited by bsclifton

Loading

simonhong commented Oct 15, 2019 •

edited

Loading

simonhong Oct 16, 2019

simonhong Oct 16, 2019 •

edited

Loading

simonhong commented Oct 16, 2019

simonhong commented Oct 28, 2019

simonhong commented Nov 5, 2019

tildelowengrimm commented Dec 5, 2019

Disable tor by group policy on Windows. #3692

Disable tor by group policy on Windows. #3692

Conversation

simonhong commented Oct 14, 2019 • edited by bsclifton Loading

Submitter Checklist:

Test Plan:

Reviewer Checklist:

After-merge Checklist:

simonhong commented Oct 15, 2019 • edited Loading

simonhong Oct 16, 2019

Choose a reason for hiding this comment

simonhong Oct 16, 2019 • edited Loading

Choose a reason for hiding this comment

simonhong commented Oct 16, 2019

simonhong commented Oct 28, 2019

simonhong commented Nov 5, 2019

tildelowengrimm commented Dec 5, 2019

simonhong commented Oct 14, 2019 •

edited by bsclifton

Loading

simonhong commented Oct 15, 2019 •

edited

Loading

simonhong Oct 16, 2019 •

edited

Loading