December 2012 - tor-commits - lists.torproject.org

[stem/master] Propagating cwd for republish calls
by atagar＠torproject.org 14 Dec '12

14 Dec '12

commit 2fcdc4bbd6ebcb27725d45cffa3461b4d833913e Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Dec 13 23:34:43 2012 -0800 Propagating cwd for republish calls The script's a little nicer (and closer to working) when we pass through a cwd rather than trying to set it separately. --- docs/republish.py | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/docs/republish.py b/docs/republish.py index 180863c..70cd50e 100644 --- a/docs/republish.py +++ b/docs/republish.py @@ -24,28 +24,25 @@ If stem's repository is unchanged then this is a no-op. -r, --repeat RATE tries to republish the site at a set rate, in minutes """ -def run(command): +def run(command, cwd = None): # Runs the given command. This returns the stdout if successful, and raises # an OSError if it fails. - cmd = subprocess.Popen(command.split(' '), stdout = subprocess.PIPE, stderr = subprocess.PIPE) + cmd = subprocess.Popen(command.split(' '), stdout = subprocess.PIPE, stderr = subprocess.PIPE, cwd = cwd) if cmd.wait() == 0: return cmd.communicate()[0] else: stdout, stderr = cmd.communicate() - raise OSError("'%s' failed\n stdout: %s\n stderr: %s" % (command, stdout, stderr)) + raise OSError("'%s' failed\n stdout: %s\n stderr: %s" % (command, stdout.strip(), stderr.strip())) def republish_site(): # Checks if stem's repository has changed, rebuilding the site if so. Ideally # we'd use plumbing commands to check this but... meh. Patches welcome. - clone_cmd = 'git --git-dir=/home/stem/stem/.git pull' - - if 'Already up-to-date.' not in run(clone_cmd): + if 'Already up-to-date.' not in run('git pull', cwd = '/home/stem/stem'): LOGGER.log(logging.INFO, "Stem's repository has changed. Republishing...") - run('cd /home/stem/stem/docs') - run('make html') + run('make html', cwd = '/home/stem/stem/docs') run('sudo -u mirroradm static-master-update-component stem.torproject.org') LOGGER.log(logging.INFO, " site republished")

1 0

[stem/master] Dropping disown from republish
by atagar＠torproject.org 14 Dec '12

14 Dec '12

commit 0700b831ff4068bc6ea83e33e8b5c63fdeaaeb0b Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Dec 13 23:10:01 2012 -0800 Dropping disown from republish The disown command isn't available on the webserver, and on some experimentation seems to be unnecessary. The daemon process survives after logout. --- docs/republish | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/docs/republish b/docs/republish index 246a38c..da747d7 100755 --- a/docs/republish +++ b/docs/republish @@ -3,6 +3,5 @@ export PATH=/home/stem/bin:$PATH export PYTHONPATH=/home/stem/lib/python -python /home/stem/stem/docs/republish.py $* -disown -h +python /home/stem/stem/docs/republish.py $*&

1 0

[stem/master] Republishing --repeat should... well, repeat
by atagar＠torproject.org 14 Dec '12

14 Dec '12

commit ffde535388f2996a9adccdccc75a22a0176d0d35 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Dec 13 22:56:17 2012 -0800 Republishing --repeat should... well, repeat Forgot to make the script continually run when --repeat was provided. --- docs/republish | 1 + docs/republish.py | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/republish b/docs/republish index f8658f1..246a38c 100755 --- a/docs/republish +++ b/docs/republish @@ -4,4 +4,5 @@ export PATH=/home/stem/bin:$PATH export PYTHONPATH=/home/stem/lib/python python /home/stem/stem/docs/republish.py $* +disown -h diff --git a/docs/republish.py b/docs/republish.py index ccd7ae1..180863c 100644 --- a/docs/republish.py +++ b/docs/republish.py @@ -73,14 +73,15 @@ if __name__ == '__main__': if repeat_rate: latest_run = 0 # unix timestamp for when we last ran - while time.time() < (latest_run + repeat_rate * 60): - time.sleep(15) - - try: - latest_run = time.time() - republish_site() - except OSError, exc: - LOGGER.log(logging.WARN, str(exc)) + while True: + while time.time() < (latest_run + repeat_rate * 60): + time.sleep(15) + + try: + latest_run = time.time() + republish_site() + except OSError, exc: + LOGGER.log(logging.WARN, str(exc)) else: republish_site()

1 0

[stem/master] Passing args along to republish.py
by atagar＠torproject.org 14 Dec '12

14 Dec '12

commit d2b2b9757cf56be09d8841184f493ae478247c0b Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Dec 13 22:53:52 2012 -0800 Passing args along to republish.py --- docs/republish | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/republish b/docs/republish index 26ecfc9..f8658f1 100755 --- a/docs/republish +++ b/docs/republish @@ -3,5 +3,5 @@ export PATH=/home/stem/bin:$PATH export PYTHONPATH=/home/stem/lib/python -python /home/stem/stem/docs/republish.py +python /home/stem/stem/docs/republish.py $*

1 0

[stem/master] Adding execute to republish
by atagar＠torproject.org 14 Dec '12

14 Dec '12

commit 9dbf340fde1a7c17b40cf3e01c0bd99684b91ce1 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Dec 13 22:52:28 2012 -0800 Adding execute to republish --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/republish b/docs/republish old mode 100644 new mode 100755

1 0

[stem/master] Script to republish stem's website content
by atagar＠torproject.org 14 Dec '12

14 Dec '12

commit 72832baa56dfbf0cff0980746db708c897017603 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Dec 13 22:50:34 2012 -0800 Script to republish stem's website content Script for stem's webserver (staticiforme) to provide a daemon that periodically publishes our site's content. --- docs/republish | 7 ++++ docs/republish.py | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 0 deletions(-) diff --git a/docs/republish b/docs/republish new file mode 100644 index 0000000..26ecfc9 --- /dev/null +++ b/docs/republish @@ -0,0 +1,7 @@ +#!/bin/sh + +export PATH=/home/stem/bin:$PATH +export PYTHONPATH=/home/stem/lib/python + +python /home/stem/stem/docs/republish.py + diff --git a/docs/republish.py b/docs/republish.py new file mode 100644 index 0000000..ccd7ae1 --- /dev/null +++ b/docs/republish.py @@ -0,0 +1,86 @@ +import getopt +import logging +import subprocess +import sys +import time + +LOGGER = logging.getLogger("republish") +LOGGER.setLevel(logging.INFO) + +handler = logging.FileHandler('/home/stem/site_republishing.log') +handler.setFormatter(logging.Formatter( + fmt = '%(asctime)s [%(levelname)s] %(message)s', + datefmt = '%m/%d/%Y %H:%M:%S', +)) +LOGGER.addHandler(handler) + +OPT = "r:h" +OPT_EXPANDED = ["repeat=", "help"] + +HELP_MSG = """\ +Republishes stem's website. This can either be done or on a reoccurring basis. +If stem's repository is unchanged then this is a no-op. + + -r, --repeat RATE tries to republish the site at a set rate, in minutes +""" + +def run(command): + # Runs the given command. This returns the stdout if successful, and raises + # an OSError if it fails. + + cmd = subprocess.Popen(command.split(' '), stdout = subprocess.PIPE, stderr = subprocess.PIPE) + + if cmd.wait() == 0: + return cmd.communicate()[0] + else: + stdout, stderr = cmd.communicate() + raise OSError("'%s' failed\n stdout: %s\n stderr: %s" % (command, stdout, stderr)) + +def republish_site(): + # Checks if stem's repository has changed, rebuilding the site if so. Ideally + # we'd use plumbing commands to check this but... meh. Patches welcome. + + clone_cmd = 'git --git-dir=/home/stem/stem/.git pull' + + if 'Already up-to-date.' not in run(clone_cmd): + LOGGER.log(logging.INFO, "Stem's repository has changed. Republishing...") + run('cd /home/stem/stem/docs') + run('make html') + run('sudo -u mirroradm static-master-update-component stem.torproject.org') + LOGGER.log(logging.INFO, " site republished") + +if __name__ == '__main__': + try: + opts = getopt.getopt(sys.argv[1:], OPT, OPT_EXPANDED)[0] + except getopt.GetoptError, exc: + print "%s (for usage provide --help)" % exc + sys.exit(1) + + LOGGER.log(logging.INFO, "Starting stem site republisher") + repeat_rate = None + + for opt, arg in opts: + if opt in ("-r", "--repeat"): + if arg.isdigit(): + repeat_rate = int(arg) + else: + print "The --repeat argument must be an integer, got '%s'" % arg + sys.exit(1) + elif opt in ("-h", "--help"): + print HELP_MSG + sys.exit() + + if repeat_rate: + latest_run = 0 # unix timestamp for when we last ran + + while time.time() < (latest_run + repeat_rate * 60): + time.sleep(15) + + try: + latest_run = time.time() + republish_site() + except OSError, exc: + LOGGER.log(logging.WARN, str(exc)) + else: + republish_site() +

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 14 Dec '12

14 Dec '12

commit b35aac0a1dfdf01545a366f8dffca44cb3c33d4f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 14 05:46:11 2012 +0000 Update translations for torbirdy_completed --- pa/torbirdy.dtd | 2 ++ pa/torbirdy.properties | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/pa/torbirdy.dtd b/pa/torbirdy.dtd index 539ab21..17c6bdc 100644 --- a/pa/torbirdy.dtd +++ b/pa/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "ਸ਼ੁਰੂ ਹੋਣ ਤੇ ਆਖਰੀ ਈਮੇਲ ਫੋਲਡਰ ਚੋਣਵਾਂ ਕਰੋ"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label "ਥੰਡਰਬਰਡ ਦੇ ਟਾਇਮ ਜ਼ੋਨ ਨੂੰ UTC ਨਾ ਤੈਅ ਕਰੋ"> +<!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "GPG '--throw-keyids' ਰੱਦ ਕਰੋ"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "ਅਕਾਊਂਟ-ਵਿਸ਼ਿਸ਼ਟ"> diff --git a/pa/torbirdy.properties b/pa/torbirdy.properties index 1af3491..1399ca0 100644 --- a/pa/torbirdy.properties +++ b/pa/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=ਤੁਹਾਨੂੰ ਗੁਪਤ ਰਖਣ ਵਾਸਤ torbirdy.email.advanced=ਧਿਆਨ ਨਾਲ! ਟੌਰਬਰਡੀ ਦੀ ਤਕਨੀਕੀ ਸੈਟਿੰਗ ਨੂੰ ਛੇੜਨਾ ਨਹੀਂ ਚਾਹਿਦਾ | \n\n ਅਗੇ ਤਾਂ ਹੀ ਵਧੋ ਜੇ ਤੁਹਾਨੂੰ ਪਤਾ ਹੇ ਕਿ ਤੁਸੀਂ ਕੀ ਕਰ ਰਹੇ ਹੋ | torbirdy.email.advanced.nextwarning=ਇਹ ਚੇਤਾਵਨੀ ਫੇਰ ਵਿਖਾਓ torbirdy.email.advanced.title=ਟੌਰਬਰਡੀ ਤਕਨੀਕੀ ਸੈਟਿੰਗ + +torbirdy.restart=ਟਾਇਮ ਜ਼ੋਨ ਸੈਟਿੰਗ ਨੂੰ ਪੂਰਾ ਕਰਨ ਵਾਸਤੇ ਥੰਡਰਬਰਡ ਨੂੰ ਰੀਸਟਾਰਟ ਕਰੋ

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 14 Dec '12

14 Dec '12

commit 30fe61f56993f3e62810fd0d744ec89c54308623 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 14 05:46:04 2012 +0000 Update translations for torbirdy --- pa/torbirdy.dtd | 4 ++-- pa/torbirdy.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pa/torbirdy.dtd b/pa/torbirdy.dtd index 851b72c..17c6bdc 100644 --- a/pa/torbirdy.dtd +++ b/pa/torbirdy.dtd @@ -33,8 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "ਸ਼ੁਰੂ ਹੋਣ ਤੇ ਆਖਰੀ ਈਮੇਲ ਫੋਲਡਰ ਚੋਣਵਾਂ ਕਰੋ"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> -<!ENTITY torbirdy.prefs.timezone.label ""> -<!ENTITY torbirdy.prefs.timezone.key ""> +<!ENTITY torbirdy.prefs.timezone.label "ਥੰਡਰਬਰਡ ਦੇ ਟਾਇਮ ਜ਼ੋਨ ਨੂੰ UTC ਨਾ ਤੈਅ ਕਰੋ"> +<!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "GPG '--throw-keyids' ਰੱਦ ਕਰੋ"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "ਅਕਾਊਂਟ-ਵਿਸ਼ਿਸ਼ਟ"> diff --git a/pa/torbirdy.properties b/pa/torbirdy.properties index 3181e4c..1399ca0 100644 --- a/pa/torbirdy.properties +++ b/pa/torbirdy.properties @@ -12,4 +12,4 @@ torbirdy.email.advanced=ਧਿਆਨ ਨਾਲ! ਟੌਰਬਰਡੀ ਦੀ ਤ torbirdy.email.advanced.nextwarning=ਇਹ ਚੇਤਾਵਨੀ ਫੇਰ ਵਿਖਾਓ torbirdy.email.advanced.title=ਟੌਰਬਰਡੀ ਤਕਨੀਕੀ ਸੈਟਿੰਗ -# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. +torbirdy.restart=ਟਾਇਮ ਜ਼ੋਨ ਸੈਟਿੰਗ ਨੂੰ ਪੂਰਾ ਕਰਨ ਵਾਸਤੇ ਥੰਡਰਬਰਡ ਨੂੰ ਰੀਸਟਾਰਟ ਕਰੋ

1 0

[flashproxy/master] Add to flashproxy-reg-email man page.
by dcf＠torproject.org 13 Dec '12

13 Dec '12

commit 8f3d5e62687dfd96b03f0d02a3eb489f5568e54e Author: David Fifield <david(a)bamsoftware.com> Date: Thu Dec 13 15:48:24 2012 -0800 Add to flashproxy-reg-email man page. --- doc/flashproxy-reg-email.1 | 8 +++++--- doc/flashproxy-reg-email.1.txt | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/doc/flashproxy-reg-email.1 b/doc/flashproxy-reg-email.1 index 3ff9c32..db602ba 100644 --- a/doc/flashproxy-reg-email.1 +++ b/doc/flashproxy-reg-email.1 @@ -2,12 +2,12 @@ .\" Title: flashproxy-reg-email .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 11/12/2012 +.\" Date: 12/13/2012 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-REG\-EMAIL" "1" "11/12/2012" "\ \&" "\ \&" +.TH "FLASHPROXY\-REG\-EMAIL" "1" "12/13/2012" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -34,10 +34,12 @@ flashproxy-reg-email \- Register with a facilitator using the email method \fBflashproxy\-reg\-email\fR [\fIOPTIONS\fR] [\fIREMOTE\fR][:\fIPORT\fR] .SH "DESCRIPTION" .sp -Register with a flash proxy facilitator through email\&. Makes a STARTTLS connection to an SMTP server and sends mail with a client IP address to a designated address\&. By default the remote address registered is ":9000" (the external IP address is guessed)\&. +Register with a flash proxy facilitator through email\&. Makes a STARTTLS connection to an SMTP server and sends mail with a client IP address to a designated address\&. By default the remote address registered is ":9000" (the external IP address is guessed based on the SMTP server\(cqs response)\&. .sp Using an SMTP server or email address other than the defaults will not work unless you have made special arrangements to connect them to a facilitator\&. .sp +The email address is not polled continually\&. After running the program, it may take up to a minute for the registration to be recognized\&. +.sp This program requires the M2Crypto library for Python\&. .SH "OPTIONS" .PP diff --git a/doc/flashproxy-reg-email.1.txt b/doc/flashproxy-reg-email.1.txt index ab12bab..a56a568 100644 --- a/doc/flashproxy-reg-email.1.txt +++ b/doc/flashproxy-reg-email.1.txt @@ -19,11 +19,15 @@ DESCRIPTION Register with a flash proxy facilitator through email. Makes a STARTTLS connection to an SMTP server and sends mail with a client IP address to a designated address. By default the remote address registered is -":9000" (the external IP address is guessed). +":9000" (the external IP address is guessed based on the SMTP server's +response). Using an SMTP server or email address other than the defaults will not work unless you have made special arrangements to connect them to a facilitator. +The email address is not polled continually. After running the program, +it may take up to a minute for the registration to be recognized. + This program requires the M2Crypto library for Python. OPTIONS

1 0

[tor/master] Nuke uses of memcmp outside of unit tests
by nickm＠torproject.org 13 Dec '12

13 Dec '12

commit b1ff8daeb521d1645bc35ffd7191599b7169c2bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 13 17:34:05 2012 -0500 Nuke uses of memcmp outside of unit tests We want to be saying fast_mem{cmp,eq,neq} when we're doing a comparison that's allowed to exit early, or tor_mem{cmp,eq,neq} when we need a data-invariant timing. Direct use of memcmp tends to imply that we haven't thought about the issue. --- src/common/aes.c | 3 ++- src/or/dirserv.c | 2 +- src/or/geoip.c | 7 ++++--- src/or/microdesc.c | 2 +- src/or/routerlist.c | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/common/aes.c b/src/common/aes.c index 2d64b85..d8865d7 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -41,6 +41,7 @@ #include "aes.h" #include "util.h" #include "torlog.h" +#include "di_ops.h" #ifdef ANDROID /* Android's OpenSSL seems to have removed all of its Engine support. */ @@ -257,7 +258,7 @@ evaluate_ctr_for_aes(void) for (i=0; i<16; ++i) AES_ctr128_encrypt(&zero[i], &output[i], 1, &key, ivec, ivec_tmp, &pos); - if (memcmp(output, encrypt_zero, 16)) { + if (fast_memneq(output, encrypt_zero, 16)) { /* Counter mode is buggy */ log_notice(LD_CRYPTO, "This OpenSSL has a buggy version of counter mode; " "not using it."); diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 0eb1fb3..d080fe7 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2269,7 +2269,7 @@ compare_routerinfo_by_ip_and_bw_(const void **a, const void **b) else if (first->addr > second->addr) return 1; - /* Potentially, this next bit could cause k n lg n memcmp calls. But in + /* Potentially, this next bit could cause k n lg n memeq calls. But in * reality, we will almost never get here, since addresses will usually be * different. */ diff --git a/src/or/geoip.c b/src/or/geoip.c index 2fd77d8..72a1983 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -224,7 +224,8 @@ static int geoip_ipv6_compare_entries_(const void **_a, const void **_b) { const geoip_ipv6_entry_t *a = *_a, *b = *_b; - return memcmp(a->ip_low.s6_addr, b->ip_low.s6_addr, sizeof(struct in6_addr)); + return fast_memcmp(a->ip_low.s6_addr, b->ip_low.s6_addr, + sizeof(struct in6_addr)); } /** bsearch helper: return -1, 1, or 0 based on comparison of an IPv6 @@ -235,10 +236,10 @@ geoip_ipv6_compare_key_to_entry_(const void *_key, const void **_member) const struct in6_addr *addr = (struct in6_addr *)_key; const geoip_ipv6_entry_t *entry = *_member; - if (memcmp(addr->s6_addr, entry->ip_low.s6_addr, + if (fast_memcmp(addr->s6_addr, entry->ip_low.s6_addr, sizeof(struct in6_addr)) < 0) return -1; - else if (memcmp(addr->s6_addr, entry->ip_high.s6_addr, + else if (fast_memcmp(addr->s6_addr, entry->ip_high.s6_addr, sizeof(struct in6_addr)) > 0) return 1; else diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 7602a93..788a7b1 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -479,7 +479,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) if (PREDICT_UNLIKELY( md->bodylen < 9 || fast_memneq(md->body, "onion-key", 9) != 0)) { /* XXXX once bug 2022 is solved, we can kill this block and turn it - * into just the tor_assert(!memcmp) */ + * into just the tor_assert(fast_memeq) */ off_t avail = cache->cache_content->size - md->off; char *bad_str; tor_assert(avail >= 0); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 5536d1c..6fff70b 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4436,7 +4436,7 @@ update_consensus_router_descriptor_downloads(time_t now, int is_vote, sd->signed_descriptor_digest, DIGEST_LEN)) { /* We have a descriptor with this digest, but either there is no * entry in routerlist with the same ID (!ri), or there is one, - * but the identity digest differs (memcmp). + * but the identity digest differs (memneq). */ smartlist_add(no_longer_old, sd); ++n_in_oldrouters; /* We have it in old_routers. */

1 0