February 2019 - tor-commits - lists.torproject.org

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 28 Feb '19

28 Feb '19

commit 77d6cacaab1af1fd2ffdc5ae746a306738d70329 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 28 16:15:53 2019 +0000 Update translations for https_everywhere_completed --- fa/https-everywhere.dtd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fa/https-everywhere.dtd b/fa/https-everywhere.dtd index ca185a002..c42978596 100644 --- a/fa/https-everywhere.dtd +++ b/fa/https-everywhere.dtd @@ -33,8 +33,9 @@ <!ENTITY https-everywhere.prefs.reset_defaults "ØšØ§Ø²ÙØŽØ§ÙÛ ØšÙ ÙŸÛØŽÙØ±Ø¶"> <!ENTITY https-everywhere.prefs.reset_defaults_message "Ø§ÛÙ ÙØ¬ÙÙØ¹Ù Ø¯Ø³ØªÙØ± Ø¹ÙÙ ÙØ§ Ø±Ø§ ØšÙ ÙØ¶Ø¹ÛØª ÙŸÛØŽ ÙØ±Ø¶ ØªÙØžÛÙ ÙØ¬Ø¯Ø¯ Ø®ÙØ§ÙØ¯ Ú©Ø±Ø¯. Ø§Ø¯Ø§ÙÙ ÙÛ Ø¯ÙÛØ¯Ø"> -<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Ø¯Ø± ÙÙÙ Ø¬Ø§ ÙØªÙØ¬Ù ØŽØ¯Ù Ø§Ø³Øª Ú©Ù ØŽÙØ§ Ø¯Ø± ØØ§Ù ÙØ±ÙØ¯ ØšÙ ÛÚ© ØµÙØÙ ØšØ¯ÙÙ HTTPS ÙØ³ØªÛØ¯Ø Ù ØªÙØ§ØŽ Ú©Ø±Ø¯ ØªØ§ Ø¯Ø± Ø¹ÙØ¶ ØŽÙØ§ Ø±Ø§ ØšÙ ÙØ³Ø®Ù HTTPS Ø¢Ù ØšÙØ±Ø³ØªØ¯. ÙØ³Ø®Ù HTTPS Ø¯Ø± Ø¯Ø³ØªØ±Ø³ ÙÛØ³Øª. ØšÙ Ø§ØØªÙØ§Ù Ø²ÛØ§Ø¯ Ø§ÛÙ Ø³Ø§ÛØª ÙØ³Ø®Ù HTTPS Ø±Ø§ ÙŸØŽØªÛØšØ§ÙÛ ÙÙÛâÚ©ÙØ¯Ø Ø§ÙØ§ ÙÙÚÙÛÙ Ø§ÛÙ Ø§ÙÚ©Ø§Ù ÙØ¬ÙØ¯ Ø¯Ø§Ø±Ø¯ Ú©Ù ÛÚ© ÙÙØ§Ø¬Ù Ø¯Ø± ØØ§Ù ÙØ³Ø¯ÙØ¯ Ú©Ø±Ø¯Ù ÙØ³Ø®Ù HTTPS Ø§Ø³Øª. Ø§Ú¯Ø± ØªÙØ§ÛÙ Ø¯Ø§Ø±ÛØ¯ Ú©Ù Ú©Ù ÙØ³Ø®ÙâÛ Ø±ÙØ² ÙØŽØ¯Ù Ø§ÛÙ ØµÙØÙ Ø±Ø§ ØšØšÛÙÛØ¯Ø ÙÛ ØªÙØ§ÙÛØ¯ Ø§ÛÙ Ú©Ø§Ø± Ø±Ø§ ØšØ§ ØºÛØ± ÙØ¹Ø§Ù Ú©Ø±Ø¯Ù Ú¯Ø²ÛÙÙ Â«ÙØ³Ø¯ÙØ¯ Ú©Ø±Ø¯Ù ØªÙØ§Ù Ø¯Ø±Ø®ÙØ§Ø³Øª ÙØ§Û Ø±ÙØ² ÙØŽØ¯ÙÂ» Ø¯Ø± Ø§ÙØ²ÙÙÙ HTTPS Ø¯Ø± ÙÙÙ Ø¬Ø§ Ø§ÙØ¬Ø§Ù Ø¯ÙÛØ¯. ØªÙØ¬Ù Ø¯Ø§ØŽØªÙ ØšØ§ØŽÛØ¯ Ú©Ù ØºÛØ±ÙØ¹Ø§Ù Ú©Ø±Ø¯Ù Ø§ÛÙ Ú¯Ø²ÛÙÙ ÙÛâØªÙØ§ÙØ¯ ÙØ±ÙØ±Ú¯Ø±ØªØ§Ù Ø±Ø§ Ø¯Ø± ÙÙØ§ØšÙ ØÙ ÙØ§Øª Ú©Ø§ÙÙØ¯Ù ÙØšØªÙÛ ØšÙ ØŽØšÚ©Ù ØšØ± Ø±ÙÛ ÙØšØ³Ø§ÛØªÛ Ú©Ù Ø¯ÛØ¯Ù ÙÛâÚ©ÙÛØ¯ Ø¢Ø³ÛØšâÙŸØ°ÛØ± Ú©ÙØ¯."> +<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Ø¯Ø± ÙÙÙ Ø¬Ø§ ÙØªÙØ¬Ù ØŽØ¯Ù Ø§Ø³Øª Ú©Ù ØŽÙØ§ Ø¯Ø± ØØ§Ù ÙØ±ÙØ¯ ØšÙ ÛÚ© ØµÙØÙ ØšØ¯ÙÙ HTTPS ÙØ³ØªÛØ¯Ø Ù ØªÙØ§ØŽ Ú©Ø±Ø¯ ØªØ§ Ø¯Ø± Ø¹ÙØ¶ ØŽÙØ§ Ø±Ø§ ØšÙ ÙØ³Ø®Ù HTTPS Ø¢Ù ØšÙØ±Ø³ØªØ¯. ÙØ³Ø®Ù HTTPS Ø¯Ø± Ø¯Ø³ØªØ±Ø³ ÙÛØ³Øª. ØšÙ Ø§ØØªÙØ§Ù Ø²ÛØ§Ø¯ Ø§ÛÙ Ø³Ø§ÛØª ÙØ³Ø®Ù HTTPS Ø±Ø§ ÙŸØŽØªÛØšØ§ÙÛ ÙÙÛÚ©ÙØ¯Ø Ø§ÙØ§ ÙÙÚÙÛÙ Ø§ÛÙ Ø§ÙÚ©Ø§Ù ÙØ¬ÙØ¯ Ø¯Ø§Ø±Ø¯ Ú©Ù ÛÚ© ÙÙØ§Ø¬Ù Ø¯Ø± ØØ§Ù ÙØ³Ø¯ÙØ¯ Ú©Ø±Ø¯Ù ÙØ³Ø®Ù HTTPS Ø§Ø³Øª. Ø§Ú¯Ø± ØªÙØ§ÛÙ Ø¯Ø§Ø±ÛØ¯ Ú©Ù Ú©Ù ÙØ³Ø®Ù Û Ø±ÙØ² ÙØŽØ¯Ù Ø§ÛÙ ØµÙØÙ Ø±Ø§ ØšØšÛÙÛØ¯Ø ÙÛ ØªÙØ§ÙÛØ¯ Ø§ÛÙ Ú©Ø§Ø± Ø±Ø§ ØšØ§ ØºÛØ± ÙØ¹Ø§Ù Ú©Ø±Ø¯Ù Ú¯Ø²ÛÙÙ 'Ø±ÙØ²ÙÚ¯Ø§Ø±Û ÙÙÙ ÙØšâÚ¯Ø§ÙâÙØ§Û ÙØ§Ø¬Ø¯ ØŽØ±Ø§ÛØ·' (EASE) Ø¯Ø± Ø§ÙØ²ÙÙÙ HTTPS Ø¯Ø± ÙÙÙ Ø¬Ø§ Ø§ÙØ¬Ø§Ù Ø¯ÙÛØ¯. ØªÙØ¬Ù Ø¯Ø§ØŽØªÙ ØšØ§ØŽÛØ¯ Ú©Ù ØºÛØ± ÙØ¹Ø§Ù Ú©Ø±Ø¯Ù Ø§ÛÙ Ú¯Ø²ÛÙÙ ÙÛ ØªÙØ§ÙØ¯ ÙØ±ÙØ±Ú¯Ø±ØªØ§Ù Ø±Ø§ Ø¯Ø± ÙÙØ§ØšÙ ØÙ ÙØ§Øª Ú©Ø§ÙÙØ¯Ù ØÙÙØ§Øª Ú©Ø§ÙÙØ¯Ù ÙØšØªÙÛ ØšÙ ØŽØšÚ©Ù ØšØ± Ø±ÙÛ ÙØšØ³Ø§ÛØªÛ Ú©Ù Ø¯ÛØ¯Ù ÙÛÚ©ÙÛØ¯ Ø¢Ø³ÛØš ÙŸØ°ÛØ± Ú©ÙØ¯."> <!ENTITY https-everywhere.cancel.he_blocking_network "ØÙÙØ§Øª Ú©Ø§ÙÙØ¯Ù ÙØšØªÙÛ ØšÙ ØŽØšÚ©Ù"> +<!ENTITY https-everywhere.cancel.open_page "ØµÙØÙ ÙØ§Ø§ÙÙ ØšØ§Ø²"> <!ENTITY https-everywhere.chrome.stable_rules "ÙÙØ§ÙÛÙ ÙŸØ§ÛØ¯Ø§Ø±"> <!ENTITY https-everywhere.chrome.stable_rules_description "Ø§ØªØµØ§ÙØ§Øª Ø±ÙØ²Ú¯Ø°Ø§Ø±Û ØšØ±Ø§Û Ø§ÛÙ ÙØšÚ¯Ø§Ù ÙØ§ Ø±Ø§ Ø§Ø¬ØšØ§Ø±Û Ú©Ù :">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 28 Feb '19

