January 2013 - tor-commits - lists.torproject.org

[tor/master] Add ntor-related modules to the Makefiles.nmake
by nickm＠torproject.org 17 Jan '13

17 Jan '13

commit 60a2aa8b00a9f4711ce5ee3da9240422bf561123 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 17 14:38:52 2013 -0500 Add ntor-related modules to the Makefiles.nmake --- src/common/Makefile.nmake | 6 +++++- src/or/Makefile.nmake | 3 +++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/common/Makefile.nmake b/src/common/Makefile.nmake index 9672f4f..0ebeaaa 100644 --- a/src/common/Makefile.nmake +++ b/src/common/Makefile.nmake @@ -6,10 +6,14 @@ LIBOR_OBJECTS = address.obj compat.obj container.obj di_ops.obj \ log.obj memarea.obj mempool.obj procmon.obj util.obj \ util_codedigest.obj -LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj torgzip.obj tortls.obj +LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj torgzip.obj tortls.obj \ + crypto_curve25519.obj curve25519-donna.obj LIBOR_EVENT_OBJECTS = compat_libevent.obj +curve25519-donna.obj: ..\ext\curve25519_donna\curve25519-donna.c + $(CC) $(CFLAGS) /D inline=_inline /c ..\ext\curve25519_donna\curve25519-donna.c + libor.lib: $(LIBOR_OBJECTS) lib $(LIBOR_OBJECTS) /out:libor.lib diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake index c334073..d67123a 100644 --- a/src/or/Makefile.nmake +++ b/src/or/Makefile.nmake @@ -44,6 +44,9 @@ LIBTOR_OBJECTS = \ nodelist.obj \ ntmain.obj \ onion.obj \ + onion_fast.obj \ + onion_ntor.obj \ + onion_tap.obj \ policies.obj \ reasons.obj \ relay.obj \

1 0

[tor/master] Another msvc changes entry
by nickm＠torproject.org 17 Jan '13

17 Jan '13

commit cd80f6ee0f8b479e0ad1815bef232d981649c367 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 17 15:54:21 2013 -0500 Another msvc changes entry --- changes/msvc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/msvc b/changes/msvc index 9975c2d..1ae92e3 100644 --- a/changes/msvc +++ b/changes/msvc @@ -2,3 +2,5 @@ - Correctly define HAVE_EVENT_BASE_LOOPEXIT, since we only build with MSVC when using Libevent 2.0 or later. Fixes bug 7308. Reported by "ultramage". + - Make the ntor and curve25519 code build correctly with MSVC. + Fix on 0.2.4.8-alpha.

1 0

[tor/master] Merge branch '024_msvc_more'
by nickm＠torproject.org 17 Jan '13

17 Jan '13

commit eea69b7020dbd1bfa172f3660be2e5644fd9687f Merge: ae58303 cd80f6e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 17 15:54:51 2013 -0500 Merge branch '024_msvc_more' changes/msvc | 2 ++ src/common/Makefile.nmake | 6 +++++- src/or/Makefile.nmake | 3 +++ src/or/onion.h | 4 ++-- src/win32/orconfig.h | 3 +++ 5 files changed, 15 insertions(+), 3 deletions(-)

1 0

[tor/master] Even more code-removal for 6826
by nickm＠torproject.org 17 Jan '13

17 Jan '13

commit ae58303d423f4e50032c5610cc479d550fe2bd37 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 17 14:40:12 2013 -0500 Even more code-removal for 6826 (Pull on a thread and the whole sweater unravels.) --- src/common/compat_libevent.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 2f41ed9..fc5b0ac 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -54,7 +54,9 @@ typedef uint32_t le_version_t; * it is. */ #define LE_OTHER V(0,0,99) +#if 0 static le_version_t tor_get_libevent_version(const char **v_out); +#endif #if defined(HAVE_EVENT_SET_LOG_CALLBACK) || defined(RUNNING_DOXYGEN) /** A string which, if it appears in a libevent log, should be ignored. */ @@ -364,6 +366,7 @@ le_versions_compatibility(le_version_t v) return 5; } +#if 0 /** Return the version number of the currently running version of Libevent. * See le_version_t for info on the format. */ @@ -386,6 +389,7 @@ tor_get_libevent_version(const char **v_out) *v_out = v; return r; } +#endif /** Return a string representation of the version of the currently running * version of Libevent. */ @@ -408,13 +412,11 @@ tor_check_libevent_version(const char *m, int server, const char **badness_out) { int thread_unsafe = 0; - le_version_t version; const char *v = NULL; const char *badness = NULL; const char *sad_os = ""; (void) m; - - version = tor_get_libevent_version(&v); + (void) server; /* Libevent versions before 1.3b do very badly on operating systems with * user-space threading implementations. */

