- tor-commits - lists.torproject.org

[arm/master] Determining initial cmd with ctypes rather than ps
by atagar＠torproject.org 03 May '11

03 May '11

commit 175fde6c4a92e1b52f060ef82baf35bf7d722639 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 2 21:28:54 2011 -0700 Determining initial cmd with ctypes rather than ps Using the ctypes argv rather than querying for our command via ps (thanks to ioerror). --- src/util/procname.py | 28 +++++++++++----------------- 1 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/util/procname.py b/src/util/procname.py index 14a82b8..97dc707 100644 --- a/src/util/procname.py +++ b/src/util/procname.py @@ -9,13 +9,10 @@ # argument replacement (ie, replace argv[0], argv[1], etc but with a string # the same size). -import os import sys import ctypes import ctypes.util -from util import sysTools - # flag for setting the process name, found in '/usr/include/linux/prctl.h' PR_SET_NAME = 15 @@ -65,24 +62,21 @@ def _setArgv(processName): if currentProcessName == None: # Getting argv via... # currentProcessName = " ".join(["python"] + sys.argv) - # + # # doesn't do the trick since this will miss interpretor arguments like... # python -W ignore::DeprecationWarning myScript.py # - # hence simply getting an outside opinion of our command. - - psResults = sysTools.call("ps -p %i -o args" % os.getpid()) + # Hence we're fetching this via our ctypes argv. Alternatively we could + # use ps, though this is less desirable: + # "ps -p %i -o args" % os.getpid() - if len(psResults) == 2: - # output looks like: - # COMMAND - # python ./src/starter.py - - currentProcessName = psResults[1] - maxNameLength = len(currentProcessName) + args = [] + for i in range(100): + if argc[i] == None: break + args.append(str(argc[i])) - if not currentProcessName: - raise IOError("unable to determine our process name") + currentProcessName = " ".join(args) + maxNameLength = len(currentProcessName) if len(processName) > maxNameLength: msg = "can't rename process to something longer than our initial name since this would overwrite memory used for the env" @@ -93,7 +87,7 @@ def _setArgv(processName): ctypes.memset(argc.contents, 0, zeroSize + 1) # null terminate the string's end ctypes.memmove(argc.contents, processName, len(processName)) - currentProcessName = processName[:MAX_CHAR] + currentProcessName = processName def _setPrctlName(processName): """

1 0

[torbrowser/master] add openssl 1.0.0d to the stable windows bundle too
by erinn＠torproject.org 03 May '11

03 May '11

commit 356249f03c314b334db8266220b5c9ee812f666b Author: Erinn Clark <erinn(a)torproject.org> Date: Mon May 2 03:01:04 2011 +0300 add openssl 1.0.0d to the stable windows bundle too --- README | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/README b/README index 277841a..ef0808e 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.1.30 (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-0.9.8p) +Tor 0.2.1.30 (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d) Polipo 1.0.4.1 FirefoxPortable 3.6.17 \_ Firefox 3.6.17 @@ -345,3 +345,4 @@ Changelog Update Firefox to 3.6.17 Update Libevent to 2.0.10-stable Update zlib to 1.2.5 + Update OpenSSL to 1.0.0d

1 0

[arm/master] fix: Making the process name setter safer/better
by atagar＠torproject.org 03 May '11

03 May '11

