- tor-commits - lists.torproject.org

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 19 Dec '11

19 Dec '11

commit eaa6be68551701dceb8eb3d4544a5d1d4ff0de85 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 19 15:15:30 2011 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 1e6c3e1..d12b33c 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-12-19 14:36+0000\n" +"PO-Revision-Date: 2011-12-19 15:14+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3274,7 +3274,7 @@ msgstr "طراحي شده توسط تُر" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" -msgstr "" +msgstr "کپی به کلیپ برد" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" @@ -3402,10 +3402,14 @@ msgid "" "ensure you configure your applications to use only SOCKS4a or SOCKS5 with " "remote hostname resolution." msgstr "" +"یکی از اپلیکیشن های شما از طریق تور و پروتکلی که ممکن است اطلاعاتی از مقصد " +"نهایی شما را فاش سازد به \"%1\" برقرار ساخته. لطفن مطمین شوید اپلیکیشن خود " +"را بنحوی تنظیم میکنید که فقط از SOCKS4a یا SOCKS5 بهمراه remote hostname " +"resolution استفاده کند." msgctxt "StatusEventWidget" msgid "Unknown SOCKS Protocol" -msgstr "" +msgstr "پروتوکل SOCKS ناشناخته" msgctxt "StatusEventWidget" msgid "" @@ -3413,10 +3417,14 @@ msgid "" " protocol that Tor does not understand. Please ensure you configure your " "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution." msgstr "" +"یکی از اپلیکیشن های شما تلاش کرده است که به توسط تور و از پروتکلی که تور آن " +"را نمیفهمد ارتباطی برقرار کند. لطفن مطمین شوید اپلیکیشن خود را بنحوی تنظیم " +"میکنید که فقط از SOCKS4a یا SOCKS5 بهمراه remote hostname resolution استفاده" +" کند." msgctxt "StatusEventWidget" msgid "Invalid Destination Hostname" -msgstr "" +msgstr "نام میزبان مقصد نامعتبر" msgctxt "StatusEventWidget" msgid "" @@ -3427,7 +3435,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "External IP Address Changed" -msgstr "" +msgstr "آی پی آدرس خارجی تغییر کرد" msgctxt "StatusEventWidget" msgid "" @@ -3606,7 +3614,7 @@ msgstr "" msgctxt "TorrcDialog" msgid "Copy" -msgstr "" +msgstr "کپی" msgctxt "TorrcDialog" msgid "Paste" @@ -3634,7 +3642,7 @@ msgstr "" msgctxt "TorrcDialog" msgid "Error connecting to Tor" -msgstr "" +msgstr "خطا در ارتباط با تور" msgctxt "TorrcDialog" msgid "Selection is empty. Please select some text, or check \"Apply all\"" @@ -3642,11 +3650,11 @@ msgstr "" msgctxt "TorrcDialog" msgid "Error at line %1: \"%2\"" -msgstr "" +msgstr "خطا در خط %1: \"%2\"" msgctxt "TorrcDialog" msgid "Error" -msgstr "" +msgstr "خطا" msgctxt "TorrcDialog" msgid "An error ocurred while opening torrc file"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 19 Dec '11

19 Dec '11

commit fa4b2fc06728a9b188a03ef0b8f898e31f9056cd Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 19 14:45:20 2011 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index f670196..1e6c3e1 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-12-19 14:10+0000\n" +"PO-Revision-Date: 2011-12-19 14:36+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3393,7 +3393,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Potentially Dangerous Connection!" -msgstr "" +msgstr "پتانسیل ارتباط خطرناک!" msgctxt "StatusEventWidget" msgid ""

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 19 Dec '11

19 Dec '11

