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

r26133: {website} fix i/li tag (website/trunk/about/en)
by Moritz Bartl 25 Mar '13

25 Mar '13

Author: moritz Date: 2013-03-25 22:48:25 +0000 (Mon, 25 Mar 2013) New Revision: 26133 Modified: website/trunk/about/en/contact.wml Log: fix i/li tag Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2013-03-24 21:56:14 UTC (rev 26132) +++ website/trunk/about/en/contact.wml 2013-03-25 22:48:25 UTC (rev 26133) @@ -38,7 +38,7 @@ <ul> <li>tor-talk(a)lists.torproject.org is for all discussion about theory, design, development, and use of Onion Routing.</li> - <li>tor-dev(a)lists.torproject.org</li> is for all discussion + <li>tor-dev(a)lists.torproject.org is for all discussion regarding Tor research and development.</li> <li>tor-translation(a)lists.torproject.org can put new <a href="<page getinvolved/translation>">translations</a> into place,

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 25 Mar '13

25 Mar '13

commit b0595ade508690a87258284ce218d8c91b852525 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 25 19:46:10 2013 +0000 Update translations for liveusb-creator --- ar/ar.po | 4 ++-- fi/fi.po | 54 +++++++++++++++++++++++++++--------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index a99b3a0..117f045 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2013-03-25 19:06+0000\n" +"PO-Revision-Date: 2013-03-25 19:25+0000\n" "Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -55,7 +55,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "Copy the running Tails onto a USB stick. All data on the target drive will be lost.</body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n p, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n انسخ تيلز الذي يعمل حاليا إلي محور يو اس بي. كل البيانات علي محور اليو اي بي سيتم حذفها.</body></html>" #: ../liveusb/launcher_ui.py:153 msgid "" diff --git a/fi/fi.po b/fi/fi.po index e7b8a4b..ab7ca3f 100644 --- a/fi/fi.po +++ b/fi/fi.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2013-03-24 20:51+0000\n" +"PO-Revision-Date: 2013-03-25 19:31+0000\n" "Last-Translator: mikkoharhanen <gitti(a)mikkoharhanen.fi>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -41,7 +41,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\">documentation</a>.</body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\nTarvitsetko apua? Lue <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\">ohjeistus</a>.</body></html>" #: ../liveusb/launcher_ui.py:151 msgid "" @@ -89,7 +89,7 @@ msgstr "" #: ../liveusb/creator.py:1120 ../liveusb/creator.py:1383 #, python-format msgid "Calculating the SHA1 of %s" -msgstr "" +msgstr "Lasketaan %s:n SHA1-tiivistettä." #: ../liveusb/creator.py:1331 msgid "Cannot find" @@ -154,7 +154,7 @@ msgstr "Ladataan %s..." #: ../liveusb/creator.py:1116 msgid "Drive is a loopback, skipping MBR reset" -msgstr "" +msgstr "Levy on loopback-laite: ohitetaan MBR:n palautus" #: ../liveusb/creator.py:1196 msgid "Error probing device" @@ -179,15 +179,15 @@ msgstr "Puretaan livelevykuva USB-laitteelle..." #: ../liveusb/creator.py:1061 #, python-format msgid "Formatting %(device)s as FAT32" -msgstr "" +msgstr "Alustetaan %(device)s FAT32:lla." #: ../liveusb/creator.py:139 msgid "ISO MD5 checksum passed" -msgstr "" +msgstr "ISO MD5 -tarkistussumma hyväksyttiin" #: ../liveusb/creator.py:137 msgid "ISO MD5 checksum verification failed" -msgstr "" +msgstr "ISO MD5 -tarkistussumma ei varmistunut" #: ../liveusb/dialog.py:156 msgid "" @@ -280,12 +280,12 @@ msgstr "Poistetaan %(file)s" #: ../liveusb/creator.py:498 msgid "Removing existing Live OS" -msgstr "" +msgstr "Poistetaan nykyinen Live-käyttöjärjestelmä" #: ../liveusb/creator.py:1110 #, python-format msgid "Resetting Master Boot Record of %s" -msgstr "" +msgstr "Palautetaan %s:n oletusarvot" #: ../liveusb/gui.py:743 msgid "Select Live ISO" @@ -293,23 +293,23 @@ msgstr "Valitse live-ISO" #: ../liveusb/creator.py:181 msgid "Setting up OLPC boot file..." -msgstr "" +msgstr "Luodaan OLPC-käynnistystiedostoa..." #: ../liveusb/creator.py:738 #, python-format msgid "" "Some partitions of USB device %(device)s are mounted. They will be unmounted" " before starting the installation process." -msgstr "" +msgstr "USB-laitteen %(device)s jotkut osiot on liitetty. Osiot irrotetaan ennen kuin asennus alkaa." #: ../liveusb/creator.py:130 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" -msgstr "" +msgstr "Lähteen tyyppi ei tue ISO MD5 -tarkistussumman varmistusta: vaihe ohitetaan." #: ../liveusb/creator.py:1144 msgid "Synchronizing data on disk..." -msgstr "" +msgstr "Synkronoidaan levyn tiedot..." #: ../liveusb/dialog.py:159 msgid "Target Device" @@ -332,7 +332,7 @@ msgstr "Valittu tiedosto ei ole luettavissa. Korjaa käyttöoikeudet tai valitse msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to '%(filename)s'." -msgstr "" +msgstr "Komennon `%(command)s` suorittamisessa oli ongelma.⏎ Tarkempi virheloki on kirjoitettu tiedostoon '%(filename)s'." #: ../liveusb/dialog.py:151 msgid "" @@ -409,17 +409,17 @@ msgstr "" #: ../liveusb/creator.py:523 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" -msgstr "" +msgstr "Edellisen Live-käyttöjärjestelmän hakemistoa ei voi poistaa: %(message)s" #: ../liveusb/creator.py:511 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" -msgstr "" +msgstr "Edellisen Live-käyttöjärjestelmän tiedostoa ei voi poistaa: %(message)s" #: ../liveusb/creator.py:1113 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." -msgstr "" +msgstr "MBR:ää ei voitu palauttaa. Pakettia syslinux ei ehkä ole asennettu." #: ../liveusb/gui.py:752 msgid "" @@ -430,11 +430,11 @@ msgstr "Valittua tiedostoa ei voitu käyttää. Tämä saattaa onnistua paremmin #: ../liveusb/creator.py:719 #, python-format msgid "Unable to write on %(device)s, skipping." -msgstr "" +msgstr "Laitteelle %(device)s ei voi kirjoittaa: vaihe ohitetaan." #: ../liveusb/creator.py:411 msgid "Unknown ISO, skipping checksum verification" -msgstr "" +msgstr "Tunnistamaton ISO, ohitetaan tarkistussumman varmistus." #: ../liveusb/creator.py:808 #, python-format @@ -443,7 +443,7 @@ msgstr "" #: ../liveusb/creator.py:787 ../liveusb/creator.py:887 msgid "Unknown filesystem. Your device may need to be reformatted." -msgstr "" +msgstr "Tuntematon tiedostojärjestelmä. Laitteesi on ehkä alustettava uudelleen." #: ../liveusb/gui.py:80 #, python-format @@ -453,7 +453,7 @@ msgstr "Tuntematon julkaisu: %s" #: ../liveusb/creator.py:835 #, python-format msgid "Unmounting %(device)s" -msgstr "" +msgstr "Irrotetaan %(device)s" #: ../liveusb/creator.py:792 ../liveusb/creator.py:890 #, python-format @@ -484,15 +484,15 @@ msgstr "Käytä olemassaolevaa Live ISOa" #: ../liveusb/creator.py:132 msgid "Verifying ISO MD5 checksum" -msgstr "" +msgstr "Varmistetaan ISO MD5 -tarkistussumma" #: ../liveusb/creator.py:385 msgid "Verifying SHA1 checksum of LiveCD image..." -msgstr "" +msgstr "Tarkistetaan LiveCD-levykuvan SHA1-summaa..." #: ../liveusb/creator.py:389 msgid "Verifying SHA256 checksum of LiveCD image..." -msgstr "" +msgstr "Tarkistetaan LiveCD-levykuvan SHA256-summaa..." #: ../liveusb/creator.py:884 ../liveusb/creator.py:1204 msgid "Verifying filesystem..." @@ -512,7 +512,7 @@ msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." -msgstr "" +msgstr "Varoitus: Laitteesi Master Boot Record ei vastaa järjestelmäsi Syslinux MBR:ää. Jos sinulla on ongelmia käynnistää tietokone uudelleen tikulta, voit ajaa ohjelman liveusb-creator valitsimella --reset-mbr." #: ../liveusb/gui.py:389 msgid "" @@ -524,13 +524,13 @@ msgstr "" #: ../liveusb/creator.py:151 #, python-format msgid "Wrote to device at %(speed)d MB/sec" -msgstr "" +msgstr "Laitteelle kirjoitettiin nopeudella %(speed)d Mt/s" #: ../liveusb/creator.py:636 msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" -msgstr "" +msgstr "Käytät syslinux-extlinuxin vanhaa versiota, joka ei tue ext4-tiedostojärjestelmää" #: ../liveusb/gui.py:737 msgid "You can try again to resume your download"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 25 Mar '13