28 Feb '19

commit e8eb2a4c3bb2ad7d1a722ed18b83d59db09ee854 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 28 16:15:46 2019 +0000 Update translations for https_everywhere --- fa/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fa/https-everywhere.dtd b/fa/https-everywhere.dtd index 2976d4a96..c42978596 100644 --- a/fa/https-everywhere.dtd +++ b/fa/https-everywhere.dtd @@ -33,9 +33,9 @@ <!ENTITY https-everywhere.prefs.reset_defaults "بازنشانی به پیشفرض"> <!ENTITY https-everywhere.prefs.reset_defaults_message "این مجموعه دستور عمل ها را به وضعیت پیش فرض تنظیم مجدد خواهد کرد. ادامه می دهید؟"> -<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere noticed you were navigating to a non-HTTPS page, and tried to send you to the HTTPS version instead. The HTTPS version is unavailable. Most likely this site does not support HTTPS, but it is also possible that an attacker is blocking the HTTPS version. If you wish to view the unencrypted version of this page, you can still do so by disabling the 'Encrypt All Sites Eligible' (EASE) option in your HTTPS Everywhere extension. Be aware that disabling this option could make your browser vulnerable to network-based downgrade attacks on websites you visit."> +<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS در همه جا متوجه شده است که شما در حال ورود به یک صفحه بدون HTTPS هستید، و تلاش کرد تا در عوض شما را به نسخه HTTPS آن بفرستد. نسخه HTTPS در دسترس نیست. به احتمال زیاد این سایت نسخه HTTPS را پشتیبانی نمیکند، اما همچنین این امکان وجود دارد که یک مهاجم در حال مسدود کردن نسخه HTTPS است. اگر تمایل دارید که که نسخه ی رمز نشده این صفحه را ببینید، می توانید این کار را با غیر فعال کردن گزینه 'رمزنگاری همه وب‌گاه‌های واجد شرایط' (EASE) در افزونه HTTPS در همه جا انجام دهید. توجه داشته باشید که غیر فعال کردن این گزینه می تواند مرورگرتان را در مقابل حم لات کاهنده حملات کاهنده مبتنی به شبکه بر روی وبسایتی که دیدن میکنید آسیب پذیر کند."> <!ENTITY https-everywhere.cancel.he_blocking_network "حملات کاهنده مبتنی به شبکه"> -<!ENTITY https-everywhere.cancel.open_page "Open insecure page"> +<!ENTITY https-everywhere.cancel.open_page "صفحه ناامن باز"> <!ENTITY https-everywhere.chrome.stable_rules "قوانین پایدار"> <!ENTITY https-everywhere.chrome.stable_rules_description "اتصالات رمزگذاری برای این وبگاه ها را اجباری کن :">

1 0

[sbws/master] tests: remove unused testnets
by juga＠torproject.org 28 Feb '19

28 Feb '19