commit eb78be9beeee01dcf137e60559f5ac26c3fe2c13 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 2 21:04:17 2011 -0700 fix: Making the process name setter safer/better fixes include: - just using memset rather than maually filling with null chars - using \0 arg dividers - erroring out rather than clobber env (ie, refuse to use a process name longer than the original argv) --- src/starter.py | 2 +- src/util/procname.py | 25 ++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/starter.py b/src/starter.py index 365676c..5b73a73 100644 --- a/src/starter.py +++ b/src/starter.py @@ -392,7 +392,7 @@ if __name__ == '__main__': try: from util import procname - procname.renameProcess("arm %s" % " ".join(sys.argv[1:])) + procname.renameProcess("arm\0%s" % "\0".join(sys.argv[1:])) except: pass cli.controller.startTorMonitor(time.time() - initTime, expandedEvents, param["startup.blindModeEnabled"]) diff --git a/src/util/procname.py b/src/util/procname.py index 7641c5a..14a82b8 100644 --- a/src/util/procname.py +++ b/src/util/procname.py @@ -19,10 +19,6 @@ from util import sysTools # flag for setting the process name, found in '/usr/include/linux/prctl.h' PR_SET_NAME = 15 -# Maximum number of characters we'll set the process name to. Evidently this -# cap was simply chosen since it didn't cause a segfault for its author. -MAX_CHAR = 1608 - argc_t = ctypes.POINTER(ctypes.c_char_p) Py_GetArgcArgv = ctypes.pythonapi.Py_GetArgcArgv @@ -32,6 +28,7 @@ Py_GetArgcArgv.argtypes = [ctypes.POINTER(ctypes.c_int), # tracks the last name we've changed the process to currentProcessName = None +maxNameLength = -1 def renameProcess(processName): """ @@ -53,7 +50,7 @@ def _setArgv(processName): strcpy(argv[0], "new_name"); """ - global currentProcessName + global currentProcessName, maxNameLength argv = ctypes.c_int(0) argc = argc_t() @@ -66,7 +63,7 @@ def _setArgv(processName): # for Jake's implementation on this. if currentProcessName == None: - # Using argv via... + # Getting argv via... # currentProcessName = " ".join(["python"] + sys.argv) # # doesn't do the trick since this will miss interpretor arguments like... @@ -82,18 +79,20 @@ def _setArgv(processName): # python ./src/starter.py currentProcessName = psResults[1] + maxNameLength = len(currentProcessName) if not currentProcessName: raise IOError("unable to determine our process name") - # we need to fill extra space with null characters, otherwise the process - # will end with a '?' when you run ps against it - if len(currentProcessName) > len(processName): - processName += "\0" * (len(currentProcessName) - len(processName)) + if len(processName) > maxNameLength: + msg = "can't rename process to something longer than our initial name since this would overwrite memory used for the env" + raise IOError(msg) + + # space we need to clear + zeroSize = max(len(currentProcessName), len(processName)) - size = min(len(processName), MAX_CHAR) - ctypes.memset(argc.contents, 0, size + 1) # null terminate the string's end - ctypes.memmove(argc.contents, processName, size) + ctypes.memset(argc.contents, 0, zeroSize + 1) # null terminate the string's end + ctypes.memmove(argc.contents, processName, len(processName)) currentProcessName = processName[:MAX_CHAR] def _setPrctlName(processName):

1 0

r24711: {website} update to 0.2.2.25-alpha packages (website/trunk/include)
by Erinn Clark 03 May '11

03 May '11

Author: erinn Date: 2011-05-03 03:59:10 +0000 (Tue, 03 May 2011) New Revision: 24711 Modified: website/trunk/include/versions.wmi Log: update to 0.2.2.25-alpha packages Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-05-02 18:06:34 UTC (rev 24710) +++ website/trunk/include/versions.wmi 2011-05-03 03:59:10 UTC (rev 24711) @@ -2,29 +2,29 @@ <define-tag version-alpha whitespace=delete>0.2.2.25-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.2.24-alpha</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.2.25-alpha</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.24-alpha</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.25-alpha</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.24-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.25-alpha-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.24-alpha</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.25-alpha</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.24-alpha</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.25-alpha</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.24-alpha</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.25-alpha</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.1.30</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.24-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>1.3.23</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>1.3.24</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.1.30</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-1.4.13, zlib-1.2.3, openssl-0.9.8p</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>3.6.16</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.10-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>3.6.17</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> @@ -32,17 +32,17 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.7</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.7</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.24-alpha</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.8</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.8</define-tag> +<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.25-alpha</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.10, zlib-1.2.3, openssl-0.9.8p</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.16</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.17</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>1.0.15</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.24-alpha</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.16</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>1.0.16</define-tag> +<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.25-alpha</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.17</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.12</define-tag>

1 0

[arm/master] Renaming our process to "arm <input args>"
by atagar＠torproject.org 03 May '11

03 May '11

