September 2011 - tor-commits - lists.torproject.org

[tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 13 Sep '11

13 Sep '11

commit 4a351b4b9ebfadf27d68e6bb3e1470cdef83ef45 Merge: d679ef6 62ec584 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 13 18:27:13 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2 Conflicts: src/or/main.c src/or/router.c changes/bug4014 | 3 +++ src/or/main.c | 7 ++++--- src/or/or.h | 4 +++- src/or/router.c | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --cc src/or/main.c index bc639db,3c879dc..289d805 --- a/src/or/main.c +++ b/src/or/main.c @@@ -937,18 -866,14 +937,19 @@@ run_scheduled_events(time_t now now + DESCRIPTOR_FAILURE_RESET_INTERVAL; } + if (options->UseBridges) + fetch_bridge_descriptors(options, now); + - /** 1b. Every MAX_SSL_KEY_LIFETIME seconds, we change our TLS context. */ + /** 1b. Every MAX_SSL_KEY_LIFETIME_INTERNAL seconds, we change our + * TLS context. */ if (!last_rotated_x509_certificate) last_rotated_x509_certificate = now; - if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME < now) { + if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME_INTERNAL < now) { log_info(LD_GENERAL,"Rotating tls context."); - if (tor_tls_context_new(get_identity_key(), - MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { + if (tor_tls_context_init(public_server_mode(options), + get_tlsclient_identity_key(), + is_server ? get_server_identity_key() : NULL, - MAX_SSL_KEY_LIFETIME) < 0) { ++ MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_warn(LD_BUG, "Error reinitializing TLS context"); /* XXX is it a bug here, that we just keep going? -RD */ } diff --cc src/or/router.c index 2165e6e,2afde74..365e888 --- a/src/or/router.c +++ b/src/or/router.c @@@ -521,12 -456,10 +521,12 @@@ init_keys(void crypto_free_pk_env(prkey); return -1; } - set_identity_key(prkey); - /* Create a TLS context; default the client nickname to "client". */ - if (tor_tls_context_new(get_identity_key(), - MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { + set_client_identity_key(prkey); + /* Create a TLS context. */ + if (tor_tls_context_init(0, + get_tlsclient_identity_key(), + NULL, - MAX_SSL_KEY_LIFETIME) < 0) { ++ MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_err(LD_GENERAL,"Error creating TLS context for Tor client."); return -1; } @@@ -619,10 -537,8 +619,10 @@@ tor_free(keydir); /* 3. Initialize link key and TLS context. */ - if (tor_tls_context_new(get_identity_key(), - MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { + if (tor_tls_context_init(public_server_mode(options), + get_tlsclient_identity_key(), + get_server_identity_key(), - MAX_SSL_KEY_LIFETIME) < 0) { ++ MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_err(LD_GENERAL,"Error initializing TLS context"); return -1; }

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 13 Sep '11

13 Sep '11

commit a4ed8622c01fc1f2f93a44d4b3e0857b6da94620 Merge: 9d1ea45 4a351b4 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 13 18:34:12 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug4014 | 3 +++ src/or/main.c | 7 ++++--- src/or/or.h | 4 +++- src/or/router.c | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-)

1 0

[tor/master] Generate our ssl session certs with a plausible lifetime
by arma＠torproject.org 13 Sep '11

13 Sep '11

commit 62ec584a3014b9b9333dcc6feb4989d1592d6d26 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 13 18:24:45 2011 -0400 Generate our ssl session certs with a plausible lifetime Nobody but Tor uses certs on the wire with 2 hour lifetimes, and it makes us stand out. Resolves ticket 4014. --- changes/bug4014 | 3 +++ src/or/main.c | 8 +++++--- src/or/or.h | 4 +++- src/or/router.c | 6 ++++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/changes/bug4014 b/changes/bug4014 new file mode 100644 index 0000000..9c20c6c --- /dev/null +++ b/changes/bug4014 @@ -0,0 +1,3 @@ + o Minor features: + - Adjust the expiration time on our SSL session certificates to + better match SSL certs seen in the wild. Resolves ticket 4014. diff --git a/src/or/main.c b/src/or/main.c index e44fd49..3c879dc 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -866,12 +866,14 @@ run_scheduled_events(time_t now) now + DESCRIPTOR_FAILURE_RESET_INTERVAL; } - /** 1b. Every MAX_SSL_KEY_LIFETIME seconds, we change our TLS context. */ + /** 1b. Every MAX_SSL_KEY_LIFETIME_INTERNAL seconds, we change our + * TLS context. */ if (!last_rotated_x509_certificate) last_rotated_x509_certificate = now; - if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME < now) { + if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME_INTERNAL < now) { log_info(LD_GENERAL,"Rotating tls context."); - if (tor_tls_context_new(get_identity_key(), MAX_SSL_KEY_LIFETIME) < 0) { + if (tor_tls_context_new(get_identity_key(), + MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_warn(LD_BUG, "Error reinitializing TLS context"); /* XXX is it a bug here, that we just keep going? -RD */ } diff --git a/src/or/or.h b/src/or/or.h index 976ba9f..0f5b2bb 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -166,7 +166,9 @@ /** How often do we rotate onion keys? */ #define MIN_ONION_KEY_LIFETIME (7*24*60*60) /** How often do we rotate TLS contexts? */ -#define MAX_SSL_KEY_LIFETIME (2*60*60) +#define MAX_SSL_KEY_LIFETIME_INTERNAL (2*60*60) +/** What expiry time shall we place on our SSL certs? */ +#define MAX_SSL_KEY_LIFETIME_ADVERTISED (365*24*60*60) /** How old do we allow a router to get before removing it * from the router list? In seconds. */ diff --git a/src/or/router.c b/src/or/router.c index cc60041..2afde74 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -458,7 +458,8 @@ init_keys(void) } set_identity_key(prkey); /* Create a TLS context; default the client nickname to "client". */ - if (tor_tls_context_new(get_identity_key(), MAX_SSL_KEY_LIFETIME) < 0) { + if (tor_tls_context_new(get_identity_key(), + MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_err(LD_GENERAL,"Error creating TLS context for Tor client."); return -1; } @@ -536,7 +537,8 @@ init_keys(void) tor_free(keydir); /* 3. Initialize link key and TLS context. */ - if (tor_tls_context_new(get_identity_key(), MAX_SSL_KEY_LIFETIME) < 0) { + if (tor_tls_context_new(get_identity_key(), + MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_err(LD_GENERAL,"Error initializing TLS context"); return -1; }

1 0

[tor/master] Merge branch 'maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 13 Sep '11

13 Sep '11

commit 4a351b4b9ebfadf27d68e6bb3e1470cdef83ef45 Merge: d679ef6 62ec584 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 13 18:27:13 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2 Conflicts: src/or/main.c src/or/router.c changes/bug4014 | 3 +++ src/or/main.c | 7 ++++--- src/or/or.h | 4 +++- src/or/router.c | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --cc src/or/main.c index bc639db,3c879dc..289d805 --- a/src/or/main.c +++ b/src/or/main.c @@@ -937,18 -866,14 +937,19 @@@ run_scheduled_events(time_t now now + DESCRIPTOR_FAILURE_RESET_INTERVAL; } + if (options->UseBridges) + fetch_bridge_descriptors(options, now); + - /** 1b. Every MAX_SSL_KEY_LIFETIME seconds, we change our TLS context. */ + /** 1b. Every MAX_SSL_KEY_LIFETIME_INTERNAL seconds, we change our + * TLS context. */ if (!last_rotated_x509_certificate) last_rotated_x509_certificate = now; - if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME < now) { + if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME_INTERNAL < now) { log_info(LD_GENERAL,"Rotating tls context."); - if (tor_tls_context_new(get_identity_key(), - MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { + if (tor_tls_context_init(public_server_mode(options), + get_tlsclient_identity_key(), + is_server ? get_server_identity_key() : NULL, - MAX_SSL_KEY_LIFETIME) < 0) { ++ MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_warn(LD_BUG, "Error reinitializing TLS context"); /* XXX is it a bug here, that we just keep going? -RD */ } diff --cc src/or/router.c index 2165e6e,2afde74..365e888 --- a/src/or/router.c +++ b/src/or/router.c @@@ -521,12 -456,10 +521,12 @@@ init_keys(void crypto_free_pk_env(prkey); return -1; } - set_identity_key(prkey); - /* Create a TLS context; default the client nickname to "client". */ - if (tor_tls_context_new(get_identity_key(), - MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { + set_client_identity_key(prkey); + /* Create a TLS context. */ + if (tor_tls_context_init(0, + get_tlsclient_identity_key(), + NULL, - MAX_SSL_KEY_LIFETIME) < 0) { ++ MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_err(LD_GENERAL,"Error creating TLS context for Tor client."); return -1; } @@@ -619,10 -537,8 +619,10 @@@ tor_free(keydir); /* 3. Initialize link key and TLS context. */ - if (tor_tls_context_new(get_identity_key(), - MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { + if (tor_tls_context_init(public_server_mode(options), + get_tlsclient_identity_key(), + get_server_identity_key(), - MAX_SSL_KEY_LIFETIME) < 0) { ++ MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_err(LD_GENERAL,"Error initializing TLS context"); return -1; }

1 0

[tor/master] Merge branch 'maint-0.2.2'
by arma＠torproject.org 13 Sep '11

13 Sep '11

commit 1fcaeb60924d155e80a9579588a1b6c31e2174f7 Merge: 1e1cc43 4a351b4 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 13 18:32:00 2011 -0400 Merge branch 'maint-0.2.2' changes/bug4014 | 3 +++ src/or/main.c | 7 ++++--- src/or/or.h | 4 +++- src/or/router.c | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 13 Sep '11

13 Sep '11

commit 4a351b4b9ebfadf27d68e6bb3e1470cdef83ef45 Merge: d679ef6 62ec584 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 13 18:27:13 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2 Conflicts: src/or/main.c src/or/router.c changes/bug4014 | 3 +++ src/or/main.c | 7 ++++--- src/or/or.h | 4 +++- src/or/router.c | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --cc src/or/main.c index bc639db,3c879dc..289d805 --- a/src/or/main.c +++ b/src/or/main.c @@@ -937,18 -866,14 +937,19 @@@ run_scheduled_events(time_t now now + DESCRIPTOR_FAILURE_RESET_INTERVAL; } + if (options->UseBridges) + fetch_bridge_descriptors(options, now); + - /** 1b. Every MAX_SSL_KEY_LIFETIME seconds, we change our TLS context. */ + /** 1b. Every MAX_SSL_KEY_LIFETIME_INTERNAL seconds, we change our + * TLS context. */ if (!last_rotated_x509_certificate) last_rotated_x509_certificate = now; - if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME < now) { + if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME_INTERNAL < now) { log_info(LD_GENERAL,"Rotating tls context."); - if (tor_tls_context_new(get_identity_key(), - MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { + if (tor_tls_context_init(public_server_mode(options), + get_tlsclient_identity_key(), + is_server ? get_server_identity_key() : NULL, - MAX_SSL_KEY_LIFETIME) < 0) { ++ MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_warn(LD_BUG, "Error reinitializing TLS context"); /* XXX is it a bug here, that we just keep going? -RD */ } diff --cc src/or/router.c index 2165e6e,2afde74..365e888 --- a/src/or/router.c +++ b/src/or/router.c @@@ -521,12 -456,10 +521,12 @@@ init_keys(void crypto_free_pk_env(prkey); return -1; } - set_identity_key(prkey); - /* Create a TLS context; default the client nickname to "client". */ - if (tor_tls_context_new(get_identity_key(), - MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { + set_client_identity_key(prkey); + /* Create a TLS context. */ + if (tor_tls_context_init(0, + get_tlsclient_identity_key(), + NULL, - MAX_SSL_KEY_LIFETIME) < 0) { ++ MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_err(LD_GENERAL,"Error creating TLS context for Tor client."); return -1; } @@@ -619,10 -537,8 +619,10 @@@ tor_free(keydir); /* 3. Initialize link key and TLS context. */ - if (tor_tls_context_new(get_identity_key(), - MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { + if (tor_tls_context_init(public_server_mode(options), + get_tlsclient_identity_key(), + get_server_identity_key(), - MAX_SSL_KEY_LIFETIME) < 0) { ++ MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_err(LD_GENERAL,"Error initializing TLS context"); return -1; }

1 0

[tor/maint-0.2.2] Generate our ssl session certs with a plausible lifetime
by arma＠torproject.org 13 Sep '11

13 Sep '11

commit 62ec584a3014b9b9333dcc6feb4989d1592d6d26 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 13 18:24:45 2011 -0400 Generate our ssl session certs with a plausible lifetime Nobody but Tor uses certs on the wire with 2 hour lifetimes, and it makes us stand out. Resolves ticket 4014. --- changes/bug4014 | 3 +++ src/or/main.c | 8 +++++--- src/or/or.h | 4 +++- src/or/router.c | 6 ++++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/changes/bug4014 b/changes/bug4014 new file mode 100644 index 0000000..9c20c6c --- /dev/null +++ b/changes/bug4014 @@ -0,0 +1,3 @@ + o Minor features: + - Adjust the expiration time on our SSL session certificates to + better match SSL certs seen in the wild. Resolves ticket 4014. diff --git a/src/or/main.c b/src/or/main.c index e44fd49..3c879dc 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -866,12 +866,14 @@ run_scheduled_events(time_t now) now + DESCRIPTOR_FAILURE_RESET_INTERVAL; } - /** 1b. Every MAX_SSL_KEY_LIFETIME seconds, we change our TLS context. */ + /** 1b. Every MAX_SSL_KEY_LIFETIME_INTERNAL seconds, we change our + * TLS context. */ if (!last_rotated_x509_certificate) last_rotated_x509_certificate = now; - if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME < now) { + if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME_INTERNAL < now) { log_info(LD_GENERAL,"Rotating tls context."); - if (tor_tls_context_new(get_identity_key(), MAX_SSL_KEY_LIFETIME) < 0) { + if (tor_tls_context_new(get_identity_key(), + MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_warn(LD_BUG, "Error reinitializing TLS context"); /* XXX is it a bug here, that we just keep going? -RD */ } diff --git a/src/or/or.h b/src/or/or.h index 976ba9f..0f5b2bb 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -166,7 +166,9 @@ /** How often do we rotate onion keys? */ #define MIN_ONION_KEY_LIFETIME (7*24*60*60) /** How often do we rotate TLS contexts? */ -#define MAX_SSL_KEY_LIFETIME (2*60*60) +#define MAX_SSL_KEY_LIFETIME_INTERNAL (2*60*60) +/** What expiry time shall we place on our SSL certs? */ +#define MAX_SSL_KEY_LIFETIME_ADVERTISED (365*24*60*60) /** How old do we allow a router to get before removing it * from the router list? In seconds. */ diff --git a/src/or/router.c b/src/or/router.c index cc60041..2afde74 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -458,7 +458,8 @@ init_keys(void) } set_identity_key(prkey); /* Create a TLS context; default the client nickname to "client". */ - if (tor_tls_context_new(get_identity_key(), MAX_SSL_KEY_LIFETIME) < 0) { + if (tor_tls_context_new(get_identity_key(), + MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_err(LD_GENERAL,"Error creating TLS context for Tor client."); return -1; } @@ -536,7 +537,8 @@ init_keys(void) tor_free(keydir); /* 3. Initialize link key and TLS context. */ - if (tor_tls_context_new(get_identity_key(), MAX_SSL_KEY_LIFETIME) < 0) { + if (tor_tls_context_new(get_identity_key(), + MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_err(LD_GENERAL,"Error initializing TLS context"); return -1; }

1 0

[tor/maint-0.2.1] Generate our ssl session certs with a plausible lifetime
by arma＠torproject.org 13 Sep '11

13 Sep '11

commit 62ec584a3014b9b9333dcc6feb4989d1592d6d26 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 13 18:24:45 2011 -0400 Generate our ssl session certs with a plausible lifetime Nobody but Tor uses certs on the wire with 2 hour lifetimes, and it makes us stand out. Resolves ticket 4014. --- changes/bug4014 | 3 +++ src/or/main.c | 8 +++++--- src/or/or.h | 4 +++- src/or/router.c | 6 ++++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/changes/bug4014 b/changes/bug4014 new file mode 100644 index 0000000..9c20c6c --- /dev/null +++ b/changes/bug4014 @@ -0,0 +1,3 @@ + o Minor features: + - Adjust the expiration time on our SSL session certificates to + better match SSL certs seen in the wild. Resolves ticket 4014. diff --git a/src/or/main.c b/src/or/main.c index e44fd49..3c879dc 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -866,12 +866,14 @@ run_scheduled_events(time_t now) now + DESCRIPTOR_FAILURE_RESET_INTERVAL; } - /** 1b. Every MAX_SSL_KEY_LIFETIME seconds, we change our TLS context. */ + /** 1b. Every MAX_SSL_KEY_LIFETIME_INTERNAL seconds, we change our + * TLS context. */ if (!last_rotated_x509_certificate) last_rotated_x509_certificate = now; - if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME < now) { + if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME_INTERNAL < now) { log_info(LD_GENERAL,"Rotating tls context."); - if (tor_tls_context_new(get_identity_key(), MAX_SSL_KEY_LIFETIME) < 0) { + if (tor_tls_context_new(get_identity_key(), + MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_warn(LD_BUG, "Error reinitializing TLS context"); /* XXX is it a bug here, that we just keep going? -RD */ } diff --git a/src/or/or.h b/src/or/or.h index 976ba9f..0f5b2bb 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -166,7 +166,9 @@ /** How often do we rotate onion keys? */ #define MIN_ONION_KEY_LIFETIME (7*24*60*60) /** How often do we rotate TLS contexts? */ -#define MAX_SSL_KEY_LIFETIME (2*60*60) +#define MAX_SSL_KEY_LIFETIME_INTERNAL (2*60*60) +/** What expiry time shall we place on our SSL certs? */ +#define MAX_SSL_KEY_LIFETIME_ADVERTISED (365*24*60*60) /** How old do we allow a router to get before removing it * from the router list? In seconds. */ diff --git a/src/or/router.c b/src/or/router.c index cc60041..2afde74 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -458,7 +458,8 @@ init_keys(void) } set_identity_key(prkey); /* Create a TLS context; default the client nickname to "client". */ - if (tor_tls_context_new(get_identity_key(), MAX_SSL_KEY_LIFETIME) < 0) { + if (tor_tls_context_new(get_identity_key(), + MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_err(LD_GENERAL,"Error creating TLS context for Tor client."); return -1; } @@ -536,7 +537,8 @@ init_keys(void) tor_free(keydir); /* 3. Initialize link key and TLS context. */ - if (tor_tls_context_new(get_identity_key(), MAX_SSL_KEY_LIFETIME) < 0) { + if (tor_tls_context_new(get_identity_key(), + MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_err(LD_GENERAL,"Error initializing TLS context"); return -1; }

1 0

r25066: {} add infield label to the right directory. (website/trunk/js)
by Andrew Lewman 13 Sep '11

13 Sep '11

Author: phobos Date: 2011-09-13 19:28:18 +0000 (Tue, 13 Sep 2011) New Revision: 25066 Added: website/trunk/js/jquery.infieldlabel.min.js Log: add infield label to the right directory. Added: website/trunk/js/jquery.infieldlabel.min.js =================================================================== --- website/trunk/js/jquery.infieldlabel.min.js (rev 0) +++ website/trunk/js/jquery.infieldlabel.min.js 2011-09-13 19:28:18 UTC (rev 25066) @@ -0,0 +1,12 @@ +/* + * In-Field Label jQuery Plugin + * http://fuelyourcoding.com/scripts/infield.html + * + * Copyright (c) 2009 Doug Neiner + * Dual licensed under the MIT and GPL licenses. + * Uses the same license as jQuery, see: + * http://docs.jquery.com/License + * + * @version 0.1 + */ +(function($){$.InFieldLabels=function(b,c,d){var f=this;f.$label=$(b);f.label=b;f.$field=$(c);f.field=c;f.$label.data("InFieldLabels",f);f.showing=true;f.init=function(){f.options=$.extend({},$.InFieldLabels.defaultOptions,d);if(f.$field.val()!=""){f.$label.hide();f.showing=false};f.$field.focus(function(){f.fadeOnFocus()}).blur(function(){f.checkForEmpty(true)}).bind('keydown.infieldlabel',function(e){f.hideOnChange(e)}).change(function(e){f.checkForEmpty()}).bind('onPropertyChange',function(){f.checkForEmpty()})};f.fadeOnFocus=function(){if(f.showing){f.setOpacity(f.options.fadeOpacity)}};f.setOpacity=function(a){f.$label.stop().animate({opacity:a},f.options.fadeDuration);f.showing=(a>0.0)};f.checkForEmpty=function(a){if(f.$field.val()==""){f.prepForShow();f.setOpacity(a?1.0:f.options.fadeOpacity)}else{f.setOpacity(0.0)}};f.prepForShow=function(e){if(!f.showing){f.$label.css({opacity:0.0}).show();f.$field.bind('keydown.infieldlabel',function(e){f.hideOnChange(e)})}};f.hide OnChange=function(e){if((e.keyCode==16)||(e.keyCode==9))return;if(f.showing){f.$label.hide();f.showing=false};f.$field.unbind('keydown.infieldlabel')};f.init()};$.InFieldLabels.defaultOptions={fadeOpacity:0.0,fadeDuration:300};$.fn.inFieldLabels=function(c){return this.each(function(){var a=$(this).attr('for');if(!a)return;var b=$("input#"+a+"[type='text'],"+"input#"+a+"[type='password'],"+"textarea#"+a);if(b.length==0)return;(new $.InFieldLabels(this,b[0],c))})}})(jQuery); \ No newline at end of file Property changes on: website/trunk/js/jquery.infieldlabel.min.js ___________________________________________________________________ Added: svn:mime-type + text/javascript

1 0

[arm/master] fix: readline buggy with a color prompt
by atagar＠torproject.org 13 Sep '11

13 Sep '11

commit e27909a69220557611c0cb8a8e98889fe64433c2 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Sep 13 08:42:56 2011 -0700 fix: readline buggy with a color prompt When providing a color prompt and history completion via the readline module the prompt can be screwed up by cycling to a command longer than the non-displayed length of the prompt string. Unfortunatley I'm not finding a workaround so removing formatting from the prompt. For more information see: http://bugs.python.org/issue12972 --- src/util/torInterpretor.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index d6f9340..fc217f3 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -492,7 +492,12 @@ class ControlInterpretor: return (inputLines, outputLines) def prompt(): - prompt = format(">>> ", Color.GREEN, Attr.BOLD) + # Cycling history via the readline module with up/down is buggy with a color + # prompt. For more information see: + # http://bugs.python.org/issue12972 + #prompt = format(">>> ", Color.GREEN, Attr.BOLD) + + prompt = ">>> " input = "" # sets up tab autocompetion

1 0