commit f2efca71c055943a7209258c9f88bc0e4edbdc09 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 19 14:15:27 2011 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index f863aa8..f670196 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-12-19 13:40+0000\n" +"PO-Revision-Date: 2011-12-19 14:10+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3351,7 +3351,8 @@ msgid "" "correct time." msgstr "" "تور مشخص کرد که ساعت کامپیوتر شما ممکن است در مقایسه با منبع \"%2\"، %1 " -"ثانیه در گذشته تنظیم شده باشد. اگر ساعت شما د" +"ثانیه در گذشته تنظیم شده باشد. اگر ساعت شما تنظیم نباشد تور کار نمی کند. " +"لطفن مطمین شوید کامپیوتر شما ساعت درست را نشان میدهد" msgctxt "StatusEventWidget" msgid "" @@ -3360,10 +3361,13 @@ msgid "" "will not be able to function. Please verify your computer displays the " "correct time." msgstr "" +"تور مشخص کرد که ساعت کامپیوتر شما ممکن است در مقایسه با منبع \"%2\"، %1 " +"ثانیه در آینده تنظیم شده باشد. اگر ساعت شما تنظیم نباشد تور کار نمی کند. " +"لطفن مطمین شوید کامپیوتر شما ساعت درست را نشان میدهد" msgctxt "StatusEventWidget" msgid "Your Computer's Clock is Potentially Incorrect" -msgstr "" +msgstr "ساعت کامپیوتر شما اشتباه است" msgctxt "StatusEventWidget" msgid "" @@ -3372,6 +3376,10 @@ msgid "" "information over the Tor network is dangerous and not recommended. For your " "protection, Tor has automatically closed this connection." msgstr "" +"ممکن است یکی از اپلیکیشن های کامپیوتر شما برای برقراری ارتباط رمزگذاری نشده " +"از درگاه %1 بتوسط تور تلاش کرده باشد. فرستادن اطلاعات رمزگذاری نشده از طریق " +"شبکه تور، خطرناک است و توصیه نمی شود. برای محافظت از شما، تور این ارتباط را " +"بصورت خودکار بست." msgctxt "StatusEventWidget" msgid "" @@ -3379,6 +3387,9 @@ msgid "" "unencrypted connection through Tor to port %1. Sending unencrypted " "information over the Tor network is dangerous and not recommended." msgstr "" +"ممکن است یکی از اپلیکیشن های کامپیوتر شما برای برقراری ارتباط رمزگذاری نشده " +"از درگاه %1 بتوسط تور تلاش کرده باشد. فرستادن اطلاعات رمزگذاری نشده از طریق " +"شبکه تور، خطرناک است و توصیه نمی شود." msgctxt "StatusEventWidget" msgid "Potentially Dangerous Connection!"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 19 Dec '11

19 Dec '11

commit ad207c7042a94ffae39645ec3fa5570a7399887e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 19 13:45:20 2011 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 69fe4ec..f863aa8 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-12-19 12:44+0000\n" +"PO-Revision-Date: 2011-12-19 13:40+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3302,6 +3302,9 @@ msgid "" "software, which may contain important security, reliability and performance " "fixes." msgstr "" +"شما هم اکنون در حال اجرای نسخه \"%1\" از نرم افزار تور هستید که دیگر توصیه " +"نمی شود. لطفن به آخرین نسخه از نرم افزار به روز کنید. این بروزرسانی ممکن است" +" شامل رفع ایرادات مهم امنیتی، عملکرد و کارایی باشد" msgctxt "StatusEventWidget" msgid "" @@ -3310,14 +3313,17 @@ msgid "" "version of the software, which may contain important security, reliability " "and performance fixes." msgstr "" +"شما هم اکنون در حال اجرای نسخه \"%1\" از نرم افزار تور هستید که ممکن است " +"دیگر با شبکه فعلی تور کار نکند. لطفن به آخرین نسخه از نرم افزار به روز کنید." +" این بروزرسانی ممکن است شامل رفع ایرادات مهم امنیتی، عملکرد و کارایی باشد" msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" -msgstr "" +msgstr "نرم افزار تور شما از رده خارج شده است" msgctxt "StatusEventWidget" msgid "Connected to the Tor Network" -msgstr "" +msgstr "به شبکه تور وصل شده است" msgctxt "StatusEventWidget" msgid "" @@ -3327,13 +3333,15 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Tor Software Error" -msgstr "" +msgstr "خطای نرم افزار تور" msgctxt "StatusEventWidget" msgid "" "The Tor software encountered an internal bug. Please report the following " "error message to the Tor developers at bugs.torproject.org: \"%1\"" msgstr "" +"نرم افزار تور با یک اشکال داخلی مواجه شد. لطفن پیام خطای زیر را برای سازندگان تور به آدرس زیر ارسال کنید:\n" +"bugs.torproject.org: \"%1\"" msgctxt "StatusEventWidget" msgid "" @@ -3342,6 +3350,8 @@ msgid "" "will not be able to function. Please verify your computer displays the " "correct time." msgstr "" +"تور مشخص کرد که ساعت کامپیوتر شما ممکن است در مقایسه با منبع \"%2\"، %1 " +"ثانیه در گذشته تنظیم شده باشد. اگر ساعت شما د" msgctxt "StatusEventWidget" msgid ""

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 19 Dec '11