commit 8ec467eb5caeb4972e12a988a805d93f511bd192 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 2 19:59:39 2011 -0700 Renaming our process to "arm <input args>" Our process was called "python ./src/starter.py <input args>" which made it a pita to identify, use killall on, etc. Using some ctypes hacks to overwrite it with an intuitive name. --- src/starter.py | 8 +++ src/util/procname.py | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 0 deletions(-) diff --git a/src/starter.py b/src/starter.py index c0a0270..365676c 100644 --- a/src/starter.py +++ b/src/starter.py @@ -387,5 +387,13 @@ if __name__ == '__main__': util.log.log(CONFIG["log.savingDebugLog"], "Saving a debug log to '%s' (please check it for sensitive information before sharing)" % LOG_DUMP_PATH) _dumpConfig() + # Attempts to rename our process from "python setup.py <input args>" to + # "arm <input args>" + + try: + from util import procname + procname.renameProcess("arm %s" % " ".join(sys.argv[1:])) + except: pass + cli.controller.startTorMonitor(time.time() - initTime, expandedEvents, param["startup.blindModeEnabled"]) diff --git a/src/util/procname.py b/src/util/procname.py new file mode 100644 index 0000000..7641c5a --- /dev/null +++ b/src/util/procname.py @@ -0,0 +1,122 @@ +# Module to allow for arbitrary renaming of our python process. This is mostly +# based on: +# http://www.rhinocerus.net/forum/lang-python/569677-setting-program-name-lik… +# and an adaptation by Jake: https://github.com/ioerror/chameleon +# +# A cleaner implementation is available at: +# https://github.com/cream/libs/blob/b38970e2a6f6d2620724c828808235be0445b799… +# but I'm not quite clear on their implementation, and it only does targeted +# argument replacement (ie, replace argv[0], argv[1], etc but with a string +# the same size). + +import os +import sys +import ctypes +import ctypes.util + +from util import sysTools + +# flag for setting the process name, found in '/usr/include/linux/prctl.h' +PR_SET_NAME = 15 + +# Maximum number of characters we'll set the process name to. Evidently this +# cap was simply chosen since it didn't cause a segfault for its author. +MAX_CHAR = 1608 + +argc_t = ctypes.POINTER(ctypes.c_char_p) + +Py_GetArgcArgv = ctypes.pythonapi.Py_GetArgcArgv +Py_GetArgcArgv.restype = None +Py_GetArgcArgv.argtypes = [ctypes.POINTER(ctypes.c_int), + ctypes.POINTER(argc_t)] + +# tracks the last name we've changed the process to +currentProcessName = None + +def renameProcess(processName): + """ + Renames our current process from "python <args>" to a custom name. + + Arguments: + processName - new name for our process + """ + + _setArgv(processName) + if sys.platform == "linux2": + _setPrctlName(processName) + elif sys.platform == "freebsd7": + _setProcTitle(processName) + +def _setArgv(processName): + """ + Overwrites our argv in a similar fashion to how it's done in C with: + strcpy(argv[0], "new_name"); + """ + + global currentProcessName + + argv = ctypes.c_int(0) + argc = argc_t() + Py_GetArgcArgv(argv, ctypes.pointer(argc)) + + # The original author did the memset for 256, while Jake did it for the + # processName length (capped at 1608). I'm not sure of the reasons for + # either of these limits, but setting it to anything higher than than the + # length of the null terminated process name should be pointless, so opting + # for Jake's implementation on this. + + if currentProcessName == None: + # Using argv via... + # currentProcessName = " ".join(["python"] + sys.argv) + # + # doesn't do the trick since this will miss interpretor arguments like... + # python -W ignore::DeprecationWarning myScript.py + # + # hence simply getting an outside opinion of our command. + + psResults = sysTools.call("ps -p %i -o args" % os.getpid()) + + if len(psResults) == 2: + # output looks like: + # COMMAND + # python ./src/starter.py + + currentProcessName = psResults[1] + + if not currentProcessName: + raise IOError("unable to determine our process name") + + # we need to fill extra space with null characters, otherwise the process + # will end with a '?' when you run ps against it + if len(currentProcessName) > len(processName): + processName += "\0" * (len(currentProcessName) - len(processName)) + + size = min(len(processName), MAX_CHAR) + ctypes.memset(argc.contents, 0, size + 1) # null terminate the string's end + ctypes.memmove(argc.contents, processName, size) + currentProcessName = processName[:MAX_CHAR] + +def _setPrctlName(processName): + """ + Sets the prctl name, which is used by top and killall. This appears to be + Linux specific and has the max of 15 characters. Source: + http://stackoverflow.com/questions/564695/is-there-a-way-to-change-effectiv… + """ + + libc = ctypes.CDLL(ctypes.util.find_library("c")) + nameBuffer = ctypes.create_string_buffer(len(processName)+1) + nameBuffer.value = processName + libc.prctl(PR_SET_NAME, ctypes.byref(nameBuffer), 0, 0, 0) + +def _setProcTitle(processName): + """ + BSD specific calls (should be compataible with both FreeBSD and OpenBSD: + http://fxr.watson.org/fxr/source/gen/setproctitle.c?v=FREEBSD-LIBC + http://www.rootr.net/man/man/setproctitle/3 + """ + + libc = ctypes.CDLL(ctypes.util.find_library("c")) + nameBuffer = ctypes.create_string_buffer(len(processName)+1) + nameBuffer.value = processName + libc.setproctitle(ctypes.byref(nameBuffer)) +