25 Mar '13

commit 13f67cb63ceaa6e5f3c71a76632ac122628de0a2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 25 19:16:09 2013 +0000 Update translations for liveusb-creator --- ar/ar.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 4731b07..a99b3a0 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2013-03-23 21:08+0000\n" +"PO-Revision-Date: 2013-03-25 19:06+0000\n" "Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -46,7 +46,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\">documentation</a>.</body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n <html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n p, li { white-space: pre-wrap; }\n </style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n هل تحتاج إلي المساعدة؟ اقرأ <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\">كتيب كيفية الأستخدام</a>.</body></html>" #: ../liveusb/launcher_ui.py:151 msgid "" @@ -225,7 +225,7 @@ msgstr "فشل إنشاء قرص USB ذاتي التشغيل" msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." -msgstr "Make sure to extract the entire liveusb-creator zip file before running this program." +msgstr "تأكد من فك ضغط ملف \"liveusb-creator\" قبل العمل بالبرنامج." #: ../liveusb/creator.py:1208 msgid ""

1 0

[stem/master] Only running RUN_OPEN by default or if requested
by atagar＠torproject.org 25 Mar '13

25 Mar '13

commit 89974d0f67f09f44c0fb8b3f2344a78b27280dc4 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 25 08:10:36 2013 -0700 Only running RUN_OPEN by default or if requested We were configured to always run the RUN_OPEN target, even if something else had been requested. This bug lasted quite a while because we usually either run the default or RUN_ALL (which includes RUN_OPEN). --- test/settings.cfg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/settings.cfg b/test/settings.cfg index 8e96214..78820ed 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -51,7 +51,7 @@ integ.target.online false integ.target.relative_data_dir false integ.target.chroot false integ.target.run.none false -integ.target.run.open true +integ.target.run.open false integ.target.run.password false integ.target.run.cookie false integ.target.run.muiltipe false