commit 0e8f6a1544bbf1cb5018aab831e874895b7d3daf Author: juga0 <juga(a)riseup.net> Date: Thu Jan 10 11:11:13 2019 +0000 tests: remove unused testnets Fixes bug #29046. Bugfix v0.4.0. --- tests/testnets/.gitignore | 8 - tests/testnets/run-network.sh | 43 ----- tests/testnets/simple-ipv4/.net | 0 tests/testnets/simple-ipv4/00-common.sh | 7 - tests/testnets/simple-ipv4/01-gen-configs.sh | 1 - tests/testnets/simple-ipv4/02-start-network.sh | 1 - .../simple-ipv4/03-network-in-ready-state.py | 1 - tests/testnets/simple-ipv4/04-stop-network.sh | 1 - tests/testnets/simple-ipv4/html/alphabet.txt | 1 - tests/testnets/simple-ipv6/.net | 0 tests/testnets/simple-ipv6/00-common.sh | 7 - tests/testnets/simple-ipv6/01-gen-configs.sh | 1 - tests/testnets/simple-ipv6/02-start-network.sh | 1 - .../simple-ipv6/03-network-in-ready-state.py | 1 - tests/testnets/simple-ipv6/04-stop-network.sh | 1 - tests/testnets/simple.common/01-gen-configs.sh | 175 --------------------- tests/testnets/simple.common/02-start-network.sh | 14 -- .../simple.common/03-network-in-ready-state.py | 126 --------------- tests/testnets/simple.common/04-stop-network.sh | 3 - 19 files changed, 392 deletions(-) diff --git a/tests/testnets/.gitignore b/tests/testnets/.gitignore deleted file mode 100644 index 91f372c..0000000 --- a/tests/testnets/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -auth?/ -relay?/ -exit?/ -client?/ -datadir/ -tor/ -config*.ini -*.log diff --git a/tests/testnets/run-network.sh b/tests/testnets/run-network.sh deleted file mode 100755 index 15a963c..0000000 --- a/tests/testnets/run-network.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash -set -e -function cleanup { - kill $(jobs -p) - echo -n '' -} -trap cleanup EXIT - -function list_of_nets { - find . -mindepth 2 -maxdepth 2 -type f -name '.net' |\ - xargs dirname | sort -u | xargs -} - -function usage { - echo "Usage: $0 <net>" - echo "Where <net> is one of: $(list_of_nets)" -} - -[ "$1" == "" ] && usage && exit 1 || net="$1" -[ ! -d "$net" ] && usage && exit 1 -[ ! -f "$net/.net" ] && usage && exit 1 - -pushd $net -./01-gen-configs.sh -./02-start-network.sh -sleep 5 -num_relays=$(ls -ld {auth,relay,exit}* | wc -l) -echo "Waiting until network of $num_relays relays is ready ..." -time ./03-network-in-ready-state.py auth* relay* exit* --size $num_relays -echo 'All ready!' - -#sbws -d . server > debug.server.log & -#sleep 1 -sbws -d . scanner > debug.scanner.log & - -run_time="45" -echo "Running for $run_time seconds ..." -sleep $run_time - -sbws -d . generate --output /dev/stdout | tee generate.log -sbws -d . stats | tee stats.log - -./04-stop-network.sh diff --git a/tests/testnets/simple-ipv4/.net b/tests/testnets/simple-ipv4/.net deleted file mode 100644 index e69de29..0000000 diff --git a/tests/testnets/simple-ipv4/00-common.sh b/tests/testnets/simple-ipv4/00-common.sh deleted file mode 100644 index 3e7985f..0000000 --- a/tests/testnets/simple-ipv4/00-common.sh +++ /dev/null @@ -1,7 +0,0 @@ -ip_space="127.10.0." -socksport="2000" -controlport="2001" -orport="2002" -dirport="2003" -auth_torrc_section="auth.torrc.part" -sbws_server_host="127.0.0.1" diff --git a/tests/testnets/simple-ipv4/01-gen-configs.sh b/tests/testnets/simple-ipv4/01-gen-configs.sh deleted file mode 120000 index 115f351..0000000 --- a/tests/testnets/simple-ipv4/01-gen-configs.sh +++ /dev/null @@ -1 +0,0 @@ -../simple.common/01-gen-configs.sh \ No newline at end of file diff --git a/tests/testnets/simple-ipv4/02-start-network.sh b/tests/testnets/simple-ipv4/02-start-network.sh deleted file mode 120000 index df06b4a..0000000 --- a/tests/testnets/simple-ipv4/02-start-network.sh +++ /dev/null @@ -1 +0,0 @@ -../simple.common/02-start-network.sh \ No newline at end of file diff --git a/tests/testnets/simple-ipv4/03-network-in-ready-state.py b/tests/testnets/simple-ipv4/03-network-in-ready-state.py deleted file mode 120000 index 70d43ba..0000000 --- a/tests/testnets/simple-ipv4/03-network-in-ready-state.py +++ /dev/null @@ -1 +0,0 @@ -../simple.common/03-network-in-ready-state.py \ No newline at end of file diff --git a/tests/testnets/simple-ipv4/04-stop-network.sh b/tests/testnets/simple-ipv4/04-stop-network.sh deleted file mode 120000 index dc2ab02..0000000 --- a/tests/testnets/simple-ipv4/04-stop-network.sh +++ /dev/null @@ -1 +0,0 @@ -../simple.common/04-stop-network.sh \ No newline at end of file diff --git a/tests/testnets/simple-ipv4/html/alphabet.txt b/tests/testnets/simple-ipv4/html/alphabet.txt deleted file mode 100644 index e85d5b4..0000000 --- a/tests/testnets/simple-ipv4/html/alphabet.txt +++ /dev/null @@ -1 +0,0 @@ -abcdefghijklmnopqrstuvwxyz \ No newline at end of file diff --git a/tests/testnets/simple-ipv6/.net b/tests/testnets/simple-ipv6/.net deleted file mode 100644 index e69de29..0000000 diff --git a/tests/testnets/simple-ipv6/00-common.sh b/tests/testnets/simple-ipv6/00-common.sh deleted file mode 100644 index fa1b800..0000000 --- a/tests/testnets/simple-ipv6/00-common.sh +++ /dev/null @@ -1,7 +0,0 @@ -ip_space="127.10.0." -socksport="2000" -controlport="2001" -orport="2002" -dirport="2003" -auth_torrc_section="auth.torrc.part" -sbws_server_host="::1" diff --git a/tests/testnets/simple-ipv6/01-gen-configs.sh b/tests/testnets/simple-ipv6/01-gen-configs.sh deleted file mode 120000 index 115f351..0000000 --- a/tests/testnets/simple-ipv6/01-gen-configs.sh +++ /dev/null @@ -1 +0,0 @@ -../simple.common/01-gen-configs.sh \ No newline at end of file diff --git a/tests/testnets/simple-ipv6/02-start-network.sh b/tests/testnets/simple-ipv6/02-start-network.sh deleted file mode 120000 index df06b4a..0000000 --- a/tests/testnets/simple-ipv6/02-start-network.sh +++ /dev/null @@ -1 +0,0 @@ -../simple.common/02-start-network.sh \ No newline at end of file diff --git a/tests/testnets/simple-ipv6/03-network-in-ready-state.py b/tests/testnets/simple-ipv6/03-network-in-ready-state.py deleted file mode 120000 index 70d43ba..0000000 --- a/tests/testnets/simple-ipv6/03-network-in-ready-state.py +++ /dev/null @@ -1 +0,0 @@ -../simple.common/03-network-in-ready-state.py \ No newline at end of file diff --git a/tests/testnets/simple-ipv6/04-stop-network.sh b/tests/testnets/simple-ipv6/04-stop-network.sh deleted file mode 120000 index dc2ab02..0000000 --- a/tests/testnets/simple-ipv6/04-stop-network.sh +++ /dev/null @@ -1 +0,0 @@ -../simple.common/04-stop-network.sh \ No newline at end of file diff --git a/tests/testnets/simple.common/01-gen-configs.sh b/tests/testnets/simple.common/01-gen-configs.sh deleted file mode 100755 index 7dcc602..0000000 --- a/tests/testnets/simple.common/01-gen-configs.sh +++ /dev/null @@ -1,175 +0,0 @@ -#!/usr/bin/env bash -set -e - -which tor || exit 1 -which tor-gencert || exit 1 - -source 00-common.sh - -function get_fingerprint { - dir=$1 - [ -f $dir/torrc ] || exit 2 - tor --ignore-missing-torrc -f $dir/torrc --Address 8.8.8.8 \ - --list-fingerprint | tail -n 1 | cut -d ' ' -f 2- \ - | sed 's|\ ||g' -} - -function get_v3ident { - dir=$1 - cert=$dir/keys/authority_certificate - [ -f $cert ] || exit 2 - grep fingerprint $cert | cut -d ' ' -f 2 -} - - -next_ip="1" -scanner_tor_socks_proxy_ip="" -scanner_tor_socks_proxy_nick="" - -echo -n '' > $auth_torrc_section -rm -fr auth?/ relay?/ exit?/ config*.ini datadir/ tor/ *.log -for A in auth1 auth2 auth3 -do - mkdir -pv $A/keys - chmod 700 $A - ip=${ip_space}${next_ip} - [ "$scanner_tor_socks_proxy_ip" == "" ] && scanner_tor_socks_proxy_ip="$ip" - [ "$scanner_tor_socks_proxy_nick" == "" ] && scanner_tor_socks_proxy_nick="$A" - echo -n '' | tor-gencert --create-identity-key --passphrase-fd 0 -m 24 -a $ip:$dirport - echo " - DataDirectory $A - PidFile $A/tor.pid - Log notice file $A/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - AuthoritativeDirectory 1 - V3AuthoritativeDirectory 1 - Address $ip - SocksPort $ip:$socksport - ControlPort $ip:$controlport - ControlSocket $(pwd)/$A/control_socket - CookieAuthentication 1 - ORPort $ip:$orport - DirPort $ip:$dirport - Nickname $A - ContactInfo pastly(a)torproject.org - " > $A/torrc - mv -v authority_* $A/keys/ - fp=$(get_fingerprint $A) - v3ident=$(get_v3ident $A) - echo "DirAuthority $A orport=$orport no-v2 v3ident=$v3ident $ip:$dirport $fp" \ - >> $auth_torrc_section - - next_ip=$((next_ip+1)) -done - -for A in relay1 relay2 relay3 relay4 relay5 relay6 relay7 -do - mkdir -pv $A - chmod 700 $A - ip=${ip_space}${next_ip} - echo " - DataDirectory $A - PidFile $A/tor.pid - Log notice file $A/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address $ip - SocksPort $ip:$socksport - ControlPort $ip:$controlport - ControlSocket $(pwd)/$A/control_socket - CookieAuthentication 1 - ORPort $ip:$orport - DirPort $ip:$dirport - Nickname $A - ContactInfo pastly(a)torproject.org - " > $A/torrc - next_ip=$((next_ip+1)) -done - -for A in exit1 exit2 exit3 -do - mkdir -pv $A - chmod 700 $A - ip=${ip_space}${next_ip} - echo " - DataDirectory $A - PidFile $A/tor.pid - Log notice file $A/notice.log - ShutdownWaitLength 2 - ExitRelay 1 - IPv6Exit 1 - ExitPolicy accept *:* - ExitPolicy reject *:* - Address $ip - SocksPort $ip:$socksport - ControlPort $ip:$controlport - ControlSocket $(pwd)/$A/control_socket - CookieAuthentication 1 - ORPort $ip:$orport - DirPort $ip:$dirport - Nickname $A - ContactInfo pastly(a)torproject.org - " > $A/torrc - next_ip=$((next_ip+1)) -done - -for torrc in ./auth*/torrc -do - echo " - TestingV3AuthInitialVotingInterval 5 - V3AuthVotingInterval 10 - TestingV3AuthInitialVoteDelay 2 - V3AuthVoteDelay 2 - TestingV3AuthInitialDistDelay 2 - V3AuthDistDelay 2 - " >> $torrc -done - -for torrc in ./{auth,relay,exit}*/torrc -do - cat $auth_torrc_section >> $torrc - echo " - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 - " >> $torrc -done - - -# Get a random port between 2000 and 62000 while handling the fact that $RANDOM -# doesn't go up that high -sbws_server_port=$(( ((RANDOM<<15)|RANDOM) % 60000 + 2000 )) - -echo " -[paths] -sbws_home = $(pwd) - -[tor] -extra_lines = - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 -$(cat $auth_torrc_section | while read LINE; do printf " $LINE\n"; done) - -[scanner] -nickname = SbwsTestnetScanner -measurement_threads = 4 -download_toofast = 0.1 -download_min = 1 -download_target = 2 -download_max = 5 -num_rtts = 5 -num_downloads = 3 - -[destinations] -debian_cd_mirror_will_break = on - -[destinations.debian_cd_mirror_will_break] -url = https://saimei.ftp.acc.umu.se/debian-cd/9.4.0/amd64/iso-dvd/debian-9.4.0-am… -#url = https://cdimage.debian.org/debian-cd/9.4.0/amd64/iso-dvd/debian-9.4.0-amd64… -" > config.ini -touch config.log.ini -rm $auth_torrc_section diff --git a/tests/testnets/simple.common/02-start-network.sh b/tests/testnets/simple.common/02-start-network.sh deleted file mode 100755 index 57c26fa..0000000 --- a/tests/testnets/simple.common/02-start-network.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -set -e -function cleanup { - #kill -INT $(cat {auth,relay,exit}*/tor.pid) - #kill -INT $(jobs -p) - echo -n '' -} -trap cleanup EXIT - - -for A in {auth,relay,exit}* -do - tor -f $A/torrc --quiet & -done diff --git a/tests/testnets/simple.common/03-network-in-ready-state.py b/tests/testnets/simple.common/03-network-in-ready-state.py deleted file mode 100755 index 5753c05..0000000 --- a/tests/testnets/simple.common/03-network-in-ready-state.py +++ /dev/null @@ -1,126 +0,0 @@ -#!/usr/bin/env python3 -from argparse import RawTextHelpFormatter, ArgumentParser -from stem.control import Controller -import time -import os -import logging - -logger = logging.getLogger(__name__) - - -def get_controller(sock_fname): - cont = Controller.from_socket_file(path=sock_fname) - cont.authenticate() - return cont - - -def get_is_bootstrapped(cont, timeout=60): - start_time = time.time() - while start_time + timeout > time.time(): - line = cont.get_info('status/bootstrap-phase') - state, _, progress, *_ = line.split() - progress = int(progress.split('=')[1]) - if state == 'NOTICE' and progress == 100: - logger.debug('Tor is bootstrapped') - return True - time.sleep(1) - logger.debug('Tor didn\'t bootstrap before timeout. Last line: %s', line) - return False - - -def get_has_full_consensus(cont, network_size, timeout=60): - start_time = time.time() - while start_time + timeout > time.time(): - relays = [r for r in cont.get_network_statuses()] - if len(relays) == network_size: - logger.debug('Tor has correct network size %d', - network_size) - return True - elif len(relays) > network_size: - logger.warning('Tor has more relays than expected. %d vs %d', - len(relays), network_size) - return True - time.sleep(1) - logger.debug('Tor didn\'t reach expected network size %d before ' - 'timeout', network_size) - return False - - -def is_tor_ready(sock_fname, network_size): - with get_controller(sock_fname) as cont: - if not get_is_bootstrapped(cont): - logger.warning('%s not bootstrapped, Tor not ready', sock_fname) - return False - if not get_has_full_consensus(cont, network_size): - logger.warning('%s doesn\'t have full consensus, Tor not ready', - sock_fname) - return False - logger.info('%s is ready', sock_fname) - return True - - -def main(args): - for datadir in args.datadir: - logger.info('Checking if %s is ready', datadir) - sock_fname = os.path.join(datadir, 'control_socket') - assert os.path.exists(sock_fname) - if not is_tor_ready(sock_fname, network_size=args.size): - return 1 - # If we got to this point, it seems like every relay is completely ready. - # Do one more check to make sure that's still the case. - for datadir in args.datadir: - logger.info('Verifying %s is still ready', datadir) - sock_fname = os.path.join(datadir, 'control_socket') - assert os.path.exists(sock_fname) - if not is_tor_ready(sock_fname, network_size=args.size): - return 1 - return 0 - - -if __name__ == '__main__': - desc = ''' -Given the data directories for a local tor network, connect to the control -socket in each directory and verify that the tor on the other end of the socket -is fully bootstrapped and has the right size of consensus. - -The "right size of consensus" is determined based on the number of data -directories given to check. If that is not okay to assume (for example, there -are some Tor client [non-relay] data directories given to check), then specify -the size manually with --size. - -Waits up to 60 seconds for each check for each tor. - -- In the worst case, this script will take a long time to run (if every tor - suddenly passes each check after 59 seconds). -- In the normal failure case, this script will take about 60 seconds to run - (the first tor is not ready and fails its checks). -- In the normal case, it will run very quickly (every tor is bootstrapped and - ready). - -Exits with 0 if everything is good. Otherwise exits with a postive integer. -''' - parser = ArgumentParser( - formatter_class=RawTextHelpFormatter, description=desc) - parser.add_argument('-s', '--size', type=int, help='If given, don\'t ' - 'assume the network size based on the number of ' - 'datadirs, but use this size instead.') - parser.add_argument('-d', '--debug', action='store_true') - parser.add_argument('datadir', nargs='+', type=str) - args = parser.parse_args() - - if args.debug: - logger.setLevel(logging.DEBUG) - else: - logger.setLevel(logging.WARNING) - ch = logging.StreamHandler() - formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s') - ch.setFormatter(formatter) - logger.addHandler(ch) - - if not args.size: - args.size = len(args.datadir) - - try: - exit(main(args)) - except KeyboardInterrupt: - pass diff --git a/tests/testnets/simple.common/04-stop-network.sh b/tests/testnets/simple.common/04-stop-network.sh deleted file mode 100755 index 1e3429b..0000000 --- a/tests/testnets/simple.common/04-stop-network.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -kill -INT $(cat {auth,relay,exit}*/tor.pid)

