tor-commits January 2016

tor-commits@lists.torproject.org

19 participants
1449 discussions

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 24 Jan '16

24 Jan '16

commit 83622bfd0814b04d81e3758692c6e7b8e59e26e3 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 24 02:45:51 2016 +0000 Update translations for tor-launcher-network-settings_completed --- zh_TW/network-settings.dtd | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd index 40d1a29..6339a3a 100644 --- a/zh_TW/network-settings.dtd +++ b/zh_TW/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.firstQuestion "下列哪一項敘述最符合您的實際情況？"> <!ENTITY torSettings.configurePrompt1 "這部電腦的網路連線有被監控過濾或是有透過代理伺服器。"> -<!ENTITY torSettings.configurePrompt2 "我需要設定橋接器或本地代理設定"> +<!ENTITY torSettings.configurePrompt2 "我必須要在連上洋蔥路由 網路之前，先設定好橋接器或本地端代理伺服器。"> <!ENTITY torSettings.configure "設定"> <!ENTITY torSettings.connectPrompt2 "我想要直接連上洋蔥路由網路。"> <!ENTITY torSettings.connectPrompt3 "這將在大多數情況下正常運作。"> @@ -22,17 +22,23 @@ <!ENTITY torSettings.proxyPageTitle "本地端代理伺服器的設定"> <!ENTITY torSettings.proxyQuestion "這台電腦需要使用本地代理伺服器來存取網路嗎？">  -<!ENTITY torSettings.proxyHelp "若您無法確定如何回答這個問題，請查看其他瀏覽器的網路設定，看它是否設定為透過代理伺服器連線。"> +<!ENTITY torSettings.proxyExplanation1 "在大部分的情況中是不需要本地端代理伺服器的，但是當所使用的網路服務是公司企業或學校等之內部網路時，就有可能會需要。"> +<!ENTITY torSettings.proxyExplanation2 "如果您不確定如何回答這個問題的話，可以參考其他網路瀏覽器的網際網路設定或者是作業系統中的網路相關設定，以確定是否需要設定本地端代理伺服器。"> <!ENTITY torSettings.enterProxy "輸入代理伺服器設定。"> <!ENTITY torSettings.bridgePageTitle "洋蔥路由橋接器的設定"> <!ENTITY torSettings.bridgeQuestion "您的網際網路服務提供者(ISP)是否會阻擋或監控過濾連接到洋蔥路由的網路活動？"> -<!ENTITY torSettings.bridgeHelp "如果您不確定如何回答此問題，請選擇「否」。  如果您選擇「是」，您將被要求設定洋蔥路由的橋接器，這會讓對於˙洋蔥路由網路連線的阻擋更加困難。"> +<!ENTITY torSettings.bridgeExplanation1 "若您不確定如何回答這個問題的話，請選擇「否」(若之後您發現沒有使用橋接器無法連上洋蔥路由網路的話，可以再回頭來增加此設定)。"> +<!ENTITY torSettings.bridgeExplanation2 "若您選擇「是」的話，您將必須要進行洋蔥路由的橋接器設定，橋接器是未被列表的祕密洋蔥路由節點，它可以讓對通往洋蔥路由網路連線的阻擋，變得更加困難。"> <!ENTITY torSettings.bridgeSettingsPrompt "您可以使用提供的橋接器，您也可以輸入一組自訂的橋接器。">  <!ENTITY torsettings.startingTor "正在等待洋蔥路由啟動…"> <!ENTITY torsettings.restartTor "重新啟動洋蔥路由"> +<!ENTITY torsettings.reconfigTor "重新設定"> + +<!ENTITY torsettings.discardSettings.prompt "您已經有設定洋蔥路由的橋接器或本地端代理伺服器。  若想要直接連上洋蔥路由網路的話，必須要先移除這部份的設定。"> +<!ENTITY torsettings.discardSettings.proceed "移除設定值並且連線"> <!ENTITY torsettings.optional "選用"> @@ -50,6 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "允許的連接埠："> <!ENTITY torsettings.useBridges.checkbox "我的網際網路服務提供者(ISP)會過濾阻擋連接至洋蔥路由的網路活動"> <!ENTITY torsettings.useBridges.default "使用提供的橋接器連線"> +<!ENTITY torsettings.useBridges.note "每種橋接器都使用不同的方式去規避網路封包過濾，  如果發現使用了某個橋接器仍然無法順利連上線的話，可以更換另一個橋接器再行嘗試。"> <!ENTITY torsettings.useBridges.type "傳輸類型："> <!ENTITY torsettings.useBridges.custom "輸入自訂的橋接器"> <!ENTITY torsettings.useBridges.label "輸入一個或多個橋接中繼器 (每行一個)。">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 24 Jan '16

24 Jan '16