1 0

[stem/master] Integ tests failed to create a control socket
by atagar＠torproject.org 25 Mar '13

25 Mar '13

commit 83b99dbe6579af04f18553740b175d6de44fa27d Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 25 08:12:30 2013 -0700 Integ tests failed to create a control socket The RUN_SOCKET test was failing while trying to make the control socket because it tried to change the permissions of /tmp to 700 (which, of course, normal users can't). Tor rejects to start if the control socket is in a globally readable directory, so making a temporary directory we can set the permissions on. --- test/runner.py | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/test/runner.py b/test/runner.py index 7fa9c41..fb4a4cd 100644 --- a/test/runner.py +++ b/test/runner.py @@ -89,7 +89,7 @@ INTEG_RUNNER = None # control authentication options and attributes CONTROL_PASSWORD = "pw" CONTROL_PORT = 1111 -CONTROL_SOCKET_PATH = tempfile.mkstemp()[1] +CONTROL_SOCKET_PATH = os.path.join(tempfile.mkdtemp(), 'socket') Torrc = stem.util.enum.Enum( ("PORT", "ControlPort %i" % CONTROL_PORT), @@ -627,10 +627,9 @@ class Runner(object): test.output.print_line("failed (%s)" % exc, *ERROR_ATTR) raise exc - # Makes a directory for the control socket if needed. As of, at least, Tor - # 0.2.3.10 it checks during startup that the directory a control socket - # resides in is only accessible by the tor user (and refuses to finish - # starting if it isn't). + # Tor checks during startup that the directory a control socket resides in + # is only accessible by the tor user (and refuses to finish starting if it + # isn't). if Torrc.SOCKET in self._custom_opts: try:

1 0

[stem/master] Safecookie authentication broken when using python 3
by atagar＠torproject.org 25 Mar '13

25 Mar '13

commit c75ab2812b90a730e135b5970ff35d431fa2c4a4 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 25 08:33:57 2013 -0700 Safecookie authentication broken when using python 3 The os.urandom() provides bytes so there's no need to convert that, but we needed to be more careful about using the converted hex in the formatted string. It too was bytes, causing an extra embedded b''... >>> "hello %s" % b"damian" "hello b'damian'" Tor in turn rejected the nonce as being invalid. I don't get why python3 does it. With python2 bytes and unicode could both be used in a reasonable fashion for formatted strings - these extra characters are almost always undesirable. Oh well... --- stem/connection.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index d1aa3e5..1f5a53d 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -119,8 +119,8 @@ from stem.util import log AuthMethod = stem.util.enum.Enum("NONE", "PASSWORD", "COOKIE", "SAFECOOKIE", "UNKNOWN") -CLIENT_HASH_CONSTANT = "Tor safe cookie authentication controller-to-server hash" -SERVER_HASH_CONSTANT = "Tor safe cookie authentication server-to-controller hash" +CLIENT_HASH_CONSTANT = b"Tor safe cookie authentication controller-to-server hash" +SERVER_HASH_CONSTANT = b"Tor safe cookie authentication server-to-controller hash" def connect_port(address = "127.0.0.1", port = 9051, password = None, chroot_path = None, controller = stem.control.Controller): @@ -690,7 +690,7 @@ def authenticate_safecookie(controller, cookie_path, suppress_ctl_errors = True) client_nonce = os.urandom(32) try: - client_nonce_hex = binascii.b2a_hex(stem.util.str_tools._to_bytes(client_nonce)) + client_nonce_hex = stem.util.str_tools._to_unicode(binascii.b2a_hex(client_nonce)) authchallenge_response = _msg(controller, "AUTHCHALLENGE SAFECOOKIE %s" % client_nonce_hex) if not authchallenge_response.is_ok():

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 25 Mar '13

25 Mar '13

commit 1e39686f8e64a97f72b3aa783b08485a9099cbfe Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 25 15:45:14 2013 +0000 Update translations for orbot --- values-sn/strings.xml | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/values-sn/strings.xml b/values-sn/strings.xml new file mode 100644 index 0000000..1de14de --- /dev/null +++ b/values-sn/strings.xml @@ -0,0 +1,28 @@ +<?xml version='1.0' encoding='UTF-8'?> +<resources> + <string name="app_name">Orbot</string> + <string name="default_web_url">http://check.torproject.org</string> + <string name="secure_default_web_url">https://check.torproject.org</string> + <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> + <string name="menu_settings">Zvamada</string> + <string name="menu_about">Maererano</string> + <string name="button_about">Maererano</string> + <string name="menu_exit">Buda</string> + <string name="wizard_btn_tell_me_more">Maererano Orbot</string> +  + <string name="wizard_proxy_help_info">Proxy Zvamada</string> +  +  +  +  +  +  +  +  +  + <string name="default_bridges"></string> +</resources>

1 0

[stem/master] Controller provided unicode microdescriptors with python 3
by atagar＠torproject.org 25 Mar '13

25 Mar '13

commit 5e6b5407f087b6b31d28ed5047e44b07f082d197 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 24 21:05:14 2013 -0700 Controller provided unicode microdescriptors with python 3 When using python 3 the get_info() method provides unicode content. We were passing this content to descriptor constructors, causing its raw_content to be unicode rather than bytes. This in turn caused a stacktrace when calling methods like hashlib.sha256(). This doesn't effect python 2.x, where str is bytes anyway. --- stem/control.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stem/control.py b/stem/control.py index 82cff41..5b9a8ac 100644 --- a/stem/control.py +++ b/stem/control.py @@ -989,7 +989,7 @@ class Controller(BaseController): raise ValueError("'%s' isn't a valid fingerprint or nickname" % relay) desc_content = self.get_info(query) - return stem.descriptor.microdescriptor.Microdescriptor(desc_content) + return stem.descriptor.microdescriptor.Microdescriptor(str_tools._to_bytes(desc_content)) except Exception, exc: if default == UNDEFINED: raise exc @@ -1079,7 +1079,7 @@ class Controller(BaseController): raise ValueError("'%s' isn't a valid fingerprint or nickname" % relay) desc_content = self.get_info(query) - return stem.descriptor.server_descriptor.RelayDescriptor(desc_content) + return stem.descriptor.server_descriptor.RelayDescriptor(str_tools._to_bytes(desc_content)) except Exception, exc: if default == UNDEFINED: raise exc @@ -1153,7 +1153,7 @@ class Controller(BaseController): raise ValueError("'%s' isn't a valid fingerprint or nickname" % relay) desc_content = self.get_info(query) - return stem.descriptor.router_status_entry.RouterStatusEntryV2(desc_content) + return stem.descriptor.router_status_entry.RouterStatusEntryV2(str_tools._to_bytes(desc_content)) except Exception, exc: if default == UNDEFINED: raise exc

1 0

[stem/master] Allowing stem.descriptor.parse_file() to handle paths
by atagar＠torproject.org 25 Mar '13

25 Mar '13

commit fa0fbd195d0531980a6e250ee2e32c99a0708259 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 24 20:52:07 2013 -0700 Allowing stem.descriptor.parse_file() to handle paths Several times now I've passed a string path to parse_file() rather than a file object and been confused for a sec by the stacktrace. On reflection there's no reason *not* to accept paths - that's commonly what we want it for after all and eliminating the extra open() lets our callers have much nicer code. --- stem/descriptor/__init__.py | 11 ++++++++++- stem/descriptor/microdescriptor.py | 14 ++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 501ac5d..ef438a7 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -125,7 +125,7 @@ def parse_file(descriptor_file, descriptor_type = None, validate = True, documen my_descriptor_file = open(descriptor_path, 'rb') - :param file descriptor_file: opened file with the descriptor contents + :param str,file descriptor_file: path or opened file with the descriptor contents :param str descriptor_type: `descriptor type <https://metrics.torproject.org/formats.html#descriptortypes>`_, this is guessed if not provided :param bool validate: checks the validity of the descriptor's content if **True**, skips these checks otherwise @@ -139,6 +139,15 @@ def parse_file(descriptor_file, descriptor_type = None, validate = True, documen * **IOError** if unable to read from the descriptor_file """ + # if we got a path then open that file for parsing + + if isinstance(descriptor_file, (bytes, unicode)): + with open(descriptor_file) as desc_file: + for desc in parse_file(desc_file, descriptor_type, validate, document_handler): + yield desc + + return + import stem.descriptor.server_descriptor import stem.descriptor.extrainfo_descriptor import stem.descriptor.networkstatus diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index 4fc2c31..ac1eb2e 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -41,10 +41,9 @@ the exit relays. print "Exit Relays:" - with open(os.path.join(data_dir, 'cached-microdesc-consensus')) as desc_file: - for desc in parse_file(desc_file): - if desc.digest in exit_digests: - print " %s (%s)" % (desc.nickname, desc.fingerprint) + for desc in parse_file(os.path.join(data_dir, 'cached-microdesc-consensus')): + if desc.digest in exit_digests: + print " %s (%s)" % (desc.nickname, desc.fingerprint) Doing the same is trivial with server descriptors... @@ -54,10 +53,9 @@ Doing the same is trivial with server descriptors... print "Exit Relays:" - with open("/home/atagar/.tor/cached-descriptors") as desc_file: - for desc in parse_file(desc_file): - if desc.exit_policy.is_exiting_allowed(): - print " %s (%s)" % (desc.nickname, desc.fingerprint) + for desc in parse_file("/home/atagar/.tor/cached-descriptors"): + if desc.exit_policy.is_exiting_allowed(): + print " %s (%s)" % (desc.nickname, desc.fingerprint) **Module Overview:**

1 0

[stem/master] Having ExitPolicyRules report /0 as a wildcard
by atagar＠torproject.org 25 Mar '13

25 Mar '13

commit b05bf7a7eeb9807bf003518b39677f8c6abc39c8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 24 19:40:23 2013 -0700 Having ExitPolicyRules report /0 as a wildcard ExitPolicyRules can apply to both IPv4 and IPv6. Because of this I treated * as a wildcard, but *not* /0 (since 0.0.0.0/0, though it applies to all IPv4 addresses, doesn't cover IPv6). However, in most cases (everywhere except the torrc?) Tor's exit policies are limited to IPv4. As such, /0 should usually be treated as a wildcard. Change suggested by Aaron Johnson. --- stem/exit_policy.py | 25 +++++++++++++++++++++---- test/unit/exit_policy/rule.py | 16 ++++++++++++++-- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 2b0d6d4..c7219b2 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -131,6 +131,12 @@ def get_config_policy(rules): else: result.append(ExitPolicyRule(rule)) + # torrc policies can apply to IPv4 or IPv6, so we need to make sure /0 + # addresses aren't treated as being a full wildcard + + for rule in result: + rule._submask_wildcard = False + return ExitPolicy(*result) @@ -510,16 +516,27 @@ class ExitPolicyRule(object): self._str_representation = None + # If true then a submask of /0 is treated by is_address_wildcard() as being + # a wildcard. + + self._submask_wildcard = True + def is_address_wildcard(self): """ - **True** if we'll match against any address, **False** otherwise. Note that - this may be different from matching against a /0 because policies can - contain both IPv4 and IPv6 addresses (so 0.0.0.0/0 won't match against an - IPv6 address). + **True** if we'll match against any address, **False** otherwise. + + Note that if this policy can apply to both IPv4 and IPv6 then this is + different from being for a /0 (since, for instance, 0.0.0.0/0 wouldn't + match against an IPv6 address). That said, /0 addresses are highly unusual + and most things citing exit policies are IPv4 specific anyway, making this + moot. :returns: **bool** for if our address matching is a wildcard """ + if self._submask_wildcard and self.get_masked_bits() == 0: + return True + return self._address_type == _address_type_to_int(AddressType.WILDCARD) def is_port_wildcard(self): diff --git a/test/unit/exit_policy/rule.py b/test/unit/exit_policy/rule.py index 0fe369b..09c0e23 100644 --- a/test/unit/exit_policy/rule.py +++ b/test/unit/exit_policy/rule.py @@ -69,10 +69,11 @@ class TestExitPolicyRule(unittest.TestCase): "accept 192.168.0.1:*": (False, True), "accept 192.168.0.1:80": (False, False), - "reject 127.0.0.1/0:*": (False, True), + "reject 127.0.0.1/0:*": (True, True), + "reject 127.0.0.1/0.0.0.0:*": (True, True), "reject 127.0.0.1/16:*": (False, True), "reject 127.0.0.1/32:*": (False, True), - "reject [0000:0000:0000:0000:0000:0000:0000:0000]/0:80": (False, False), + "reject [0000:0000:0000:0000:0000:0000:0000:0000]/0:80": (True, False), "reject [0000:0000:0000:0000:0000:0000:0000:0000]/64:80": (False, False), "reject [0000:0000:0000:0000:0000:0000:0000:0000]/128:80": (False, False), @@ -89,6 +90,16 @@ class TestExitPolicyRule(unittest.TestCase): self.assertEquals(is_address_wildcard, rule.is_address_wildcard()) self.assertEquals(is_port_wildcard, rule.is_port_wildcard()) + # check that when appropriate a /0 is reported as *not* being a wildcard + + rule = ExitPolicyRule("reject 127.0.0.1/0:*") + rule._submask_wildcard = False + self.assertEquals(False, rule.is_address_wildcard()) + + rule = ExitPolicyRule("reject [0000:0000:0000:0000:0000:0000:0000:0000]/0:80") + rule._submask_wildcard = False + self.assertEquals(False, rule.is_address_wildcard()) + def test_invalid_wildcard(self): test_inputs = ( "reject */16:*", @@ -237,6 +248,7 @@ class TestExitPolicyRule(unittest.TestCase): for rule_arg, matches in test_inputs.items(): rule = ExitPolicyRule(rule_arg) + rule._submask_wildcard = False for match_args, expected_result in matches.items(): self.assertEquals(expected_result, rule.is_match(*match_args))

1 0