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

[snowflake/master] Escape quoted HTML markup within textarea.
by dcf＠torproject.org 21 Dec '18

21 Dec '18

commit 82b696709d48d164db540cf790c3c346ba9059ad Author: David Fifield <david(a)bamsoftware.com> Date: Thu Dec 20 20:14:47 2018 -0700 Escape quoted HTML markup within textarea. --- proxy/static/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/static/index.html b/proxy/static/index.html index a0c6a48..d34d08b 100644 --- a/proxy/static/index.html +++ b/proxy/static/index.html @@ -54,7 +54,7 @@ It is now possible to embed the Snowflake badge on any website: </p> <textarea readonly> -<iframe src="https://snowflake.torproject.org/embed.html" width="88" height="16" frameborder="0" scrolling="no"></iframe> +<iframe src="https://snowflake.torproject.org/embed.html" width="88" height="16" frameborder="0" scrolling="no"></iframe> </textarea> <p>

1 0

[snowflake/master] Fix HTML tag typo.
by dcf＠torproject.org 21 Dec '18

21 Dec '18

commit 5667aa8ebbb69ce9d18f46a29bfc9894835cb650 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Dec 20 18:29:51 2018 -0700 Fix HTML tag typo. --- proxy/static/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/static/index.html b/proxy/static/index.html index 9b4175e..a0c6a48 100644 --- a/proxy/static/index.html +++ b/proxy/static/index.html @@ -75,4 +75,4 @@ gitweb.torproject.org/pluggable-transports/snowflake.git Last update: <time>2018-12-19</time> </body> -<html> +</html>

1 0

[snowflake/master] .gitignore broker/broker.
by dcf＠torproject.org 20 Dec '18

20 Dec '18

commit 9e47cc3b5b40a6677ed572681c605353819776ff Author: David Fifield <david(a)bamsoftware.com> Date: Thu Dec 20 16:40:30 2018 -0700 .gitignore broker/broker. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 18eeb57..165c512 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ *.swm .DS_Store datadir/ +broker/broker client/client server-webrtc/server-webrtc server/server

1 0

[tor/master] Use K/V parser to handle LOG messages for pluggable transports.
by nickm＠torproject.org 20 Dec '18

20 Dec '18