1 0

[sbws/master] MANIFEST: Remove testnets rules
by juga＠torproject.org 28 Feb '19

28 Feb '19

commit 5be9da54a1123cc44ca8ac838c2ce9627f39846e Author: juga0 <juga(a)riseup.net> Date: Thu Feb 28 11:57:32 2019 +0000 MANIFEST: Remove testnets rules since testnets dir has been removed. --- MANIFEST.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 332cfc4..608581d 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,10 +5,4 @@ include examples * recursive-include docs * prune docs/build recursive-include tests * -prune tests/testnets/*/auth? -prune tests/testnets/*/relay? -prune tests/testnets/*/datadir -prune tests/testnets/*/exit? -recursive-exclude tests/testnets/* config*.ini -recursive-exclude tests/testnets/* *.log prune **/__pycache__

1 0

[sbws/master] Merge branch 'bug29046'
by juga＠torproject.org 28 Feb '19

28 Feb '19

commit 289757f9df3619e39002d25b05258956fa58bdd3 Merge: 878e21e 0e8f6a1 Author: juga0 <juga(a)riseup.net> Date: Thu Feb 28 11:53:09 2019 +0000 Merge branch 'bug29046' tests/testnets/.gitignore | 8 - tests/testnets/run-network.sh | 43 ----- tests/testnets/simple-ipv4/.net | 0 tests/testnets/simple-ipv4/00-common.sh | 7 - tests/testnets/simple-ipv4/01-gen-configs.sh | 1 - tests/testnets/simple-ipv4/02-start-network.sh | 1 - .../simple-ipv4/03-network-in-ready-state.py | 1 - tests/testnets/simple-ipv4/04-stop-network.sh | 1 - tests/testnets/simple-ipv4/html/alphabet.txt | 1 - tests/testnets/simple-ipv6/.net | 0 tests/testnets/simple-ipv6/00-common.sh | 7 - tests/testnets/simple-ipv6/01-gen-configs.sh | 1 - tests/testnets/simple-ipv6/02-start-network.sh | 1 - .../simple-ipv6/03-network-in-ready-state.py | 1 - tests/testnets/simple-ipv6/04-stop-network.sh | 1 - tests/testnets/simple.common/01-gen-configs.sh | 175 --------------------- tests/testnets/simple.common/02-start-network.sh | 14 -- .../simple.common/03-network-in-ready-state.py | 126 --------------- tests/testnets/simple.common/04-stop-network.sh | 3 - 19 files changed, 392 deletions(-)