commit d9cd6fe5abec525d12b8ce19b1f0df34d044afeb Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 24 02:45:47 2016 +0000 Update translations for tor-launcher-network-settings --- zh_TW/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd index 2bfd971..6339a3a 100644 --- a/zh_TW/network-settings.dtd +++ b/zh_TW/network-settings.dtd @@ -23,7 +23,7 @@ <!ENTITY torSettings.proxyQuestion "這台電腦需要使用本地代理伺服器來存取網路嗎？">  <!ENTITY torSettings.proxyExplanation1 "在大部分的情況中是不需要本地端代理伺服器的，但是當所使用的網路服務是公司企業或學校等之內部網路時，就有可能會需要。"> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation2 "如果您不確定如何回答這個問題的話，可以參考其他網路瀏覽器的網際網路設定或者是作業系統中的網路相關設定，以確定是否需要設定本地端代理伺服器。"> <!ENTITY torSettings.enterProxy "輸入代理伺服器設定。"> <!ENTITY torSettings.bridgePageTitle "洋蔥路由橋接器的設定"> <!ENTITY torSettings.bridgeQuestion "您的網際網路服務提供者(ISP)是否會阻擋或監控過濾連接到洋蔥路由的網路活動？"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "允許的連接埠："> <!ENTITY torsettings.useBridges.checkbox "我的網際網路服務提供者(ISP)會過濾阻擋連接至洋蔥路由的網路活動"> <!ENTITY torsettings.useBridges.default "使用提供的橋接器連線"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "每種橋接器都使用不同的方式去規避網路封包過濾，  如果發現使用了某個橋接器仍然無法順利連上線的話，可以更換另一個橋接器再行嘗試。"> <!ENTITY torsettings.useBridges.type "傳輸類型："> <!ENTITY torsettings.useBridges.custom "輸入自訂的橋接器"> <!ENTITY torsettings.useBridges.label "輸入一個或多個橋接中繼器 (每行一個)。">

1 0

[translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
by translation＠torproject.org 24 Jan '16

24 Jan '16

commit 5c6df7339006448d6e2074e0bfd6890bd85f97ed Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 24 02:45:42 2016 +0000 Update translations for tor-launcher-progress_completed --- zh_TW/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/progress.dtd b/zh_TW/progress.dtd index be27a6b..061e5fd 100644 --- a/zh_TW/progress.dtd +++ b/zh_TW/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 狀態"> <!ENTITY torprogress.openSettings "開啟設定"> <!ENTITY torprogress.heading "正在連線至 Tor 網路"> -<!ENTITY torprogress.pleaseWait "我們正在建立 Tor 網路連線，請稍候..."> +<!ENTITY torprogress.pleaseWait "我們正在建立通往洋蔥路由網路的連線，敬請稍作等待， 因為這可能會需要幾分鐘的時間。">

1 0

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 24 Jan '16

24 Jan '16

commit 95b649de1120b72e590104f02c546196e4974fb8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 24 02:45:38 2016 +0000 Update translations for tor-launcher-progress --- zh_TW/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/progress.dtd b/zh_TW/progress.dtd index 65b0d3e..061e5fd 100644 --- a/zh_TW/progress.dtd +++ b/zh_TW/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 狀態"> <!ENTITY torprogress.openSettings "開啟設定"> <!ENTITY torprogress.heading "正在連線至 Tor 網路"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "我們正在建立通往洋蔥路由網路的連線，敬請稍作等待， 因為這可能會需要幾分鐘的時間。">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 24 Jan '16

24 Jan '16

commit 1a70e1e848a9b88f81327d0395e2c7befaece76d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 24 02:15:47 2016 +0000 Update translations for tor-launcher-network-settings --- zh_TW/network-settings.dtd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd index 5e54ea1..2bfd971 100644 --- a/zh_TW/network-settings.dtd +++ b/zh_TW/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "下列哪一項敘述最符合您的實際情況？"> <!ENTITY torSettings.configurePrompt1 "這部電腦的網路連線有被監控過濾或是有透過代理伺服器。"> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "我必須要在連上洋蔥路由 網路之前，先設定好橋接器或本地端代理伺服器。"> <!ENTITY torSettings.configure "設定"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "我想要直接連上洋蔥路由網路。"> <!ENTITY torSettings.connectPrompt3 "這將在大多數情況下正常運作。"> <!ENTITY torSettings.connect "連接"> <!ENTITY torSettings.proxyPageTitle "本地端代理伺服器的設定"> <!ENTITY torSettings.proxyQuestion "這台電腦需要使用本地代理伺服器來存取網路嗎？">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> +<!ENTITY torSettings.proxyExplanation1 "在大部分的情況中是不需要本地端代理伺服器的，但是當所使用的網路服務是公司企業或學校等之內部網路時，就有可能會需要。"> <!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> <!ENTITY torSettings.enterProxy "輸入代理伺服器設定。"> <!ENTITY torSettings.bridgePageTitle "洋蔥路由橋接器的設定"> <!ENTITY torSettings.bridgeQuestion "您的網際網路服務提供者(ISP)是否會阻擋或監控過濾連接到洋蔥路由的網路活動？"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "若您不確定如何回答這個問題的話，請選擇「否」(若之後您發現沒有使用橋接器無法連上洋蔥路由網路的話，可以再回頭來增加此設定)。"> +<!ENTITY torSettings.bridgeExplanation2 "若您選擇「是」的話，您將必須要進行洋蔥路由的橋接器設定，橋接器是未被列表的祕密洋蔥路由節點，它可以讓對通往洋蔥路由網路連線的阻擋，變得更加困難。"> <!ENTITY torSettings.bridgeSettingsPrompt "您可以使用提供的橋接器，您也可以輸入一組自訂的橋接器。">  <!ENTITY torsettings.startingTor "正在等待洋蔥路由啟動…"> <!ENTITY torsettings.restartTor "重新啟動洋蔥路由"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "重新設定"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "您已經有設定洋蔥路由的橋接器或本地端代理伺服器。  若想要直接連上洋蔥路由網路的話，必須要先移除這部份的設定。"> +<!ENTITY torsettings.discardSettings.proceed "移除設定值並且連線"> <!ENTITY torsettings.optional "選用">

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 24 Jan '16

24 Jan '16

commit 3a345ddc693aebb487e7a9a0a14ab04033fef28c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 24 02:15:24 2016 +0000 Update translations for https_everywhere_completed --- zh_TW/https-everywhere.dtd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zh_TW/https-everywhere.dtd b/zh_TW/https-everywhere.dtd index fa740b2..0d23740 100644 --- a/zh_TW/https-everywhere.dtd +++ b/zh_TW/https-everywhere.dtd @@ -3,8 +3,11 @@ <!ENTITY https-everywhere.about.ext_description "加密整個網路！自動在網站上使用 HTTPS 安全連線。"> <!ENTITY https-everywhere.about.version "版本"> <!ENTITY https-everywhere.about.created_by "建立於"> +<!ENTITY https-everywhere.about.and "，以及"> <!ENTITY https-everywhere.about.librarians "規則集管理員"> <!ENTITY https-everywhere.about.thanks "致謝"> +<!ENTITY https-everywhere.about.many_contributors "許許多多的貢獻者，包括了"> +<!ENTITY https-everywhere.about.noscript "並且，在 HTTPS Everyhere 中有部份的程式碼，是 Giorgio Maone 及其他人從 NoScript 裡移植並修改而來的，我們非常地感謝他們如此傑出的貢獻！"> <!ENTITY https-everywhere.about.contribute "若您喜歡 HTTPS Everywhere，您或許可以考慮"> <!ENTITY https-everywhere.about.donate_tor "贊助 Tor"> <!ENTITY https-everywhere.about.tor_lang_code "zh-TW">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 24 Jan '16

24 Jan '16

commit 138fc2a4b3984666317f694e0b4df08f61a7bce7 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 24 02:15:16 2016 +0000 Update translations for https_everywhere --- zh_TW/https-everywhere.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_TW/https-everywhere.dtd b/zh_TW/https-everywhere.dtd index 435cc5a..0d23740 100644 --- a/zh_TW/https-everywhere.dtd +++ b/zh_TW/https-everywhere.dtd @@ -3,11 +3,11 @@ <!ENTITY https-everywhere.about.ext_description "加密整個網路！自動在網站上使用 HTTPS 安全連線。"> <!ENTITY https-everywhere.about.version "版本"> <!ENTITY https-everywhere.about.created_by "建立於"> -<!ENTITY https-everywhere.about.and ", and"> +<!ENTITY https-everywhere.about.and "，以及"> <!ENTITY https-everywhere.about.librarians "規則集管理員"> <!ENTITY https-everywhere.about.thanks "致謝"> -<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including"> -<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others. We are grateful for their excellent work!"> +<!ENTITY https-everywhere.about.many_contributors "許許多多的貢獻者，包括了"> +<!ENTITY https-everywhere.about.noscript "並且，在 HTTPS Everyhere 中有部份的程式碼，是 Giorgio Maone 及其他人從 NoScript 裡移植並修改而來的，我們非常地感謝他們如此傑出的貢獻！"> <!ENTITY https-everywhere.about.contribute "若您喜歡 HTTPS Everywhere，您或許可以考慮"> <!ENTITY https-everywhere.about.donate_tor "贊助 Tor"> <!ENTITY https-everywhere.about.tor_lang_code "zh-TW">

1 0

[stem/master] lsof support for ipv6 addresses
by atagar＠torproject.org 24 Jan '16

24 Jan '16

commit b0ad83ab827c8e6cf4d2f333a58b4fe1b457eead Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 23 15:47:57 2016 -0800 lsof support for ipv6 addresses Needed to recognize brackets but that's about it. Added thanks to toralf on... https://trac.torproject.org/projects/tor/ticket/18079#comment:3 --- stem/util/connection.py | 8 ++++---- test/unit/util/connection.py | 33 ++++++++++++++++++++++++--------- 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/stem/util/connection.py b/stem/util/connection.py index 37839cb..09a1fff 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -203,8 +203,8 @@ def get_connections(resolver, process_pid = None, process_name = None): resolver_regex_str = RESOLVER_FILTER[resolver].format( protocol = '(?P<protocol>\S+)', - local = '(?P<local>[0-9a-f.:]+)', - remote = '(?P<remote>[0-9a-f.:]+)', + local = '(?P<local>[\[\]0-9a-f.:]+)', + remote = '(?P<remote>[\[\]0-9a-f.:]+)', pid = process_pid if process_pid else '[0-9]*', name = process_name if process_name else '\S*', ) @@ -218,7 +218,7 @@ def get_connections(resolver, process_pid = None, process_name = None): def _parse_address_str(addr_type, addr_str, line): addr, port = addr_str.rsplit(':', 1) - if not is_valid_ipv4_address(addr) and not is_valid_ipv6_address(addr): + if not is_valid_ipv4_address(addr) and not is_valid_ipv6_address(addr, allow_brackets = True): _log('Invalid %s address (%s): %s' % (addr_type, addr, line)) return None, None elif not is_valid_port(port): @@ -226,7 +226,7 @@ def get_connections(resolver, process_pid = None, process_name = None): return None, None else: _log('Valid %s:%s: %s' % (addr, port, line)) - return addr, int(port) + return addr.lstrip('[').rstrip(']'), int(port) for line in results: match = resolver_regex.match(line) diff --git a/test/unit/util/connection.py b/test/unit/util/connection.py index 793bcc6..3442326 100644 --- a/test/unit/util/connection.py +++ b/test/unit/util/connection.py @@ -11,9 +11,9 @@ from stem.util.connection import Resolver, Connection try: # added in python 3.3 - from unittest.mock import patch + from unittest.mock import Mock, patch except ImportError: - from mock import patch + from mock import Mock, patch NETSTAT_OUTPUT = """\ Active Internet connections (w/o servers) @@ -75,6 +75,15 @@ firefox 20586 atagar 66u IPv4 5765353 0t0 TCP 192.168.0.1:47486->62. firefox 20586 atagar 71u IPv4 13094989 0t0 TCP 192.168.0.1:43762->182.3.10.42:443 (CLOSE_WAIT) """ +LSOF_IPV6_OUTPUT = """\ +COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME +ntpd 1818 root 20u IPv6 530 0t0 UDP [::1]:123 +ntpd 1818 root 21u IPv6 532 0t0 UDP [2a01:4f8:190:514a::2]:123 +ntpd 1818 root 22u IPv6 534 0t0 UDP [fe80::3285:a9ff:feed:1cb]:123 +tor 1904 tor 10u IPv6 4372 0t0 TCP [2a01:4f8:190:514a::2]:443 (LISTEN) +tor 1904 tor 3228u IPv6 10303350 0t0 TCP [2a01:4f8:190:514a::2]:443->[2001:858:2:2:aabb:0:563b:1526]:44811 (ESTABLISHED) +""" + LSOF_OUTPUT_OSX = """\ tor 129 atagar 4u IPv4 0xffffff3527af0500 0t0 TCP 127.0.0.1:9051 (LISTEN) tor 129 atagar 5u IPv4 0xffffff363af9de40 0t0 TCP 192.168.1.10:9090 (LISTEN) @@ -240,8 +249,8 @@ class TestConnection(unittest.TestCase): call_mock.side_effect = OSError('Unable to call ss') self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.SS, process_pid = 1111) - @patch('stem.util.system.call') - def test_get_connections_by_ss_ipv6(self, call_mock): + @patch('stem.util.system.call', Mock(return_value = SS_IPV6_OUTPUT.split('\n'))) + def test_get_connections_by_ss_ipv6(self): """ Checks the get_connections function with the ss resolver results on IPv6 conections. This also checks with the output from a hardened Gentoo system @@ -250,7 +259,6 @@ class TestConnection(unittest.TestCase): https://trac.torproject.org/projects/tor/ticket/18079 """ - call_mock.return_value = SS_IPV6_OUTPUT.split('\n') expected = [ Connection('5.9.158.75', 443, '107.170.93.13', 56159, 'tcp'), Connection('5.9.158.75', 443, '159.203.97.91', 37802, 'tcp'), @@ -279,15 +287,22 @@ class TestConnection(unittest.TestCase): call_mock.side_effect = OSError('Unable to call lsof') self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.LSOF, process_pid = 1111) - @patch('stem.util.system.call') - def test_get_connections_by_lsof_osx(self, call_mock): + @patch('stem.util.system.call', Mock(return_value = LSOF_IPV6_OUTPUT.split('\n'))) + def test_get_connections_by_lsof_ipv6(self): + """ + Checks the get_connections function with the lsof resolver for IPv6. + """ + + expected = [Connection('2a01:4f8:190:514a::2', 443, '2001:858:2:2:aabb:0:563b:1526', 44811, 'tcp')] + self.assertEqual(expected, stem.util.connection.get_connections(Resolver.LSOF, process_pid = 1904, process_name = 'tor')) + + @patch('stem.util.system.call', Mock(return_value = LSOF_OUTPUT_OSX.split('\n'))) + def test_get_connections_by_lsof_osx(self): """ Checks the get_connections function with the lsof resolver on OSX. This only includes entries for the tor process. """ - call_mock.return_value = LSOF_OUTPUT_OSX.split('\n') - expected = [ Connection('192.168.1.20', 9090, '38.229.79.2', 14010, 'tcp'), Connection('192.168.1.20', 9090, '68.169.35.102', 14815, 'tcp'),

1 0

[stem/master] Support IPv4-mapped IPv6 addresses
by atagar＠torproject.org 24 Jan '16

24 Jan '16

commit 195f36b382fd9825269d057fde775dcce25d482b Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 23 14:25:14 2016 -0800 Support IPv4-mapped IPv6 addresses Ohhh IPv6, how many quirks can you manage to cram into one spec? I know, I know, it's the new hotness but why couldn't they keep the @*!& addresses simple as its predecessor? </grumble> Thanks to cypherpunks for pointing this out! https://trac.torproject.org/projects/tor/ticket/18079#comment:6 --- docs/change_log.rst | 1 + stem/util/connection.py | 38 ++++++++++++++++++++++++++++++++++++++ test/unit/util/connection.py | 31 ++++++++++++++++++------------- 3 files changed, 57 insertions(+), 13 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 1420ddf..9c6b88b 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -74,6 +74,7 @@ The following are only available within Stem's `git repository * Added :func:`~stem.util.__init__.datetime_to_unix` * Basic IPv6 support in :func:`~stem.util.connection.get_connections` * The 'ss' connection resolver didn't work on Gentoo (:trac:`18079`) + * Recognize IPv4-mapped IPv6 addresses in our utils (:trac:`18079`) * Allow :func:`stem.util.conf.Config.set` to remove values when provided with a **None** value * **Interpreter** diff --git a/stem/util/connection.py b/stem/util/connection.py index 0490f9c..37839cb 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -393,6 +393,22 @@ def is_valid_ipv6_address(address, allow_brackets = False): if address.startswith('[') and address.endswith(']'): address = address[1:-1] + if address.count('.') == 3: + # Likely an ipv4-mapped portion. Check that its vaild, then replace with a + # filler. + + ipv4_start = address.rfind(':', 0, address.find('.')) + 1 + ipv4_end = address.find(':', ipv4_start + 1) + + if ipv4_end == -1: + ipv4_end = None # don't crop the last character + + if not is_valid_ipv4_address(address[ipv4_start:ipv4_end]): + return False + + addr_comp = [address[:ipv4_start - 1] if ipv4_start != 0 else None, 'ff:ff', address[ipv4_end + 1:] if ipv4_end else None] + address = ':'.join(filter(None, addr_comp)) + # addresses are made up of eight colon separated groups of four hex digits # with leading zeros being optional # https://en.wikipedia.org/wiki/IPv6#Address_format @@ -494,6 +510,9 @@ def expand_ipv6_address(address): >>> expand_ipv6_address('::') '0000:0000:0000:0000:0000:0000:0000:0000' + >>> expand_ipv6_address('::ffff:5.9.158.75') + '0000:0000:0000:0000:0000:ffff:0509:9e4b' + :param str address: IPv6 address to be expanded :raises: **ValueError** if the address can't be expanded due to being malformed @@ -502,6 +521,25 @@ def expand_ipv6_address(address): if not is_valid_ipv6_address(address): raise ValueError("'%s' isn't a valid IPv6 address" % address) + # expand ipv4-mapped portions of addresses + if address.count('.') == 3: + ipv4_start = address.rfind(':', 0, address.find('.')) + 1 + ipv4_end = address.find(':', ipv4_start + 1) + + if ipv4_end == -1: + ipv4_end = None # don't crop the last character + + # Converts ipv4 address to its hex ipv6 representation. For instance... + # + # '5.9.158.75' => '0509:9e4b' + + ipv4_bin = _get_address_binary(address[ipv4_start:ipv4_end]) + groupings = [ipv4_bin[16 * i:16 * (i + 1)] for i in range(2)] + ipv6_snippet = ':'.join(['%04x' % int(group, 2) for group in groupings]) + + addr_comp = [address[:ipv4_start - 1] if ipv4_start != 0 else None, ipv6_snippet, address[ipv4_end + 1:] if ipv4_end else None] + address = ':'.join(filter(None, addr_comp)) + # expands collapsed groupings, there can only be a single '::' in a valid # address if '::' in address: diff --git a/test/unit/util/connection.py b/test/unit/util/connection.py index 776182d..793bcc6 100644 --- a/test/unit/util/connection.py +++ b/test/unit/util/connection.py @@ -53,7 +53,7 @@ tcp ESTAB 0 0 127.0.0.1:22 127.0.0.1:56673 tcp ESTAB 0 0 192.168.0.1:44415 38.229.79.2:443 users:(("tor",15843,9)) """ -SS_GENTOO_OUTPUT = """\ +SS_IPV6_OUTPUT = """\ Netid State Recv-Q Send-Q Local Address:Port Peer Address:Port tcp ESTAB 0 0 5.9.158.75:443 107.170.93.13:56159 users:(("tor",pid=25056,fd=997)) tcp ESTAB 0 0 5.9.158.75:443 159.203.97.91:37802 users:(("tor",pid=25056,fd=77)) @@ -241,15 +241,16 @@ class TestConnection(unittest.TestCase): self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.SS, process_pid = 1111) @patch('stem.util.system.call') - def test_get_connections_by_ss_on_gentoo(self, call_mock): + def test_get_connections_by_ss_ipv6(self, call_mock): """ - Checks the get_connections function with the ss resolver results on a - hardened Gentoo system... + Checks the get_connections function with the ss resolver results on IPv6 + conections. This also checks with the output from a hardened Gentoo system + which has subtle differences... https://trac.torproject.org/projects/tor/ticket/18079 """ - call_mock.return_value = SS_GENTOO_OUTPUT.split('\n') + call_mock.return_value = SS_IPV6_OUTPUT.split('\n') expected = [ Connection('5.9.158.75', 443, '107.170.93.13', 56159, 'tcp'), Connection('5.9.158.75', 443, '159.203.97.91', 37802, 'tcp'), @@ -257,12 +258,7 @@ class TestConnection(unittest.TestCase): Connection('2a01:4f8:190:514a::2', 443, '2001:858:2:2:aabb:0:563b:1526', 51428, 'tcp'), ] self.assertEqual(expected, stem.util.connection.get_connections(Resolver.SS, process_pid = 25056, process_name = 'tor')) - - # TODO: This example ss output has entries like "::ffff:5.9.158.75:5222". - # What is this? Looks like a IPv6 *and* IPv4 address mashed together. Our - # resolver understandably thinks this is invalid right now. - - self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.SS, process_name = 'beam') + self.assertEqual(2, len(stem.util.connection.get_connections(Resolver.SS, process_name = 'beam'))) @patch('stem.util.system.call') def test_get_connections_by_lsof(self, call_mock): @@ -399,6 +395,9 @@ class TestConnection(unittest.TestCase): 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329', 'fe80:0:0:0:202:b3ff:fe1e:8329', 'fe80::202:b3ff:fe1e:8329', + '::ffff:5.9.158.75', + '5.9.158.75::ffff', + '::5.9.158.75:ffff', '::', ) @@ -406,16 +405,19 @@ class TestConnection(unittest.TestCase): 'fe80:0000:0000:0000:0202:b3ff:fe1e:829g', 'fe80:0000:0000:0000:0202:b3ff:fe1e: 8329', '2001:db8::aaaa::1', + '::ffff:5.9.158.75.12', + '::ffff:5.9.158', + '::ffff:5.9', ':::', ':', '', ) for address in valid_addresses: - self.assertTrue(stem.util.connection.is_valid_ipv6_address(address)) + self.assertTrue(stem.util.connection.is_valid_ipv6_address(address), "%s isn't a valid IPv6 address" % address) for address in invalid_addresses: - self.assertFalse(stem.util.connection.is_valid_ipv6_address(address)) + self.assertFalse(stem.util.connection.is_valid_ipv6_address(address), '%s should be an invalid IPv6 address' % address) def test_is_valid_port(self): """ @@ -464,6 +466,9 @@ class TestConnection(unittest.TestCase): '::': '0000:0000:0000:0000:0000:0000:0000:0000', '::1': '0000:0000:0000:0000:0000:0000:0000:0001', '1::1': '0001:0000:0000:0000:0000:0000:0000:0001', + '::ffff:5.9.158.75': '0000:0000:0000:0000:0000:ffff:0509:9e4b', + '5.9.158.75::ffff': '0509:9e4b:0000:0000:0000:0000:0000:ffff', + '::5.9.158.75:ffff': '0000:0000:0000:0000:0000:0509:9e4b:ffff', } for test_arg, expected in test_values.items():

1 0

[stem/master] Expand Connetion enum with an is_ipv6 attribute
by atagar＠torproject.org 24 Jan '16

24 Jan '16

commit d32bd6f09f7a2edae4c8e46787a252ab7df632a2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 23 15:59:38 2016 -0800 Expand Connetion enum with an is_ipv6 attribute Providing an attribute to easily distinguish if the connection is IPv6 or IPv4. --- docs/change_log.rst | 3 ++- stem/util/connection.py | 5 ++-- stem/util/proc.py | 6 ++--- test/unit/util/connection.py | 58 +++++++++++++++++++++--------------------- test/unit/util/proc.py | 4 +-- 5 files changed, 39 insertions(+), 37 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 9c6b88b..b1e26a1 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -72,9 +72,10 @@ The following are only available within Stem's `git repository * **Utilities** * Added :func:`~stem.util.__init__.datetime_to_unix` - * Basic IPv6 support in :func:`~stem.util.connection.get_connections` + * IPv6 support in :func:`~stem.util.connection.get_connections` * The 'ss' connection resolver didn't work on Gentoo (:trac:`18079`) * Recognize IPv4-mapped IPv6 addresses in our utils (:trac:`18079`) + * Added an **is_ipv6** value to Connection instances * Allow :func:`stem.util.conf.Config.set` to remove values when provided with a **None** value * **Interpreter** diff --git a/stem/util/connection.py b/stem/util/connection.py index 09a1fff..567ca9e 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -132,7 +132,7 @@ RESOLVER_FILTER = { } -class Connection(collections.namedtuple('Connection', ['local_address', 'local_port', 'remote_address', 'remote_port', 'protocol'])): +class Connection(collections.namedtuple('Connection', ['local_address', 'local_port', 'remote_address', 'remote_port', 'protocol', 'is_ipv6'])): """ Network connection information. @@ -141,6 +141,7 @@ class Connection(collections.namedtuple('Connection', ['local_address', 'local_p :var str remote_address: destionation ip address :var int remote_port: destination port :var str protocol: protocol of the connection ('tcp', 'udp', etc) + :var bool is_ipv6: addresses are ipv6 if true, and ipv4 otherwise """ @@ -246,7 +247,7 @@ def get_connections(resolver, process_pid = None, process_name = None): _log('Unrecognized protocol (%s): %s' % (protocol, line)) continue - conn = Connection(local_addr, local_port, remote_addr, remote_port, protocol) + conn = Connection(local_addr, local_port, remote_addr, remote_port, protocol, is_valid_ipv6_address(local_addr)) connections.append(conn) _log(str(conn)) diff --git a/stem/util/proc.py b/stem/util/proc.py index 5d2219c..1432710 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -333,8 +333,8 @@ def connections(pid): :param int pid: process id of the process to be queried :returns: A listing of connection tuples of the form **[(local_ipAddr1, - local_port1, foreign_ipAddr1, foreign_port1, protocol), ...]** (addresses - and protocols are strings and ports are ints) + local_port1, foreign_ipAddr1, foreign_port1, protocol, is_ipv6), ...]** + (addresses and protocols are strings and ports are ints) :raises: **IOError** if it can't be determined """ @@ -403,7 +403,7 @@ def connections(pid): local_ip, local_port = _decode_proc_address_encoding(l_addr) foreign_ip, foreign_port = _decode_proc_address_encoding(f_addr) protocol = proc_file_path[10:] - conn.append((local_ip, local_port, foreign_ip, foreign_port, protocol)) + conn.append((local_ip, local_port, foreign_ip, foreign_port, protocol, False)) proc_file.close() except IOError as exc: diff --git a/test/unit/util/connection.py b/test/unit/util/connection.py index 3442326..2baedc5 100644 --- a/test/unit/util/connection.py +++ b/test/unit/util/connection.py @@ -185,13 +185,13 @@ class TestConnection(unittest.TestCase): """ proc_mock.return_value = [ - ('17.17.17.17', 4369, '34.34.34.34', 8738, 'tcp'), - ('187.187.187.187', 48059, '204.204.204.204', 52428, 'tcp'), + ('17.17.17.17', 4369, '34.34.34.34', 8738, 'tcp', False), + ('187.187.187.187', 48059, '204.204.204.204', 52428, 'tcp', False), ] expected = [ - Connection('17.17.17.17', 4369, '34.34.34.34', 8738, 'tcp'), - Connection('187.187.187.187', 48059, '204.204.204.204', 52428, 'tcp'), + Connection('17.17.17.17', 4369, '34.34.34.34', 8738, 'tcp', False), + Connection('187.187.187.187', 48059, '204.204.204.204', 52428, 'tcp', False), ] self.assertEqual(expected, stem.util.connection.get_connections(Resolver.PROC, process_pid = 1111)) @@ -206,7 +206,7 @@ class TestConnection(unittest.TestCase): """ call_mock.return_value = NETSTAT_OUTPUT.split('\n') - expected = [Connection('192.168.0.1', 44284, '38.229.79.2', 443, 'tcp')] + expected = [Connection('192.168.0.1', 44284, '38.229.79.2', 443, 'tcp', False)] self.assertEqual(expected, stem.util.connection.get_connections(Resolver.NETSTAT, process_pid = 15843, process_name = 'tor')) self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.NETSTAT, process_pid = 15843, process_name = 'stuff') @@ -222,7 +222,7 @@ class TestConnection(unittest.TestCase): """ call_mock.return_value = NETSTAT_WINDOWS_OUTPUT.split('\n') - expected = [Connection('192.168.0.1', 44284, '38.229.79.2', 443, 'tcp')] + expected = [Connection('192.168.0.1', 44284, '38.229.79.2', 443, 'tcp', False)] self.assertEqual(expected, stem.util.connection.get_connections(Resolver.NETSTAT_WINDOWS, process_pid = 15843, process_name = 'tor')) self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.NETSTAT_WINDOWS, process_pid = 1111, process_name = 'tor') @@ -238,8 +238,8 @@ class TestConnection(unittest.TestCase): call_mock.return_value = SS_OUTPUT.split('\n') expected = [ - Connection('192.168.0.1', 44092, '23.112.135.72', 443, 'tcp'), - Connection('192.168.0.1', 44415, '38.229.79.2', 443, 'tcp'), + Connection('192.168.0.1', 44092, '23.112.135.72', 443, 'tcp', False), + Connection('192.168.0.1', 44415, '38.229.79.2', 443, 'tcp', False), ] self.assertEqual(expected, stem.util.connection.get_connections(Resolver.SS, process_pid = 15843, process_name = 'tor')) @@ -260,10 +260,10 @@ class TestConnection(unittest.TestCase): """ expected = [ - Connection('5.9.158.75', 443, '107.170.93.13', 56159, 'tcp'), - Connection('5.9.158.75', 443, '159.203.97.91', 37802, 'tcp'), - Connection('2a01:4f8:190:514a::2', 443, '2001:638:a000:4140::ffff:189', 38556, 'tcp'), - Connection('2a01:4f8:190:514a::2', 443, '2001:858:2:2:aabb:0:563b:1526', 51428, 'tcp'), + Connection('5.9.158.75', 443, '107.170.93.13', 56159, 'tcp', False), + Connection('5.9.158.75', 443, '159.203.97.91', 37802, 'tcp', False), + Connection('2a01:4f8:190:514a::2', 443, '2001:638:a000:4140::ffff:189', 38556, 'tcp', True), + Connection('2a01:4f8:190:514a::2', 443, '2001:858:2:2:aabb:0:563b:1526', 51428, 'tcp', True), ] self.assertEqual(expected, stem.util.connection.get_connections(Resolver.SS, process_pid = 25056, process_name = 'tor')) self.assertEqual(2, len(stem.util.connection.get_connections(Resolver.SS, process_name = 'beam'))) @@ -276,8 +276,8 @@ class TestConnection(unittest.TestCase): call_mock.return_value = LSOF_OUTPUT.split('\n') expected = [ - Connection('192.168.0.1', 44415, '38.229.79.2', 443, 'tcp'), - Connection('192.168.0.1', 44092, '68.169.35.102', 443, 'tcp'), + Connection('192.168.0.1', 44415, '38.229.79.2', 443, 'tcp', False), + Connection('192.168.0.1', 44092, '68.169.35.102', 443, 'tcp', False), ] self.assertEqual(expected, stem.util.connection.get_connections(Resolver.LSOF, process_pid = 15843, process_name = 'tor')) @@ -293,7 +293,7 @@ class TestConnection(unittest.TestCase): Checks the get_connections function with the lsof resolver for IPv6. """ - expected = [Connection('2a01:4f8:190:514a::2', 443, '2001:858:2:2:aabb:0:563b:1526', 44811, 'tcp')] + expected = [Connection('2a01:4f8:190:514a::2', 443, '2001:858:2:2:aabb:0:563b:1526', 44811, 'tcp', True)] self.assertEqual(expected, stem.util.connection.get_connections(Resolver.LSOF, process_pid = 1904, process_name = 'tor')) @patch('stem.util.system.call', Mock(return_value = LSOF_OUTPUT_OSX.split('\n'))) @@ -304,9 +304,9 @@ class TestConnection(unittest.TestCase): """ expected = [ - Connection('192.168.1.20', 9090, '38.229.79.2', 14010, 'tcp'), - Connection('192.168.1.20', 9090, '68.169.35.102', 14815, 'tcp'), - Connection('192.168.1.20', 9090, '62.135.16.134', 14456, 'tcp'), + Connection('192.168.1.20', 9090, '38.229.79.2', 14010, 'tcp', False), + Connection('192.168.1.20', 9090, '68.169.35.102', 14815, 'tcp', False), + Connection('192.168.1.20', 9090, '62.135.16.134', 14456, 'tcp', False), ] self.assertEqual(expected, stem.util.connection.get_connections(Resolver.LSOF, process_pid = 129, process_name = 'tor')) @@ -319,8 +319,8 @@ class TestConnection(unittest.TestCase): call_mock.return_value = SOCKSTAT_OUTPUT.split('\n') expected = [ - Connection('192.168.0.1', 44415, '38.229.79.2', 443, 'tcp'), - Connection('192.168.0.1', 44092, '68.169.35.102', 443, 'tcp'), + Connection('192.168.0.1', 44415, '38.229.79.2', 443, 'tcp', False), + Connection('192.168.0.1', 44092, '68.169.35.102', 443, 'tcp', False), ] self.assertEqual(expected, stem.util.connection.get_connections(Resolver.SOCKSTAT, process_pid = 15843, process_name = 'tor')) @@ -339,11 +339,11 @@ class TestConnection(unittest.TestCase): call_mock.return_value = BSD_SOCKSTAT_OUTPUT.split('\n') expected = [ - Connection('172.27.72.202', 54011, '38.229.79.2', 9001, 'tcp'), - Connection('172.27.72.202', 59374, '68.169.35.102', 9001, 'tcp'), - Connection('172.27.72.202', 59673, '213.24.100.160', 9001, 'tcp'), - Connection('172.27.72.202', 51946, '32.188.221.72', 443, 'tcp'), - Connection('172.27.72.202', 60344, '21.89.91.78', 9001, 'tcp'), + Connection('172.27.72.202', 54011, '38.229.79.2', 9001, 'tcp', False), + Connection('172.27.72.202', 59374, '68.169.35.102', 9001, 'tcp', False), + Connection('172.27.72.202', 59673, '213.24.100.160', 9001, 'tcp', False), + Connection('172.27.72.202', 51946, '32.188.221.72', 443, 'tcp', False), + Connection('172.27.72.202', 60344, '21.89.91.78', 9001, 'tcp', False), ] self.assertEqual(expected, stem.util.connection.get_connections(Resolver.BSD_SOCKSTAT, process_pid = 4397, process_name = 'tor')) @@ -361,10 +361,10 @@ class TestConnection(unittest.TestCase): call_mock.return_value = BSD_PROCSTAT_OUTPUT.split('\n') expected = [ - Connection('10.0.0.2', 9050, '10.0.0.1', 22370, 'tcp'), - Connection('10.0.0.2', 9050, '10.0.0.1', 44381, 'tcp'), - Connection('10.0.0.2', 33734, '38.229.79.2', 443, 'tcp'), - Connection('10.0.0.2', 47704, '68.169.35.102', 9001, 'tcp'), + Connection('10.0.0.2', 9050, '10.0.0.1', 22370, 'tcp', False), + Connection('10.0.0.2', 9050, '10.0.0.1', 44381, 'tcp', False), + Connection('10.0.0.2', 33734, '38.229.79.2', 443, 'tcp', False), + Connection('10.0.0.2', 47704, '68.169.35.102', 9001, 'tcp', False), ] self.assertEqual(expected, stem.util.connection.get_connections(Resolver.BSD_PROCSTAT, process_pid = 3561, process_name = 'tor')) diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py index ea206b8..b6cb0d6 100644 --- a/test/unit/util/proc.py +++ b/test/unit/util/proc.py @@ -210,8 +210,8 @@ class TestProc(unittest.TestCase): self.assertEqual([], proc.connections(0)) expected_results = [ - ('17.17.17.17', 4369, '34.34.34.34', 8738, 'tcp'), - ('187.187.187.187', 48059, '204.204.204.204', 52428, 'udp'), + ('17.17.17.17', 4369, '34.34.34.34', 8738, 'tcp', False), + ('187.187.187.187', 48059, '204.204.204.204', 52428, 'udp', False), ] self.assertEqual(expected_results, proc.connections(pid))

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2016