commit 426c52b377057dc5f4428c664ee56ca77d648c9e Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Dec 20 02:10:42 2018 +0100 Use K/V parser to handle LOG messages for pluggable transports. This patch changes the LOG pluggable transport message to use the recent K/V parser that landed in Tor. This allows PT's to specify the log severity level as well as the message. A mapping between the PT log severity levels and Tor's log serverity level is provided. See: https://bugs.torproject.org/28846 --- src/feature/client/transports.c | 80 ++++++++++++++++++++++++++++++++++++++--- src/feature/client/transports.h | 2 ++ src/feature/control/control.c | 11 +++--- src/feature/control/control.h | 2 +- src/test/test_pt.c | 29 +++++++++++---- 5 files changed, 106 insertions(+), 18 deletions(-) diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index de53fe346..6a3479a47 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -101,6 +101,8 @@ #include "core/or/connection_or.h" #include "feature/relay/ext_orport.h" #include "feature/control/control.h" +#include "lib/encoding/confline.h" +#include "lib/encoding/kvline.h" #include "lib/process/process.h" #include "lib/process/env.h" @@ -1144,22 +1146,63 @@ parse_log_line(const char *line, managed_proxy_t *mp) tor_assert(line); tor_assert(mp); + config_line_t *values = NULL; + char *log_message = NULL; + if (strlen(line) < (strlen(PROTO_LOG) + 1)) { log_warn(LD_PT, "Managed proxy sent us a %s line " "with missing argument.", PROTO_LOG); goto done; } - const char *message = line + strlen(PROTO_LOG) + 1; + const char *data = line + strlen(PROTO_LOG) + 1; + values = kvline_parse(data, KV_QUOTED); + + if (! values) { + log_warn(LD_PT, "Managed proxy \"%s\" wrote an invalid LOG message: %s", + mp->argv[0], data); + goto done; + } + + const config_line_t *severity = config_line_find(values, "SEVERITY"); + const config_line_t *message = config_line_find(values, "MESSAGE"); + + /* Check if we got a message. */ + if (! message) { + log_warn(LD_PT, "Managed proxy \"%s\" wrote a LOG line without " + "MESSAGE: %s", mp->argv[0], data); + goto done; + } + + /* Check if severity is there and whether it's valid. */ + if (! severity) { + log_warn(LD_PT, "Managed proxy \"%s\" wrote a LOG line without " + "SEVERITY: %s", mp->argv[0], data); + goto done; + } - log_info(LD_PT, "Managed proxy \"%s\" says: %s", - mp->argv[0], message); + int log_severity = managed_proxy_severity_parse(severity->value); + + if (log_severity == -1) { + log_warn(LD_PT, "Managed proxy \"%s\" wrote a LOG line with an " + "invalid severity level: %s", + mp->argv[0], severity->value); + goto done; + } + + tor_log(log_severity, LD_PT, "Managed proxy \"%s\": %s", + mp->argv[0], message->value); + + /* Prepend the PT name. */ + config_line_prepend(&values, "PT", mp->argv[0]); + log_message = kvline_encode(values, KV_QUOTED); /* Emit control port event. */ - control_event_pt_log(mp->argv[0], message); + control_event_pt_log(log_message); done: - return; + config_free_lines(values); + tor_free(log_message); } /** Return a newly allocated string that tor should place in @@ -1779,3 +1822,30 @@ managed_proxy_exit_callback(process_t *process, process_exit_code_t exit_code) return true; } + +/** Returns a valid integer log severity level from <b>severity</b> that + * is compatible with Tor's logging functions. Returns <b>-1</b> on + * error. */ +STATIC int +managed_proxy_severity_parse(const char *severity) +{ + tor_assert(severity); + + /* Slightly different than log.c's parse_log_level :-( */ + if (! strcmp(severity, "debug")) + return LOG_DEBUG; + + if (! strcmp(severity, "info")) + return LOG_INFO; + + if (! strcmp(severity, "notice")) + return LOG_NOTICE; + + if (! strcmp(severity, "warning")) + return LOG_WARN; + + if (! strcmp(severity, "error")) + return LOG_ERR; + + return -1; +} diff --git a/src/feature/client/transports.h b/src/feature/client/transports.h index a3994a009..b8d1bb008 100644 --- a/src/feature/client/transports.h +++ b/src/feature/client/transports.h @@ -147,6 +147,8 @@ STATIC void managed_proxy_stdout_callback(process_t *, const char *, size_t); STATIC void managed_proxy_stderr_callback(process_t *, const char *, size_t); STATIC bool managed_proxy_exit_callback(process_t *, process_exit_code_t); +STATIC int managed_proxy_severity_parse(const char *); + #endif /* defined(PT_PRIVATE) */ #endif /* !defined(TOR_TRANSPORTS_H) */ diff --git a/src/feature/control/control.c b/src/feature/control/control.c index 7fae3b7a1..849f11707 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -7033,15 +7033,14 @@ control_event_transport_launched(const char *mode, const char *transport_name, mode, transport_name, fmt_addr(addr), port); } -/** A pluggable transport called <b>pt_name</b> has emitted a log - * message found in <b>message</b>. */ +/** A pluggable transport called <b>pt_name</b> has emitted a log message + * found in <b>message</b> at <b>severity</b> log level. */ void -control_event_pt_log(const char *pt_name, const char *message) +control_event_pt_log(const char *log) { send_control_event(EVENT_PT_LOG, - "650 PT_LOG %s %s\r\n", - pt_name, - message); + "650 PT_LOG %s\r\n", + log); } /** Convert rendezvous auth type to string for HS_DESC control events diff --git a/src/feature/control/control.h b/src/feature/control/control.h index a1609b0f0..b3a270767 100644 --- a/src/feature/control/control.h +++ b/src/feature/control/control.h @@ -207,7 +207,7 @@ void control_event_clients_seen(const char *controller_str); void control_event_transport_launched(const char *mode, const char *transport_name, tor_addr_t *addr, uint16_t port); -void control_event_pt_log(const char *pt_name, const char *message); +void control_event_pt_log(const char *log); const char *rend_auth_type_to_string(rend_auth_type_t auth_type); MOCK_DECL(const char *, node_describe_longname_by_id,(const char *id_digest)); void control_event_hs_descriptor_requested(const char *onion_address, diff --git a/src/test/test_pt.c b/src/test/test_pt.c index 8fcdd5c1e..271d74f26 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -310,8 +310,12 @@ process_read_stdout_replacement(process_t *process, buf_t *buffer) } else if (times_called <= 6) { buf_add_string(buffer, "SMETHODS DONE\n"); } else if (times_called <= 7) { - buf_add_string(buffer, "LOG Oh noes, something bad happened. " - "What do we do!?\n"); + buf_add_string(buffer, "LOG SEVERITY=error MESSAGE=\"Oh noes, something " + "bad happened. What do we do!?\"\n"); + buf_add_string(buffer, "LOG SEVERITY=warning MESSAGE=\"warning msg\"\n"); + buf_add_string(buffer, "LOG SEVERITY=notice MESSAGE=\"notice msg\"\n"); + buf_add_string(buffer, "LOG SEVERITY=info MESSAGE=\"info msg\"\n"); + buf_add_string(buffer, "LOG SEVERITY=debug MESSAGE=\"debug msg\"\n"); } return (int)buf_datalen(buffer); @@ -416,12 +420,25 @@ test_pt_configure_proxy(void *arg) /* Get the log message out. */ process_notify_event_stdout(mp->process); - tt_int_op(controlevent_n, OP_EQ, 6); + tt_int_op(controlevent_n, OP_EQ, 10); tt_int_op(controlevent_event, OP_EQ, EVENT_PT_LOG); - tt_int_op(smartlist_len(controlevent_msgs), OP_EQ, 6); + tt_int_op(smartlist_len(controlevent_msgs), OP_EQ, 10); tt_str_op(smartlist_get(controlevent_msgs, 5), OP_EQ, - "650 PT_LOG <testcase> Oh noes, something bad happened. " - "What do we do!?\r\n"); + "650 PT_LOG PT=<testcase> SEVERITY=error " + "MESSAGE=\"Oh noes, " + "something bad happened. What do we do!?\"\r\n"); + tt_str_op(smartlist_get(controlevent_msgs, 6), OP_EQ, + "650 PT_LOG PT=<testcase> SEVERITY=warning " + "MESSAGE=\"warning msg\"\r\n"); + tt_str_op(smartlist_get(controlevent_msgs, 7), OP_EQ, + "650 PT_LOG PT=<testcase> SEVERITY=notice " + "MESSAGE=\"notice msg\"\r\n"); + tt_str_op(smartlist_get(controlevent_msgs, 8), OP_EQ, + "650 PT_LOG PT=<testcase> SEVERITY=info " + "MESSAGE=\"info msg\"\r\n"); + tt_str_op(smartlist_get(controlevent_msgs, 9), OP_EQ, + "650 PT_LOG PT=<testcase> SEVERITY=debug " + "MESSAGE=\"debug msg\"\r\n"); { /* check that the transport info were saved properly in the tor state */ config_line_t *transport_in_state = NULL;