1 0

[tor-browser-build/master] Bug 28685: Set Build ID based on Tor Browser version
by gk＠torproject.org 28 Feb '19

28 Feb '19

commit d11f03f7c10c2cf5a942a353d0961249ceee9644 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 20 20:15:19 2019 +0100 Bug 28685: Set Build ID based on Tor Browser version --- projects/firefox/build | 2 +- projects/firefox/get-moz-build-date | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 1544c11..aa0a34f 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -113,7 +113,7 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %] [% END %] -eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] $(cat browser/config/version.txt)) +eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %] if [ -z $MOZ_BUILD_DATE ] then echo "MOZ_BUILD_DATE is not set" diff --git a/projects/firefox/get-moz-build-date b/projects/firefox/get-moz-build-date index fb7298a..4e55c92 100755 --- a/projects/firefox/get-moz-build-date +++ b/projects/firefox/get-moz-build-date @@ -1,16 +1,24 @@ #!/usr/bin/perl -w -# Generate a MOZ_BUILD_DATE based on firefox version number +# Generate a MOZ_BUILD_DATE based on Tor Browser version number use strict; die "wrong number of arguments" unless @ARGV == 2; my ($year, $version) = @ARGV; -$version =~ s/\D+$//; -my @v = split(/[\.ab]/, $version); -push @v, '0' if @v < 4; -push @v, '0' if @v < 4; -my $day_of_month = int(($v[0] - 45) / 5); -my $date = 101010101 + $year * 10000000000 + $day_of_month * 1000000 - + $v[1] * 10000 + $v[2] * 100 + $v[3]; -$date += 100000000 unless $version =~ m/[ab]/; +my $date; +if ($version eq 'tbb-nightly') { + my (undef, undef, undef, $day, $mon, $y) = localtime; + $date = sprintf("%d%02d%02d010101", $y + 1900, $mon + 1, $day); +} else { + my @v = split(/[\.ab]/, $version); + push @v, '0' if @v < 4; + push @v, '0' if @v < 4; + # When MOZ_BUILD_DATE was based on the firefox version, with + # Tor Browser 8.0.6 and firefox 60.5.1 it was 20190204060201 + # We can remove 5 from the month, while keeping it increasing. + my $month = $v[0] - 5; + $date = 1010101 + $year * 10000000000 + $month * 100000000 + + $v[1] * 1000000 + $v[2] * 10000 + $v[3]; + $date += 1000000 unless $version =~ m/[ab]/; +} print "export MOZ_BUILD_DATE=$date\n";

