nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.0'

Browse Source
This commit is contained in:
George Kadianakis 2019-05-29 21:20:02 +03:00
commit 650bdca97f
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket29702 Normal file
View File

@ -0,0 +1,4 @@
o Testing:
- Specify torrc paths (with empty files) when launching tor in
integration tests; refrain from reading user and system torrcs.
Resolves issue 29702.

3
src/test/test_key_expiration.sh
View File

@ -66,10 +66,11 @@ trap 'rm -rf "$DATA_DIR"' 0
DATA_DIR=$(cd "${DATA_DIR}" && pwd) DATA_DIR=$(cd "${DATA_DIR}" && pwd)
touch "${DATA_DIR}/empty_torrc" touch "${DATA_DIR}/empty_torrc"
touch "${DATA_DIR}/empty_defaults_torrc"
QUIETLY="--hush" QUIETLY="--hush"
SILENTLY="--quiet" SILENTLY="--quiet"
TOR="${TOR_BINARY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f ${DATA_DIR}/empty_torrc --DataDirectory ${DATA_DIR}" TOR="${TOR_BINARY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 --DataDirectory ${DATA_DIR} -f ${DATA_DIR}/empty_torrc --defaults-torrc ${DATA_DIR}/empty_defaults_torrc"
##### SETUP ##### SETUP
# #

3
src/test/test_keygen.sh
View File

@ -83,10 +83,11 @@ trap 'rm -rf "$DATA_DIR"' 0
DATA_DIR=$(cd "${DATA_DIR}" && pwd) DATA_DIR=$(cd "${DATA_DIR}" && pwd)
touch "${DATA_DIR}/empty_torrc" touch "${DATA_DIR}/empty_torrc"
touch "${DATA_DIR}/empty_defaults_torrc"
QUIETLY="--hush" QUIETLY="--hush"
SILENTLY="--quiet" SILENTLY="--quiet"
TOR="${TOR_BINARY} ${QUIETLY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f ${DATA_DIR}/empty_torrc" TOR="${TOR_BINARY} ${QUIETLY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f ${DATA_DIR}/empty_torrc --defaults-torrc ${DATA_DIR}/empty_defaults_torrc"
##### SETUP ##### SETUP
# #

10
src/test/test_rebind.py
View File

@ -83,13 +83,21 @@ if not os.path.exists(sys.argv[2]):
tor_path = sys.argv[1] tor_path = sys.argv[1]
data_dir = sys.argv[2] data_dir = sys.argv[2]
empty_torrc_path = os.path.join(data_dir, 'empty_torrc')
open(empty_torrc_path, 'w').close()
empty_defaults_torrc_path = os.path.join(data_dir, 'empty_defaults_torrc')
open(empty_defaults_torrc_path, 'w').close()
tor_process = subprocess.Popen([tor_path, tor_process = subprocess.Popen([tor_path,
'-DataDirectory', data_dir, '-DataDirectory', data_dir,
'-ControlPort', '127.0.0.1:{}'.format(control_port), '-ControlPort', '127.0.0.1:{}'.format(control_port),
'-SOCKSPort', '127.0.0.1:{}'.format(socks_port), '-SOCKSPort', '127.0.0.1:{}'.format(socks_port),
'-Log', 'debug stdout', '-Log', 'debug stdout',
'-LogTimeGranularity', '1', '-LogTimeGranularity', '1',
'-FetchServerDescriptors', '0'], '-FetchServerDescriptors', '0',
'-f', empty_torrc_path,
'--defaults-torrc', empty_defaults_torrc_path,
],
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE)

3
src/test/zero_length_keys.sh
View File

@ -43,10 +43,11 @@ fi
trap 'rm -rf "$DATA_DIR"' 0 trap 'rm -rf "$DATA_DIR"' 0
touch "$DATA_DIR"/empty_torrc touch "$DATA_DIR"/empty_torrc
touch "$DATA_DIR"/empty_defaults_torrc
# DisableNetwork means that the ORPort won't actually be opened. # DisableNetwork means that the ORPort won't actually be opened.
# 'ExitRelay 0' suppresses a warning. # 'ExitRelay 0' suppresses a warning.
TOR="${TOR_BINARY} --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc" TOR="${TOR_BINARY} --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc --defaults-torrc $DATA_DIR/empty_defaults_torrc"
if [ -s "$DATA_DIR"/keys/secret_id_key ] && [ -s "$DATA_DIR"/keys/secret_onion_key ] && if [ -s "$DATA_DIR"/keys/secret_id_key ] && [ -s "$DATA_DIR"/keys/secret_onion_key ] &&
[ -s "$DATA_DIR"/keys/secret_onion_key_ntor ]; then [ -s "$DATA_DIR"/keys/secret_onion_key_ntor ]; then