1 0

[tor/master] Escape the PT K/V data before sending it to the logger.
by nickm＠torproject.org 20 Dec '18

20 Dec '18

commit ab0d7d2dd470a447535eaf7c35bd4877c43bce26 Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Dec 20 19:05:08 2018 +0100 Escape the PT K/V data before sending it to the logger. See: https://bugs.torproject.org/28846 --- src/feature/client/transports.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index 45dbd0c88..8a8bcd9f7 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -1175,14 +1175,14 @@ parse_log_line(const char *line, managed_proxy_t *mp) /* Check if we got a message. */ if (! message) { log_warn(LD_PT, "Managed proxy \"%s\" wrote a LOG line without " - "MESSAGE: %s", mp->argv[0], data); + "MESSAGE: %s", mp->argv[0], escaped(data)); goto done; } /* Check if severity is there and whether it's valid. */ if (! severity) { log_warn(LD_PT, "Managed proxy \"%s\" wrote a LOG line without " - "SEVERITY: %s", mp->argv[0], data); + "SEVERITY: %s", mp->argv[0], escaped(data)); goto done; } @@ -1232,7 +1232,7 @@ parse_status_line(const char *line, managed_proxy_t *mp) if (! values) { log_warn(LD_PT, "Managed proxy \"%s\" wrote an invalid " - "STATUS message: %s", mp->argv[0], data); + "STATUS message: %s", mp->argv[0], escaped(data)); goto done; } @@ -1242,7 +1242,7 @@ parse_status_line(const char *line, managed_proxy_t *mp) if (! type) { log_warn(LD_PT, "Managed proxy \"%s\" wrote a STATUS line without " - "TYPE: %s", mp->argv[0], data); + "TYPE: %s", mp->argv[0], escaped(data)); goto done; }

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/609'
by nickm＠torproject.org 20 Dec '18

20 Dec '18

