tor-commits November 2011

tor-commits@lists.torproject.org

16 participants
987 discussions

[tor/master] Merge branch 'disable_network'
by nickm＠torproject.org 29 Nov '11

29 Nov '11

commit 83f66db79ec6469beea0fb410be6536acb90ffd0 Merge: 9e25422 9e8f3ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 29 17:52:23 2011 -0500 Merge branch 'disable_network' changes/disable_network | 9 ++++++ doc/tor.1.txt | 6 ++++ src/or/config.c | 13 ++++++++- src/or/connection.c | 68 +++++++++++++++++++++++++++++++++++++++++++--- src/or/connection.h | 3 ++ src/or/dns.c | 7 +++++ src/or/hibernate.c | 11 +------- src/or/main.c | 29 +++++++++++--------- src/or/or.h | 4 +++ src/or/router.c | 12 +++++++- src/or/router.h | 2 + src/or/routerlist.c | 6 +++- 12 files changed, 138 insertions(+), 32 deletions(-)

1 0

[tor/master] Make linelists always overridden by the command line
by nickm＠torproject.org 29 Nov '11

29 Nov '11

commit 9ce5801e22790e4df702b4a56555404c75ac8058 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 27 18:11:50 2011 -0500 Make linelists always overridden by the command line This starts an effort to refactor torrc handling code to make it easier to live with. It makes it possible to override exit policies from the command line, and possible to override (rather than append to) socksport lists from the command line. It'll be necessary to make a "base" torrc implementation work at all. --- changes/config | 13 +++++++++++++ src/or/config.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- src/or/or.h | 12 ++++++++++++ 3 files changed, 69 insertions(+), 4 deletions(-) diff --git a/changes/config b/changes/config new file mode 100644 index 0000000..5e4039e --- /dev/null +++ b/changes/config @@ -0,0 +1,13 @@ + o Minor features + - Slightly change behavior of "list" options (that is, options that + can appear more than once) when they appear both in torrc and on + the command line. Previously, the command-line options would be + appended to the ones from torrc. Now, the command-line options + override the torrc options entirely. This new behavior allows + the user to override list options (like exit policies and + ports to listen on) from the command line, rather than simply + appending to the list. + + o Minor bugfixes: + - Restore behavior of overriding SocksPort, ORPort, and similar + options from the command line. Bugfix on 0.2.3.3-alpha. diff --git a/src/or/config.c b/src/or/config.c index c0ce404..f4cf3d0 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1783,7 +1783,7 @@ config_line_append(config_line_t **lst, { config_line_t *newline; - newline = tor_malloc(sizeof(config_line_t)); + newline = tor_malloc_zero(sizeof(config_line_t)); newline->key = tor_strdup(key); newline->value = tor_strdup(val); newline->next = NULL; @@ -1817,7 +1817,7 @@ config_get_lines(const char *string, config_line_t **result) /* This list can get long, so we keep a pointer to the end of it * rather than using config_line_append over and over and getting * n^2 performance. */ - *next = tor_malloc(sizeof(config_line_t)); + *next = tor_malloc_zero(sizeof(config_line_t)); (*next)->key = k; (*next)->value = v; (*next)->next = NULL; @@ -2048,7 +2048,19 @@ config_assign_value(const config_format_t *fmt, or_options_t *options, case CONFIG_TYPE_LINELIST: case CONFIG_TYPE_LINELIST_S: - config_line_append((config_line_t**)lvalue, c->key, c->value); + { + config_line_t *lastval = *(config_line_t**)lvalue; + if (lastval && lastval->fragile) { + if (c->command != CONFIG_LINE_APPEND) { + config_free_lines(lastval); + *(config_line_t**)lvalue = NULL; + } else { + lastval->fragile = 0; + } + } + + config_line_append((config_line_t**)lvalue, c->key, c->value); + } break; case CONFIG_TYPE_OBSOLETE: log_warn(LD_CONFIG, "Skipping obsolete configuration option '%s'", c->key); @@ -2064,6 +2076,28 @@ config_assign_value(const config_format_t *fmt, or_options_t *options, return 0; } +/** Mark every linelist in options "fragile", so that fresh assignments + * to it will replace old ones. */ +static void +config_mark_lists_fragile(const config_format_t *fmt, or_options_t *options) +{ + int i; + tor_assert(fmt); + tor_assert(options); + + for (i = 0; fmt->vars[i].name; ++i) { + const config_var_t *var = &fmt->vars[i]; + config_line_t *list; + if (var->type != CONFIG_TYPE_LINELIST && + var->type != CONFIG_TYPE_LINELIST_V) + continue; + + list = *(config_line_t **)STRUCT_VAR_P(options, var->var_offset); + if (list) + list->fragile = 1; + } +} + /** If c is a syntactically valid configuration line, update * options with its value and return 0. Otherwise return -1 for bad * key, -2 for bad value. @@ -2211,7 +2245,7 @@ config_lines_dup(const config_line_t *inp) config_line_t *result = NULL; config_line_t **next_out = &result; while (inp) { - *next_out = tor_malloc(sizeof(config_line_t)); + *next_out = tor_malloc_zero(sizeof(config_line_t)); (*next_out)->key = tor_strdup(inp->key); (*next_out)->value = tor_strdup(inp->value); inp = inp->next; @@ -2448,6 +2482,12 @@ config_assign(const config_format_t *fmt, void *options, config_line_t *list, list = list->next; } bitarray_free(options_seen); + + /** Now we're done assigning a group of options to the configuration. + * Subsequent group assignments should _replace_ linelists, not extend + * them. */ + config_mark_lists_fragile(fmt, options); + return 0; } diff --git a/src/or/or.h b/src/or/or.h index 546fe17..b3fd082 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2836,11 +2836,23 @@ typedef struct port_cfg_t { char unix_addr[FLEXIBLE_ARRAY_MEMBER]; } port_cfg_t; +/** Ordinary configuration line. */ +#define CONFIG_LINE_NORMAL 0 +/** Appends to previous configuration for the same option, even if we + * would ordinary replace it. */ +#define CONFIG_LINE_APPEND 1 + /** A linked list of lines in a config file. */ typedef struct config_line_t { char *key; char *value; struct config_line_t *next; + /** What special treatment (if any) does this line require? */ + unsigned int command:1; + /** If true, subsequent assignments to this linelist should replace + * it, not extend it. Set only on the first item in a linelist in an + * or_options_t. */ + unsigned int fragile:1; } config_line_t; typedef struct routerset_t routerset_t;

1 0

[tor/master] Add the ability to append and clear linelist options from cmdline
by nickm＠torproject.org 29 Nov '11

29 Nov '11

commit 73436a1d6fdbe411a0ee869ee570f4a1239cfa81 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 27 21:32:51 2011 -0500 Add the ability to append and clear linelist options from cmdline This will be important for getting stuff to work right across zones. --- changes/config | 6 ++++ src/or/config.c | 69 +++++++++++++++++++++++++++++++++++++++++------------ src/or/config.h | 2 +- src/or/control.c | 2 +- src/or/dirserv.c | 2 +- src/or/or.h | 4 ++- 6 files changed, 65 insertions(+), 20 deletions(-) diff --git a/changes/config b/changes/config index 5e4039e..08874eb 100644 --- a/changes/config +++ b/changes/config @@ -7,6 +7,12 @@ the user to override list options (like exit policies and ports to listen on) from the command line, rather than simply appending to the list. + - You can get the old (appending) command-line behavior for "list" + "list" options, by prefixing the option name with a "+". + - You can remove all the values for a "list" option from the command + line without adding any new ones by prefixing the option name + with a "/". + o Minor bugfixes: - Restore behavior of overriding SocksPort, ORPort, and similar diff --git a/src/or/config.c b/src/or/config.c index f4cf3d0..fa44793 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1728,6 +1728,9 @@ config_get_commandlines(int argc, char **argv, config_line_t **result) int i = 1; while (i < argc) { + unsigned command = CONFIG_LINE_NORMAL; + int want_arg = 1; + if (!strcmp(argv[i],"-f") || !strcmp(argv[i],"--hash-password")) { i += 2; /* command-line option with argument. ignore them. */ @@ -1745,13 +1748,6 @@ config_get_commandlines(int argc, char **argv, config_line_t **result) continue; } - if (i == argc-1) { - log_warn(LD_CONFIG,"Command-line option '%s' with no value. Failing.", - argv[i]); - config_free_lines(front); - return -1; - } - *new = tor_malloc_zero(sizeof(config_line_t)); s = argv[i]; @@ -1760,15 +1756,33 @@ config_get_commandlines(int argc, char **argv, config_line_t **result) s++; if (*s == '-') s++; + /* Figure out the command, if any. */ + if (*s == '+') { + s++; + command = CONFIG_LINE_APPEND; + } else if (*s == '/') { + s++; + command = CONFIG_LINE_CLEAR; + /* A 'clear' command has no argument. */ + want_arg = 0; + } + + if (want_arg && i == argc-1) { + log_warn(LD_CONFIG,"Command-line option '%s' with no value. Failing.", + argv[i]); + config_free_lines(front); + return -1; + } (*new)->key = tor_strdup(expand_abbrev(&options_format, s, 1, 1)); - (*new)->value = tor_strdup(argv[i+1]); + (*new)->value = want_arg ? tor_strdup(argv[i+1]) : tor_strdup(""); + (*new)->command = command; (*new)->next = NULL; log(LOG_DEBUG, LD_CONFIG, "command line: parsed keyword '%s', value '%s'", (*new)->key, (*new)->value); new = &((*new)->next); - i += 2; + i += want_arg ? 2 : 1; } *result = front; return 0; @@ -1796,9 +1810,12 @@ config_line_append(config_line_t **lst, /** Helper: parse the config string and strdup into key/value * strings. Set *result to the list, or NULL if parsing the string * failed. Return 0 on success, -1 on failure. Warn and ignore any - * misformatted lines. */ + * misformatted lines. + * + * If extended is set, then treat keys beginning with / and with + as + * indicating "clear" and "append" respectively. */ int -config_get_lines(const char *string, config_line_t **result) +config_get_lines(const char *string, config_line_t **result, int extended) { config_line_t *list = NULL, **next; char *k, *v; @@ -1814,6 +1831,22 @@ config_get_lines(const char *string, config_line_t **result) return -1; } if (k && v) { + unsigned command = CONFIG_LINE_NORMAL; + if (extended) { + if (k[0] == '+') { + char *k_new = tor_strdup(k+1); + tor_free(k); + k = k_new; + command = CONFIG_LINE_APPEND; + } else if (k[0] == '/') { + char *k_new = tor_strdup(k+1); + tor_free(k); + k = k_new; + tor_free(v); + v = tor_strdup(""); + command = CONFIG_LINE_CLEAR; + } + } /* This list can get long, so we keep a pointer to the end of it * rather than using config_line_append over and over and getting * n^2 performance. */ @@ -1821,6 +1854,7 @@ config_get_lines(const char *string, config_line_t **result) (*next)->key = k; (*next)->value = v; (*next)->next = NULL; + (*next)->command = command; next = &((*next)->next); } else { tor_free(k); @@ -2140,8 +2174,9 @@ config_assign_line(const config_format_t *fmt, or_options_t *options, if (!strlen(c->value)) { /* reset or clear it, then return */ if (!clear_first) { - if (var->type == CONFIG_TYPE_LINELIST || - var->type == CONFIG_TYPE_LINELIST_S) { + if ((var->type == CONFIG_TYPE_LINELIST || + var->type == CONFIG_TYPE_LINELIST_S) && + c->command != CONFIG_LINE_CLEAR) { /* We got an empty linelist from the torrc or command line. As a special case, call this an error. Warn and ignore. */ log_warn(LD_CONFIG, @@ -2151,6 +2186,8 @@ config_assign_line(const config_format_t *fmt, or_options_t *options, } } return 0; + } else if (c->command == CONFIG_LINE_CLEAR && !clear_first) { + option_reset(fmt, options, var, use_defaults); } if (options_seen && (var->type != CONFIG_TYPE_LINELIST && @@ -4454,7 +4491,7 @@ options_init_from_string(const char *cf, newoptions->command_arg = command_arg; /* get config lines, assign them */ - retval = config_get_lines(cf, &cl); + retval = config_get_lines(cf, &cl, 1); if (retval < 0) { err = SETOPT_ERR_PARSE; goto err; @@ -4505,7 +4542,7 @@ options_init_from_string(const char *cf, newoptions->command_arg = command_arg; /* Assign all options a second time. */ - retval = config_get_lines(cf, &cl); + retval = config_get_lines(cf, &cl, 1); if (retval < 0) { err = SETOPT_ERR_PARSE; goto err; @@ -6190,7 +6227,7 @@ or_state_load(void) if (contents) { config_line_t *lines=NULL; int assign_retval; - if (config_get_lines(contents, &lines)<0) + if (config_get_lines(contents, &lines, 0)<0) goto done; assign_retval = config_assign(&state_format, new_state, lines, 0, 0, &errmsg); diff --git a/src/or/config.h b/src/or/config.h index 1e4d567..73095de 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -23,7 +23,7 @@ const char *escaped_safe_str_client(const char *address); const char *escaped_safe_str(const char *address); const char *get_version(void); -int config_get_lines(const char *string, config_line_t **result); +int config_get_lines(const char *string, config_line_t **result, int extended); void config_free_lines(config_line_t *front); setopt_err_t options_trial_assign(config_line_t *list, int use_defaults, int clear_first, char **msg); diff --git a/src/or/control.c b/src/or/control.c index 109eb88..19904dd 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -737,7 +737,7 @@ control_setconf_helper(control_connection_t *conn, uint32_t len, char *body, SMARTLIST_FOREACH(entries, char *, cp, tor_free(cp)); smartlist_free(entries); - if (config_get_lines(config, &lines) < 0) { + if (config_get_lines(config, &lines, 0) < 0) { log_warn(LD_CONTROL,"Controller gave us config lines we can't parse."); connection_write_str_to_buf("551 Couldn't parse configuration\r\n", conn); diff --git a/src/or/dirserv.c b/src/or/dirserv.c index be62459..8fe1b18 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -232,7 +232,7 @@ dirserv_load_fingerprint_file(void) } tor_free(fname); - result = config_get_lines(cf, &front); + result = config_get_lines(cf, &front, 0); tor_free(cf); if (result < 0) { log_warn(LD_CONFIG, "Error reading from fingerprint file"); diff --git a/src/or/or.h b/src/or/or.h index b3fd082..c0963b0 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2841,6 +2841,8 @@ typedef struct port_cfg_t { /** Appends to previous configuration for the same option, even if we * would ordinary replace it. */ #define CONFIG_LINE_APPEND 1 +/* Removes all previous configuration for an option. */ +#define CONFIG_LINE_CLEAR 2 /** A linked list of lines in a config file. */ typedef struct config_line_t { @@ -2848,7 +2850,7 @@ typedef struct config_line_t { char *value; struct config_line_t *next; /** What special treatment (if any) does this line require? */ - unsigned int command:1; + unsigned int command:2; /** If true, subsequent assignments to this linelist should replace * it, not extend it. Set only on the first item in a linelist in an * or_options_t. */

1 0

[tor/master] Merge branch 'multilevel_cfg'
by nickm＠torproject.org 29 Nov '11

29 Nov '11

commit 9e25422eed03ad5fe8f54653fbc74668561f43a1 Merge: aba25a6 230422b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 29 17:38:19 2011 -0500 Merge branch 'multilevel_cfg' changes/config | 26 +++++ src/or/config.c | 315 ++++++++++++++++++++++++++++++++++++++---------------- src/or/config.h | 6 +- src/or/control.c | 8 +- src/or/dirserv.c | 2 +- src/or/or.h | 14 +++ 6 files changed, 272 insertions(+), 99 deletions(-)

1 0

[tor/master] Support for a defaults torrc file.
by nickm＠torproject.org 29 Nov '11

29 Nov '11

commit 230422b955e1708f27f42cdd25e8b21a33fdd3dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 27 22:25:52 2011 -0500 Support for a defaults torrc file. This will mainly help distributors by giving a way to set system or package defaults that a user can override, and that a later package can replace. No promises about the particular future location or semantics for this: we will probably want to tweak it some before 0.2.3.x-rc The file is searched for in CONFDIR/torrc-defaults , which can be overridden with the "--defaults-torrc" option on the command line. --- changes/config | 9 ++- src/or/config.c | 202 ++++++++++++++++++++++++++++++++++-------------------- src/or/config.h | 4 +- src/or/control.c | 6 +- 4 files changed, 142 insertions(+), 79 deletions(-) diff --git a/changes/config b/changes/config index 08874eb..3a1c7d1 100644 --- a/changes/config +++ b/changes/config @@ -12,7 +12,14 @@ - You can remove all the values for a "list" option from the command line without adding any new ones by prefixing the option name with a "/". - + - Add *experimental* support for a "defaults" torrc file to be parsed + before the regular torrc. Torrc options override the defaults file's + options in the same way that the command line overrides the torrc. + The SAVECONF controller command saves only those options which differ + between the current configuration and the defaults file. HUP reloads + both files. (Note: This is an experimental feature; its behavior will + probably be refined in future 0.2.3.x-alpha versions to better meet + packagers' needs.) o Minor bugfixes: - Restore behavior of overriding SocksPort, ORPort, and similar diff --git a/src/or/config.c b/src/or/config.c index fa44793..120c8ce 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -661,8 +661,12 @@ static const config_format_t state_format = { /** Command-line and config-file options. */ static or_options_t *global_options = NULL; +/** DOCDOC */ +static or_options_t *global_default_options = NULL; /** Name of most recently read torrc file. */ static char *torrc_fname = NULL; +/** DOCDOC */ +static char *torrc_defaults_fname; /** Persistent serialized state. */ static or_state_t *global_state = NULL; /** Configuration Options set by command line. */ @@ -806,6 +810,8 @@ config_free_all(void) { or_options_free(global_options); global_options = NULL; + or_options_free(global_default_options); + global_default_options = NULL; config_free(&state_format, global_state); global_state = NULL; @@ -821,6 +827,7 @@ config_free_all(void) } tor_free(torrc_fname); + tor_free(torrc_defaults_fname); tor_free(_version); tor_free(global_dirfrontpagecontents); } @@ -1732,6 +1739,7 @@ config_get_commandlines(int argc, char **argv, config_line_t **result) int want_arg = 1; if (!strcmp(argv[i],"-f") || + !strcmp(argv[i],"--defaults-torrc") || !strcmp(argv[i],"--hash-password")) { i += 2; /* command-line option with argument. ignore them. */ continue; @@ -3020,24 +3028,30 @@ config_init(const config_format_t *fmt, void *options) * Else, if comment_defaults, write default values as comments. */ static char * -config_dump(const config_format_t *fmt, const void *options, int minimal, +config_dump(const config_format_t *fmt, const void *default_options, + const void *options, int minimal, int comment_defaults) { smartlist_t *elements; - or_options_t *defaults; + const or_options_t *defaults = default_options; + void *defaults_tmp = NULL; config_line_t *line, *assigned; char *result; int i; char *msg = NULL; - defaults = config_alloc(fmt); - config_init(fmt, defaults); + if (defaults == NULL) { + defaults = defaults_tmp = config_alloc(fmt); + config_init(fmt, defaults_tmp); + } /* XXX use a 1 here so we don't add a new log line while dumping */ - if (fmt->validate_fn(NULL,defaults, 1, &msg) < 0) { - log_err(LD_BUG, "Failed to validate default config."); - tor_free(msg); - tor_assert(0); + if (default_options == NULL) { + if (fmt->validate_fn(NULL, defaults_tmp, 1, &msg) < 0) { + log_err(LD_BUG, "Failed to validate default config."); + tor_free(msg); + tor_assert(0); + } } elements = smartlist_create(); @@ -3079,7 +3093,8 @@ config_dump(const config_format_t *fmt, const void *options, int minimal, result = smartlist_join_strings(elements, "", 0, NULL); SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp)); smartlist_free(elements); - config_free(fmt, defaults); + if (defaults_tmp) + config_free(fmt, defaults_tmp); return result; } @@ -3090,7 +3105,8 @@ config_dump(const config_format_t *fmt, const void *options, int minimal, char * options_dump(const or_options_t *options, int minimal) { - return config_dump(&options_format, options, minimal, 0); + return config_dump(&options_format, global_default_options, + options, minimal, 0); } /** Return 0 if every element of sl is a string holding a decimal @@ -4244,17 +4260,25 @@ get_windows_conf_root(void) } #endif -/** Return the default location for our torrc file. */ +/** Return the default location for our torrc file. + * DOCDOC defaults_file */ static const char * -get_default_conf_file(void) +get_default_conf_file(int defaults_file) { #ifdef MS_WINDOWS - static char path[MAX_PATH+1]; - strlcpy(path, get_windows_conf_root(), MAX_PATH); - strlcat(path,"\\torrc",MAX_PATH); - return path; + if (defaults_file) { + static char defaults_path[MAX_PATH+1]; + tor_snprintf(defaults_path, MAX_PATH, "%s\\torrc-defaults", + get_windows_conf_root()); + return defaults_path; + } else { + static char path[MAX_PATH+1]; + tor_snprintf(path, MAX_PATH, "%s\\torrc", + get_windows_conf_root()); + return path; + } #else - return (CONFDIR "/torrc"); + return defaults_file ? CONFDIR "/torrc-defaults" : CONFDIR "/torrc"; #endif } @@ -4287,37 +4311,46 @@ check_nickname_list(const char *lst, const char *name, char **msg) return r; } -/** Learn config file name from command line arguments, or use the default */ +/** Learn config file name from command line arguments, or use the default, + * DOCDOC defaults_file */ static char * find_torrc_filename(int argc, char **argv, + int defaults_file, int *using_default_torrc, int *ignore_missing_torrc) { char *fname=NULL; int i; + const char *fname_opt = defaults_file ? "--defaults-torrc" : "-f"; + const char *ignore_opt = defaults_file ? NULL : "--ignore-missing-torrc"; + + if (defaults_file) + *ignore_missing_torrc = 1; for (i = 1; i < argc; ++i) { - if (i < argc-1 && !strcmp(argv[i],"-f")) { + if (i < argc-1 && !strcmp(argv[i],fname_opt)) { if (fname) { - log(LOG_WARN, LD_CONFIG, "Duplicate -f options on command line."); + log(LOG_WARN, LD_CONFIG, "Duplicate %s options on command line.", + fname_opt); tor_free(fname); } fname = expand_filename(argv[i+1]); *using_default_torrc = 0; ++i; - } else if (!strcmp(argv[i],"--ignore-missing-torrc")) { + } else if (ignore_opt && !strcmp(argv[i],ignore_opt)) { *ignore_missing_torrc = 1; } } if (*using_default_torrc) { /* didn't find one, try CONFDIR */ - const char *dflt = get_default_conf_file(); + const char *dflt = get_default_conf_file(defaults_file); if (dflt && file_status(dflt) == FN_FILE) { fname = tor_strdup(dflt); } else { #ifndef MS_WINDOWS - char *fn; - fn = expand_filename("~/.torrc"); + char *fn = NULL; + if (!defaults_file) + fn = expand_filename("~/.torrc"); if (fn && file_status(fn) == FN_FILE) { fname = fn; } else { @@ -4332,31 +4365,34 @@ find_torrc_filename(int argc, char **argv, return fname; } -/** Load torrc from disk, setting torrc_fname if successful */ +/** Load torrc from disk, setting torrc_fname if successful. + * DOCDOC defaults_file */ static char * -load_torrc_from_disk(int argc, char **argv) +load_torrc_from_disk(int argc, char **argv, int defaults_file) { char *fname=NULL; char *cf = NULL; int using_default_torrc = 1; int ignore_missing_torrc = 0; + char **fname_var = defaults_file ? &torrc_fname : &torrc_defaults_fname; - fname = find_torrc_filename(argc, argv, + fname = find_torrc_filename(argc, argv, defaults_file, &using_default_torrc, &ignore_missing_torrc); tor_assert(fname); log(LOG_DEBUG, LD_CONFIG, "Opening config file \"%s\"", fname); - tor_free(torrc_fname); - torrc_fname = fname; + tor_free(*fname_var); + *fname_var = fname; /* Open config file */ if (file_status(fname) != FN_FILE || !(cf = read_file_to_str(fname,0,NULL))) { - if (using_default_torrc == 1 || ignore_missing_torrc ) { - log(LOG_NOTICE, LD_CONFIG, "Configuration file \"%s\" not present, " - "using reasonable defaults.", fname); + if (using_default_torrc == 1 || ignore_missing_torrc) { + if (!defaults_file) + log(LOG_NOTICE, LD_CONFIG, "Configuration file \"%s\" not present, " + "using reasonable defaults.", fname); tor_free(fname); /* sets fname to NULL */ - torrc_fname = NULL; + *fname_var = NULL; cf = tor_strdup(""); } else { log(LOG_WARN, LD_CONFIG, @@ -4370,7 +4406,7 @@ load_torrc_from_disk(int argc, char **argv) return cf; err: tor_free(fname); - torrc_fname = NULL; + *fname_var = NULL; return NULL; } @@ -4381,7 +4417,7 @@ load_torrc_from_disk(int argc, char **argv) int options_init_from_torrc(int argc, char **argv) { - char *cf=NULL; + char *cf=NULL, *cf_defaults=NULL; int i, retval, command; static char **backup_argv; static int backup_argc; @@ -4441,13 +4477,15 @@ options_init_from_torrc(int argc, char **argv) if (command == CMD_HASH_PASSWORD) { cf = tor_strdup(""); } else { - cf = load_torrc_from_disk(argc, argv); + cf_defaults = load_torrc_from_disk(argc, argv, 1); + cf = load_torrc_from_disk(argc, argv, 0); if (!cf) goto err; } - retval = options_init_from_string(cf, command, command_arg, &errmsg); + retval = options_init_from_string(cf_defaults, cf, command, command_arg, &errmsg); tor_free(cf); + tor_free(cf_defaults); if (retval < 0) goto err; @@ -4471,13 +4509,13 @@ options_init_from_torrc(int argc, char **argv) * * -4 for error while setting the new options */ setopt_err_t -options_init_from_string(const char *cf, +options_init_from_string(const char *cf_defaults, const char *cf, int command, const char *command_arg, char **msg) { - or_options_t *oldoptions, *newoptions; + or_options_t *oldoptions, *newoptions, *newdefaultoptions=NULL; config_line_t *cl; - int retval; + int retval, i; setopt_err_t err = SETOPT_ERR_MISC; tor_assert(msg); @@ -4490,17 +4528,24 @@ options_init_from_string(const char *cf, newoptions->command = command; newoptions->command_arg = command_arg; - /* get config lines, assign them */ - retval = config_get_lines(cf, &cl, 1); - if (retval < 0) { - err = SETOPT_ERR_PARSE; - goto err; - } - retval = config_assign(&options_format, newoptions, cl, 0, 0, msg); - config_free_lines(cl); - if (retval < 0) { - err = SETOPT_ERR_PARSE; - goto err; + for (i = 0; i < 2; ++i) { + const char *body = i==0 ? cf_defaults : cf; + if (!body) + continue; + /* get config lines, assign them */ + retval = config_get_lines(body, &cl, 1); + if (retval < 0) { + err = SETOPT_ERR_PARSE; + goto err; + } + retval = config_assign(&options_format, newoptions, cl, 0, 0, msg); + config_free_lines(cl); + if (retval < 0) { + err = SETOPT_ERR_PARSE; + goto err; + } + if (i==0) + newdefaultoptions = options_dup(&options_format, newoptions); } /* Go through command-line variables too */ @@ -4535,6 +4580,8 @@ options_init_from_string(const char *cf, /* Clear newoptions and re-initialize them with new defaults. */ config_free(&options_format, newoptions); + config_free(&options_format, newdefaultoptions); + newdefaultoptions = NULL; newoptions = tor_malloc_zero(sizeof(or_options_t)); newoptions->_magic = OR_OPTIONS_MAGIC; options_init(newoptions); @@ -4542,22 +4589,24 @@ options_init_from_string(const char *cf, newoptions->command_arg = command_arg; /* Assign all options a second time. */ - retval = config_get_lines(cf, &cl, 1); - if (retval < 0) { - err = SETOPT_ERR_PARSE; - goto err; - } - retval = config_assign(&options_format, newoptions, cl, 0, 0, msg); - config_free_lines(cl); - if (retval < 0) { - err = SETOPT_ERR_PARSE; - goto err; - } - retval = config_assign(&options_format, newoptions, - global_cmdline_options, 0, 0, msg); - if (retval < 0) { - err = SETOPT_ERR_PARSE; - goto err; + for (i = 0; i < 2; ++i) { + const char *body = i==0 ? cf_defaults : cf; + if (!body) + continue; + /* get config lines, assign them */ + retval = config_get_lines(body, &cl, 1); + if (retval < 0) { + err = SETOPT_ERR_PARSE; + goto err; + } + retval = config_assign(&options_format, newoptions, cl, 0, 0, msg); + config_free_lines(cl); + if (retval < 0) { + err = SETOPT_ERR_PARSE; + goto err; + } + if (i==0) + newdefaultoptions = options_dup(&options_format, newoptions); } } @@ -4576,11 +4625,14 @@ options_init_from_string(const char *cf, err = SETOPT_ERR_SETTING; goto err; /* frees and replaces old options */ } + config_free(&options_format, global_default_options); + global_default_options = newdefaultoptions; return SETOPT_OK; err: config_free(&options_format, newoptions); + config_free(&options_format, newdefaultoptions); if (*msg) { char *old_msg = *msg; tor_asprintf(msg, "Failed to parse/validate config: %s", old_msg); @@ -4592,12 +4644,14 @@ options_init_from_string(const char *cf, /** Return the location for our configuration file. */ const char * -get_torrc_fname(void) +get_torrc_fname(int defaults_fname) { - if (torrc_fname) - return torrc_fname; + const char *fname = defaults_fname ? torrc_defaults_fname : torrc_fname; + + if (fname) + return fname; else - return get_default_conf_file(); + return get_default_conf_file(defaults_fname); } /** Adjust the address map based on the MapAddress elements in the @@ -5202,7 +5256,7 @@ parse_dir_server_line(const char *line, dirinfo_type_t required_type, * clause once Tor 0.1.2.17 is obsolete. */ log_warn(LD_CONFIG, "Dangerous dirserver line. To correct, erase your " "torrc file (%s), or reinstall Tor and use the default torrc.", - get_torrc_fname()); + get_torrc_fname(0)); goto err; } if (base16_decode(digest, DIGEST_LEN, fingerprint, HEX_DIGEST_LEN)<0) { @@ -5761,7 +5815,7 @@ options_save_current(void) * If we try falling back to datadirectory or something, we have a better * chance of saving the configuration, but a better chance of doing * something the user never expected. */ - return write_configuration_file(get_torrc_fname(), get_options()); + return write_configuration_file(get_torrc_fname(0), get_options()); } /** Mapping from a unit name to a multiplier for converting that unit into a @@ -6331,7 +6385,7 @@ or_state_save(time_t now) tor_free(global_state->TorVersion); tor_asprintf(&global_state->TorVersion, "Tor %s", get_version()); - state = config_dump(&state_format, global_state, 1, 0); + state = config_dump(&state_format, NULL, global_state, 1, 0); format_local_iso_time(tbuf, now); tor_asprintf(&contents, "# Tor state file last generated on %s local time\n" diff --git a/src/or/config.h b/src/or/config.h index 73095de..e1fc5cf 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -33,14 +33,14 @@ int is_local_addr(const tor_addr_t *addr); void options_init(or_options_t *options); char *options_dump(const or_options_t *options, int minimal); int options_init_from_torrc(int argc, char **argv); -setopt_err_t options_init_from_string(const char *cf, +setopt_err_t options_init_from_string(const char *cf_defaults, const char *cf, int command, const char *command_arg, char **msg); int option_is_recognized(const char *key); const char *option_get_canonical_name(const char *key); config_line_t *option_get_assignment(const or_options_t *options, const char *key); int options_save_current(void); -const char *get_torrc_fname(void); +const char *get_torrc_fname(int defaults_fname); char *options_get_datadir_fname2_suffix(const or_options_t *options, const char *sub1, const char *sub2, const char *suffix); diff --git a/src/or/control.c b/src/or/control.c index 19904dd..8d924b4 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -883,7 +883,7 @@ handle_control_loadconf(control_connection_t *conn, uint32_t len, const char *msg = NULL; (void) len; - retval = options_init_from_string(body, CMD_RUN_TOR, NULL, &errstring); + retval = options_init_from_string(NULL, body, CMD_RUN_TOR, NULL, &errstring); if (retval != SETOPT_OK) log_warn(LD_CONTROL, @@ -1378,7 +1378,9 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, if (!strcmp(question, "version")) { *answer = tor_strdup(get_version()); } else if (!strcmp(question, "config-file")) { - *answer = tor_strdup(get_torrc_fname()); + *answer = tor_strdup(get_torrc_fname(0)); + } else if (!strcmp(question, "config-defaults-file")) { + *answer = tor_strdup(get_torrc_fname(1)); } else if (!strcmp(question, "config-text")) { *answer = options_dump(get_options(), 1); } else if (!strcmp(question, "info/names")) {

1 0

[tor/master] Make pending libevent actions cancelable
by nickm＠torproject.org 29 Nov '11

29 Nov '11

commit aba25a6939a5907d40dbcff7433a8c130ffd12ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 29 17:06:09 2011 -0500 Make pending libevent actions cancelable This avoids a dangling pointer issue in the 3412 code, and should fix bug 4599. --- src/common/compat_libevent.c | 24 +++++++++++++++++------- src/common/compat_libevent.h | 8 +++++--- src/common/tortls.c | 13 +++---------- src/or/connection_or.c | 25 +++++++++++++++++++++---- src/or/or.h | 2 ++ 5 files changed, 48 insertions(+), 24 deletions(-) diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 3a754be..67f4659 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -558,17 +558,17 @@ tor_check_libevent_header_compatibility(void) #endif } -typedef struct runnable_t { +struct tor_libevent_action_t { struct event *ev; void (*cb)(void *arg); void *arg; -} runnable_t; +}; /** Callback for tor_run_in_libevent_loop */ static void run_runnable_cb(evutil_socket_t s, short what, void *arg) { - runnable_t *r = arg; + tor_libevent_action_t *r = arg; void (*cb)(void *) = r->cb; void *cb_arg = r->arg; (void)what; @@ -584,22 +584,32 @@ run_runnable_cb(evutil_socket_t s, short what, void *arg) * deep inside a no-reentrant code and there's some function you want to call * without worrying about whether it might cause reeentrant invocation. */ -int +tor_libevent_action_t * tor_run_in_libevent_loop(void (*cb)(void *arg), void *arg) { - runnable_t *r = tor_malloc(sizeof(runnable_t)); + tor_libevent_action_t *r = tor_malloc(sizeof(tor_libevent_action_t)); r->cb = cb; r->arg = arg; r->ev = tor_event_new(tor_libevent_get_base(), -1, EV_TIMEOUT, run_runnable_cb, r); if (!r->ev) { tor_free(r); - return -1; + return NULL; } /* Make the event active immediately. */ event_active(r->ev, EV_TIMEOUT, 1); - return 0; + return r; +} + +/** + * Cancel action without running it. + */ +void +tor_cancel_libevent_action(tor_libevent_action_t *action) +{ + tor_event_free(action->ev); + tor_free(action); } /* diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index 3f916d1..4076cc0 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -44,10 +44,12 @@ void tor_event_free(struct event *ev); #define tor_evdns_add_server_port evdns_add_server_port #endif -typedef struct periodic_timer_t periodic_timer_t; - -int tor_run_in_libevent_loop(void (*cb)(void *arg), void *arg); +typedef struct tor_libevent_action_t tor_libevent_action_t; +tor_libevent_action_t *tor_run_in_libevent_loop(void (*cb)(void *arg), + void *arg); +void tor_cancel_libevent_action(tor_libevent_action_t *action); +typedef struct periodic_timer_t periodic_timer_t; periodic_timer_t *periodic_timer_new(struct event_base *base, const struct timeval *tv, void (*cb)(periodic_timer_t *timer, void *data), diff --git a/src/common/tortls.c b/src/common/tortls.c index b4d81de..a6947c8 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1339,16 +1339,9 @@ tor_tls_got_client_hello(tor_tls_t *tls) tls->excess_renegotiations_callback) { /* We got more than one renegotiation requests. The Tor protocol needs just one renegotiation; more than that probably means - They are trying to DoS us and we have to stop them. We can't - close their connection from in here since it's an OpenSSL - callback, so we set a libevent timer that triggers in the next - event loop and closes the connection. */ - - if (tor_run_in_libevent_loop(tls->excess_renegotiations_callback, - tls->callback_arg) < 0) { - log_warn(LD_GENERAL, "Didn't manage to set a renegotiation " - "limiting callback."); - } + They are trying to DoS us and we have to stop them. */ + + tls->excess_renegotiations_callback(tls->callback_arg); } /* Now check the cipher list. */ diff --git a/src/or/connection_or.c b/src/or/connection_or.c index e868b7b..246b08a 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -492,6 +492,9 @@ connection_or_about_to_close(or_connection_t *or_conn) time_t now = time(NULL); connection_t *conn = TO_CONN(or_conn); + if (or_conn->pending_action) + tor_cancel_libevent_action(or_conn->pending_action); + /* Remember why we're closing this connection. */ if (conn->state != OR_CONN_STATE_OPEN) { /* Inform any pending (not attached) circs that they should @@ -1153,20 +1156,34 @@ connection_or_tls_renegotiated_cb(tor_tls_t *tls, void *_conn) } } -/** Invoked on the server side using a timer from inside - * tor_tls_got_client_hello() when the server receives excess - * renegotiation attempts; probably indicating a DoS. */ +/*DOCDOC*/ static void -connection_or_close_connection_cb(void *_conn) +close_connection_libevent_cb(void *_conn) { or_connection_t *or_conn = _conn; connection_t *conn = TO_CONN(or_conn); + or_conn->pending_action = NULL; + connection_stop_reading(conn); if (!conn->marked_for_close) connection_mark_for_close(conn); } +/* DOCDOC */ +static void +connection_or_close_connection_cb(void *_conn) +{ + /* We can't close their connection from in here since it's an OpenSSL + callback, so we set a libevent event that triggers in the next event + loop and closes the connection. */ + or_connection_t *or_conn = _conn; + if (or_conn->_base.marked_for_close || or_conn->pending_action) + return; + or_conn->pending_action = + tor_run_in_libevent_loop(close_connection_libevent_cb, or_conn); +} + /** Move forward with the tls handshake. If it finishes, hand * conn to connection_tls_finish_handshake(). * diff --git a/src/or/or.h b/src/or/or.h index 546fe17..185d20d 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1272,6 +1272,8 @@ typedef struct or_connection_t { unsigned active_circuit_pqueue_last_recalibrated; struct or_connection_t *next_with_same_id; /**< Next connection with same * identity digest as this one. */ + + tor_libevent_action_t *pending_action; } or_connection_t; /** Subtype of connection_t for an "edge connection" -- that is, an entry (ap)

1 0

[stem/master] Function and testing for password authentication
by atagar＠torproject.org 29 Nov '11

29 Nov '11

commit 7f760f86414ee0bfbd050480e1753555c66e9a5b Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Nov 29 10:02:24 2011 -0800 Function and testing for password authentication Adding a function for password authentication. This included escaping quotes but otherwise is trivial - most of the effort was refactoring the authentication integ tests. --- stem/connection.py | 30 +++++++ test/integ/connection/authentication.py | 130 +++++++++++++++++++++++++++---- 2 files changed, 145 insertions(+), 15 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index bef8d50..3ea5747 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -62,6 +62,36 @@ def authenticate_none(control_socket): if str(auth_response) != "OK": raise ValueError(str(auth_response)) +def authenticate_password(control_socket, password): + """ + Authenticates to a control socket that uses a password (via the + HashedControlPassword torrc option). Quotes in the password are escaped. + + If authentication fails then tor will close the control socket. + + Arguments: + control_socket (stem.socket.ControlSocket) - socket to be authenticated + password (str) - passphrase to present to the socket + + Raises: + ValueError if the authentication credentials aren't accepted + stem.socket.ProtocolError the content from the socket is malformed + stem.socket.SocketError if problems arise in using the socket + """ + + # Escapes quotes. Tor can include those in the password hash, in which case + # it expects escaped quotes from the controller. For more information see... + # https://trac.torproject.org/projects/tor/ticket/4600 + + password = password.replace('"', '\\"') + + control_socket.send("AUTHENTICATE \"%s\"" % password) + auth_response = control_socket.recv() + + # if we got anything but an OK response then error + if str(auth_response) != "OK": + raise ValueError(str(auth_response)) + def get_protocolinfo_by_port(control_addr = "127.0.0.1", control_port = 9051, get_socket = False): """ Issues a PROTOCOLINFO query to a control port, getting information about the diff --git a/test/integ/connection/authentication.py b/test/integ/connection/authentication.py index 4ba0bfa..c3759e6 100644 --- a/test/integ/connection/authentication.py +++ b/test/integ/connection/authentication.py @@ -4,6 +4,7 @@ stem.connection.authenticate_* functions. """ import unittest +import functools import test.runner import stem.connection @@ -15,6 +16,9 @@ COOKIE_AUTH_FAIL = "Authentication failed: Wrong length on authentication cookie PASSWORD_AUTH_FAIL = "Authentication failed: Password did not match HashedControlPassword value from configuration. Maybe you tried a plain text password? If so, the standard requires that you put it in double quotes." MULTIPLE_AUTH_FAIL = "Authentication failed: Password did not match HashedControlPassword *or* authentication cookie." +# this only arises in password-only auth when we authenticate by password +INCORRECT_PASSWORD_FAIL = "Authentication failed: Password did not match HashedControlPassword value from configuration" + class TestAuthenticate(unittest.TestCase): """ Tests the authentication methods. This should be run with the 'CONN_ALL' @@ -32,31 +36,127 @@ class TestAuthenticate(unittest.TestCase): if connection_type == test.runner.TorConnection.NONE: self.skipTest("(no connection)") - # If the connection has authentication then this will fail with a message - # based on the authentication type. If not then this will succeed. + expect_success = self._is_authenticateable(stem.connection.AuthMethod.NONE) + self._check_auth(stem.connection.AuthMethod.NONE, None, expect_success) + + def test_authenticate_password(self): + """ + Tests the authenticate_password function. + """ + + runner = test.runner.get_runner() + connection_type = runner.get_connection_type() + + if connection_type == test.runner.TorConnection.NONE: + self.skipTest("(no connection)") + + expect_success = self._is_authenticateable(stem.connection.AuthMethod.PASSWORD) + self._check_auth(stem.connection.AuthMethod.PASSWORD, test.runner.CONTROL_PASSWORD, expect_success) + + # Check with an empty, invalid, and quoted password. These should work if + # we have no authentication, and fail otherwise. + + expect_success = self._is_authenticateable(stem.connection.AuthMethod.NONE) + self._check_auth(stem.connection.AuthMethod.PASSWORD, "", expect_success) + self._check_auth(stem.connection.AuthMethod.PASSWORD, "blarg", expect_success) + self._check_auth(stem.connection.AuthMethod.PASSWORD, "this has a \" in it", expect_success) + + def _get_socket_auth(self): + """ + Provides the types of authentication that our current test socket accepts. - control_socket = test.runner.get_runner().get_tor_socket(False) + Returns: + bool tuple of the form (password_auth, cookie_auth) + """ + connection_type = test.runner.get_runner().get_connection_type() connection_options = test.runner.CONNECTION_OPTS[connection_type] - cookie_auth = test.runner.OPT_COOKIE in connection_options password_auth = test.runner.OPT_PASSWORD in connection_options + cookie_auth = test.runner.OPT_COOKIE in connection_options - if cookie_auth or password_auth: - if cookie_auth and password_auth: failure_msg = MULTIPLE_AUTH_FAIL - elif cookie_auth: failure_msg = COOKIE_AUTH_FAIL - else: failure_msg = PASSWORD_AUTH_FAIL - - try: - stem.connection.authenticate_none(control_socket) - self.fail() - except ValueError, exc: - self.assertEqual(failure_msg, str(exc)) + return password_auth, cookie_auth + + def _is_authenticateable(self, auth_type): + """ + Checks if the given authentication type should be able to authenticate to + our current socket. + + Arguments: + auth_type (stem.connection.AuthMethod) - authentication method to check + + Returns: + bool that's True if we should be able to authenticate and False otherwise + """ + + password_auth, cookie_auth = self._get_socket_auth() + + # If the control socket is open then all authentication methods will be + # accepted. Otherwise check if our auth type matches what the socket + # accepts. + + if not password_auth and not cookie_auth: return True + elif auth_type == stem.connection.AuthMethod.PASSWORD: return password_auth + elif auth_type == stem.connection.AuthMethod.COOKIE: return cookie_auth + else: return False + + def _check_auth(self, auth_type, auth_value, expect_success): + """ + Attempts to use the given authentication function against our connection. + If this works then checks that we can use the connection. If not then we + check that the error message is what we'd expect. + + Arguments: + auth_type (stem.connection.AuthMethod) - method by which we should + authentiate to the control socket + auth_value (str) - value to be provided to the authentication function + expect_success (bool) - true if the authentication should succeed, false + otherwise + """ + + runner = test.runner.get_runner() + control_socket = runner.get_tor_socket(False) + password_auth, cookie_auth = self._get_socket_auth() + + # construct the function call + + if auth_type == stem.connection.AuthMethod.NONE: + auth_function = stem.connection.authenticate_none + elif auth_type == stem.connection.AuthMethod.PASSWORD: + auth_function = stem.connection.authenticate_password + elif auth_type == stem.connection.AuthMethod.COOKIE: + auth_function = None # TODO: fill in + else: + raise ValueError("unexpected auth type: %s" % auth_type) + + if auth_value != None: + auth_function = functools.partial(auth_function, control_socket, auth_value) else: - stem.connection.authenticate_none(control_socket) + auth_function = functools.partial(auth_function, control_socket) + + if expect_success: + auth_function() # issues a 'GETINFO config-file' query to confirm that we can use the socket control_socket.send("GETINFO config-file") config_file_response = control_socket.recv() self.assertEquals("config-file=%s\nOK" % runner.get_torrc_path(), str(config_file_response)) + control_socket.close() + else: + if cookie_auth and password_auth: failure_msg = MULTIPLE_AUTH_FAIL + elif cookie_auth: failure_msg = COOKIE_AUTH_FAIL + else: + # if we're attempting to authenticate with a password then it's a + # truncated message + + if auth_type == stem.connection.AuthMethod.PASSWORD: + failure_msg = INCORRECT_PASSWORD_FAIL + else: + failure_msg = PASSWORD_AUTH_FAIL + + try: + auth_function() + self.fail() + except ValueError, exc: + self.assertEqual(failure_msg, str(exc))

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 29 Nov '11

29 Nov '11

commit b6d7fbf415e301821c673e841f8a8d8c1a4938ab Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 29 12:45:22 2011 +0000 Update translations for vidalia_help --- zh_CN/bridges.po | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/zh_CN/bridges.po b/zh_CN/bridges.po index 172f14c..ac11b62 100644 --- a/zh_CN/bridges.po +++ b/zh_CN/bridges.po @@ -2,13 +2,14 @@ # Translators: # runasand <runa.sandvik(a)gmail.com>, 2011. # snakeyi <snakeyi0624(a)gmail.com>, 2011. +# <szescxz(a)126.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2011-03-22 16:41+0000\n" -"Last-Translator: snakeyi <snakeyi0624(a)gmail.com>\n" +"PO-Revision-Date: 2011-11-29 12:32+0000\n" +"Last-Translator: szescxz <szescxz(a)126.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,6 +44,7 @@ msgid "" "to all the known Tor relays, they probably won't be able to block all the " "bridges." msgstr "" +"一些互联网服务提供商（ISP）会封锁用户访问已知的Tor中继以阻止用户连接到Tor网络。网桥中继（或简称为网桥）是帮助这些被封锁的用户连接到Tor网络的中继。不像其他Tor中继，网桥不会在普通的网桥的公共目录当中。虽然没有这些网桥的完整的公共目录，即使您的ISP过滤了到所有已知的Tor中继的连接，他们当然也不可能封锁所有网桥。" #. type: Content of: <html><body> #: en/bridges.html:31 @@ -57,12 +59,12 @@ msgstr "我怎么找到一个网桥中继" #. type: Content of: <html><body> #: en/bridges.html:34 msgid "There are two main ways to learn about a bridge address:" -msgstr "" +msgstr "这里有两个主要的获取网桥地址的办法：" #. type: Content of: <html><body><ol><li> #: en/bridges.html:36 msgid "Get some friends to run private bridges for you" -msgstr "" +msgstr "让一些朋友为您提供私人网桥" #. type: Content of: <html><body><ol><li> #: en/bridges.html:37 @@ -80,6 +82,8 @@ msgid "" "just passes data to and from the Tor network, so it shouldn't expose the " "operator to any abuse complaints." msgstr "" +"要使用私人网桥，让您的朋友在一个没有封锁的的互联网区域运行Vidalia和Tor，然后点击<a " +"href=\"server.html\">中继设置页面</a>中的帮助被封锁的用户。之后他们应私下把他们在中继页面底部的网桥地址发送给您。跟运行回路中继不同，运行一个网桥中继只是与Tor网络收发数据，所以它不会遭到任何运营商的投诉。" #. type: Content of: <html><body> #: en/bridges.html:52

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 29 Nov '11

29 Nov '11

commit 786880e2ace6be7f10801391f41551decfd81d37 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 29 12:15:26 2011 +0000 Update translations for vidalia --- zh_CN/vidalia_zh_CN.po | 100 ++++++++++++++++++++++++----------------------- 1 files changed, 51 insertions(+), 49 deletions(-) diff --git a/zh_CN/vidalia_zh_CN.po b/zh_CN/vidalia_zh_CN.po index 7aa1a3d..51c5652 100644 --- a/zh_CN/vidalia_zh_CN.po +++ b/zh_CN/vidalia_zh_CN.po @@ -7,7 +7,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-11-29 11:44+0000\n" +"PO-Revision-Date: 2011-11-29 11:58+0000\n" "Last-Translator: szescxz <szescxz(a)126.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -140,15 +140,15 @@ msgstr "选择储存Tor软件数据的文件夹" msgctxt "AdvancedPage" msgid "Tor Control" -msgstr "" +msgstr "Tor控制" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" -msgstr "" +msgstr "使用TCP连接（控制端口）" msgctxt "AdvancedPage" msgid "Path:" -msgstr "" +msgstr "路径：" msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" @@ -156,11 +156,11 @@ msgstr "" msgctxt "AdvancedPage" msgid "Edit current torrc" -msgstr "" +msgstr "编辑当前torrc" msgctxt "AdvancedPage" msgid "NOTE: this will edit the currently loaded torrc" -msgstr "" +msgstr "注意：这将会编辑当前已加载的torrc" msgctxt "AdvancedPage" msgid "ControlSocket path doesn't exist." @@ -180,15 +180,15 @@ msgstr "" msgctxt "AdvancedPage" msgid "Warning" -msgstr "" +msgstr "警告" msgctxt "AdvancedPage" msgid "You changed torrc path, would you like to restart Tor?" -msgstr "" +msgstr "您更改了torrc的路径，您想要重启Tor吗？" msgctxt "AdvancedPage" msgid "Tor Configuration File (torrc);;All Files (*)" -msgstr "" +msgstr "Tor配置文件 (torrc);;所有文件 (*)" msgctxt "AdvancedPage" msgid "Select a file to use for Tor socket path" @@ -196,7 +196,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" -msgstr "" +msgstr "自动配置控制端口" msgctxt "AdvancedPage" msgid "" @@ -1164,7 +1164,7 @@ msgstr "津巴布韦" msgctxt "CountryInfo" msgid "Zaire" -msgstr "" +msgstr "扎伊尔" msgctxt "CountryInfo" msgid "Albania" @@ -1264,29 +1264,29 @@ msgstr "台湾" msgctxt "CrashReportDialog" msgid "Submit a Crash Report" -msgstr "" +msgstr "提交崩溃报告" msgctxt "CrashReportDialog" msgid "Vidalia encountered an error and needed to close" -msgstr "" +msgstr "Vidalia遇到了一个错误，需要关闭" msgctxt "CrashReportDialog" msgid "Restart Vidalia" -msgstr "" +msgstr "重启Vidalia" msgctxt "CrashReportDialog" msgid "Don't Restart" -msgstr "" +msgstr "不重启" msgctxt "CrashReportDialog" msgid "Unable to restart Vidalia" -msgstr "" +msgstr "无法重启Vidalia" msgctxt "CrashReportDialog" msgid "" "We were unable to automatically restart Vidalia. Please restart Vidalia " "manually." -msgstr "" +msgstr "无法自动重启Vidalia。请手动重启Vidalia。" msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" @@ -1297,13 +1297,15 @@ msgid "" "<a " "href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" msgstr "" +"<a " +"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" msgctxt "CrashReportDialog" msgid "" "A crash report has been created that you can send to the Vidalia developers " "to help identify and fix the problem. The submitted report does not contain " "any personally identifying information." -msgstr "" +msgstr "一个错误报告已建立。您可以把它发送给Vidalia的开发者以帮助识别并修正问题。提交的报告不包含任何个人身份信息。" msgctxt "CrashReportDialog" msgid "" @@ -1586,27 +1588,27 @@ msgstr "未知" msgctxt "LogTreeItem" msgid "Debug" -msgstr "" +msgstr "调试" msgctxt "LogTreeItem" msgid "Info" -msgstr "" +msgstr "信息" msgctxt "LogTreeItem" msgid "Notice" -msgstr "" +msgstr "注意" msgctxt "LogTreeItem" msgid "Warning" -msgstr "" +msgstr "警告" msgctxt "LogTreeItem" msgid "Error" -msgstr "" +msgstr "错误" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "" +msgstr "未知" msgctxt "MainWindow" msgid "Start Tor" @@ -2371,15 +2373,15 @@ msgstr "自动保存新的消息内容至文件" msgctxt "MessageLog" msgid "Basic" -msgstr "" +msgstr "基本法" msgctxt "MessageLog" msgid "Tor Status" -msgstr "" +msgstr "Tor状态" msgctxt "MessageLog" msgid "Advanced" -msgstr "" +msgstr "高级" msgctxt "MessageLog" msgid "Always Save New Log Messages" @@ -2655,31 +2657,31 @@ msgstr "单击帮助查看获取新网桥的其他渠道。" msgctxt "NetworkPage" msgid "Address:" -msgstr "" +msgstr "地址：" msgctxt "NetworkPage" msgid "Type:" -msgstr "" +msgstr "类型：" msgctxt "NetworkPage" msgid "You must select the proxy type." -msgstr "" +msgstr "您必须选择代理类型。" msgctxt "NetworkPage" msgid "SOCKS 4" -msgstr "" +msgstr "SOCKS 4" msgctxt "NetworkPage" msgid "SOCKS 5" -msgstr "" +msgstr "SOCKS 5" msgctxt "NetworkPage" msgid "HTTP" -msgstr "" +msgstr "HTTP" msgctxt "NetworkPage" msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" msgctxt "Policy" msgid "accept" @@ -3101,7 +3103,7 @@ msgstr "<a href=\"#bridgeUsage\">谁曾使用过我的网桥?</a>" msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" -msgstr "" +msgstr "<a href=\"#bridgeHelp\">这是什么？</a>" msgctxt "ServerPage" msgid "Automatically distribute my bridge address" @@ -3203,19 +3205,19 @@ msgstr "由Tor创建" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" -msgstr "" +msgstr "复制到剪贴板" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" -msgstr "" +msgstr "Tor软件正在运行" msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." -msgstr "" +msgstr "您当前正在运行版本为 %1 的Tor。" msgctxt "StatusEventWidget" msgid "The Tor Software is not Running" -msgstr "" +msgstr "Tor未运行" msgctxt "StatusEventWidget" msgid "" @@ -3242,11 +3244,11 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" -msgstr "" +msgstr "您的Tor已过时" msgctxt "StatusEventWidget" msgid "Connected to the Tor Network" -msgstr "" +msgstr "已连接到Tor网络" msgctxt "StatusEventWidget" msgid "" @@ -3256,7 +3258,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Tor Software Error" -msgstr "" +msgstr "Tor软件错误" msgctxt "StatusEventWidget" msgid "" @@ -3371,7 +3373,7 @@ msgid "" "Tor is trying to determine if your relay's server port is reachable from the" " Tor network by connecting to itself at %1:%2. This test could take several " "minutes." -msgstr "" +msgstr "Tor正在尝试确定Tor网络可以连接到您的服务器端口 %1:%2。这可能需要几分钟。" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Successful!" @@ -3379,7 +3381,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your relay's server port is reachable from the Tor network!" -msgstr "" +msgstr "Tor网络可以连接到您的中继服务器的端口！" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Failed" @@ -3436,7 +3438,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Relay is Online" -msgstr "" +msgstr "您的中继已在线" msgctxt "StatusEventWidget" msgid "" @@ -3542,11 +3544,11 @@ msgstr "" msgctxt "TorrcDialog" msgid "Error connecting to Tor" -msgstr "" +msgstr "与Tor连接发生错误" msgctxt "TorrcDialog" msgid "Selection is empty. Please select some text, or check \"Apply all\"" -msgstr "" +msgstr "您没有选择任何文本。请选择一些文本，或勾选“全部应用”" msgctxt "TorrcDialog" msgid "Error at line %1: \"%2\"" @@ -3554,11 +3556,11 @@ msgstr "" msgctxt "TorrcDialog" msgid "Error" -msgstr "" +msgstr "错误" msgctxt "TorrcDialog" msgid "An error ocurred while opening torrc file" -msgstr "" +msgstr "打开torrc文件时发生错误" msgctxt "UPNPControl" msgid "Success"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 29 Nov '11

29 Nov '11

commit b837439d9e25bc35ee8f17dea885893b5f800d4b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 29 11:45:21 2011 +0000 Update translations for vidalia --- zh_CN/vidalia_zh_CN.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/zh_CN/vidalia_zh_CN.po b/zh_CN/vidalia_zh_CN.po index 9d5d996..7aa1a3d 100644 --- a/zh_CN/vidalia_zh_CN.po +++ b/zh_CN/vidalia_zh_CN.po @@ -1,13 +1,14 @@ # # Translators: # runasand <runa.sandvik(a)gmail.com>, 2011. +# <szescxz(a)126.com>, 2011. msgid "" 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-08 00:46+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2011-11-29 11:44+0000\n" +"Last-Translator: szescxz <szescxz(a)126.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2636,7 +2637,7 @@ msgstr "立刻搜索网桥" msgctxt "NetworkPage" msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>" -msgstr "<a href=\"bridges.finding\">如果通过其他方式获取网桥?</a>" +msgstr "<a href=\"bridges.finding\">如何通过其他方式获取网桥?</a>" msgctxt "NetworkPage" msgid "<a href=\"bridges.finding\">How can I find bridges?</a>" @@ -3341,7 +3342,7 @@ msgid "" "Tor has determined your relay's public IP address is currently %1%2. If that" " is not correct, please consider setting the 'Address' option in your " "relay's configuration." -msgstr "" +msgstr "Tor已确定您的中继的当前公共IP地址是 %1%2。如果这不正确，请尝试设置中继配置中的地址选项。" msgctxt "StatusEventWidget" msgid "DNS Hijacking Detected"

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
99
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2011