1 0

[torspec/master] Be explicit about spaces in rend-spec
by nickm＠torproject.org 17 Jan '13

17 Jan '13

commit 5505d901fd09799877e939dc545ecb147453c8d9 Author: Jérémy Bobbio <lunar(a)debian.org> Date: Thu Jan 17 17:32:11 2013 +0100 Be explicit about spaces in rend-spec --- rend-spec.txt | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rend-spec.txt b/rend-spec.txt index 4516b29..dfadc7d 100644 --- a/rend-spec.txt +++ b/rend-spec.txt @@ -220,7 +220,7 @@ addition to (or instead of) "V0" descriptors. The format of a "V2" descriptor is as follows: - "rendezvous-service-descriptor" descriptor-id NL + "rendezvous-service-descriptor" SP descriptor-id NL [At start, exactly once] @@ -274,7 +274,7 @@ multiple descriptors with different descriptor IDs in order to distribute them to different places on the ring. - "version" version-number NL + "version" SP version-number NL [Exactly once] @@ -287,7 +287,7 @@ The public key of the hidden service which is required to verify the "descriptor-id" and the "signature". - "secret-id-part" secret-id-part NL + "secret-id-part" SP secret-id-part NL [Exactly once] @@ -297,13 +297,13 @@ secret-id-part = H(time-period | descriptor-cookie | replica) - "publication-time" YYYY-MM-DD HH:MM:SS NL + "publication-time" SP YYYY-MM-DD HH:MM:SS NL [Exactly once] A timestamp when this descriptor has been created. - "protocol-versions" version-string NL + "protocol-versions" SP version-string NL [Exactly once] @@ -341,20 +341,20 @@ Subsequently, an arbitrary number of introduction point entries may follow, each containing the following data: - "introduction-point" identifier NL + "introduction-point" SP identifier NL [At start, exactly once] The identifier of this introduction point: the base-32 encoded hash of this introduction point's identity key. - "ip-address" ip-address NL + "ip-address" SP ip-address NL [Exactly once] The IP address of this introduction point. - "onion-port" port NL + "onion-port" SP port NL [Exactly once]

1 0

[torspec/master] Correct typo in dir-spec related to network-status-version
by nickm＠torproject.org 17 Jan '13

17 Jan '13

commit 57a31aa198c4631c20b255bcbc2fc1b310272b7d Author: Jérémy Bobbio <lunar(a)debian.org> Date: Thu Jan 17 17:31:10 2013 +0100 Correct typo in dir-spec related to network-status-version --- dir-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 40ec304..531be5e 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1142,7 +1142,7 @@ The preamble contains the following items. They MUST occur in the order given here: - "network-status-version" SP version NL. + "network-status-version" SP version NL [At start, exactly once.]

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 17 Jan '13

17 Jan '13