commit e4109020e9b423a170e7ca14d04727bc3730dc67 Merge: 0e6e902cb ab0d7d2dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 20 16:42:35 2018 -0500 Merge remote-tracking branch 'tor-github/pr/609' changes/ticket28180 | 2 +- changes/ticket28846 | 3 + src/feature/client/transports.c | 140 +++++++++++++++++++++++++++++++++++++--- src/feature/client/transports.h | 3 + src/feature/control/control.c | 21 ++++-- src/feature/control/control.h | 6 +- src/test/test_pt.c | 50 ++++++++++++-- 7 files changed, 202 insertions(+), 23 deletions(-)

1 0

[tor/master] Add and update changes files for #28846.
by nickm＠torproject.org 20 Dec '18

20 Dec '18

commit e2c36b9ca064580208ac0976aaad28f08f3a744b Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Dec 20 04:08:04 2018 +0100 Add and update changes files for #28846. This ticket finishes the implementatoin of #28180 and adds the new STATUS message from #28846. See: https://bugs.torproject.org/28846 --- changes/ticket28180 | 2 +- changes/ticket28846 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/ticket28180 b/changes/ticket28180 index 2ec547bd4..59de1c625 100644 --- a/changes/ticket28180 +++ b/changes/ticket28180 @@ -1,3 +1,3 @@ o Minor features (pluggable transports): - Add support for logging to Tor's logging subsystem from a pluggable - transport process. Partial implementation for ticket 28180 + transport process. Closes ticket 28180 diff --git a/changes/ticket28846 b/changes/ticket28846 new file mode 100644 index 000000000..efb5b9938 --- /dev/null +++ b/changes/ticket28846 @@ -0,0 +1,3 @@ + o Minor features (pluggable transports): + - Add support for emitting STATUS updates to Tor's control port from a + pluggable transport process. Closes ticket 28846.

1 0

[tor/master] Add support for STATUS messages from Pluggable Transports.
by nickm＠torproject.org 20 Dec '18

20 Dec '18