1 0

[sbws/master] scanner: log any exception raised by main_loop
by juga＠torproject.org 28 Feb '19

28 Feb '19

commit 88752c93de820fce8b1e6486984da117f68a0b93 Author: juga0 <juga(a)riseup.net> Date: Wed Feb 27 15:08:55 2019 +0000 scanner: log any exception raised by main_loop before stopping the scanner. --- sbws/core/scanner.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index 00071be..a1206d3 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -36,6 +36,9 @@ pool = None rd = None controller = None +FILLUP_TICKET_MSG = """Something went wrong. +Please create a ticket in https://trac.torproject.org with this traceback.""" + def stop_threads(signal, frame, exit_code=0): global rd, pool @@ -540,14 +543,18 @@ def run_speedtest(args, conf): fail_hard(error_msg) max_pending_results = conf.getint('scanner', 'measurement_threads') pool = Pool(max_pending_results) - try: main_loop(args, conf, controller, rl, cb, rd, rp, destinations, max_pending_results, pool) except KeyboardInterrupt: log.info("Interrupted by the user.") - finally: stop_threads(signal.SIGINT, None) + # Any exception not catched at this point would make the scanner stall. + # Log it and exit gracefully. + except Exception as e: + log.critical(FILLUP_TICKET_MSG) + log.exception(e) + stop_threads(signal.SIGTERM, None, 1) def gen_parser(sub):

1 0

[sbws/master] scanner: Log callback error traceback
by juga＠torproject.org 28 Feb '19

28 Feb '19

commit 8cbb73052240f685b409a89df910b915228c651c Author: juga0 <juga(a)riseup.net> Date: Wed Feb 27 17:07:21 2019 +0000 scanner: Log callback error traceback Since the exception happens in a thread, not the main process, use print_traceback to print the traceback. --- sbws/core/scanner.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index 06bae72..e99b8cd 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -3,6 +3,7 @@ import signal import sys import threading +import traceback import uuid from ..lib.circuitbuilder import GapsCircuitBuilder as CB @@ -59,7 +60,6 @@ signal.signal(signal.SIGTERM, stop_threads) def dumpstacks(): - import traceback log.critical(FILLUP_TICKET_MSG) thread_id2name = dict([(t.ident, t.name) for t in threading.enumerate()]) for thread_id, stack in sys._current_frames().items(): @@ -393,7 +393,11 @@ def result_putter_error(target): def closure(object): # The only object that can be here if there is not any uncatched # exception is stem.SocketClosed when stopping sbws - log.debug(type(object)) + # An exception here means that the worker thread finished. + log.warning(FILLUP_TICKET_MSG) + # To print the traceback that happened in the thread, not here in the + # main process + traceback.print_exception(type(object), object, object.__traceback__) return closure

1 0

[sbws/master] config: Add country to scanner and destinations sections
by juga＠torproject.org 28 Feb '19

28 Feb '19