commit 616697e8364fb48967ecc8c9633262812b2d4b7b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 17 17:45:19 2013 +0000 Update translations for vidalia_alpha --- ja/vidalia_ja.po | 122 +++++++++++++++++++++++++++--------------------------- 1 files changed, 61 insertions(+), 61 deletions(-) diff --git a/ja/vidalia_ja.po b/ja/vidalia_ja.po index 9296fc3..fddf76e 100644 --- a/ja/vidalia_ja.po +++ b/ja/vidalia_ja.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2013-01-17 16:54+0000\n" +"PO-Revision-Date: 2013-01-17 17:30+0000\n" "Last-Translator: brt <87(a)itokei.info>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -270,11 +270,11 @@ msgstr "" msgctxt "AppearancePage" msgid "Hide the Tray Icon" -msgstr "" +msgstr "トレイアイコンを隠す" msgctxt "AppearancePage" msgid "Hide the Dock Icon" -msgstr "" +msgstr "ドックアイコンを隠す" msgctxt "BandwidthGraph" msgid "Since:" @@ -1289,11 +1289,11 @@ msgstr "" msgctxt "CountryInfo" msgid "Korea, North" -msgstr "" +msgstr "北朝鮮" msgctxt "CountryInfo" msgid "Korea, South" -msgstr "" +msgstr "韓国" msgctxt "CountryInfo" msgid "Libya" @@ -1343,13 +1343,13 @@ msgstr "自動的にVidaliaを再起動できませんでした。Vidaliaを手 msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" -msgstr "" +msgstr "以下でチケットを登録してください:" msgctxt "CrashReportDialog" msgid "" "<a " "href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" -msgstr "" +msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" msgctxt "CrashReportDialog" msgid "" @@ -1374,11 +1374,11 @@ msgstr "" msgctxt "DebugDialog" msgid "Syntax Errors" -msgstr "" +msgstr "構文エラー" msgctxt "DebugDialog" msgid "Exceptions" -msgstr "" +msgstr "例外" msgctxt "GeneralPage" msgid "Executables (*.exe)" @@ -2019,7 +2019,7 @@ msgstr "" msgctxt "MainWindow" msgid "New Circuit" -msgstr "" +msgstr "新しい回路" msgctxt "MainWindow" msgid "Debug output" @@ -2035,11 +2035,11 @@ msgstr "" msgctxt "MainWindow" msgid "Plugins" -msgstr "" +msgstr "プラグイン" msgctxt "MainWindow" msgid "Your clock is wrong" -msgstr "" +msgstr "あなたの時計に誤りがあります" msgctxt "MainWindow" msgid "" @@ -2517,7 +2517,7 @@ msgstr "状態" msgctxt "NetViewer" msgid "<a href=\"server.offline\">Why is my relay offline?</a>" -msgstr "" +msgstr "<a href=\"server.offline\">私のリレーはなぜオフラインなのですか?</a>" msgctxt "NetViewer" msgid "" @@ -2675,7 +2675,7 @@ msgstr "HTTP / HTTPS" msgctxt "NetworkPage" msgid "You must specify one or more bridges." -msgstr "" +msgstr "一つ以上のブリッジを記述する必要があります。" msgctxt "PluginEngine" msgid "WARNING: %1 doesn't have an info file." @@ -2749,7 +2749,7 @@ msgstr "" msgctxt "QDialogButtonBox" msgid "OK" -msgstr "" +msgstr "OK" msgctxt "QObject" msgid "There were some settings that Vidalia wasn't able to apply together" @@ -2775,7 +2775,7 @@ msgstr "" msgctxt "QObject" msgid "Vidalia was unable to save the options to the torrc file." -msgstr "" +msgstr "Vidalia は設定を torrc に保存することができませんでした。" msgctxt "RouterDescriptor" msgid "Online" @@ -3241,19 +3241,19 @@ msgstr "" msgctxt "ServerPage" msgid "KB" -msgstr "" +msgstr "KB" msgctxt "ServerPage" msgid "MB" -msgstr "" +msgstr "MB" msgctxt "ServerPage" msgid "GB" -msgstr "" +msgstr "GB" msgctxt "ServerPage" msgid "TB" -msgstr "" +msgstr "TB" msgctxt "ServerPage" msgid "Push no more than" @@ -3284,7 +3284,7 @@ msgid "" "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor " "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for " "details about any errors encountered." -msgstr "" +msgstr "Torソフトウェアを再起動するためVidaliaコントロールパネルの\"Torを実行する\"をクリックしてください。Torが予期せず終了した場合は、発生したエラーの詳細のため\"詳細\"タブを選びます。" msgctxt "StatusEventWidget" msgid "" @@ -3576,11 +3576,11 @@ msgstr "" msgctxt "TorControl" msgid "Connection failed: %1" -msgstr "" +msgstr "接続失敗: %1" msgctxt "TorControl" msgid "Disconnected" -msgstr "" +msgstr "切断" msgctxt "TorProcess" msgid "Process %1 failed to stop. [%2]" @@ -3712,67 +3712,67 @@ msgstr "UPnPのサポートをテスト中" msgctxt "UPNPTestDialog" msgid "Testing Universal Plug & Play Support" -msgstr "" +msgstr "Universal Plug & Playのサポートをテスト中" msgctxt "UpdateProcess" msgid "" "Vidalia was unable to check for available software updates because it could " "not find '%1'." -msgstr "" +msgstr "'%1' が見つけられないため、Vidaliaはソフトウェアのアップデートをチェックできませんでした。" msgctxt "UpdateProcess" msgid "" "Vidalia was unable to check for available software updates because Tor's " "update process exited unexpectedly." -msgstr "" +msgstr "Torのアップデートプロセスが予期せず終了したため、Vidaliaはソフトウェアのアップデートをチェックできませんでした。" msgctxt "UpdateProgressDialog" msgid "Checking for available updates..." -msgstr "" +msgstr "アップデートの存在を確認中" msgctxt "UpdateProgressDialog" msgid "Hide" -msgstr "" +msgstr "非表示にする" msgctxt "UpdateProgressDialog" msgid "Downloading updates..." -msgstr "" +msgstr "更新をダウンロードしています..." msgctxt "UpdateProgressDialog" msgid "Installing updated software..." -msgstr "" +msgstr "アップデートソフトウェアをインストール中..." msgctxt "UpdateProgressDialog" msgid "Done! Your software is now up to date." -msgstr "" +msgstr "完了しました！あなたのソフトウェアは最新です。" msgctxt "UpdateProgressDialog" msgid "OK" -msgstr "" +msgstr "OK" msgctxt "UpdateProgressDialog" msgid "Software Updates" -msgstr "" +msgstr "ソフトウェアアップデート" msgctxt "UpdateProgressDialog" msgid "Checking for updates..." -msgstr "" +msgstr "アップデートを確認中..." msgctxt "UpdateProgressDialog" msgid "Cancel" -msgstr "" +msgstr "キャンセル" msgctxt "UpdatesAvailableDialog" msgid "Software Updates Available" -msgstr "" +msgstr "更新が利用可能です" msgctxt "UpdatesAvailableDialog" msgid "Remind Me Later" -msgstr "" +msgstr "後で知らせる" msgctxt "UpdatesAvailableDialog" msgid "Install" -msgstr "" +msgstr "インストール" msgctxt "UpdatesAvailableDialog" msgid "The following updated software packages are ready for installation:" @@ -3780,27 +3780,27 @@ msgstr "" msgctxt "UpdatesAvailableDialog" msgid "Package" -msgstr "" +msgstr "パッケージ" msgctxt "UpdatesAvailableDialog" msgid "Version" -msgstr "" +msgstr "バージョン" msgctxt "VMessageBox" msgid "OK" -msgstr "" +msgstr "OK" msgctxt "VMessageBox" msgid "Cancel" -msgstr "" +msgstr "キャンセル" msgctxt "VMessageBox" msgid "Yes" -msgstr "" +msgstr "はい" msgctxt "VMessageBox" msgid "No" -msgstr "" +msgstr "いいえ" msgctxt "VMessageBox" msgid "Help" @@ -3808,27 +3808,27 @@ msgstr "ヘルプ" msgctxt "VMessageBox" msgid "Retry" -msgstr "" +msgstr "再試行" msgctxt "VMessageBox" msgid "Show Log" -msgstr "" +msgstr "ログの表示" msgctxt "VMessageBox" msgid "Show Settings" -msgstr "" +msgstr "設定の表示" msgctxt "VMessageBox" msgid "Continue" -msgstr "" +msgstr "続行" msgctxt "VMessageBox" msgid "Quit" -msgstr "" +msgstr "終了" msgctxt "VMessageBox" msgid "Browse" -msgstr "" +msgstr "参照" msgctxt "Vidalia" msgid "Invalid Argument" @@ -3864,15 +3864,15 @@ msgstr "" msgctxt "Vidalia" msgid "Sets Vidalia's interface style." -msgstr "" +msgstr "Vidalia のインターフェイススタイルを設定します。" msgctxt "Vidalia" msgid "Sets Vidalia's language." -msgstr "" +msgstr "Vidalia の言語を設定します。" msgctxt "Vidalia" msgid "Vidalia Usage Information" -msgstr "" +msgstr "Vidalia の使用情報" msgctxt "Vidalia" msgid "Unable to open log file '%1': %2" @@ -3903,32 +3903,32 @@ msgstr "" msgctxt "stringutil.h" msgid "%1 secs" -msgstr "" +msgstr "%1 秒" msgctxt "stringutil.h" msgid "%1 B/s" -msgstr "" +msgstr "%1 B/s" msgctxt "stringutil.h" msgid "%1 KB/s" -msgstr "" +msgstr "%1 KB/s" msgctxt "stringutil.h" msgid "%1 MB/s" -msgstr "" +msgstr "%1 MB/s" msgctxt "stringutil.h" msgid "%1 GB/s" -msgstr "" +msgstr "%1 GB/s" msgctxt "stringutil.h" msgid "%1 days" -msgstr "" +msgstr "%1 days" msgctxt "stringutil.h" msgid "%1 hours" -msgstr "" +msgstr "%1 hours" msgctxt "stringutil.h" msgid "%1 mins" -msgstr "" +msgstr "%1 mins"