commit 4efe4cc2f918ce45075b010d2cdc09ec7791ac6b Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Dec 20 03:55:02 2018 +0100 Add support for STATUS messages from Pluggable Transports. This patch adds support for the new STATUS message that PT's can emit from their standard out. The STATUS message uses the `config_line_t` K/V format that was recently added in Tor. See: https://bugs.torproject.org/28846 --- src/feature/client/transports.c | 60 ++++++++++++++++++++++++++++++++++++++--- src/feature/client/transports.h | 1 + src/feature/control/control.c | 10 +++++++ src/feature/control/control.h | 4 ++- src/test/test_pt.c | 21 +++++++++++++++ 5 files changed, 92 insertions(+), 4 deletions(-) diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index 6a3479a47..45dbd0c88 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -130,6 +130,7 @@ static void parse_method_error(const char *line, int is_server_method); #define PROTO_PROXY_DONE "PROXY DONE" #define PROTO_PROXY_ERROR "PROXY-ERROR" #define PROTO_LOG "LOG" +#define PROTO_STATUS "STATUS" /** The first and only supported - at the moment - configuration protocol version. */ @@ -912,12 +913,16 @@ handle_proxy_line(const char *line, managed_proxy_t *mp) parse_proxy_error(line); goto err; - /* We check for the additional " " after the PROTO_LOG string to make sure - * we can later extend this big if/else-if table with something that begins - * with "LOG" without having to get the order right. */ + /* We check for the additional " " after the PROTO_LOG * PROTO_STATUS + * string to make sure we can later extend this big if/else-if table with + * something that begins with "LOG" without having to get the order right. + * */ } else if (!strcmpstart(line, PROTO_LOG " ")) { parse_log_line(line, mp); return; + } else if (!strcmpstart(line, PROTO_STATUS " ")) { + parse_status_line(line, mp); + return; } log_notice(LD_GENERAL, "Unknown line received by managed proxy (%s).", line); @@ -1205,6 +1210,55 @@ parse_log_line(const char *line, managed_proxy_t *mp) tor_free(log_message); } +/** Parses a STATUS <b>line</b> and emit control events accordingly. */ +STATIC void +parse_status_line(const char *line, managed_proxy_t *mp) +{ + tor_assert(line); + tor_assert(mp); + + config_line_t *values = NULL; + char *status_message = NULL; + + if (strlen(line) < (strlen(PROTO_STATUS) + 1)) { + log_warn(LD_PT, "Managed proxy sent us a %s line " + "with missing argument.", PROTO_STATUS); + goto done; + } + + const char *data = line + strlen(PROTO_STATUS) + 1; + + values = kvline_parse(data, KV_QUOTED); + + if (! values) { + log_warn(LD_PT, "Managed proxy \"%s\" wrote an invalid " + "STATUS message: %s", mp->argv[0], data); + goto done; + } + + /* We check if we received the TYPE parameter, which is the only *required* + * value. */ + const config_line_t *type = config_line_find(values, "TYPE"); + + if (! type) { + log_warn(LD_PT, "Managed proxy \"%s\" wrote a STATUS line without " + "TYPE: %s", mp->argv[0], data); + goto done; + } + + /* Prepend the PT name. */ + config_line_prepend(&values, "PT", mp->argv[0]); + status_message = kvline_encode(values, KV_QUOTED); + + /* We have checked that TYPE is there, we can now emit the STATUS event via + * the control port. */ + control_event_pt_status(status_message); + + done: + config_free_lines(values); + tor_free(status_message); +} + /** Return a newly allocated string that tor should place in * TOR_PT_SERVER_TRANSPORT_OPTIONS while configuring the server * manged proxy in <b>mp</b>. Return NULL if no such options are found. */ diff --git a/src/feature/client/transports.h b/src/feature/client/transports.h index b8d1bb008..1a910ae82 100644 --- a/src/feature/client/transports.h +++ b/src/feature/client/transports.h @@ -129,6 +129,7 @@ STATIC void parse_env_error(const char *line); STATIC void parse_proxy_error(const char *line); STATIC void handle_proxy_line(const char *line, managed_proxy_t *mp); STATIC void parse_log_line(const char *line, managed_proxy_t *mp); +STATIC void parse_status_line(const char *line, managed_proxy_t *mp); STATIC char *get_transport_options_for_server_proxy(const managed_proxy_t *mp); STATIC void managed_proxy_destroy(managed_proxy_t *mp, diff --git a/src/feature/control/control.c b/src/feature/control/control.c index 849f11707..4ef550c91 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -7043,6 +7043,16 @@ control_event_pt_log(const char *log) log); } +/** A pluggable transport has emitted a STATUS message found in + * <b>status</b>. */ +void +control_event_pt_status(const char *status) +{ + send_control_event(EVENT_PT_STATUS, + "650 PT_STATUS %s\r\n", + status); +} + /** Convert rendezvous auth type to string for HS_DESC control events */ const char * diff --git a/src/feature/control/control.h b/src/feature/control/control.h index b3a270767..d78ce4d87 100644 --- a/src/feature/control/control.h +++ b/src/feature/control/control.h @@ -208,6 +208,7 @@ void control_event_transport_launched(const char *mode, const char *transport_name, tor_addr_t *addr, uint16_t port); void control_event_pt_log(const char *log); +void control_event_pt_status(const char *status); const char *rend_auth_type_to_string(rend_auth_type_t auth_type); MOCK_DECL(const char *, node_describe_longname_by_id,(const char *id_digest)); void control_event_hs_descriptor_requested(const char *onion_address, @@ -297,7 +298,8 @@ void control_free_all(void); #define EVENT_HS_DESC_CONTENT 0x0022 #define EVENT_NETWORK_LIVENESS 0x0023 #define EVENT_PT_LOG 0x0024 -#define EVENT_MAX_ 0x0024 +#define EVENT_PT_STATUS 0x0025 +#define EVENT_MAX_ 0x0025 /* sizeof(control_connection_t.event_mask) in bits, currently a uint64_t */ #define EVENT_CAPACITY_ 0x0040 diff --git a/src/test/test_pt.c b/src/test/test_pt.c index 271d74f26..8de687c86 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -316,6 +316,10 @@ process_read_stdout_replacement(process_t *process, buf_t *buffer) buf_add_string(buffer, "LOG SEVERITY=notice MESSAGE=\"notice msg\"\n"); buf_add_string(buffer, "LOG SEVERITY=info MESSAGE=\"info msg\"\n"); buf_add_string(buffer, "LOG SEVERITY=debug MESSAGE=\"debug msg\"\n"); + } else if (times_called <= 8) { + buf_add_string(buffer, "STATUS TYPE=a K_1=a K_2=b K_3=\"foo bar\"\n"); + buf_add_string(buffer, "STATUS TYPE=b K_1=a K_2=b K_3=\"foo bar\"\n"); + buf_add_string(buffer, "STATUS TYPE=c K_1=a K_2=b K_3=\"foo bar\"\n"); } return (int)buf_datalen(buffer); @@ -440,6 +444,23 @@ test_pt_configure_proxy(void *arg) "650 PT_LOG PT=<testcase> SEVERITY=debug " "MESSAGE=\"debug msg\"\r\n"); + /* Get the STATUS messages out. */ + process_notify_event_stdout(mp->process); + + tt_int_op(controlevent_n, OP_EQ, 13); + tt_int_op(controlevent_event, OP_EQ, EVENT_PT_STATUS); + tt_int_op(smartlist_len(controlevent_msgs), OP_EQ, 13); + + tt_str_op(smartlist_get(controlevent_msgs, 10), OP_EQ, + "650 PT_STATUS " + "PT=<testcase> TYPE=a K_1=a K_2=b K_3=\"foo bar\"\r\n"); + tt_str_op(smartlist_get(controlevent_msgs, 11), OP_EQ, + "650 PT_STATUS " + "PT=<testcase> TYPE=b K_1=a K_2=b K_3=\"foo bar\"\r\n"); + tt_str_op(smartlist_get(controlevent_msgs, 12), OP_EQ, + "650 PT_STATUS " + "PT=<testcase> TYPE=c K_1=a K_2=b K_3=\"foo bar\"\r\n"); + { /* check that the transport info were saved properly in the tor state */ config_line_t *transport_in_state = NULL; smartlist_t *transport_info_sl = smartlist_new();

