This is an automated email from the git hooks/post-receive script.
dgoulet pushed a change to branch main in repository tor.
from 970a534f03 test: Fix parseconf to account for ClientUseIPv6 change for dirauth disabled new 5118a8003b Log state transitions for Pluggable Transports new 0d51dfa605 Log name of managed proxy in exit handler. new 3338b34ec9 Only terminate PT processes that are running. new 58f0e548ff Log at LD_PT instead of LD_GENERAL for PT process stdout lines. new 506781d41e Restart PT processes when they die on us. new 5f432bff31 Add missing changes file for tor#33669. new a1042f4873 Merge branch 'tor-gitlab/mr/443'
The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Summary of changes: changes/ticket33669 | 3 ++ src/feature/client/transports.c | 99 ++++++++++++++++++++++++++++++++++------- src/feature/client/transports.h | 2 + 3 files changed, 88 insertions(+), 16 deletions(-) create mode 100644 changes/ticket33669
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 5118a8003b2679d30c7a3cc7207d50af985b9434 Author: Alexander Færøy ahf@torproject.org AuthorDate: Fri Sep 24 14:43:24 2021 +0200
Log state transitions for Pluggable Transports
This patch makes Tor log state transitions within the PT layer at the info log-level. This should make it easier to figure out if Tor ends up in a strange state.
See: tpo/core/tor#33669 --- src/feature/client/transports.c | 66 ++++++++++++++++++++++++++++++++++------- src/feature/client/transports.h | 2 ++ 2 files changed, 58 insertions(+), 10 deletions(-)
diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index 167beb96c6..c5d7df479d 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -541,7 +541,7 @@ proxy_prepare_for_restart(managed_proxy_t *mp) mp->proxy_supported = 0;
/* flag it as an infant proxy so that it gets launched on next tick */ - mp->conf_state = PT_PROTO_INFANT; + managed_proxy_set_state(mp, PT_PROTO_INFANT); unconfigured_proxies_n++; }
@@ -578,7 +578,7 @@ launch_managed_proxy(managed_proxy_t *mp) log_info(LD_CONFIG, "Managed proxy at '%s' has spawned with PID '%" PRIu64 "'.", mp->argv[0], process_get_pid(mp->process)); - mp->conf_state = PT_PROTO_LAUNCHED; + managed_proxy_set_state(mp, PT_PROTO_LAUNCHED);
return 0; } @@ -648,7 +648,7 @@ configure_proxy(managed_proxy_t *mp) /* if we haven't launched the proxy yet, do it now */ if (mp->conf_state == PT_PROTO_INFANT) { if (launch_managed_proxy(mp) < 0) { /* launch fail */ - mp->conf_state = PT_PROTO_FAILED_LAUNCH; + managed_proxy_set_state(mp, PT_PROTO_FAILED_LAUNCH); handle_finished_proxy(mp); } return 0; @@ -810,8 +810,12 @@ handle_finished_proxy(managed_proxy_t *mp) managed_proxy_destroy(mp, 1); /* annihilate it. */ break; } - register_proxy(mp); /* register its transports */ - mp->conf_state = PT_PROTO_COMPLETED; /* and mark it as completed. */ + + /* register its transports */ + register_proxy(mp); + + /* and mark it as completed. */ + managed_proxy_set_state(mp, PT_PROTO_COMPLETED); break; case PT_PROTO_INFANT: case PT_PROTO_LAUNCHED: @@ -881,7 +885,7 @@ handle_proxy_line(const char *line, managed_proxy_t *mp) goto err;
tor_assert(mp->conf_protocol != 0); - mp->conf_state = PT_PROTO_ACCEPTING_METHODS; + managed_proxy_set_state(mp, PT_PROTO_ACCEPTING_METHODS); return; } else if (!strcmpstart(line, PROTO_CMETHODS_DONE)) { if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) @@ -889,7 +893,7 @@ handle_proxy_line(const char *line, managed_proxy_t *mp)
handle_methods_done(mp);
- mp->conf_state = PT_PROTO_CONFIGURED; + managed_proxy_set_state(mp, PT_PROTO_CONFIGURED); return; } else if (!strcmpstart(line, PROTO_SMETHODS_DONE)) { if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) @@ -897,7 +901,7 @@ handle_proxy_line(const char *line, managed_proxy_t *mp)
handle_methods_done(mp);
- mp->conf_state = PT_PROTO_CONFIGURED; + managed_proxy_set_state(mp, PT_PROTO_CONFIGURED); return; } else if (!strcmpstart(line, PROTO_CMETHOD_ERROR)) { if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) @@ -960,7 +964,7 @@ handle_proxy_line(const char *line, managed_proxy_t *mp) return;
err: - mp->conf_state = PT_PROTO_BROKEN; + managed_proxy_set_state(mp, PT_PROTO_BROKEN); log_warn(LD_CONFIG, "Managed proxy at '%s' failed the configuration protocol" " and will be destroyed.", mp->argv[0]); } @@ -1521,7 +1525,7 @@ managed_proxy_create(const smartlist_t *with_transport_list, char **proxy_argv, int is_server) { managed_proxy_t *mp = tor_malloc_zero(sizeof(managed_proxy_t)); - mp->conf_state = PT_PROTO_INFANT; + managed_proxy_set_state(mp, PT_PROTO_INFANT); mp->is_server = is_server; mp->argv = proxy_argv; mp->transports = smartlist_new(); @@ -2015,3 +2019,45 @@ managed_proxy_outbound_address(const or_options_t *options, sa_family_t family) /* The user have not specified a preference for outgoing connections. */ return NULL; } + +STATIC const char * +managed_proxy_state_to_string(enum pt_proto_state state) +{ + switch (state) { + case PT_PROTO_INFANT: + return "Infant"; + case PT_PROTO_LAUNCHED: + return "Launched"; + case PT_PROTO_ACCEPTING_METHODS: + return "Accepting methods"; + case PT_PROTO_CONFIGURED: + return "Configured"; + case PT_PROTO_COMPLETED: + return "Completed"; + case PT_PROTO_BROKEN: + return "Broken"; + case PT_PROTO_FAILED_LAUNCH: + return "Failed to launch"; + } + + /* LCOV_EXCL_START */ + tor_assert_unreached(); + return NULL; + /* LCOV_EXCL_STOP */ +} + +/** Set the internal state of the given <b>mp</b> to the given <b>new_state</b> + * value. */ +STATIC void +managed_proxy_set_state(managed_proxy_t *mp, enum pt_proto_state new_state) +{ + if (mp->conf_state == new_state) + return; + + tor_log(LOG_INFO, LD_PT, "Managed proxy "%s" changed state: %s -> %s", + mp->argv[0], + managed_proxy_state_to_string(mp->conf_state), + managed_proxy_state_to_string(new_state)); + + mp->conf_state = new_state; +} diff --git a/src/feature/client/transports.h b/src/feature/client/transports.h index 3f08beadba..535689537c 100644 --- a/src/feature/client/transports.h +++ b/src/feature/client/transports.h @@ -153,6 +153,8 @@ STATIC int managed_proxy_severity_parse(const char *); STATIC const tor_addr_t *managed_proxy_outbound_address(const or_options_t *, sa_family_t);
+STATIC const char *managed_proxy_state_to_string(enum pt_proto_state); +STATIC void managed_proxy_set_state(managed_proxy_t *, enum pt_proto_state); #endif /* defined(PT_PRIVATE) */
#endif /* !defined(TOR_TRANSPORTS_H) */
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 0d51dfa605a83fa2b97144de12c76c7ef79e15bb Author: Alexander Færøy ahf@torproject.org AuthorDate: Fri Sep 24 14:47:30 2021 +0200
Log name of managed proxy in exit handler.
This patch ensures that we can figure out which PT that terminated in the PT exit handler.
See: tpo/core/tor#33669 --- src/feature/client/transports.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index c5d7df479d..e8f0ed543f 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -1941,9 +1941,12 @@ managed_proxy_exit_callback(process_t *process, process_exit_code_t exit_code) { tor_assert(process);
+ const managed_proxy_t *mp = process_get_data(process); + const char *name = mp ? mp->argv[0] : "N/A"; + log_warn(LD_PT, - "Pluggable Transport process terminated with status code %" PRIu64, - exit_code); + "Managed proxy "%s" process terminated with status code %" PRIu64, + name, exit_code);
/* Returning true here means that the process subsystem will take care of * calling process_free() on our process_t. */
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 3338b34ec9e57ffe57929f9cf67ae7f5e8f841be Author: Alexander Færøy ahf@torproject.org AuthorDate: Fri Sep 24 16:07:21 2021 +0200
Only terminate PT processes that are running.
See: tpo/core/tor#33669 --- src/feature/client/transports.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index e8f0ed543f..95c9cfeba2 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -519,8 +519,10 @@ proxy_prepare_for_restart(managed_proxy_t *mp) tor_assert(mp->conf_state == PT_PROTO_COMPLETED);
/* destroy the process handle and terminate the process. */ - process_set_data(mp->process, NULL); - process_terminate(mp->process); + if (mp->process) { + process_set_data(mp->process, NULL); + process_terminate(mp->process); + }
/* destroy all its registered transports, since we will no longer use them. */
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 58f0e548fff20648d848ed95c1daa2f071ef0743 Author: Alexander Færøy ahf@torproject.org AuthorDate: Fri Sep 24 16:07:50 2021 +0200
Log at LD_PT instead of LD_GENERAL for PT process stdout lines.
See: tpo/core/tor#33669 --- src/feature/client/transports.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index 95c9cfeba2..ceeae61dd4 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -863,7 +863,7 @@ handle_methods_done(const managed_proxy_t *mp) STATIC void handle_proxy_line(const char *line, managed_proxy_t *mp) { - log_info(LD_GENERAL, "Got a line from managed proxy '%s': (%s)", + log_info(LD_PT, "Got a line from managed proxy '%s': (%s)", mp->argv[0], line);
if (!strcmpstart(line, PROTO_ENV_ERROR)) {
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 506781d41e9b0943c3c8a9670011f9309f159cb4 Author: Alexander Færøy ahf@torproject.org AuthorDate: Fri Sep 24 16:08:12 2021 +0200
Restart PT processes when they die on us.
This patch forces a PT reconfigure of infant PT processes as part of the PT process' exit handler.
See: tpo/core/tor#33669 --- src/feature/client/transports.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index ceeae61dd4..cac7e694c7 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -556,6 +556,8 @@ launch_managed_proxy(managed_proxy_t *mp) smartlist_t *env = create_managed_proxy_environment(mp);
/* Configure our process. */ + tor_assert(mp->process == NULL); + mp->process = process_new(mp->argv[0]); process_set_data(mp->process, mp); process_set_stdout_read_callback(mp->process, managed_proxy_stdout_callback); process_set_stderr_read_callback(mp->process, managed_proxy_stderr_callback); @@ -1532,7 +1534,9 @@ managed_proxy_create(const smartlist_t *with_transport_list, mp->argv = proxy_argv; mp->transports = smartlist_new(); mp->proxy_uri = get_pt_proxy_uri(); - mp->process = process_new(proxy_argv[0]); + + /* Gets set in launch_managed_proxy(). */ + mp->process = NULL;
mp->transports_to_launch = smartlist_new(); SMARTLIST_FOREACH(with_transport_list, const char *, transport, @@ -1943,13 +1947,25 @@ managed_proxy_exit_callback(process_t *process, process_exit_code_t exit_code) { tor_assert(process);
- const managed_proxy_t *mp = process_get_data(process); + managed_proxy_t *mp = process_get_data(process); const char *name = mp ? mp->argv[0] : "N/A";
log_warn(LD_PT, "Managed proxy "%s" process terminated with status code %" PRIu64, name, exit_code);
+ if (mp) { + /* We remove this process_t from the mp. */ + tor_assert(mp->process == process); + mp->process = NULL; + + /* Prepare the proxy for restart. */ + proxy_prepare_for_restart(mp); + + /* We have proxies we want to restart? */ + pt_configure_remaining_proxies(); + } + /* Returning true here means that the process subsystem will take care of * calling process_free() on our process_t. */ return true;
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 5f432bff315f926c04ab64ae7890981c7ba736d8 Author: Alexander Færøy ahf@torproject.org AuthorDate: Fri Nov 4 20:57:53 2022 +0100
Add missing changes file for tor#33669.
See: tpo/core/tor#33669. --- changes/ticket33669 | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/changes/ticket33669 b/changes/ticket33669 new file mode 100644 index 0000000000..d7ec3a5f40 --- /dev/null +++ b/changes/ticket33669 @@ -0,0 +1,3 @@ + o Minor features (pluggable transports): + - Automatically restart managed Pluggable Transport processes when their + process terminate. Resolves ticket 33669.
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit a1042f4873edd2f04787e7f60b3f9d3642b36611 Merge: 970a534f03 5f432bff31 Author: David Goulet dgoulet@torproject.org AuthorDate: Thu May 25 10:50:15 2023 -0400
Merge branch 'tor-gitlab/mr/443'
changes/ticket33669 | 3 ++ src/feature/client/transports.c | 99 ++++++++++++++++++++++++++++++++++------- src/feature/client/transports.h | 2 + 3 files changed, 88 insertions(+), 16 deletions(-)
tor-commits@lists.torproject.org
-
gitolite role