19 Dec '11

commit dda8757a47d4616977a5af4c92f6028f4c2be29a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 19 12:45:21 2011 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 67419a0..69fe4ec 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -1,5 +1,6 @@ # # Translators: +# Ardeshir <ardeshir(a)redteam.io>, 2011. # <green.dove1388(a)gmail.com>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" @@ -7,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-09-09 23:17+0000\n" -"Last-Translator: greenwave <green.dove1388(a)gmail.com>\n" +"PO-Revision-Date: 2011-12-19 12:44+0000\n" +"Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3168,11 +3169,11 @@ msgstr "<a href=\"bridges.finding\">چطور می توانم یک پل را پی msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" -msgstr "" +msgstr "<a href=\"#bridgeHelp\">این چیست؟</a>" msgctxt "ServerPage" msgid "Automatically distribute my bridge address" -msgstr "" +msgstr "بطور خودکار آدرس پل من را پخش کن" msgctxt "ServerPage" msgid "Mirror the Relay Directory" @@ -3277,15 +3278,15 @@ msgstr "" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" -msgstr "" +msgstr "نرم افزار تور در حال اجراست" msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." -msgstr "" +msgstr "شما هم اکنون در حال اجرای نسخه \"%1\" نرم افزار تور هستید " msgctxt "StatusEventWidget" msgid "The Tor Software is not Running" -msgstr "" +msgstr "نرم افزار تور در حال اجرا نیست" msgctxt "StatusEventWidget" msgid ""

1 0

[stem/master] Implementing general authentication
by atagar＠torproject.org 19 Dec '11

19 Dec '11