commit 92dea956c0f9a18dfeb8b571ecff5633929a858d Author: juga0 <juga(a)riseup.net> Date: Wed Feb 6 12:11:20 2019 +0000 config: Add country to scanner and destinations sections To be able to add them to the bandwidth file so that we can diversify the locations and/or know how the location affects the bandwidth results. --- docs/source/config.example.ini | 7 +++++++ docs/source/man_sbws.ini.rst | 10 ++++++++-- sbws/config.default.ini | 3 +++ sbws/util/config.py | 23 +++++++++++++++++++++-- sbws/util/iso3166.py | 37 +++++++++++++++++++++++++++++++++++++ tests/unit/util/test_config.py | 30 ++++++++++++++++++++++++++++++ 6 files changed, 106 insertions(+), 4 deletions(-) diff --git a/docs/source/config.example.ini b/docs/source/config.example.ini index f3ca1da..9a0d1ca 100644 --- a/docs/source/config.example.ini +++ b/docs/source/config.example.ini @@ -2,9 +2,16 @@ [scanner] # A human-readable string with chars in a-zA-Z0-9 to identify your scanner nickname = sbws_default +# ISO 3166-1 alpha-2 country code. To be edited. +# Default to a non existing country to detect it was not edited. +country = AA [destinations] foo = off [destinations.foo] url = https://example.com/does/not/exist.bin +# ISO 3166-1 alpha-2 country code. To be edited. +# Use ZZ if the destination URL is a domain name and it is in a CDN. +# Default to a non existing country to detect it was not edited. +country = AA diff --git a/docs/source/man_sbws.ini.rst b/docs/source/man_sbws.ini.rst index 8886d62..8f64b0d 100644 --- a/docs/source/man_sbws.ini.rst +++ b/docs/source/man_sbws.ini.rst @@ -8,9 +8,9 @@ Tor bandwidth scanner configuration file. **sbws** (1) ``scanner`` command requires a configuration file with a "[destinations]" section. +"[destinations]" is the only section that does not have a default value. -It is the only section that does not have a default value. - +It is also required to configure "country" in the "[scanner]" section. It is recommended, but not required to configure "nickname" in the "[scanner]" section. @@ -77,6 +77,9 @@ destinations.STR verify = BOOL Whether or not to verify the destination certificate. (Default: True) + country = STR + ISO 3166-1 alpha-2 country code. + Use ZZ if the destination URL is a domain name and it is in a CDN. tor @@ -99,6 +102,9 @@ scanner nickname = STR A human-readable string with chars in a-zA-Z0-9 to identify the scanner. (Default: IDidntEditTheSBWSConfig) + country = STR + ISO 3166-1 alpha-2 country code. + (Default: AA, a non existing country to detect it was not edited) download_toofast = INT Limits on what download times are too fast/slow/etc. (Default: 1) download_min = INT diff --git a/sbws/config.default.ini b/sbws/config.default.ini index f666640..81b4b07 100644 --- a/sbws/config.default.ini +++ b/sbws/config.default.ini @@ -36,6 +36,9 @@ reset_bw_ipv6_changes = off [scanner] # A human-readable string with chars in a-zA-Z0-9 to identify your scanner nickname = IDidntEditTheSBWSConfig +# ISO 3166-1 alpha-2 country code. To be edited. +# Default to a non existing country to detect it was not edited. +country = AA # Limits on what download times are too fast/slow/etc. download_toofast = 1 download_min = 5 diff --git a/sbws/util/config.py b/sbws/util/config.py index b1ecc4f..6622ba3 100644 --- a/sbws/util/config.py +++ b/sbws/util/config.py @@ -12,6 +12,8 @@ from sbws.globals import (DEFAULT_CONFIG_PATH, DEFAULT_LOG_CONFIG_PATH, USER_CONFIG_PATH, SUPERVISED_RUN_DPATH, SUPERVISED_USER_CONFIG_PATH) +from sbws.util.iso3166 import ISO_3166_ALPHA_2 + _ALPHANUM = 'abcdefghijklmnopqrstuvwxyz' _ALPHANUM += _ALPHANUM.upper() _ALPHANUM += '0123456789' @@ -269,6 +271,21 @@ def _validate_paths(conf): return errors +def _validate_country(conf, sec, key, err_tmpl): + errors = [] + if conf[sec].get(key, None) is None: + errors.append(err_tmpl.substitute( + sec=sec, key=key, val=None, + e="Missing country in configuration file.")) + return errors + valid = conf[sec]['country'] in ISO_3166_ALPHA_2 + if not valid: + errors.append(err_tmpl.substitute( + sec=sec, key=key, val=conf[sec][key], + e="Not a valid ISO 3166 alpha-2 country code.")) + return errors + + def _validate_scanner(conf): errors = [] sec = 'scanner' @@ -288,7 +305,7 @@ def _validate_scanner(conf): 'download_max': {'minimum': 0.001, 'maximum': None}, } all_valid_keys = list(ints.keys()) + list(floats.keys()) + \ - ['nickname'] + ['nickname', 'country'] errors.extend(_validate_section_keys(conf, sec, all_valid_keys, err_tmpl)) errors.extend(_validate_section_ints(conf, sec, ints, err_tmpl)) errors.extend(_validate_section_floats(conf, sec, floats, err_tmpl)) @@ -296,6 +313,7 @@ def _validate_scanner(conf): if not valid: errors.append(err_tmpl.substitute( sec=sec, key='nickname', val=conf[sec]['nickname'], e=error_msg)) + errors.extend(_validate_country(conf, sec, 'country', err_tmpl)) return errors @@ -388,7 +406,7 @@ def _validate_destinations(conf): urls = { 'url': {}, } - all_valid_keys = list(urls.keys()) + ['verify'] + all_valid_keys = list(urls.keys()) + ['verify', 'country'] for sec in dest_sections: if sec not in conf: errors.append('{} is an enabled destination but is not a ' @@ -397,6 +415,7 @@ def _validate_destinations(conf): errors.extend(_validate_section_keys( conf, sec, all_valid_keys, err_tmpl, allow_missing=['verify'])) errors.extend(_validate_section_urls(conf, sec, urls, err_tmpl)) + errors.extend(_validate_country(conf, sec, 'country', err_tmpl)) return errors diff --git a/sbws/util/iso3166.py b/sbws/util/iso3166.py new file mode 100644 index 0000000..d537c18 --- /dev/null +++ b/sbws/util/iso3166.py @@ -0,0 +1,37 @@ +""" +ISO 3166 alpha-2 countries' codes. +Obtained from https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes. +Last updated 2019/02/05. +ZZ is not the code of any country and it is used to denote any country, +when the destination Web Server is in a CDN. +""" +# When the destination Web Server is in a CDN, the IP could be resolved by +# the exit relay and obtain the country from the IP. + +# It would be better to use some standard location system for geopgraphic areas +# that doesn't depend on political borders. +# It should be possible to obtain IP address location in that system too. + +ISO_3166_ALPHA_2 = [ + 'AF', 'AX', 'AL', 'DZ', 'AS', 'AD', 'AO', 'AI', 'AQ', 'AG', 'AR', 'AM', + 'AW', 'AU', 'AT', 'AZ', 'BS', 'BH', 'BD', 'BB', 'BY', 'BE', 'BZ', 'BJ', + 'BM', 'BT', 'BO', 'BQ', 'BA', 'BW', 'BV', 'BR', 'IO', 'BN', 'BG', 'BF', + 'BI', 'CV', 'KH', 'CM', 'CA', 'KY', 'CF', 'TD', 'CL', 'CN', 'CX', 'CC', + 'CO', 'KM', 'CD', 'CG', 'CK', 'CR', 'CI', 'HR', 'CU', 'CW', 'CY', 'CZ', + 'DK', 'DJ', 'DM', 'DO', 'EC', 'EG', 'SV', 'GQ', 'ER', 'EE', 'SZ', 'ET', + 'FK', 'FO', 'FJ', 'FI', 'FR', 'GF', 'PF', 'TF', 'GA', 'GM', 'GE', 'DE', + 'GH', 'GI', 'GR', 'GL', 'GD', 'GP', 'GU', 'GT', 'GG', 'GN', 'GW', 'GY', + 'HT', 'HM', 'VA', 'HN', 'HK', 'HU', 'IS', 'IN', 'ID', 'IR', 'IQ', 'IE', + 'IM', 'IL', 'IT', 'JM', 'JP', 'JE', 'JO', 'KZ', 'KE', 'KI', 'KP', 'KR', + 'KW', 'KG', 'LA', 'LV', 'LB', 'LS', 'LR', 'LY', 'LI', 'LT', 'LU', 'MO', + 'MK', 'MG', 'MW', 'MY', 'MV', 'ML', 'MT', 'MH', 'MQ', 'MR', 'MU', 'YT', + 'MX', 'FM', 'MD', 'MC', 'MN', 'ME', 'MS', 'MA', 'MZ', 'MM', 'NA', 'NR', + 'NP', 'NL', 'NC', 'NZ', 'NI', 'NE', 'NG', 'NU', 'NF', 'MP', 'NO', 'OM', + 'PK', 'PW', 'PS', 'PA', 'PG', 'PY', 'PE', 'PH', 'PN', 'PL', 'PT', 'PR', + 'QA', 'RE', 'RO', 'RU', 'RW', 'BL', 'SH', 'KN', 'LC', 'MF', 'PM', 'VC', + 'WS', 'SM', 'ST', 'SA', 'SN', 'RS', 'SC', 'SL', 'SG', 'SX', 'SK', 'SI', + 'SB', 'SO', 'ZA', 'GS', 'SS', 'ES', 'LK', 'SD', 'SR', 'SJ', 'SE', 'CH', + 'SY', 'TW', 'TJ', 'TZ', 'TH', 'TL', 'TG', 'TK', 'TO', 'TT', 'TN', 'TR', + 'TM', 'TC', 'TV', 'UG', 'UA', 'AE', 'GB', 'UM', 'US', 'UY', 'UZ', 'VU', + 'VE', 'VN', 'VG', 'VI', 'WF', 'EH', 'YE', 'ZM', 'ZW', 'ZZ' + ] diff --git a/tests/unit/util/test_config.py b/tests/unit/util/test_config.py index 95dde6f..4ebc703 100644 --- a/tests/unit/util/test_config.py +++ b/tests/unit/util/test_config.py @@ -235,6 +235,36 @@ def test_nickname(): assert not valid, reason +def test_country(conf): + from string import Template + err_tmpl = Template('$sec/$key ($val): $e') + + # Invalid default country code in scanner section + errors = con._validate_country(conf, 'scanner', 'country', err_tmpl) + assert errors[0] == \ + 'scanner/country (AA): Not a valid ISO 3166 alpha-2 country code.' + + # Valid country code in scanner section + conf['scanner']['country'] = 'US' + errors = con._validate_country(conf, 'scanner', 'country', err_tmpl) + assert not errors + + # No country in destinations.foo section + conf['destinations']['foo'] = 'on' + conf['destinations.foo'] = {} + conf['destinations.foo']['url'] = 'https://foo.bar' + errors = con._validate_country( + conf, 'destinations.foo', 'country', err_tmpl) + assert errors[0] == \ + 'destinations.foo/country (None): ' \ + 'Missing country in configuration file.' + + # Valid country in destinations.foo section + conf['destinations.foo']['url'] = 'US' + errors = con._validate_country(conf, 'scanner', 'country', err_tmpl) + assert not errors + + def test_config_arg_provided_but_no_found(args, conf): args.config = 'non_existing_file' user_conf = con._get_user_config(args, conf)