1 0

[webwml/master] if no jobs open, uncomment the 'no jobs' text
by arma＠torproject.org 20 Dec '18

20 Dec '18

commit a3e21ccb54300a31384e326128a4f39e533e3b16 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Dec 20 16:37:58 2018 -0500 if no jobs open, uncomment the 'no jobs' text --- about/en/jobs.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/about/en/jobs.wml b/about/en/jobs.wml index d082a48d..9084843b 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -12,8 +12,8 @@ <div id="maincol"> <h1>The Tor Project is always looking for more great people to join our team!</h1> - # <p>At the moment, we don't have any official open positions. Please check back soon, though! In the meantime, you may want to glance at our - # <a href="<page getinvolved/volunteer>">volunteers</a> page.</p> + <p>At the moment, we don't have any official open positions. Please check back soon, though! In the meantime, you may want to glance at our + <a href="<page getinvolved/volunteer>">volunteers</a> page.</p> <!-- <p>Specifically, we're looking for the following people currently:</p>

1 0

[stem/master] Blank inputs cause server descriptor parsing to fail
by atagar＠torproject.org 20 Dec '18

20 Dec '18

commit 5488849baaf2402a8a315d9d474dc69207b2e6ef Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Dec 20 11:47:34 2018 -0800 Blank inputs cause server descriptor parsing to fail Honestly I'm not digging in too much, but DocTor has started providing me with notifications of... Unable to retrieve the present server descriptors... source: http://204.13.164.118:80/tor/server/all time: 12/20/2018 11:44 error: Content conform to being a server descriptor: We strip annotation whitespace if we have descritor content to parse but didn't if we didnn't. No reason I can think of to not do so in both cases. --- stem/descriptor/server_descriptor.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 89b80d0a..98300775 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -195,6 +195,9 @@ def _parse_file(descriptor_file, is_bridge = False, validate = False, **kwargs): while True: annotations = _read_until_keywords('router', descriptor_file) + annotations = map(bytes.strip, annotations) # strip newlines + annotations = map(stem.util.str_tools._to_unicode, annotations) # convert to unicode + annotations = list(filter(lambda x: x != '', annotations)) # drop any blanks if not is_bridge: descriptor_content = _read_until_keywords('router-signature', descriptor_file) @@ -210,9 +213,6 @@ def _parse_file(descriptor_file, is_bridge = False, validate = False, **kwargs): if descriptor_content[0].startswith(b'@type'): descriptor_content = descriptor_content[1:] - # strip newlines from annotations - annotations = list(map(bytes.strip, annotations)) - descriptor_text = bytes.join(b'', descriptor_content) if is_bridge: @@ -221,8 +221,7 @@ def _parse_file(descriptor_file, is_bridge = False, validate = False, **kwargs): yield RelayDescriptor(descriptor_text, validate, annotations, **kwargs) else: if validate and annotations: - orphaned_annotations = stem.util.str_tools._to_unicode(b'\n'.join(annotations)) - raise ValueError('Content conform to being a server descriptor:\n%s' % orphaned_annotations) + raise ValueError('Content conform to being a server descriptor:\n%s' % '\n'.join(annotations)) break # done parsing descriptors

1 0