commit def66d45d3cf4c82786fa9a8526a18839fcbf816 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 18 17:25:46 2011 -0800 Implementing general authentication Finally finished the fabled general authentication function, which uses PROTOCOLINFO information for authentication. The vast majority of the effort behind this function was getting the exception hierarchy right. This is totally untested. Unit and integ testing comes next. --- stem/connection.py | 216 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 214 insertions(+), 2 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index e9bd5f7..ddfed89 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -3,7 +3,10 @@ Functions for connecting and authenticating to the tor process. AuthenticationFailure - Base exception raised for authentication failures. |- UnrecognizedAuthMethods - Authentication methods are unsupported. - |- OpenAuthRejected - Tor rejected this method of authentication. + |- IncorrectSocketType - Socket does not speak the tor control protocol. + | + |- OpenAuthFailed - Failure when authenticating by an open socket. + | +- OpenAuthRejected - Tor rejected this method of authentication. | |- PasswordAuthFailed - Failure when authenticating by a password. | |- PasswordAuthRejected - Tor rejected this method of authentication. @@ -77,8 +80,18 @@ class AuthenticationFailure(Exception): class UnrecognizedAuthMethods(AuthenticationFailure): "All methods for authenticating aren't recognized." + + def __init__(self, message, unknown_auth_methods): + AuthenticationFailure.__init__(self, message) + self.unknown_auth_methods = unknown_auth_methods + +class IncorrectSocketType(AuthenticationFailure): + "Socket does not speak the control protocol." -class OpenAuthRejected(AuthenticationFailure): +class OpenAuthFailed(AuthenticationFailure): + "Failure to authenticate to an open socket." + +class OpenAuthRejected(OpenAuthFailed): "Attempt to connect to an open control socket was rejected." class PasswordAuthFailed(AuthenticationFailure): @@ -120,6 +133,205 @@ class NoAuthMethods(MissingAuthInfo): class NoAuthCookie(MissingAuthInfo): "PROTOCOLINFO response supports cookie auth but doesn't have its path." +# authentication exceptions ordered as per the authenticate function's pydocs +AUTHENTICATE_EXCEPTIONS = ( + IncorrectSocketType, + UnrecognizedAuthMethods, + MissingPassword, + IncorrectPassword, + IncorrectCookieSize, + UnreadableCookieFile, + IncorrectCookieValue, + OpenAuthRejected, + MissingAuthInfo, + AuthenticationFailure, +) + +def authenticate(control_socket, password = None, protocolinfo_response = None): + """ + Authenticates to a control socket using the information provided by a + PROTOCOLINFO response. In practice this will often be all we need to + authenticate, raising an exception if all attempts to authenticate fail. + + All exceptions are subclasses of AuthenticationFailure so, in practice, + callers should catch the types of authentication failure that they care + about, then have a AuthenticationFailure catch-all at the end. For example... + + import sys + import getpass + import stem.connection + import stem.socket + + try: + control_socket = stem.socket.ControlPort(control_port = 9051) + except stem.socket.SocketError, exc: + print "Unable to connect to port 9051 (%s)" % exc + sys.exit(1) + + try: + stem.connection.authenticate(control_socket) + except stem.connection.IncorrectSocketType: + print "Please check in your torrc that 9051 is the ControlPort." + print "Maybe you configured it to be the ORPort or SocksPort instead?" + sys.exit(1) + except stem.connection.MissingPassword: + controller_password = getpass.getpass("Controller password: ") + + try: + stem.connection.authenticate_password(control_socket, controller_password) + except stem.connection.PasswordAuthFailed: + print "Unable to authenticate, password is incorrect" + sys.exit(1) + except stem.connection.AuthenticationFailure, exc: + print "Unable to authenticate: %s" % exc + sys.exit(1) + + Arguments: + control_socket (stem.socket.ControlSocket) - socket to be authenticated + password (str) - passphrase to present to the socket if it uses password + authentication (skips password auth if None) + protocolinfo_response (stem.connection.ProtocolInfoResponse) - + tor protocolinfo response, this is retrieved on our own if None + + Raises: + AuthenticationFailed subclass if all attempts to authenticate fail. Since + this may try multiple authentication methods it may encounter multiple + exceptions. If so then the exception this raises is prioritized as + follows... + + stem.connection.IncorrectSocketType + The control_socket does not speak the tor control protocol. Most often + this happened because the user confused the SocksPort or ORPort with the + ControlPort. + + stem.connection.UnrecognizedAuthMethods + All of the authentication methods tor will accept are new and + unrecognized. Please upgrade stem and, if that doesn't work, file a + ticket on 'trac.torproject.org' and I'd be happy to add support. + + stem.connection.MissingPassword + We were unable to authenticate but didn't attempt password authentication + because none was provided. You should prompt the user for a password and + try again via 'authenticate_password'. + + stem.connection.IncorrectPassword + We were provided with a password but it was incorrect. + + stem.connection.IncorrectCookieSize + Tor allows for authentication by reading it a cookie file, but that file + is the wrong size to be an authentication cookie. + + stem.connection.UnreadableCookieFile + Tor allows for authentication by reading it a cookie file, but we can't + read that file (probaby due to permissions). + + stem.connection.IncorrectCookieValue (*) + Tor allows for authentication by reading it a cookie file, but rejected + the contents of that file. + + stem.connection.OpenAuthRejected (*) + Tor says that it allows for authentication without any credentials, but + then rejected our authentication attempt. + + stem.connection.MissingAuthInfo (*) + Tor provided us with a PROTOCOLINFO reply that is technically valid, but + missing the information we need to authenticate. + + stem.connection.AuthenticationFailure (*) + There are numerous other ways that authentication could have failed + including socket failures, malformed controller responses, etc. These + mostly constitute transient failures or bugs. + + * In practice it is highly unusual for this to occure, being more of a + theoretical possability rather than something you should expect. It's + fine to treat these as errors. If you have a use case where this commonly + happens, please file a ticket on 'trac.torproject.org'. + + In the future new AuthenticationFailure subclasses may be added to allow + for better error handling. + """ + + if not protocolinfo_response: + try: + protocolinfo_response = get_protocolinfo(control_socket) + except stem.socket.ProtocolError: + raise IncorrectSocketType("unable to use the control socket") + except stem.socket.SocketError, exc: + raise AuthenticationFailure("socket connection failed (%s)" % exc) + + auth_methods = list(protocolinfo_response.auth_methods) + auth_exceptions = [] + + if len(auth_methods) == 0: + raise NoAuthMethods("our PROTOCOLINFO response did not have any methods for authenticating") + + # remove authentication methods that are either unknown or for which we don't + # have an input + if AuthMethod.UNKNOWN in auth_methods: + auth_methods.remove(AuthMethod.UNKNOWN) + + unknown_methods = protocolinfo_response.unknown_auth_methods + plural_label = "s" if len(unknown_methods) > 1 else "" + methods_label = ", ".join(unknown_methods) + + # we... er, can't do anything with only unrecognized auth types + if not auth_methods: + exc_msg = "unrecognized authentication method%s (%s)" % (plural_label, methods_label) + auth_exceptions.append(UnrecognizedAuthMethods(exc_msg, unknown_methods)) + else: + LOGGER.debug("Authenticating to a socket with unrecognized auth method%s, ignoring them: %s" % (plural_label, methods_label)) + + if AuthMethod.COOKIE in auth_methods and protocolinfo_response.cookie_path == None: + auth_methods.remove(AuthMethod.COOKIE) + auth_exceptions.append(NoAuthCookie("our PROTOCOLINFO reponse did not have the location of our authentication cookie")) + + if AuthMethod.PASSWORD in auth_methods and password == None: + auth_methods.remove(AuthMethod.PASSWORD) + auth_exceptions.append(MissingPassword("no passphrase provided")) + + # iterating over AuthMethods so we can try them in this order + for auth_type in (AuthMethod.NONE, AuthMethod.PASSWORD, AuthMethod.COOKIE): + if not auth_type in auth_methods: continue + + try: + if auth_type == AuthMethod.NONE: + authenticate_none(control_socket, False) + elif auth_type == AuthMethod.PASSWORD: + authenticate_password(control_socket, password, False) + elif auth_type == AuthMethod.COOKIE: + authenticate_cookie(control_socket, protocolinfo_response.cookie_path, False) + + return # success! + except OpenAuthRejected, exc: + auth_exceptions.append(exc) + except IncorrectPassword, exc: + auth_exceptions.append(exc) + except PasswordAuthRejected, exc: + # Since the PROTOCOLINFO says password auth is available we can assume + # that if PasswordAuthRejected is raised it's being raised in error. + LOGGER.debug("The authenticate_password method raised a PasswordAuthRejected when password auth should be available. Stem may need to be corrected to recognize this response: %s" % exc) + auth_exceptions.append(IncorrectPassword(str(exc))) + except (IncorrectCookieSize, UnreadableCookieFile, IncorrectCookieValue), exc: + auth_exceptions.append(exc) + except CookieAuthRejected, exc: + LOGGER.debug("The authenticate_cookie method raised a CookieAuthRejected when cookie auth should be available. Stem may need to be corrected to recognize this response: %s" % exc) + auth_exceptions.append(IncorrectCookieValue(str(exc))) + except stem.socket.ControllerError, exc: + auth_exceptions.append(AuthenticationFailure(str(exc))) + + # All authentication attempts failed. Raise the exception that takes priority + # according to our pydocs. + + for exc_type in AUTHENTICATE_EXCEPTIONS: + for auth_exc in auth_exceptions: + if isinstance(auth_exc, exc_type): + raise auth_exc + + # We really, really shouldn't get here. It means that auth_exceptions is + # either empty or contains something that isn't an AuthenticationFailure. + + raise AssertionError("BUG: Authenticaion failed without providing a recognized exception: %s" % str(auth_exceptions)) + def authenticate_none(control_socket, suppress_ctl_errors = True): """ Authenticates to an open control socket. All control connections need to

