Commit b79fb2df authored by anonym's avatar anonym

tor-controlport-filter: non-atomic commit, sorry!

Most of it is about ending the stupid experiment with multiple filters
and merging, so this is a huge simplification made possible by dropping
some functionality of questionable use. One filter to rule them all!

It also adds the `confs` syntactic sugar, and fixes some tiny issues
introduced in recent commits.
parent 01316898
......@@ -10,9 +10,9 @@
- 'stream-status'
- 'ns/id/[a-fA-F0-9]+'
- 'ip-to-country/\d+\.\d+\.\d+\.\d+'
GETCONF:
- 'usemicrodescriptors'
- '__owningcontrollerprocess'
confs:
usemicrodescriptors:
__owningcontrollerprocess:
events:
SIGNAL:
suppress: true
......
......@@ -8,12 +8,12 @@
GETINFO:
- 'version'
- 'onions/current'
GETCONF:
- '__owningcontrollerprocess'
ADD_ONION:
- 'NEW:BEST Port=80,176([0-4][0-]|50)'
DEL_ONION:
- '.+'
confs:
- '__owningcontrollerprocess'
events:
SIGNAL:
suppress: true
......
......@@ -3,15 +3,15 @@
- '/usr/local/lib/tor-browser/firefox'
match-users:
- 'amnesia'
restrict-stream-events: true
commands:
SIGNAL:
- 'NEWNYM'
GETCONF:
- 'bridge'
GETINFO:
- 'circuit-status'
- 'ns/id/[a-fA-F0-9]+'
- 'ip-to-country/\d+\.\d+\.\d+\.\d+'
confs:
bridge:
events:
STREAM:
restrict-stream-events: true
......@@ -8,19 +8,17 @@
- ''
GETINFO:
- 'status/bootstrap-phase'
GETCONF:
- 'UseBridges'
- 'Bridge'
- 'Socks(4|5)Proxy'
- 'HTTPSProxy'
SETCONF:
- 'UseBridges(=.*)?'
- 'Bridge(=.*)?'
- 'Socks(4|5)Proxy(=.*)?'
- 'Socks5Proxy(Username|Password)(=.*)?'
- 'HTTPSProxy(Authenticator)?(=.*)?'
- 'ReachableAddresses(=.*)?'
- 'DisableNetwork=0'
confs:
UseBridges: ['', '.*']
Bridge: ['', '.*']
Socks4Proxy: ['', '.*']
Socks5Proxy: ['', '.*']
HTTPSProxy: ['', '.*']
Socks5ProxyUsername: ['', '.*']
Socks5ProxyPassword: ['', '.*']
HTTPSProxyAuthenticator: ['', '.*']
ReachableAddresses: ['', '.*']
DisableNetwork: ['0']
events:
STATUS_CLIENT:
NOTICE:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment