- tor-commits - lists.torproject.org

[translation/tsum] Update translations for tsum
by translation＠torproject.org 13 Nov '11

13 Nov '11

commit 1af5e1a19d9da5e3a638232543fdbe6c50e88019 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 13 19:15:05 2011 +0000 Update translations for tsum --- cs/tsum.po | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/cs/tsum.po b/cs/tsum.po index 3451c61..efbdd4a 100644 --- a/cs/tsum.po +++ b/cs/tsum.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-13 18:44+0000\n" +"PO-Revision-Date: 2011-11-13 18:56+0000\n" "Last-Translator: Sanky <gsanky+transifex(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -614,6 +614,9 @@ msgid "" "and use winzip to extract the archive. Before renaming the file, tell " "Windows to show file extensions:" msgstr "" +"Pokud nemůžete stáhnout 7-Zip, zkuste přejmenovat soubor z .z na .zip a " +"použít winzip k rozbalení balíčku. Před přejmenováním souboru řekněte " +"Windows, aby zobrazoval přípony souborů:" #. type: Plain text #: en/tsum.text:254 @@ -651,6 +654,8 @@ msgid "" "### What to do with split packages\n" "When you request a split package, the parts may arrive out of order. You need to make sure you have received all the parts before you attempt to unpack them. Save all the parts into one directory on your computer, unzip them, and double-click the file that ends in \"..split.part01.exe\" to start the unpacking process." msgstr "" +"### Co dělat s rozděleným balíčkem\n" +"Když si vyžádáte rozdělený balíček, části mohou přijít ve špatném pořadí. Musíte se ujistit, že vám přišly všechny části, než se je pokusíte rozbalit. Uložte všechny části do jedné složky na vašem počítači, rozzipujte je a dvakrát klikněte na soubor který končí na \"..split.part01.exe\" pro započatí rozbalovacího procesu." #. type: Plain text #: en/tsum.text:277 @@ -669,6 +674,8 @@ msgid "" "### Vidalia asks for a password\n" "You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems:" msgstr "" +"### Vidalia se ptá pro heslo\n" +"Při spouštění Vidalii by nemělo být potřeba zadávat heslo. Pokud jste o něj žádáni, pravděpodobně jste postižení jedním z následujících problémů:" #. type: Plain text #: en/tsum.text:287 @@ -714,6 +721,8 @@ msgid "" "### Flash does not work\n" "For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity." msgstr "" +"### Flash nefunguje\n" +"Z bezpečnostních důvodů jsou Flash, Java a jiné pluginy v současnosti pod Torem vypnuté. Pluginy běhají nezávisle na Firefoxu a mohou provádět aktivity na vašem počítači které zmaří vaší anonymitu." #. type: Plain text #: en/tsum.text:308 @@ -752,6 +761,8 @@ msgid "" "### I want to use another browser\n" "For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks." msgstr "" +"### Chci používat jiný prohlížeč\n" +"Z bezpečnostních důvodů doporučujeme brouzdání internetu skrz Tor jen pomocí Tor Browser Bundle. Teoreticky je možné používat Tor s jinými prohlížeči, ale mohli byste se tím otevřít pro potencionální útoky." #. type: Plain text #: en/tsum.text:325

1 0

[stem/master] Standardizing on suppress_exc args for sys util
by atagar＠torproject.org 13 Nov '11

13 Nov '11

commit d1c3c8db724eb17c754c26f66016315d0524a74a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 12 15:46:13 2011 -0800 Standardizing on suppress_exc args for sys util The system functions are mostly best-effort, platform specific attempts to retrieve data and usually don't have meaningful information to provide back to the caller via exceptions. I'm defaulting to have them return None, with an optional arg for having them raise IOError exceptions on failure instead. I've gone back and forth on the fencepost here a few times, and I'm still not positive if this is the right choice. Might change this later if it doesn't work out. --- stem/util/proc.py | 2 +- stem/util/system.py | 101 +++++++++++++++++++++++++++++++++++++++---------- test/integ/system.py | 8 ++-- test/runner.py | 11 +---- 4 files changed, 87 insertions(+), 35 deletions(-) diff --git a/stem/util/proc.py b/stem/util/proc.py index 30fab6a..79cf92a 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -109,7 +109,7 @@ def get_physical_memory(): return SYS_PHYSICAL_MEMORY -def get_pwd(pid): +def get_cwd(pid): """ Provides the current working directory for the given process. diff --git a/stem/util/system.py b/stem/util/system.py index 467787c..fd7277d 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -93,7 +93,7 @@ def is_running(command, suppress_exc = True): if suppress_exc: return None else: raise OSError("Unable to check via 'ps -A co command'") -def get_pid(process_name, process_port = None): +def get_pid(process_name, process_port = None, suppress_exc = True): """ Attempts to determine the process id for a running process, using the following: @@ -110,14 +110,20 @@ def get_pid(process_name, process_port = None): are discarded (since only netstat can differentiate using a bound port). Arguments: - process_name (str) - process name for which to fetch the pid - process_port (int) - port that the process we're interested in is bound to, - this is used to disambiguate if there's multiple - instances running + process_name (str) - process name for which to fetch the pid + process_port (int) - port that the process we're interested in is bound + to, this is used to disambiguate if there's multiple + instances running + suppress_exc (bool) - if True then None is returned on failure, otherwise + this raises the exception Returns: - int with the process id, None if either no running process exists or it - can't be determined + int with the process id, None if it can't be determined and suppress_exc is + True + + Raises: + IOError if either no running process exists or it can't be determined and + suppress_exc is True """ # attempts to resolve using pgrep, failing if: @@ -241,30 +247,39 @@ def get_pid(process_name, process_port = None): if pid.isdigit(): return int(pid) except IOError: pass - return None + exc_msg = "failed to resolve a pid for %s" % process_name + + if suppress_exc: + LOGGER.debug(exc_msg) + return None + else: + raise IOError(exc_msg) -def get_pwd(pid): +def get_cwd(pid, suppress_exc = True): """ Provices the working directory of the given process. Arguments: - pid (int) - process id of the process to be queried + pid (int) - process id of the process to be queried + suppress_exc (bool) - if True then None is returned on failure, otherwise + this raises the exception Returns: - str with the absolute path for the process' present working directory + str with the absolute path for the process' present working directory, None + if it can't be determined and suppress_exc is True Raises: - IOError if it can't be determined + IOError if this fails and suppress_exc is False """ # try fetching via the proc contents if it's available if stem.util.proc.is_available(): - try: return stem.util.proc.get_pwd(pid) + try: return stem.util.proc.get_cwd(pid) except IOError: pass # Fall back to a pwdx query. This isn't available on BSD. If we attempt this - # lookup then it trumps lsof when reporting an exception at the end since - # it's the better lookup method for this information. + # lookup then it trumps lsof when logging isssues at the end since it's the + # better lookup method for this information. exc_msg = None @@ -304,14 +319,18 @@ def get_pwd(pid): exc_msg = "we got unexpected output from lsof: %s" % results except OSError, exc: if not exc_msg: - exc_msg = "lsof query for the pwd of %s failed: %s" % (pid, exc) + exc_msg = "lsof query for the cwd of %s failed: %s" % (pid, exc) if not exc_msg: # shouldn't happen, somehow we never registered a failure... - exc_msg = "unable to query pwdx or lsof" + exc_msg = "unable to query pwdx or lsof for the cwd of %s" % pid - # we failed all lookups, raise - raise IOError(exc_msg) + # we failed all lookups, either raise or log the issue and return None + if suppress_exc: + LOGGER.debug(exc_msg) + return None + else: + raise IOError(exc_msg) def get_bsd_jail_id(pid): """ @@ -341,6 +360,47 @@ def get_bsd_jail_id(pid): LOGGER.warn("Failed to figure out the FreeBSD jail id. Assuming 0.") return 0 +def is_relative_path(path): + """ + Checks if the path can be expanded by the expand_path function. + + Returns: + bool that's True if the path is relative or begins with an expandable home, + False otherwise + """ + + return path and not path.startswith("/") + +def expand_path(path, cwd = None): + """ + Provides an absolute path, expanding tildas with the user's home and + appending a current working directory if the path was relative. + + Arguments: + path (str) - path to be expanded + cwd (str) - current working directory to expand relative paths with, our + process' if this is None. + + Returns: + str of the path expanded to be an absolute path + """ + + if not path or path[0] == "/": + # empty or already absolute - nothing to do + return path + elif path.startswith("~"): + # prefixed with a ~ or ~user entry + return os.path.expanduser(path) + else: + # relative path, expand with the cwd + if not cwd: cwd = os.getcwd() + + # we'll be dealing with both "my/path/" and "./my/path" entries, so + # cropping the later + if path.startswith("./"): path = path[2:] + + return os.path.join(cwd, path) + def call(command, suppress_exc = True): """ Issues a command in a subprocess, blocking until completion and returning the @@ -373,8 +433,7 @@ def call(command, suppress_exc = True): if stdout: return stdout.split("\n") else: return [] except OSError, exc: - msg = "system call (failed): %s (error: %s)" % (command, exc) - LOGGER.debug(msg) + LOGGER.debug("system call (failed): %s (error: %s)" % (command, exc)) if suppress_exc: return None else: raise exc diff --git a/test/integ/system.py b/test/integ/system.py index 6e3370e..4aa5d15 100644 --- a/test/integ/system.py +++ b/test/integ/system.py @@ -41,15 +41,15 @@ class TestSystemFunctions(unittest.TestCase): self.assertEquals(runner.get_pid(), system.get_pid("tor", runner.get_control_port())) self.assertEquals(None, system.get_pid("blarg_and_stuff")) - def test_get_pwd(self): + def test_get_cwd(self): """ - Checks the util.system.get_pwd function. + Checks the util.system.get_cwd function. """ # tor's pwd will match our process since we started it runner = test.runner.get_runner() - self.assertEquals(os.getcwd(), system.get_pwd(runner.get_pid())) - self.assertRaises(IOError, system.get_pwd, 99999) + self.assertEquals(os.getcwd(), system.get_cwd(runner.get_pid())) + self.assertRaises(IOError, system.get_cwd, 99999) def test_get_bsd_jail_id(self): """ diff --git a/test/runner.py b/test/runner.py index 21cf1e5..613b3b2 100644 --- a/test/runner.py +++ b/test/runner.py @@ -105,11 +105,7 @@ class Runner: config_test_dir = self._config["test.integ.test_directory"] if config_test_dir: - # makes paths relative of stem's base directory - if config_test_dir.startswith("./"): - config_test_dir = STEM_BASE + config_test_dir[1:] - - self._test_dir = os.path.expanduser(config_test_dir) + self._test_dir = stem.util.system.expand_path(config_test_dir, STEM_BASE) else: self._test_dir = tempfile.mktemp("-stem-integ") @@ -333,10 +329,7 @@ class Runner: logging_path = self._config["test.integ.log"] if logging_path: - # makes paths relative of stem's base directory - if logging_path.startswith("./"): - logging_path = STEM_BASE + logging_path[1:] - + logging_path = stem.util.system.expand_path(logging_path, STEM_BASE) _print_status(" configuring logger (%s)... " % logging_path, STATUS_ATTR, quiet) # delete the old log

1 0

[stem/master] Function for querying a process' pwd
by atagar＠torproject.org 13 Nov '11

13 Nov '11

commit fab872725d791e8a9ca20f28f6eb5c5358aff87b Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Nov 10 09:30:06 2011 -0800 Function for querying a process' pwd Implementing and testing a stem.util.system.get_pwd(pid) function. This will be needed for correcting the relative cookie paths mentioned in... https://trac.torproject.org/projects/tor/ticket/1101 --- stem/util/system.py | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ test/integ/system.py | 11 +++++++ 2 files changed, 83 insertions(+), 0 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index b63974d..467787c 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -9,6 +9,8 @@ import time import logging import subprocess +import stem.util.proc + LOGGER = logging.getLogger("stem") # Mapping of commands to if they're available or not. This isn't always @@ -241,6 +243,76 @@ def get_pid(process_name, process_port = None): return None +def get_pwd(pid): + """ + Provices the working directory of the given process. + + Arguments: + pid (int) - process id of the process to be queried + + Returns: + str with the absolute path for the process' present working directory + + Raises: + IOError if it can't be determined + """ + + # try fetching via the proc contents if it's available + if stem.util.proc.is_available(): + try: return stem.util.proc.get_pwd(pid) + except IOError: pass + + # Fall back to a pwdx query. This isn't available on BSD. If we attempt this + # lookup then it trumps lsof when reporting an exception at the end since + # it's the better lookup method for this information. + + exc_msg = None + + if is_available("pwdx"): + # pwdx results are of the form: + # 3799: /home/atagar + # 5839: No such process + + try: + results = call("pwdx %s" % pid) + + if not results: + exc_msg = "pwdx didn't return any results" + elif results[0].endswith("No such process"): + exc_msg = "pwdx reported no process for pid %s" % pid + elif len(results) != 1 or results[0].count(" ") != 1: + exc_msg = "we got unexpected output from pwdx: %s" % results + else: + return results[0].split(" ", 1)[1].strip() + except OSError, exc: + exc_msg = "pwdx query for %s failed: %s" % (pid, exc) + + # Use lsof as the final fallback. This is available on both Linux and is the + # only lookup method here that works for BSD... + # https://trac.torproject.org/projects/tor/ticket/4236 + # + # ~$ lsof -a -p 75717 -d cwd -Fn + # p75717 + # n/Users/atagar/tor/src/or + + try: + results = call("lsof -a -p %s -d cwd -Fn" % pid) + + if results and len(results) == 2 and results[1].startswith("n/"): + return results[1][1:].strip() + elif not exc_msg: + exc_msg = "we got unexpected output from lsof: %s" % results + except OSError, exc: + if not exc_msg: + exc_msg = "lsof query for the pwd of %s failed: %s" % (pid, exc) + + if not exc_msg: + # shouldn't happen, somehow we never registered a failure... + exc_msg = "unable to query pwdx or lsof" + + # we failed all lookups, raise + raise IOError(exc_msg) + def get_bsd_jail_id(pid): """ Get the FreeBSD jail id for a process. diff --git a/test/integ/system.py b/test/integ/system.py index dc5b24c..6e3370e 100644 --- a/test/integ/system.py +++ b/test/integ/system.py @@ -2,6 +2,7 @@ Unit tests for the util.system functions in the context of a tor process. """ +import os import unittest import test.runner @@ -40,6 +41,16 @@ class TestSystemFunctions(unittest.TestCase): self.assertEquals(runner.get_pid(), system.get_pid("tor", runner.get_control_port())) self.assertEquals(None, system.get_pid("blarg_and_stuff")) + def test_get_pwd(self): + """ + Checks the util.system.get_pwd function. + """ + + # tor's pwd will match our process since we started it + runner = test.runner.get_runner() + self.assertEquals(os.getcwd(), system.get_pwd(runner.get_pid())) + self.assertRaises(IOError, system.get_pwd, 99999) + def test_get_bsd_jail_id(self): """ Exercises the util.system.get_bsd_jail_id function, running through the

1 0

[stem/master] Avoid adding duplicate null logging handlers
by atagar＠torproject.org 13 Nov '11

13 Nov '11

commit 5d200b1cdbebcd60cadf6455a9b1baf1d9431fb3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 12 16:19:34 2011 -0800 Avoid adding duplicate null logging handlers Checking if logging already has a handler before adding a NullHandler, to avoid having _every_ import trigger an extra no-op handler. --- stem/util/__init__.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/stem/util/__init__.py b/stem/util/__init__.py index 0391293..14692fe 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -11,7 +11,10 @@ import logging class NullHandler(logging.Handler): def emit(self, record): pass -logging.getLogger("stem").addHandler(NullHandler()) +stem_logger = logging.getLogger("stem") + +if not stem_logger.handlers: + stem_logger.addHandler(NullHandler()) __all__ = ["conf", "enum", "log", "proc", "system", "term"]

1 0

[stem/master] Expanding contorller exception types
by atagar＠torproject.org 13 Nov '11

13 Nov '11

commit efe28987ffd27e69a2c6c566bdad2efc5f16e93e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 12 15:55:09 2011 -0800 Expanding contorller exception types Exception types pretty much mirror what TorCtl has (protocol error, socket error, and controller closed) with a base type users can catch instead. One difference though is that if stem functions raise a socket.error (without documenting that they do) then that's a bug - those errors should cuase a stem.types.SocketError instead. --- stem/types.py | 34 +++++++++++++++++++++------------- test/integ/message.py | 14 +++++++------- test/integ/system.py | 3 ++- test/unit/types/control_message.py | 2 +- 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/stem/types.py b/stem/types.py index e03698c..78e2fd9 100644 --- a/stem/types.py +++ b/stem/types.py @@ -2,8 +2,10 @@ Class representations for a variety of tor objects. These are most commonly return values rather than being instantiated by users directly. -ProtocolError - Malformed socket data. -ControlSocketClosed - Socket terminated. +ControllerError - Base exception raised when using the controller. + |- ProtocolError - Malformed socket data. + |- SocketError - Socket used for controller communication errored. + +- SocketClosed - Socket terminated. read_message - Reads a ControlMessage from a control socket. ControlMessage - Message from the control socket. @@ -45,11 +47,18 @@ KEY_ARG = re.compile("^(\S+)=") CONTROL_ESCAPES = {r"\\": "\\", r"\"": "\"", r"\'": "'", r"\r": "\r", r"\n": "\n", r"\t": "\t"} -class ProtocolError(Exception): +class ControllerError(Exception): + "Base error for controller communication issues." + +class ProtocolError(ControllerError): "Malformed content from the control socket." pass -class ControlSocketClosed(Exception): +class SocketError(ControllerError): + "Error arose while communicating with the control socket." + pass + +class SocketClosed(ControllerError): "Control socket was closed before completing the message." pass @@ -67,8 +76,7 @@ def read_message(control_file): Raises: ProtocolError the content from the socket is malformed - ControlSocketClosed if the socket closes before we receive a complete - message + SocketClosed if the socket closes before we receive a complete message """ parsed_content, raw_content = [], "" @@ -79,11 +87,11 @@ def read_message(control_file): # if the control_file has been closed then we will receive: # AttributeError: 'NoneType' object has no attribute 'recv' - LOGGER.warn("ControlSocketClosed: socket file has been closed") - raise ControlSocketClosed("socket file has been closed") + LOGGER.warn("SocketClosed: socket file has been closed") + raise SocketClosed("socket file has been closed") except socket.error, exc: - LOGGER.warn("ControlSocketClosed: received an exception (%s)" % exc) - raise ControlSocketClosed(exc) + LOGGER.warn("SocketClosed: received an exception (%s)" % exc) + raise SocketClosed(exc) raw_content += line @@ -94,8 +102,8 @@ def read_message(control_file): # if the socket is disconnected then the readline() method will provide # empty content - LOGGER.warn("ControlSocketClosed: empty socket content") - raise ControlSocketClosed("Received empty socket content.") + LOGGER.warn("SocketClosed: empty socket content") + raise SocketClosed("Received empty socket content.") elif len(line) < 4: LOGGER.warn("ProtocolError: line too short (%s)" % line) raise ProtocolError("Badly formatted reply line: too short") @@ -125,7 +133,7 @@ def read_message(control_file): while True: try: line = control_file.readline() - except socket.error, exc: raise ControlSocketClosed(exc) + except socket.error, exc: raise SocketClosed(exc) raw_content += line diff --git a/test/integ/message.py b/test/integ/message.py index 531d4a2..a562f86 100644 --- a/test/integ/message.py +++ b/test/integ/message.py @@ -40,16 +40,16 @@ class TestMessageFunctions(unittest.TestCase): control_socket_file.write("GETINFO version\r\n") control_socket_file.flush() - self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) + self.assertRaises(stem.types.SocketClosed, stem.types.read_message, control_socket_file) # Additional socket usage should fail, and pulling more responses will fail # with more closed exceptions. control_socket_file.write("GETINFO version\r\n") self.assertRaises(socket.error, control_socket_file.flush) - self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) - self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) - self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) + self.assertRaises(stem.types.SocketClosed, stem.types.read_message, control_socket_file) + self.assertRaises(stem.types.SocketClosed, stem.types.read_message, control_socket_file) + self.assertRaises(stem.types.SocketClosed, stem.types.read_message, control_socket_file) # The socket connection is already broken so calling close shouldn't have # an impact. @@ -57,7 +57,7 @@ class TestMessageFunctions(unittest.TestCase): control_socket.close() control_socket_file.write("GETINFO version\r\n") self.assertRaises(socket.error, control_socket_file.flush) - self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) + self.assertRaises(stem.types.SocketClosed, stem.types.read_message, control_socket_file) # Closing the file handler, however, will cause a different type of error. # This seems to depend on the python version, in 2.6 we get an @@ -72,8 +72,8 @@ class TestMessageFunctions(unittest.TestCase): # receives: AttributeError: 'NoneType' object has no attribute 'sendall' self.assertRaises(AttributeError, control_socket_file.flush) - # receives: stem.types.ControlSocketClosed: socket file has been closed - self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) + # receives: stem.types.SocketClosed: socket file has been closed + self.assertRaises(stem.types.SocketClosed, stem.types.read_message, control_socket_file) def test_invalid_command(self): """ diff --git a/test/integ/system.py b/test/integ/system.py index 4aa5d15..09ffd24 100644 --- a/test/integ/system.py +++ b/test/integ/system.py @@ -49,7 +49,8 @@ class TestSystemFunctions(unittest.TestCase): # tor's pwd will match our process since we started it runner = test.runner.get_runner() self.assertEquals(os.getcwd(), system.get_cwd(runner.get_pid())) - self.assertRaises(IOError, system.get_cwd, 99999) + self.assertEquals(None, system.get_cwd(99999, True)) + self.assertRaises(IOError, system.get_cwd, 99999, False) def test_get_bsd_jail_id(self): """ diff --git a/test/unit/types/control_message.py b/test/unit/types/control_message.py index 563a0bf..5e9b7bc 100644 --- a/test/unit/types/control_message.py +++ b/test/unit/types/control_message.py @@ -156,7 +156,7 @@ class TestControlMessage(unittest.TestCase): control_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) control_socket_file = control_socket.makefile() - self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) + self.assertRaises(stem.types.SocketClosed, stem.types.read_message, control_socket_file) def assert_message_parses(self, controller_reply): """

1 0

[stem/master] Parsing and class for PROTOCOLINFO responses
by atagar＠torproject.org 13 Nov '11

13 Nov '11

commit 5756f9940ff0bbd55330a700d648af347dec713a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 13 02:19:26 2011 -0800 Parsing and class for PROTOCOLINFO responses Finally have enough plumbing in place to write the parsing for the PROTOCOLINFO queries. I'm pretty happy with how it turned out - next is testing for the class, then moving on to functions for issuing the PROTOCOLINFO queries. --- stem/connection.py | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 175 insertions(+), 2 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index 4076400..d17efde 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -4,11 +4,184 @@ Functions for connecting and authenticating to the tor process. import Queue import socket +import logging import threading import stem.types +import stem.util.enum +import stem.util.system -from stem.util import log +LOGGER = logging.getLogger("stem") + +# Methods by which a controller can authenticate to the control port. Tor gives +# a list of all the authentication methods it will accept in response to +# PROTOCOLINFO queries. +# +# NONE - No authentication required +# PASSWORD - See tor's HashedControlPassword option. Controllers must provide +# the password used to generate the hash. +# COOKIE - See tor's CookieAuthentication option. Controllers need to supply +# the contents of the cookie file. +# UNKNOWN - Tor provided one or more authentication methods that we don't +# recognize. This is probably from a new addition to the control +# protocol. + +AuthMethod = stem.util.enum.Enum("NONE", "PASSWORD", "COOKIE", "UNKNOWN") + +class ProtocolInfoResponse(stem.types.ControlMessage): + """ + Version one PROTOCOLINFO query response. + + According to the control spec the cookie_file is an absolute path. However, + this often is not the case (especially for the Tor Browser Bundle)... + https://trac.torproject.org/projects/tor/ticket/1101 + + If the path is relative then we'll make an attempt (which may not work) to + correct this. + + The protocol_version is the only mandatory data for a valid PROTOCOLINFO + response, so all other values are None if undefined or empty if a collecion. + + Attributes: + protocol_version (int) - protocol version of the response + tor_version (stem.types.Version) - version of the tor process + auth_methods (tuple) - AuthMethod types that tor will accept + unknown_auth_methods (tuple) - strings of unrecognized auth methods + cookie_file (str) - path of tor's authentication cookie + socket (socket.socket) - socket used to make the query + """ + + def convert(control_message): + """ + Parses a ControlMessage, converting it into a ProtocolInfoResponse. + + Arguments: + control_message (stem.types.ControlMessage) - + message to be parsed as a PROTOCOLINFO reply + + Raises: + stem.types.ProtocolError the message isn't a proper PROTOCOLINFO response + ValueError if argument is of the wrong type + """ + + if isinstance(control_message, stem.types.ControlMessage): + control_message.__class__ = ProtocolInfoResponse + control_message._parse_message() + return control_message + else: + raise ValueError("Only able to convert stem.types.ControlMessage instances") + + convert = staticmethod(convert) + + def _parse_message(self): + # Example: + # 250-PROTOCOLINFO 1 + # 250-AUTH METHODS=COOKIE COOKIEFILE="/home/atagar/.tor/control_auth_cookie" + # 250-VERSION Tor="0.2.1.30" + # 250 OK + + self.protocol_version = None + self.tor_version = None + self.cookie_file = None + self.socket = None + + auth_methods, unknown_auth_methods = [], [] + + # sanity check that we're a PROTOCOLINFO response + if not list(self)[0].startswith("PROTOCOLINFO"): + msg = "Message is not a PROTOCOLINFO response" + raise stem.types.ProtocolError(msg) + + for line in self: + if line == "OK": break + elif line.is_empty(): continue # blank line + + line_type = line.pop() + + if line_type == "PROTOCOLINFO": + # Line format: + # FirstLine = "PROTOCOLINFO" SP PIVERSION CRLF + # PIVERSION = 1*DIGIT + + if line.is_empty(): + msg = "PROTOCOLINFO response's initial line is missing the protocol version: %s" % line + raise stem.types.ProtocolError(msg) + + piversion = line.pop() + + if not piversion.isdigit(): + msg = "PROTOCOLINFO response version is non-numeric: %s" % line + raise stem.types.ProtocolError(msg) + + self.protocol_version = int(piversion) + + # The piversion really should be "1" but, according to the spec, tor + # does not necessarily need to provide the PROTOCOLINFO version that we + # requested. Log if it's something we aren't expecting but still make + # an effort to parse like a v1 response. + + if self.protocol_version != 1: + LOGGER.warn("We made a PROTOCOLINFO v1 query but got a version %i response instead. We'll still try to use it, but this may cause problems." % self.protocol_version) + elif line_type == "AUTH": + # Line format: + # AuthLine = "250-AUTH" SP "METHODS=" AuthMethod *("," AuthMethod) + # *(SP "COOKIEFILE=" AuthCookieFile) CRLF + # AuthMethod = "NULL" / "HASHEDPASSWORD" / "COOKIE" + # AuthCookieFile = QuotedString + + # parse AuthMethod mapping + if not line.is_next_mapping("METHODS"): + msg = "PROTOCOLINFO response's AUTH line is missing its mandatory 'METHODS' mapping: %s" % line + raise stem.types.ProtocolError(msg) + + for method in line.pop_mapping()[1].split(","): + if method == "NULL": + auth_methods.append(AuthMethod.NONE) + elif method == "HASHEDPASSWORD": + auth_methods.append(AuthMethod.PASSWORD) + elif method == "COOKIE": + auth_methods.append(AuthMethod.COOKIE) + else: + unknown_auth_methods.append(method) + LOGGER.info("PROTOCOLINFO response had an unrecognized authentication method: %s" % method) + + # our auth_methods should have a single AuthMethod.UNKNOWN entry if + # any unknown authentication methods exist + if not AuthMethod.UNKNOWN in auth_methods: + auth_methods.append(AuthMethod.UNKNOWN) + + # parse optional COOKIEFILE mapping (quoted and can have escapes) + if line.is_next_mapping("COOKIEFILE", True, True): + self.cookie_file = line.pop_mapping(True, True)[0] + + # attempt to expand relative cookie paths + if stem.util.system.is_relative_path(self.cookie_file): + try: + tor_pid = stem.util.system.get_pid("tor", suppress_exc = False) + tor_cwd = stem.util.system.get_cwd(tor_pid, False) + self.cookie_file = stem.util.system.expand_path(self.cookie_file, tor_cwd) + except IOError, exc: + LOGGER.debug("unable to expand relative tor cookie path: %s" % exc) + elif line_type == "VERSION": + # Line format: + # VersionLine = "250-VERSION" SP "Tor=" TorVersion OptArguments CRLF + # TorVersion = QuotedString + + if not line.is_next_mapping("Tor", True): + msg = "PROTOCOLINFO response's VERSION line is missing its mandatory tor version mapping: %s" % line + raise stem.types.ProtocolError(msg) + + torversion = line.pop_mapping(True)[1] + + try: + self.tor_version = stem.types.Version(torversion) + except ValueError, exc: + raise stem.types.ProtocolError(exc) + else: + LOGGER.debug("unrecognized PROTOCOLINFO line type '%s', ignoring entry: %s" % (line_type, line)) + + self.auth_methods = tuple(auth_methods) + self.unknown_auth_methods = tuple(unknown_auth_methods) class ControlConnection: """ @@ -126,7 +299,7 @@ class ControlConnection: # TODO: figure out a good method for terminating the socket thread self._reply_queue.put(control_message) except stem.types.ProtocolError, exc: - log.log(log.ERR, "Error reading control socket message: %s" % exc) + LOGGER.error("Error reading control socket message: %s" % exc) # TODO: terminate? def close(self):

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 13 Nov '11

13 Nov '11

commit d79647f3afe6bb1e2946b403b26a4f09e7512264 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 13 18:45:04 2011 +0000 Update translations for tsum --- cs/tsum.po | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 42 insertions(+), 2 deletions(-) diff --git a/cs/tsum.po b/cs/tsum.po index d0fe7fc..3451c61 100644 --- a/cs/tsum.po +++ b/cs/tsum.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-13 18:14+0000\n" +"PO-Revision-Date: 2011-11-13 18:44+0000\n" "Last-Translator: Sanky <gsanky+transifex(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -138,7 +138,9 @@ msgid "" " browse to the [Tor Project website](https://www.torproject.org/) and " "download it there, or you can use GetTor, the email autoresponder." msgstr "" -"Jsou dva různé způsoby jak se dostat k softwaru Tor. Můžete buď přejít " +"Jsou dva různé způsoby jak se dostat k softwaru Tor. Můžete buď navštívit " +"[stránku projektu Tor](https://www.torproject.org/) a stáhnout ho tam, nebo " +"můžete použít GetTor, emailového robota." #. type: Plain text #: en/tsum.text:53 @@ -146,6 +148,8 @@ msgid "" "### How to get Tor via email\n" "To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with **windows** in the body of the message. You can leave the subject blank." msgstr "" +"### Jak získat Tor přes email\n" +"Pro získání anglického Tor Browser Bundle pro Windows, pošlete email na gettor(a)torproject.org s **windows** v těle zprávy. Předmět můžete nechat prázdný." #. type: Plain text #: en/tsum.text:57 @@ -177,6 +181,10 @@ msgid "" "want, send an email to help(a)rt.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" +"**Poznámka**: Tor Browser Bundle pro Linux a Mac OS X jsou docela velké a s " +"účtem u Gmailu, Hotmailu nebo Yahoo je nebudete moci přijmout. Pokud " +"nemůžete přijmout balíček který chcete, pošlete email na " +"help(a)rt.torproject.org a dáme vám seznam webových mirrorů.\n" #. type: Plain text #: en/tsum.text:73 @@ -184,6 +192,8 @@ msgid "" "#### How to get Tor as several small sized packages\n" "It is possible to request the Tor Browser Bundle for Windows as several small sized packages, instead of one big package. This can be useful if you don't have a lot of bandwidth available, or if your email provider does not allow you to receive large attachments." msgstr "" +"#### Jak dostat Tor jako několik malých balíčků\n" +"Je možné si vyžádat Tor Browser Bundle pro Windows jako několik malých balíčků místo jednoho velkého. To může být užitečné pokud nemáte dostupný bandwidth, nebo pokud vám váš emailový provider nedovoluje přijímat velké přílohy." #. type: Plain text #: en/tsum.text:76 @@ -210,6 +220,9 @@ msgid "" "*What to do with split packages* for information on how to unpack and re-" "assemble the small sized packages." msgstr "" +"Je důležité napsat klíčové slovo *split* na zvláštní řádek. Vizte sekci *Co " +"dělat s rozděleným balíčkem* pro informace o rozbalení a sestavení malých " +"částí balíčku." #. type: Plain text #: en/tsum.text:89 @@ -217,6 +230,8 @@ msgid "" "### Tor for smartphones\n" "You can get Tor on your Android device by installing the package named *Orbot*. For information about how to download and install Orbot, please see the [Tor Project website](https://www.torproject.org/docs/android.html.en)." msgstr "" +"### Tor pro chytré mobilní telefony\n" +"Můžete získat Tor na vaše Android zařízení nainstalováním balíčku se jménem *Orbot*. Pro informace o tom jak stáhnout a nainstalovat Orbot, navštivte prosím [stránku projektu Tor](https://www.torproject.org/docs/android.html.en)." #. type: Plain text #: en/tsum.text:93 @@ -225,6 +240,9 @@ msgid "" "Maemo/N900](https://www.torproject.org/docs/N900.html.en) and [Apple " "iOS](http://sid77.slackware.it/iphone/)." msgstr "" +"Máme také experimentální balíčky pro systémy [Nokia " +"Maemo/N900](https://www.torproject.org/docs/N900.html.en) a [Apple " +"iOS](http://sid77.slackware.it/iphone/)." #. type: Plain text #: en/tsum.text:97 @@ -232,6 +250,8 @@ msgid "" "### How to verify that you have the right version\n" "Before running the Tor Browser Bundle, you should make sure that you have the right version." msgstr "" +"### Jak ověřit, že máte správnou verzi\n" +"Před spuštením Tor Browser Bundle byste se měli ujistit, že máte správnou verzi." #. type: Plain text #: en/tsum.text:102 @@ -355,6 +375,10 @@ msgid "" "about where you downloaded the package from, how you verified the signature," " and the output from GnuPG in an email to help(a)rt.torproject.org." msgstr "" +"Výstup by měl psát *\"Good signature\"*. Špatný podpis může znamenat že do " +"souboru někdo zasahoval. Uvidíte-li špatný podpis, pošlete detaily o místě " +"ze kterého jste balíček stáhli, jak jste ověřovali podpis a výpis GnuPG v " +"emailu na help(a)rt.torproject.org." #. type: Plain text #: en/tsum.text:147 @@ -378,6 +402,8 @@ msgid "" "### How to use the Tor Browser Bundle\n" "After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called \"Start Tor Browser\" (or \"start-tor-browser\", depending on your operating system)." msgstr "" +"### Jak použít Tor Browser Bundle\n" +"Po stažení Tor Browser Bundle a rozbalení balíčku byste měli mít adresář s několika soubory. Jeden z nich bude spustitelný soubor nazvaný \"Start Tor Browser\" (nebo \"start-tor-browser\", podle vašeho operačního systému)." #. type: Plain text #: en/tsum.text:160 @@ -410,6 +436,8 @@ msgid "" "### What to do when Tor does not connect\n" "Some users will notice that Vidalia gets stuck when trying to connect to the Tor network. If this happens, make sure that you are connected to the Internet. If you need to connect to a proxy server, see *How to use an open proxy* below." msgstr "" +"### Co dělat když se Tor vůbec nepřipojí\n" +"Některým uživatelům se může stát, že se Vidalia zasekne při pokusu připojit se k síti Tor. V takovém případě se ujistěte, že jste připojeni k Internetu. Pokud se potřebujete připojit k proxy serveru, vizte *Jak použít otevřenou proxy* níže." #. type: Plain text #: en/tsum.text:174 @@ -477,6 +505,8 @@ msgid "" "If you need help with figuring out why Tor can't connect, send an email to " "help(a)rt.torproject.org and include the relevant parts from the log file." msgstr "" +"Pokud potřebujete pomoc zjistit proč se Tor nechce připojit, pošlete email " +"na help(a)rt.torproject.org a zahrňte podstatné části z logů." #. type: Plain text #: en/tsum.text:203 @@ -484,6 +514,8 @@ msgid "" "### How to find a bridge\n" "To use a bridge, you will first have to locate one; you can either browse to [bridges.torproject.org](https://bridges.torproject.org/), or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write **get bridges** in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address." msgstr "" +"### Jak zajistit most\n" +"Abyste mohli použít most, musíte nejprve nějaký najít; můžete buď navštívit [bridges.torproject.org](https://bridges.torproject.org/), nebo můžete poslat email na bridges(a)torproject.org. Pokud se rozhodnete poslat email, prosím napište **get bridges** do těla emailu. Bez toho nedostanete odpověď. Také je tento email potřeba poslat z gmail.com nebo yahoo.com adresy." #. type: Plain text #: en/tsum.text:208 @@ -504,6 +536,8 @@ msgid "" "### How to use a bridge\n" "Once you have a set of bridges to use, open the Vidalia control panel, click on *Settings*, *Network* and tick the box that says *My ISP blocks connections to the Tor network*. Enter the bridges in the box below, hit *OK* and start Tor again." msgstr "" +"### Jak použít most\n" +"Jakmile budete mít mosty k použití, otevřte ovládací panel Vidalii, klikněte na *Settings*, *Network* a zaškrtněte *My ISP blocks connections to the Tor network*. Vepište mosty do kolonky níže, stiskněte *OK* a spusťte Tor znovu." #. type: Plain text #: en/tsum.text:220 @@ -511,6 +545,8 @@ msgid "" "### How to use an open proxy\n" "If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet." msgstr "" +"### Jak použít otevřenou proxy\n" +"Pokud vám nejde použít most, zkuste nastavit Tor pro použití jakékoliv HTTPS nebo SOCKS proxy pro získání přístupu k síti Tor. To znamená, že i když je Tor blokovaný vaší lokální sítí, otevřené proxy mohou bezpečně umožnit přístup na síť Tor a na necenzorovaný internet." #. type: Plain text #: en/tsum.text:223 @@ -559,6 +595,8 @@ msgid "" "## Frequently Asked Questions\n" "This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org." msgstr "" +"## Často kladené otázky\n" +"Tato sekce zodpoví několik nejčastějších otázek. Pokud zde není vaše otázka zmíněna, pošlete email na help(a)rt.torproject.org." #. type: Plain text #: en/tsum.text:244 @@ -566,6 +604,8 @@ msgid "" "### Unable to extract the archive\n" "If you are using Windows and find that you cannot extract the archive, download and install [7-Zip](http://www.7-zip.org/)." msgstr "" +"### Nepodařilo se rozbalit archiv\n" +"Pokud používáte Windows a nepodaří se vám rozbalit archiv, stáhněte a nainstalujte [7-Zip](http://www.7-zip.org/)." #. type: Plain text #: en/tsum.text:248

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 13 Nov '11

13 Nov '11

commit 961046ca6d49c59eca51f5174a9a67d3f3acf417 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 13 18:15:04 2011 +0000 Update translations for tsum --- cs/tsum.po | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 45 insertions(+), 4 deletions(-) diff --git a/cs/tsum.po b/cs/tsum.po index 5d1771b..d0fe7fc 100644 --- a/cs/tsum.po +++ b/cs/tsum.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-05 21:28+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2011-11-13 18:14+0000\n" +"Last-Translator: Sanky <gsanky+transifex(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +21,7 @@ msgstr "" #. type: Plain text #: en/tsum.text:2 msgid "# The Short User Manual\n" -msgstr "" +msgstr "# Krátký uživatelský manuál\n" #. type: Plain text #: en/tsum.text:7 @@ -31,6 +31,10 @@ msgid "" "find the answer to your question in this document, email " "help(a)rt.torproject.org." msgstr "" +"Tento uživatelský manuál obsahuje informace o tom jak stáhnout Tor, jak ho " +"použít, a co dělat v případě, že se Toru nepodaří se připojit k síti. Pokud " +"v tomto dokumentu nenaleznete odpověď na svůj dotaz, pošlete email na " +"help(a)rt.torproject.org." #. type: Plain text #: en/tsum.text:11 @@ -39,6 +43,9 @@ msgid "" " lot of emails every single day. There is no need to worry if we don't get " "back to you straight away." msgstr "" +"Vemte prosím v potaz, že naše podpora je čistě dobrovolná a dostáváme " +"každodenně velké množství emailů. Není potřeba se strachovat, pokud vám " +"neodpovíme obratem." #. type: Plain text #: en/tsum.text:13 @@ -95,6 +102,9 @@ msgid "" "to a website with a username and password, make sure that you are using " "HTTPS (e.g. **https**://torproject.org/, not **http**://torproject.org/)." msgstr "" +"Pokud přenášíte citlivé informace, například při přihlašování se na stránku " +"s uživatelským jménem a heslem, ujistěte se, že používáte HTTPS (například " +"**https**://torproject.org/, ne **http**://torproject.org/)." #. type: Plain text #: en/tsum.text:38 @@ -128,6 +138,7 @@ msgid "" " browse to the [Tor Project website](https://www.torproject.org/) and " "download it there, or you can use GetTor, the email autoresponder." msgstr "" +"Jsou dva různé způsoby jak se dostat k softwaru Tor. Můžete buď přejít " #. type: Plain text #: en/tsum.text:53 @@ -180,6 +191,7 @@ msgid "" "Send an email to gettor(a)torproject.org with the following words in the body " "of the email:" msgstr "" +"Pošlete email na gettor(a)torproject.org s následujícími slovy v těle emailu:" #. type: Plain text #: en/tsum.text:79 @@ -188,6 +200,8 @@ msgid "" "windows \n" "split\n" msgstr "" +"windows \n" +"split\n" #. type: Plain text #: en/tsum.text:83 @@ -504,16 +518,20 @@ msgid "" "The steps below assume you have a functional Tor/Vidalia configuration, and " "you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies." msgstr "" +"Následující kroky předpokládají, že máte funkční Tor/Vidalia konfiguraci, a " +"že jste našli seznam HTTPS, SOCKS4, či SOCKS5 proxin." #. type: Bullet: '1. ' #: en/tsum.text:235 msgid "Open the Vidalia control panel, click on *Settings*." -msgstr "" +msgstr "Otevřte kontrolní panel Vidalii a klikněte na *Settings* (nastavení)." #. type: Bullet: '2. ' #: en/tsum.text:235 msgid "Click *Network*. Select *I use a proxy to access the Internet*." msgstr "" +"Klikněte na *Network* (síť). Vyberte *I want to use a proxy to access the " +"Internet* (Chci používat proxy pro přístup k internetu)." #. type: Plain text #: en/tsum.text:235 @@ -529,6 +547,11 @@ msgid "" "7. Push the *OK* button. Vidalia and Tor are now configured to use a\n" "proxy to access the rest of the Tor network.\n" msgstr "" +"3. Na *Address* řádek vepište adresu otevřené proxy. To může být hostname nebo IP adresa.\n" +"4. Zadejte jméno pro proxy.\n" +"5. Většinou není potřeba zadávat uživatelské jméno a heslo. Potřebujete-li, informace vyplňte.\n" +"6. Vyberte *Typ* proxy který používáte, HTTP/HTTPS, SOCKS4, nebo SOCKS5.\n" +"7. Stiskněte tlačítko *OK*. Vidalia a Tor jsou teď nakonfigurovaní pro použití proxy na přístup ke zbytku sítě Tor.\n" #. type: Plain text #: en/tsum.text:240 @@ -596,6 +619,9 @@ msgid "" "\".exe\" file in the same directory. Run this file and wait for the Tor " "Browser Bundle to start." msgstr "" +"Až se dokončí rozbalování, měli byste vidět nově vytvořený \".exe\" soubor " +"ve stejném adresáři. Tento soubor otevřte a počkejte než se spustí Tor " +"Browser Bundle." #. type: Plain text #: en/tsum.text:281 @@ -614,6 +640,8 @@ msgid "" "case, you will need to close the old Vidalia and Tor before you can run\n" "this one.\n" msgstr "" +"** Již používáte Vidalia a Tor **: \n" +"Tato situace může nastat pokud jste nainstalovali balíček Vidalia a nyní se snažíte spustit Tor Browser Bundle. V tom případě musíte nejprve starou Vidalii a Tor zavřít.\n" #. type: Plain text #: en/tsum.text:294 @@ -626,6 +654,8 @@ msgid "" "is unable to restart Tor for you; go into your process or task manager,\n" "and terminate the Tor process. Then use Vidalia to restart Tor.\n" msgstr "" +"**Vidalia zkolabovala, ale nechala Tor puštěný**:\n" +"Pokud má dialogové okno ptající se na ovládací heslo tlačítko restart, můžete na něj kliknout a Vidalia Tor restartuje s novým náhodným ovládacím heslem. Pokud tlačítko reset nevidíte, nebo pokud se Vidalii nepodaří Tor restartovat, jděte do správce procesů a ukončete proces Toru. Poté použijte Vidalia k restartování Toru.\n" #. type: Plain text #: en/tsum.text:298 @@ -634,6 +664,9 @@ msgid "" "[FAQ](https://torproject.org/docs/faq.html#VidaliaPassword) on the Tor " "Project website." msgstr "" +"Pro více informací navštivte [často kladené " +"dotazy](https://torproject.org/docs/faq.html#VidaliaPassword) na stránce Tor" +" Projektu." #. type: Plain text #: en/tsum.text:303 @@ -649,6 +682,9 @@ msgid "" " over Tor. You need to join the [HTML5 trial](https://www.youtube.com/html5)" " on the YouTube website before you can use the HTML5 player." msgstr "" +"Většina YouTube videí fungují s HTML5 a je možné je skrz Tor zhlédnout. " +"Musíte se přidat do [HTML5 trialu](https://www.youtube.com/html5) na stránce" +" YouTube než budete moci HTML5 přehrávač použít." #. type: Plain text #: en/tsum.text:312 @@ -657,6 +693,9 @@ msgid "" "close it, so you will need to re-join the trial the next time you run the " "Tor Browser Bundle." msgstr "" +"Pamatujte, že si prohlížeč nastavení trialu nebude po vypnutí pamatovat, " +"takže se budete muset do trialu opět přidat až příště spustíte Tor Browser " +"Bundle." #. type: Plain text #: en/tsum.text:315 @@ -664,6 +703,8 @@ msgid "" "Please see the [Torbutton FAQ](https://www.torproject.org/torbutton" "/torbutton-faq.html#noflash) for more information." msgstr "" +"Pro více informací navštivte [Torbutton " +"FAQ](https://www.torproject.org/torbutton/torbutton-faq.html#noflash)." #. type: Plain text #: en/tsum.text:321

1 0

[tor-cloud/master] Updated the website with new AMI IDs
by runa＠torproject.org 13 Nov '11

13 Nov '11

commit 6e2e09671bb0e56665693be4a79b74bd5853aeb3 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sun Nov 13 17:04:33 2011 +0000 Updated the website with new AMI IDs --- html/index.html | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/html/index.html b/html/index.html index e4c8710..793ed8b 100644 --- a/html/index.html +++ b/html/index.html @@ -117,13 +117,14 @@ Pricing</a> page for more information. <ul class="region-nav"> - <li><a class="region" - href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-11af…" target="_blank">us-east-1 Virginia</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-4bf9…" target="_blank">us-west-1 N. California</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-9c99…" target="_blank">eu-west-1 Ireland</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> - </ul> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-8939…" target="_blank">us-east-1 Virginia</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-012e…" target="_blank">us-west-1 N. California</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-94f1…" target="_blank">us-west-2 Oregon</a></li> + + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-65b3…" target="_blank">eu-west-1 Ireland</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> + </ul> <hgroup> <div class="deco"></div>

1 0

[tor-cloud/master] Updated build instructions for Tor Cloud
by runa＠torproject.org 13 Nov '11

13 Nov '11

commit d76f41b71ff8af0249ad87b5b304655a843e7eb4 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sun Nov 13 17:05:38 2011 +0000 Updated build instructions for Tor Cloud --- BUILD | 140 ++++++++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 91 insertions(+), 49 deletions(-) diff --git a/BUILD b/BUILD index 461ddc1..183ebdc 100644 --- a/BUILD +++ b/BUILD @@ -1,70 +1,112 @@ -Installation: +This document explains the process of building and publishing new Tor +images in the Amazon EC2 cloud. - 0) Edit /etc/apt/sources.list to include multiverse - 1) Install ec2-api-tools and git-core on your laptop or build machine - 2) If the setup of openjdk-6-jre-headless is giving you a headache (e.g. crashing the instance), try using the 64-bit Ubuntu image instead. - 3) Clone https://git.torproject.org/tor-cloud.git - 4) Get the private keys (pk.cert and cert.pem) from Amazon and put them somewhere safe - 5) Run the following two commands to make sure the system knows about the private keys: +1. Set up your build environment - # export EC2_PRIVATE_KEY=/path/to/pk.cert - # export EC2_CERT=/path/to/cert.pem + I usually spin up an Ubuntu instance in the EC2 cloud and set it up + as the Tor Cloud build machine. You can use another server, or your + laptop, if you want. - 1) Test that ec2-api-tools is working: - root@inf0:~/Tor-Cloud# ec2-describe-regions - REGION eu-west-1 ec2.eu-west-1.amazonaws.com - REGION us-east-1 ec2.us-east-1.amazonaws.com - REGION ap-northeast-1 ec2.ap-northeast-1.amazonaws.com - REGION us-west-1 ec2.us-west-1.amazonaws.com - REGION ap-southeast-1 ec2.ap-southeast-1.amazonaws.com + You need to install two packages; ec2-api-tools and git-core. The + ec2-api-tools package can be found in multiverse, so you'll need to + add this to /etc/apt/sources.list. - 4) Create Generate private keys for each region. For each key - generated, save it in keys/: - - # ec2-add-keypair --region us-east-1 tor-cloud-us-east-1 - # ec2-add-keypair --region us-west-1 tor-cloud-us-west-1 - # ec2-add-keypair --region us-west-1 tor-cloud-eu-west-1 - # ec2-add-keypair --region us-west-1 tor-cloud-ap-northeast-1 - # ec2-add-keypair --region us-west-1 tor-cloud-ap-southeast-1 + Note that ec2-api-tools will download and install + openjdk-6-jre-headless. There's a bug in Ubuntu which may cause your + Ubuntu instance to crash when installing that package. If that's the + case, try using a 64-bit image for the build machine instead. + As root, clone the Tor Cloud git repository from + https://git.torproject.org/tor-cloud.git, and create two + directories; certs and keys. - for example: ec2-add-keypair --region us-east-1 tor-cloud-east-1 - and save the key in: ~/keys/tor-cloud-east-1.pem, don't forget to run chmod 600 ~/keys/* + Download the private certificates (pk.cert and cert.pem) for your + AWS account and put them in the certs directory. Run the following + two commands: - Your folder should look like this: - root@inf0:~/Tor-Cloud# ls /home/architect/keys/ -lh - -rw------- 1 root root 1.7K 2011-09-12 19:11 tor-cloud-ap-northeast-1.pem - -rw------- 1 root root 1.7K 2011-09-12 19:13 tor-cloud-ap-southeast-1.pem - -rw------- 1 root root 1.7K 2011-09-12 19:14 tor-cloud-eu-west-1.pem - -rw------- 1 root root 1.7K 2011-09-12 19:09 tor-cloud-us-east-1.pem - -rw------- 1 root root 1.7K 2011-09-12 19:09 tor-cloud-us-west-1.pem + root@tor-build:~# export EC2_PRIVATE_KEY=/root/certs/pk.cert + root@tor-build:~# export EC2_CERT=/root/certs/cert.pem + Make sure that you also update tor-cloud/build.sh with the correct + path to pk.cert and cert.pem. - +2. Test that everything's working - 5) Create a Security Group called "tor-cloud-build" and allow SSH inbound traffic. + To test that everything's working, run the command + 'ec2-describe-regions'. The output should be something like this: - 6) You are now ready to build Bridge AMIs: - For example, to build in "ap-southeast-1" region run: - ./build.sh bridge ap-southeast-1 /home/architect/keys/tor-cloud-ap-southeast-1.pem tor-cloud-ap-southeast-1 + root@tor-build:~# ec2-describe-regions + REGION eu-west-1 ec2.eu-west-1.amazonaws.com + REGION us-east-1 ec2.us-east-1.amazonaws.com + REGION ap-northeast-1 ec2.ap-northeast-1.amazonaws.com + REGION us-west-2 ec2.us-west-2.amazonaws.com + REGION us-west-1 ec2.us-west-1.amazonaws.com + REGION ap-southeast-1 ec2.ap-southeast-1.amazonaws.com - 7) The last thing the build.sh will spit out is the region and the AMI ID: +3. Generate private keys - ec2-describe-snapshots --region us-east-1 - IMAGE ami-5799503e + If you have done this before, but can't access the private keys, + delete the keys before generating them again (see example below): - 8) Before other people can launch it, make sure you make it - public in AWS: + root@tor-build:~# ec2-delete-keypair tor-cloud-us-east-1 --region us-east-1 - - Images, AMIs, right clic, edit permissions, set to public + Generate private keys for each region that you are going to create + images for: + root@tor-build:~# ec2-add-keypair --region us-east-1 tor-cloud-us-east-1 > keys/tor-cloud-us-east-1.pem + root@tor-build:~# ec2-add-keypair --region us-west-1 tor-cloud-us-west-1 > keys/tor-cloud-us-west-1.pem + root@tor-build:~# ec2-add-keypair --region us-west-2 tor-cloud-us-west-2 > keys/tor-cloud-us-west-2.pem + root@tor-build:~# ec2-add-keypair --region eu-west-1 tor-cloud-eu-west-1 > keys/tor-cloud-eu-west-1.pem + root@tor-build:~# ec2-add-keypair --region ap-northeast-1 tor-cloud-ap-northeast-1 > keys/tor-cloud-ap-northeast-1.pem + root@tor-build:~# ec2-add-keypair --region ap-southeast-1 tor-cloud-ap-southeast-1 > keys/tor-cloud-ap-southeast-1.pem + Give the keys the right set of permissions with 'chmod 600 keys/*'. - TIP: You can run the build command for all the regions at the same time. Use screen or & to send the process to background! +4. Create a security group - - + In AWS, create a security group called "tor-cloud-build" and allow + SSH inbound. Note that you will need to create this security group in every + region that you want to create an image for. - +5. Build Tor Cloud images - + To build a Tor Cloud image for the region "us-east-1", cd into the + tor-cloud directory and run the following command: + + root@tor-build:~/tor-cloud# ./build.sh bridge us-east-1 /root/keys/tor-cloud-us-east-1.pem tor-cloud-us-east-1 + +6. Test the image yourself + + Just before build.sh completes the build process, it prints out the AMI ID + of the image you just created: + + Registering and publishing the image... + IMAGE ami-8939f0e0 + + You should be able to find the same image under "IMAGES" and "AMIs" in AWS. + + To test the image, click on "EC2 Dashboard" and "Launch Instance". Select + "My AMIs" in the box that pops up, and you should see the image you created + a few minutes ago. + + Go through the setup process, and wait for your instance to boot up. You'll + want to wait five minutes or so for the image to boot once, install + packages, configure Tor, and then reboot. + + Here are some things to look for once you've logged in: + + - Check that Tor is running and check the log file for errors + - Check that /etc/ec2-prep.sh says that the system has been configured as a Tor bridge + - Test the bridge yourself + +7. Make the images public + + To make the image available to the rest of the world, click on "AMIs" under + "IMAGES", right click the image you want to make public and select "Edit + Permissions". Select "Public" and click "Save". + +8. Update the Tor Cloud website + + Open tor-cloud/html/index.html and update the AMI ID for the region you + created the image for. Save the file, commit, push to git and ask someone + to update https://cloud.torproject.org/.

1 0