1 0

[arm/master] fix: getProcessName should return the base name
by atagar＠torproject.org 18 Dec '11

18 Dec '11

commit 3f71b5115476a27d6fc58260a6a72125a6a92297 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 18 14:38:10 2011 -0800 fix: getProcessName should return the base name When the proc query failed the fallback ps command would return the command's full path rather than just the base name. This in turn would make lookups that use this value (like netstat) fail. Caught by Stephan Seitz. --- src/util/sysTools.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/util/sysTools.py b/src/util/sysTools.py index 4bb0667..1c84462 100644 --- a/src/util/sysTools.py +++ b/src/util/sysTools.py @@ -152,6 +152,7 @@ def getProcessName(pid, default = None, cacheFailure = True): return default else: + processName = os.path.basename(processName) PROCESS_NAME_CACHE[pid] = processName return processName

1 0

[arm/master] fix: disabling localization for system commands
by atagar＠torproject.org 18 Dec '11

18 Dec '11

commit 31800f4018275d83c2f7db8f725b1fca1ee97360 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 18 14:35:49 2011 -0800 fix: disabling localization for system commands Setting LANG to C to disable localization for subcommands like netstat. This is important since we use words in it (like ESTABLISHED) to filter the results. Caught by Stephan Seitz. --- src/starter.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/starter.py b/src/starter.py index 3d74315..40c23f7 100644 --- a/src/starter.py +++ b/src/starter.py @@ -103,6 +103,11 @@ PRIVATE_TORRC_ENTRIES = ["HashedControlPassword", "Bridge", "HiddenServiceDir"] TOR_ROOT_NOTICE = "Tor is currently running with root permissions. This is not a good idea and shouldn't be necessary. See the 'User UID' option from Tor's man page for an easy method of reducing its permissions after startup." ARM_ROOT_NOTICE = "Arm is currently running with root permissions. This is not a good idea, and will still work perfectly well if it's run with the same user as Tor (ie, starting with \"sudo -u %s arm\")." +# Makes subcommands provide us with English results (this is important so we +# can properly parse it). + +os.putenv("LANG", "C") + def allowConnectionTypes(): """ This provides a tuple with booleans indicating if we should or shouldn't

