- tor-commits - lists.torproject.org

[stem/master] Have get_connections() resolve the pid if not provided with one
by atagar＠torproject.org 28 Jan '16

28 Jan '16

commit 949e59ffcf2eb09495ec7b42672598af5e0bb656 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 28 09:20:30 2016 -0800 Have get_connections() resolve the pid if not provided with one Three of our connection resolvers require a pid to function. When provided with a process name instead we raised a ValueError, but we can at least *try* to resolve the name to a pid. If unsuccessful we now raise an IOError. Thanks to toralf for suggesting this change. --- stem/util/connection.py | 20 ++++++++++++++------ test/unit/manual.py | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/stem/util/connection.py b/stem/util/connection.py index cbc6ac2..e72bd12 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -166,14 +166,16 @@ def get_connections(resolver, process_pid = None, process_name = None): :returns: **list** of :class:`~stem.util.connection.Connection` instances :raises: - * **ValueError** if using **Resolver.PROC** or **Resolver.BSD_PROCSTAT** - and the process_pid wasn't provided + * **ValueError** if neither a process_pid nor process_name is provided * **IOError** if no connections are available or resolution fails (generally they're indistinguishable). The common causes are the command being unavailable or permissions. """ + if not process_pid and not process_name: + raise ValueError('You must provide a pid or process name to provide connections for') + def _log(msg): if LOG_CONNECTION_RESOLUTION: log.debug(msg) @@ -187,11 +189,17 @@ def get_connections(resolver, process_pid = None, process_name = None): except ValueError: raise ValueError('Process pid was non-numeric: %s' % process_pid) - if process_pid is None and process_name and resolver == Resolver.NETSTAT_WINDOWS: - process_pid = stem.util.system.pid_by_name(process_name) + if process_pid is None: + all_pids = stem.util.system.pid_by_name(process_name, True) - if process_pid is None and resolver in (Resolver.NETSTAT_WINDOWS, Resolver.PROC, Resolver.BSD_PROCSTAT): - raise ValueError('%s resolution requires a pid' % resolver) + if len(all_pids) == 0: + if resolver in (Resolver.NETSTAT_WINDOWS, Resolver.PROC, Resolver.BSD_PROCSTAT): + raise IOError("Unable to determine the pid of '%s'. %s requires the pid to provide the connections." % (process_name, resolver)) + elif len(all_pids) == 1: + process_pid = all_pids[0] + else: + if resolver in (Resolver.NETSTAT_WINDOWS, Resolver.PROC, Resolver.BSD_PROCSTAT): + raise IOError("There's multiple processes named '%s'. %s requires a single pid to provide the connections." % (process_name, resolver)) if resolver == Resolver.PROC: return [Connection(*conn) for conn in stem.util.proc.connections(process_pid)] diff --git a/test/unit/manual.py b/test/unit/manual.py index 8711fb7..99628b0 100644 --- a/test/unit/manual.py +++ b/test/unit/manual.py @@ -238,7 +238,7 @@ class TestManual(unittest.TestCase): @patch('tempfile.mkdtemp', Mock(return_value = '/no/such/path')) @patch('shutil.rmtree', Mock()) @patch('stem.manual.open', Mock(return_value = io.BytesIO()), create = True) - @patch('stem.util.system.call', Mock(side_effect = OSError('call failed'))) + @patch('stem.util.system.call', Mock(side_effect = stem.util.system.CallError('call failed', 'a2x -f manpage /no/such/path/tor.1.txt', 1, None, None, 'call failed'))) @patch('stem.util.system.is_available', Mock(return_value = True)) @patch(URL_OPEN, Mock(return_value = io.BytesIO(b'test content'))) def test_download_man_page_when_a2x_fails(self):

1 0

[stem/master] Add TorTP to examples page
by atagar＠torproject.org 28 Jan '16

28 Jan '16

commit a35f80ca4994fb76e2b7ae1db2fb4be5fe9f5030 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 28 09:24:53 2016 -0800 Add TorTP to examples page TorTP's new version uses stem to determine the iptables rules to make. Adding it to our examples page. --- docs/tutorials/double_double_toil_and_trouble.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst index bae1ec5..54df821 100644 --- a/docs/tutorials/double_double_toil_and_trouble.rst +++ b/docs/tutorials/double_double_toil_and_trouble.rst @@ -74,6 +74,7 @@ Applications `OnionShare <https://github.com/micahflee/onionshare>`_ Hidden service based file sharing application. `Syboa <https://gitorious.org/syboa/syboa>`_ GTK Tor interface similar to `TorK <http://sourceforge.net/projects/tork/>`_. `hs-health <https://gitlab.com/hs-health/hs-health>`_ Experiment to measure churn and reachability of hidden services. +`TorTP <https://github.com/vinc3nt/stem-tortp>`_ Configures iptables to torify all traffic. =========================================================================================================== ========== Scripts

1 0

[metrics-web/master] Add Contributor's guide to the Metrics website.
by karsten＠torproject.org 28 Jan '16

28 Jan '16

commit 5611ef4563453ac74ada78299d0972c166b83230 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 28 18:00:20 2016 +0100 Add Contributor's guide to the Metrics website. --- CONTRIB.md | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/CONTRIB.md b/CONTRIB.md new file mode 100644 index 0000000..4f36afe --- /dev/null +++ b/CONTRIB.md @@ -0,0 +1,89 @@ +Contributor's guide to the Metrics website + +Dear contributor to the Metrics website. This guide shall help you +understand the design decisions behind building the Metrics website and +give you starting points where you should look to make it bigger and +better. + +First of all, let's talk briefly about the scope of the Metrics website, +which we'll be calling Metrics in the following. + + - What Metrics is: Metrics is supposed to provide easy access to Tor + network data. The typical Metrics user is neither a researcher nor a + developer and is just looking for an easy way to learn more about this + Tor network they have been hearing about. Metrics is giving them data + in visual or tabular form, together with explanations that are easy to + understand with as little technical language as possible. + + - What Metrics is not: The typical Tor researcher or Tor developer would + probably want to dive deeper into the data to learn even more about the + Tor network. But in contrast to the average Metrics user they could + just fetch the original data from CollecTor and run their own analysis. + Metrics is not trying to be the solution for everyone. If we have to + choose, we're aiming for simplicity instead of comprehensiveness. + +Now let's take a quick tour of the components that Metrics is made of. + + - Data-processing modules: The bulk of Metrics code is running in the + background, invisible to Metrics users. It's the code that takes + CollecTor data as input and that produces .csv files that are the basis + for graphs and tables on Metrics. There's usually one such module per + generated .csv file that focuses on a different aspect of Tor network + data. All these modules are periodically executed by the system's cron + daemon, independent of user requests to the website part of Metrics. + See the modules/ subdirectory for the existing data-processing modules. + Note that modules don't have to be written in Java even though that's + currently the case for all of them. The only requirement is that + there's a shell script to run the module using packages available in + Debian stable. The remaining components of Metrics are all related to + its website part. + + - Start page: The website part of Metrics is organized into one page per + metric, which can be a graph, table, data file, or external link, and + the start page to browse available metrics. Each metric has attributes + like a descriptive name, one or more tags (relays, bridges, etc.), a + type (graph, table, etc.), and a level (basic or advanced). All + metrics are defined in `website/etc/metrics.json` and displayed in the + table on the start page. + + - Graph pages: The bulk of graph pages consist of graphing methods in + `website/rserve/graphs.R` that are written in R and using the ggplot2 + graphing library. These methods read one or more of the .csv files + produced by data-processing modules and produce a graph image as + output. Graphs have a few additional attributes in + `website/etc/metrics.json` like a description and parameters to + customize the graph. As of writing this guide, there's one exception + with the bubble graph which is implemented using JavaScript library + D3.js and which might soon be generated on the server using Node.js. + + - Table pages: Metrics also provides a few aspects of Tor network data in + tabular form with customization options. Like graphs, the data in + these tables is provided using R by reading the previously generated + .csv files. All relevant R code for generating table data is located + in `website/rserve/tables.R`. Again, there are additional attributes + in `website/etc/metrics.json` that define what parameters are available + to customize table contents and how to format results. + + - Data pages: While most Metrics user are not expected to run their own + analyses based on raw Tor network data, some of them might want to look + deeper into the data they saw in a graph or table. Metrics provides + all pre-aggregated output from its data-processing modules as + downloadable .csv files and also documents these file formats in + sufficient detail for Metrics users to use them. + + - Link pages: Metrics is not the only game in town, and it's great that + other developers take the publicly available Tor network data and + visualize it in a different way. Metrics acknowledges these efforts by + adding link pages with thumbnails to make it easy for Metrics users to + find those external visualizations. + + - About page: Most Metrics users have a basic understanding of how Tor + works, most likely from reading the main Tor website. But Metrics + should give its users enough explanations to understand where all the + Tor network data comes from and how that data is used to learn + interesting facts about the Tor network. That's where the About page + comes into play. The About page consists of a list of frequently used + terms and a second list of frequently asked questions. There could be + more documentation, but more text doesn't necessarily mean that users + will read more. +

1 0

[tor/master] Try to fix formatting in manpage
by nickm＠torproject.org 28 Jan '16

28 Jan '16

commit 601c82325549c00fb6d3c507c87b3224de44fa3f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 11:52:48 2016 -0500 Try to fix formatting in manpage --- doc/tor.1.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 0f605ff..c011bff 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -95,8 +95,7 @@ COMMAND-LINE OPTIONS which tells Tor to only send warnings and errors to the console, or with the **--quiet** option, which tells Tor not to log to the console at all. -[[opt-keygen]] **--keygen** [**--newpass**] - +[[opt-keygen]] **--keygen** [**--newpass**]:: Running "tor --keygen" creates a new ed25519 master identity key for a relay, or only a fresh temporary signing key and certificate, if you already have a master key. Optionally you can encrypt the master identity

1 0

[tor/master] Merge branch 'maint-0.2.7'
by nickm＠torproject.org 28 Jan '16

28 Jan '16

commit a5bed4dab2f8521f744d5137e4f439b073c7e5e9 Merge: 6b2087d 601c823 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 11:53:03 2016 -0500 Merge branch 'maint-0.2.7' doc/tor.1.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[tor/maint-0.2.7] Try to fix formatting in manpage
by nickm＠torproject.org 28 Jan '16

28 Jan '16

commit 601c82325549c00fb6d3c507c87b3224de44fa3f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 11:52:48 2016 -0500 Try to fix formatting in manpage --- doc/tor.1.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 0f605ff..c011bff 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -95,8 +95,7 @@ COMMAND-LINE OPTIONS which tells Tor to only send warnings and errors to the console, or with the **--quiet** option, which tells Tor not to log to the console at all. -[[opt-keygen]] **--keygen** [**--newpass**] - +[[opt-keygen]] **--keygen** [**--newpass**]:: Running "tor --keygen" creates a new ed25519 master identity key for a relay, or only a fresh temporary signing key and certificate, if you already have a master key. Optionally you can encrypt the master identity

1 0

[tor/master] Add descriptions for --keygen to the manpage
by nickm＠torproject.org 28 Jan '16

28 Jan '16

commit fb64c55cf87615745e7c59c5bdc660119986bab1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 10:19:29 2016 -0500 Add descriptions for --keygen to the manpage Based on text from s7r --- changes/bug17583 | 4 ++++ doc/tor.1.txt | 29 +++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/changes/bug17583 b/changes/bug17583 new file mode 100644 index 0000000..d77d467 --- /dev/null +++ b/changes/bug17583 @@ -0,0 +1,4 @@ + o Documentation: + - Add a description of the correct use of the '--keygen' command-line + option. Closes ticket 17583; based on text by 's7r'. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5ea5623..0f605ff 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -95,6 +95,30 @@ COMMAND-LINE OPTIONS which tells Tor to only send warnings and errors to the console, or with the **--quiet** option, which tells Tor not to log to the console at all. +[[opt-keygen]] **--keygen** [**--newpass**] + + Running "tor --keygen" creates a new ed25519 master identity key for a + relay, or only a fresh temporary signing key and certificate, if you + already have a master key. Optionally you can encrypt the master identity + key with a passphrase: Tor will ask you for one. If you don't want to + encrypt the master key, just don't enter any passphrase when asked. + + + + The **--newpass** option should be used with --keygen only when you need + to add, change, or remove a passphrase on an existing ed25519 master + identity key. You will be prompted for the old passphase (if any), + and the new passphrase (if any). + + + + When generating a master key, you will probably want to use + **--DataDirectory** to control where the keys + and certificates will be stored, and **--SigningKeyLifetime** to + control their lifetimes. Their behavior is as documented in the + server options section below. (You must have write access to the specified + DataDirectory.) + + + + To use the generated files, you must copy them to the DataDirectory/keys + directory of your Tor daemon, and make sure that they are owned by the + user actually running the Tor daemon on your system. + Other options can be specified on the command-line in the format "--option value", in the format "option value", or in a configuration file. For instance, you can tell Tor to start listening for SOCKS connections on port @@ -1908,8 +1932,9 @@ is non-zero): [[OfflineMasterKey]] **OfflineMasterKey** **0**|**1**:: If non-zero, the Tor relay will never generate or load its master secret - key. Instead, you'll have to use "tor --keygen" to manage the master - secret key. (Default: 0) + key. Instead, you'll have to use "tor --keygen" to manage the permanent + ed25519 master identity key, as well as the corresponding temporary + signing keys and certificates. (Default: 0) DIRECTORY SERVER OPTIONS ------------------------

1 0

[tor/master] Merge branch 'maint-0.2.7'
by nickm＠torproject.org 28 Jan '16

28 Jan '16

commit 6b2087dbe42e2e4a81b5cac9278f81a97f80a1cb Merge: 4770db8 fb64c55 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 10:22:06 2016 -0500 Merge branch 'maint-0.2.7' changes/bug17583 | 4 ++++ doc/tor.1.txt | 29 +++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.7] Add descriptions for --keygen to the manpage
by nickm＠torproject.org 28 Jan '16

28 Jan '16

commit fb64c55cf87615745e7c59c5bdc660119986bab1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 10:19:29 2016 -0500 Add descriptions for --keygen to the manpage Based on text from s7r --- changes/bug17583 | 4 ++++ doc/tor.1.txt | 29 +++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/changes/bug17583 b/changes/bug17583 new file mode 100644 index 0000000..d77d467 --- /dev/null +++ b/changes/bug17583 @@ -0,0 +1,4 @@ + o Documentation: + - Add a description of the correct use of the '--keygen' command-line + option. Closes ticket 17583; based on text by 's7r'. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5ea5623..0f605ff 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -95,6 +95,30 @@ COMMAND-LINE OPTIONS which tells Tor to only send warnings and errors to the console, or with the **--quiet** option, which tells Tor not to log to the console at all. +[[opt-keygen]] **--keygen** [**--newpass**] + + Running "tor --keygen" creates a new ed25519 master identity key for a + relay, or only a fresh temporary signing key and certificate, if you + already have a master key. Optionally you can encrypt the master identity + key with a passphrase: Tor will ask you for one. If you don't want to + encrypt the master key, just don't enter any passphrase when asked. + + + + The **--newpass** option should be used with --keygen only when you need + to add, change, or remove a passphrase on an existing ed25519 master + identity key. You will be prompted for the old passphase (if any), + and the new passphrase (if any). + + + + When generating a master key, you will probably want to use + **--DataDirectory** to control where the keys + and certificates will be stored, and **--SigningKeyLifetime** to + control their lifetimes. Their behavior is as documented in the + server options section below. (You must have write access to the specified + DataDirectory.) + + + + To use the generated files, you must copy them to the DataDirectory/keys + directory of your Tor daemon, and make sure that they are owned by the + user actually running the Tor daemon on your system. + Other options can be specified on the command-line in the format "--option value", in the format "option value", or in a configuration file. For instance, you can tell Tor to start listening for SOCKS connections on port @@ -1908,8 +1932,9 @@ is non-zero): [[OfflineMasterKey]] **OfflineMasterKey** **0**|**1**:: If non-zero, the Tor relay will never generate or load its master secret - key. Instead, you'll have to use "tor --keygen" to manage the master - secret key. (Default: 0) + key. Instead, you'll have to use "tor --keygen" to manage the permanent + ed25519 master identity key, as well as the corresponding temporary + signing keys and certificates. (Default: 0) DIRECTORY SERVER OPTIONS ------------------------

1 0

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

28 Jan '16

commit 97063a3aa30f77fe4395f70771a980b39dfa16c4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 28 15:15:52 2016 +0000 Update translations for tor-launcher-network-settings_completed --- bg/network-settings.dtd | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/bg/network-settings.dtd b/bg/network-settings.dtd index 46165b8..3c4bc72 100644 --- a/bg/network-settings.dtd +++ b/bg/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.firstQuestion "Кое от следните описва най-добре вашата ситуация?"> <!ENTITY torSettings.configurePrompt1 "Интернет връзката на този компютър е цензурирана или минава през proxy сървър."> -<!ENTITY torSettings.configurePrompt2 "Трябва да конфигурирам bridge или proxy настройки."> +<!ENTITY torSettings.configurePrompt2 "Трябва да конфигурират bridge или proxy настройки преди свързване към Tor мрежата."> <!ENTITY torSettings.configure "Конфигурирай"> <!ENTITY torSettings.connectPrompt2 "Бих искал да се свържа директно към Tor мрежата."> <!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 "Блокирани или цензурирани ли са връзките към Tor Мрежата от вашият Интернет Доставчик(ISP)?"> -<!ENTITY torSettings.bridgeHelp "Ако не сте сигурни как да отговорите на този въпрос, изберете No.  Ако изберете Yes, вие ще бъдете помолен да конфигурирате Tor Bridges, непубликувани relays които правят блокирането на връзката към Tor Network по трудна."> +<!ENTITY torSettings.bridgeExplanation1 "Ако не сте сигурни как да отговори на този въпрос, изберете Не (ако не сте в състояние да се свържете с Tor мрежата без bridge, може да го добавите по-късно)."> +<!ENTITY torSettings.bridgeExplanation2 "Ако изберете Да, ще бъдете помолени да изберете Tor Bridges, които са неофициални relays, което прави по-трудно да се блокира връзката към Tor мрежата."> <!ENTITY torSettings.bridgeSettingsPrompt "Вие може да използвате предложените комплекти от bridges или може да изисквате персонализиран комплект от тях.">  <!ENTITY torsettings.startingTor "Изчакване на Tor да стартира..."> <!ENTITY torsettings.restartTor "Рестартирайте Тор"> +<!ENTITY torsettings.reconfigTor "Преконфигуриране"> + +<!ENTITY torsettings.discardSettings.prompt "Вие сте конфигурирали Tor bridges или сте въвели местните настройките на прокси сървъра.  За да направите директно свързване към Tor мрежата, тези настройки трябва да бъдат отстранени."> +<!ENTITY torsettings.discardSettings.proceed "Премахване на Настройките и Свързване"> <!ENTITY torsettings.optional "Допълнителен"> @@ -50,6 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Позволени портове:"> <!ENTITY torsettings.useBridges.checkbox "Моят Интернет Доставчик (ISP) блокира връзките към Tor мрежата"> <!ENTITY torsettings.useBridges.default "Свържи се с предоставените bridges"> +<!ENTITY torsettings.useBridges.note "Всеки вид bridge използва различен метод, за да се избегне цензурата.  Ако един bridge не работи, опитайте отново като използвате друг."> <!ENTITY torsettings.useBridges.type "Тип транспортиране:"> <!ENTITY torsettings.useBridges.custom "Въведи персонални bridges"> <!ENTITY torsettings.useBridges.label "Въведи един или повече bridge relays (по един на линия).">

1 0