1 0

[stem/master] Malformed url in docs
by atagar＠torproject.org 17 Jan '13

17 Jan '13

commit b060be224ef31342f813b8224fcac7f17fdcb3a4 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 17 09:37:37 2013 -0800 Malformed url in docs Missing the proper reStructuredText formatting for a url. --- stem/descriptor/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 3a0f46e..178795c 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -59,7 +59,7 @@ def parse_file(descriptor_file, descriptor_type = None, path = None): :class:`~stem.descriptor.reader.DescriptorReader`. :param file descriptor_file: opened file with the descriptor contents - :param tuple descriptor_type: tuple of the form **(type, major_version, minor_version)** as per `https://metrics.torproject.org/formats.html#descriptortypes`_ + :param tuple descriptor_type: tuple of the form **(type, major_version, minor_version)** as per the `metrics site <https://metrics.torproject.org/formats.html#descriptortypes>`_ :param str path: absolute path to the file's location on disk :returns: iterator for :class:`stem.descriptor.Descriptor` instances in the file

1 0

[stem/master] Adding documentation for Flag enums
by atagar＠torproject.org 17 Jan '13

17 Jan '13

commit 7d013d66db31d9bef398b00e12e2fb78c7222a32 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 17 08:37:58 2013 -0800 Adding documentation for Flag enums We were missing docs for the Flag enums along with a couple values (BADDIRECTORY and V3DIR). --- stem/descriptor/__init__.py | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index ca10823..95cfeaf 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -10,6 +10,30 @@ Package for parsing and processing descriptor data. |- get_path - location of the descriptor on disk if it came from a file |- get_unrecognized_lines - unparsed descriptor content +- __str__ - string that the descriptor was made from + +.. data:: Flag (enum) + + Flag assigned to tor relays by the authorities to indicate various + characteristics. + + ================= =========== + Flag Description + ================= =========== + **AUTHORITY** relay is a directory authority + **BADEXIT** relay shouldn't be used as an exit due to being either problematic or malicious (`https://trac.torproject.org/projects/tor/wiki/doc/badRelays`_) + **BADDIRECTORY** relay shouldn't be used for directory information + **EXIT** relay's exit policy makes it more useful as an exit rather than middle hop + **FAST** relay's suitable for high-bandwidth circuits + **GUARD** relay's suitable for being an entry guard (first hop) + **HSDIR** relay is being used as a v2 hidden service directory + **NAMED** relay can be referred to by its nickname + **RUNNING** relay is currently usable + **STABLE** relay's suitable for long-lived circuits + **UNNAMED** relay isn't presently bound to a nickname + **V2DIR** relay supports the v2 directory protocol + **V3DIR** relay supports the v3 directory protocol + **VALID** relay has been validated + ================= =========== """ __all__ = [ @@ -43,6 +67,7 @@ PGP_BLOCK_END = "-----END %s-----" Flag = stem.util.enum.Enum( ("AUTHORITY", "Authority"), ("BADEXIT", "BadExit"), + ("BADDIRECTORY", "BadDirectory"), ("EXIT", "Exit"), ("FAST", "Fast"), ("GUARD", "Guard"), @@ -52,6 +77,7 @@ Flag = stem.util.enum.Enum( ("STABLE", "Stable"), ("UNNAMED", "Unnamed"), ("V2DIR", "V2Dir"), + ("V3DIR", "V3Dir"), ("VALID", "Valid"), )