1 0

r25264: {website} Update website for Torbutton 1.4.5.1. (in website/trunk: include torbutton)
by Mike Perry 18 Dec '11

18 Dec '11

Author: mikeperry Date: 2011-12-18 00:42:03 +0000 (Sun, 18 Dec 2011) New Revision: 25264 Modified: website/trunk/include/versions.wmi website/trunk/torbutton/update.rdf Log: Update website for Torbutton 1.4.5.1. Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-12-17 04:41:37 UTC (rev 25263) +++ website/trunk/include/versions.wmi 2011-12-18 00:42:03 UTC (rev 25264) @@ -102,8 +102,8 @@ <define-tag file-source-alpha whitespace=delete>tor-<version-alpha>.tar.gz</define-tag> <define-tag package-source-alpha whitespace=delete>../dist/<file-source-alpha></define-tag> -<define-tag version-torbutton whitespace=delete>1.4.5 (14 Oct 2011)</define-tag> -<define-tag version-hash-torbutton whitespace=delete>sha1:5f2e2d72343b2d4702ec24491a11babedd3650b9</define-tag> +<define-tag version-torbutton whitespace=delete>1.4.5.1 (17 Dec 2011)</define-tag> +<define-tag version-hash-torbutton whitespace=delete>sha1:0002e2d61613504e41d8b773c30ff6307b8286da</define-tag> <define-tag version-torbutton-alpha whitespace=delete>None</define-tag> <define-tag version-hash-torbutton-alpha whitespace=delete>sha1:c7323cd408ebee28ee23b6a91fe056d59de668f5</define-tag> Modified: website/trunk/torbutton/update.rdf =================================================================== (Binary files differ)

1 0

[torbutton/master] Update version + changelog.
by mikeperry＠torproject.org 18 Dec '11

18 Dec '11

commit c309f832b52b3808809bc722beb08c541263f5e8 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Dec 17 16:35:47 2011 -0800 Update version + changelog. --- README.RELEASE | 2 +- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.RELEASE b/README.RELEASE index 83f238b..f386760 100644 --- a/README.RELEASE +++ b/README.RELEASE @@ -5,7 +5,7 @@ #. Decide the version number. - export VERSION="1.4.5" + export VERSION="1.4.5.1" vim ./src/install.rdf # edit <em:version> tag to reflect version #. Test upgrades of candidate XPI in latest Firefox and TBB product matrix diff --git a/src/CHANGELOG b/src/CHANGELOG index d492635..4c049ae 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.4.5.1 + 17 Dec 2011 + * bug 4722: Fix ability to drag tabs on Windows (due to #4517) + 1.4.5 14 Dec 2011 * bug 4517: Disable external drag and drop (prevents proxy bypass) diff --git a/src/install.rdf b/src/install.rdf index 2067f72..371d353 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry & Kory Kirk</em:creator> <em:id>{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}</em:id> - <em:version>1.4.5</em:version> + <em:version>1.4.5.1</em:version> <em:homepageURL>https://www.torproject.org/torbutton/</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0