1 0

[tor/master] Don't choose exit nodes without desc available
by nickm＠torproject.org 03 May '11

03 May '11

commit 47a2e5a9ce4b9324931781c76f3aa11f4d9ea0a2 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Apr 30 13:27:47 2011 +0200 Don't choose exit nodes without desc available n_supported[i] has a random value prior to initialization, so a node that doesn't have routerinfo available can have a random priority. Patch contributed by wanoskarnet from #tor. Thanks! --- src/or/circuitbuild.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 04d833d..2b5638b 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2668,8 +2668,10 @@ choose_good_exit_server_general(int need_uptime, int need_capacity) */ continue; } - if (!node_has_descriptor(node)) + if (!node_has_descriptor(node)) { + n_supported[i] = -1; continue; + } if (!node->is_running || node->is_bad_exit) { n_supported[i] = -1; continue; /* skip routers that are known to be down or bad exits */ @@ -2786,8 +2788,6 @@ choose_good_exit_server_general(int need_uptime, int need_capacity) /* try once to pick only from routers that satisfy a needed port, * then if there are none, pick from any that support exiting. */ SMARTLIST_FOREACH_BEGIN(the_nodes, const node_t *, node) { - if (!node_has_descriptor(node)) - continue; if (n_supported[node_sl_idx] != -1 && (attempt || node_handles_some_port(node, needed_ports))) { // log_fn(LOG_DEBUG,"Try %d: '%s' is a possibility.",

1 0

[tor/master] Merge remote-tracking branch 'sebastian/bug3047'
by nickm＠torproject.org 03 May '11

03 May '11

commit 5b96773a40fb1290e3198c0f01d11b2fc0fe74bd Merge: 27b3b7a 47a2e5a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 2 20:21:08 2011 -0400 Merge remote-tracking branch 'sebastian/bug3047' src/or/circuitbuild.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/master] Add a couple of notes to doc/HACKING based on 0.2.2.25-alpha process
by nickm＠torproject.org 03 May '11

03 May '11

commit 033c27ac5ea02fa1a44651c5a324cb78e787f1a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 2 14:45:44 2011 -0400 Add a couple of notes to doc/HACKING based on 0.2.2.25-alpha process --- doc/HACKING | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index 6336232..86d4a98 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -472,6 +472,9 @@ in their approved versions list. 7) Sign and push the tarball to the website in the dist/ directory. Sign and push the git tag. + (That's either "git tag -u <keyid> tor-0.2.x.y-status", then + "git push origin tag tor-0.2.x.y-status". To sign the + tarball, "gpg -ba <the_tarball>") 8) Edit include/versions.wmi to note the new version. Rebuild and push the website. @@ -490,3 +493,5 @@ the date in the ChangeLog. packages are up (for a stable release), and mail the release blurb and changelog to tor-talk or tor-announce. + (We might be moving to faster announcements, but don't announce until + the website is at least updated.)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 03 May '11

03 May '11

commit 27b3b7aa58a4cc812f4cc6e2cfc533fa429b06de Merge: 751e408 033c27a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 2 20:18:28 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' doc/HACKING | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.2] Add a couple of notes to doc/HACKING based on 0.2.2.25-alpha process
by nickm＠torproject.org 02 May '11

02 May '11

commit 033c27ac5ea02fa1a44651c5a324cb78e787f1a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 2 14:45:44 2011 -0400 Add a couple of notes to doc/HACKING based on 0.2.2.25-alpha process --- doc/HACKING | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index 6336232..86d4a98 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -472,6 +472,9 @@ in their approved versions list. 7) Sign and push the tarball to the website in the dist/ directory. Sign and push the git tag. + (That's either "git tag -u <keyid> tor-0.2.x.y-status", then + "git push origin tag tor-0.2.x.y-status". To sign the + tarball, "gpg -ba <the_tarball>") 8) Edit include/versions.wmi to note the new version. Rebuild and push the website. @@ -490,3 +493,5 @@ the date in the ChangeLog. packages are up (for a stable release), and mail the release blurb and changelog to tor-talk or tor-announce. + (We might be moving to faster announcements, but don't announce until + the website is at least updated.)

1 0