1 0

[stem/master] Moving Flag enum to stem's base module
by atagar＠torproject.org 17 Jan '13

17 Jan '13

commit a85aa8cfcdabfaf2176497abeaf0c90cb80a9624 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 17 08:43:17 2013 -0800 Moving Flag enum to stem's base module I'm making an effort to put most general purpose enums in the base module. Oddly I never referenced the Flag enum in the descriptor pydocs... --- stem/__init__.py | 42 ++++++++++++++++++++ stem/descriptor/__init__.py | 43 --------------------- stem/descriptor/networkstatus.py | 2 +- stem/descriptor/router_status_entry.py | 2 +- test/settings.cfg | 2 +- test/unit/descriptor/networkstatus/document_v3.py | 2 +- test/unit/descriptor/router_status_entry.py | 2 +- 7 files changed, 47 insertions(+), 48 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index 4ad7f78..a3ecf71 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -45,6 +45,30 @@ Library for working with the tor process. **CLEARDNSCACHE** clears cached DNS results ========================= =========== +.. data:: Flag (enum) + + Flag assigned to tor relays by the authorities to indicate various + characteristics. + + ================= =========== + Flag Description + ================= =========== + **AUTHORITY** relay is a directory authority + **BADEXIT** relay shouldn't be used as an exit due to being either problematic or malicious (`https://trac.torproject.org/projects/tor/wiki/doc/badRelays`_) + **BADDIRECTORY** relay shouldn't be used for directory information + **EXIT** relay's exit policy makes it more useful as an exit rather than middle hop + **FAST** relay's suitable for high-bandwidth circuits + **GUARD** relay's suitable for being an entry guard (first hop) + **HSDIR** relay is being used as a v2 hidden service directory + **NAMED** relay can be referred to by its nickname + **RUNNING** relay is currently usable + **STABLE** relay's suitable for long-lived circuits + **UNNAMED** relay isn't presently bound to a nickname + **V2DIR** relay supports the v2 directory protocol + **V3DIR** relay supports the v3 directory protocol + **VALID** relay has been validated + ================= =========== + .. data:: CircStatus (enum) Statuses that a circuit can be in. Tor may provide statuses not in this enum. @@ -375,6 +399,7 @@ __all__ = [ "SocketClosed", "Runlevel", "Signal", + "Flag", "CircStatus", "CircBuildFlag", "CircPurpose", @@ -481,6 +506,23 @@ Runlevel = stem.util.enum.UppercaseEnum( "ERR", ) +Flag = stem.util.enum.Enum( + ("AUTHORITY", "Authority"), + ("BADEXIT", "BadExit"), + ("BADDIRECTORY", "BadDirectory"), + ("EXIT", "Exit"), + ("FAST", "Fast"), + ("GUARD", "Guard"), + ("HSDIR", "HSDir"), + ("NAMED", "Named"), + ("RUNNING", "Running"), + ("STABLE", "Stable"), + ("UNNAMED", "Unnamed"), + ("V2DIR", "V2Dir"), + ("V3DIR", "V3Dir"), + ("VALID", "Valid"), +) + Signal = stem.util.enum.UppercaseEnum( "RELOAD", "HUP", diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 95cfeaf..aabf37e 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -10,30 +10,6 @@ Package for parsing and processing descriptor data. |- get_path - location of the descriptor on disk if it came from a file |- get_unrecognized_lines - unparsed descriptor content +- __str__ - string that the descriptor was made from - -.. data:: Flag (enum) - - Flag assigned to tor relays by the authorities to indicate various - characteristics. - - ================= =========== - Flag Description - ================= =========== - **AUTHORITY** relay is a directory authority - **BADEXIT** relay shouldn't be used as an exit due to being either problematic or malicious (`https://trac.torproject.org/projects/tor/wiki/doc/badRelays`_) - **BADDIRECTORY** relay shouldn't be used for directory information - **EXIT** relay's exit policy makes it more useful as an exit rather than middle hop - **FAST** relay's suitable for high-bandwidth circuits - **GUARD** relay's suitable for being an entry guard (first hop) - **HSDIR** relay is being used as a v2 hidden service directory - **NAMED** relay can be referred to by its nickname - **RUNNING** relay is currently usable - **STABLE** relay's suitable for long-lived circuits - **UNNAMED** relay isn't presently bound to a nickname - **V2DIR** relay supports the v2 directory protocol - **V3DIR** relay supports the v3 directory protocol - **VALID** relay has been validated - ================= =========== """ __all__ = [ @@ -50,8 +26,6 @@ __all__ = [ import os import re -import stem.util.enum - try: # added in python 2.7 from collections import OrderedDict @@ -64,23 +38,6 @@ KEYWORD_LINE = re.compile("^([%s]+)(?:[%s]+(.*))?$" % (KEYWORD_CHAR, WHITESPACE) PGP_BLOCK_START = re.compile("^-----BEGIN ([%s%s]+)-----$" % (KEYWORD_CHAR, WHITESPACE)) PGP_BLOCK_END = "-----END %s-----" -Flag = stem.util.enum.Enum( - ("AUTHORITY", "Authority"), - ("BADEXIT", "BadExit"), - ("BADDIRECTORY", "BadDirectory"), - ("EXIT", "Exit"), - ("FAST", "Fast"), - ("GUARD", "Guard"), - ("HSDIR", "HSDir"), - ("NAMED", "Named"), - ("RUNNING", "Running"), - ("STABLE", "Stable"), - ("UNNAMED", "Unnamed"), - ("V2DIR", "V2Dir"), - ("V3DIR", "V3Dir"), - ("VALID", "Valid"), -) - def parse_file(path, descriptor_file): """ diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index a056917..ef7e4a5 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -438,7 +438,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): signatures from all authorities :var list client_versions: list of recommended client tor versions :var list server_versions: list of recommended server tor versions - :var list known_flags: **\*** list of known router flags + :var list known_flags: **\*** list of :data:`~stem.Flag` for the router's flags :var list params: **\*** dict of parameter(**str**) => value(**int**) mappings :var list directory_authorities: **\*** list of :class:`~stem.descriptor.networkstatus.DirectoryAuthority` objects that have generated this document diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index 5c7d735..aca72ed 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -104,7 +104,7 @@ class RouterStatusEntry(stem.descriptor.Descriptor): :var int or_port: **\*** router's ORPort :var int dir_port: **\*** router's DirPort - :var list flags: **\*** list of status flags + :var list flags: **\*** list of :data:`~stem.Flag` associated with the relay :var stem.version.Version version: parsed version of tor, this is **None** if the relay's using a new versioning scheme diff --git a/test/settings.cfg b/test/settings.cfg index 9b58f82..561c0c8 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -156,6 +156,6 @@ target.torrc RUN_PTRACE => PORT, PTRACE pyflakes.ignore stem/prereq.py => 'RSA' imported but unused pyflakes.ignore stem/prereq.py => 'asn1' imported but unused pyflakes.ignore stem/prereq.py => 'long_to_bytes' imported but unused -pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDict' from line 33 +pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDict' from line 31 pyflakes.ignore test/unit/response/events.py => 'from stem import *' used; unable to detect undefined names diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index 4ea6347..c68549c 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -10,7 +10,7 @@ import unittest import stem.version -from stem.descriptor import Flag +from stem import Flag from stem.descriptor.networkstatus import HEADER_STATUS_DOCUMENT_FIELDS, \ FOOTER_STATUS_DOCUMENT_FIELDS, \ diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index b0fcc79..3f27663 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -5,7 +5,7 @@ Unit tests for stem.descriptor.router_status_entry. import datetime import unittest -from stem.descriptor import Flag +from stem import Flag from stem.descriptor.router_status_entry import RouterStatusEntryV3, _decode_fingerprint from stem.exit_policy import MicroExitPolicy from stem.version import Version

1 0