1 0

[sbws/master] scanner, destination: Log all possible exceptions
by juga＠torproject.org 28 Feb '19

28 Feb '19

commit c4f502c1d05570d6069680b3a91cf9a1709d6e7a Author: juga0 <juga(a)riseup.net> Date: Wed Feb 27 17:30:59 2019 +0000 scanner, destination: Log all possible exceptions that can happen from requests, so that they can later be stored in a Result. --- sbws/core/scanner.py | 8 ++------ sbws/lib/destination.py | 5 +---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index e99b8cd..3fbd378 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -84,8 +84,6 @@ def timed_recv_from_server(session, dest, byte_range): start_time = time.time() HTTP_GET_HEADERS['Range'] = byte_range - # TODO: - # - What other exceptions can this throw? # - response.elapsed "measures the time taken between sending the first # byte of the request and finishing parsing the headers. # It is therefore unaffected by consuming the response content" @@ -94,10 +92,8 @@ def timed_recv_from_server(session, dest, byte_range): try: # headers are merged with the session ones, not overwritten. session.get(dest.url, headers=HTTP_GET_HEADERS, verify=dest.verify) - # NewConnectionError will be raised when shutting down. - except (requests.exceptions.ConnectionError, - requests.exceptions.ReadTimeout, - requests.exceptions.NewConnectionError) as e: + # Catch any `requests` exception, so that it can stored in the Result + except requests.exceptions.RequestException as e: log.debug(e) return False, e end_time = time.time() diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py index e1be0bb..c0e6b03 100644 --- a/sbws/lib/destination.py +++ b/sbws/lib/destination.py @@ -76,11 +76,8 @@ def connect_to_destination_over_circuit(dest, circ_id, session, cont, max_dl): listener = stem_utils.attach_stream_to_circuit_listener(cont, circ_id) stem_utils.add_event_listener(cont, listener, EventType.STREAM) try: - # TODO: - # - What other exceptions can this throw? head = session.head(dest.url, verify=dest.verify) - except (requests.exceptions.ConnectionError, - requests.exceptions.ReadTimeout) as e: + except requests.exceptions.RequestException as e: dest.set_failure() return False, 'Could not connect to {} over circ {} {}: {}'.format( dest.url, circ_id, stem_utils.circuit_str(cont, circ_id), e)

1 0