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

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 14 Sep '17

14 Sep '17

commit 3f3fecdc08825a4730ffb5c4e8fb261771646e58 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 14 22:15:26 2017 +0000 Update translations for whisperback_completed --- el/el.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/el/el.po b/el/el.po index 0b685b94e..ab05ceeaf 100644 --- a/el/el.po +++ b/el/el.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-03-22 13:04+0000\n" +"PO-Revision-Date: 2017-09-14 21:53+0000\n" "Last-Translator: Adrian Pappas <pappasadrian(a)gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 14 Sep '17

14 Sep '17

commit a52b7447ac5a1b64989d7cfc85cf01c592a3dcac Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 14 22:15:22 2017 +0000 Update translations for whisperback --- el/el.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/el/el.po b/el/el.po index 0b685b94e..ab05ceeaf 100644 --- a/el/el.po +++ b/el/el.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-03-22 13:04+0000\n" +"PO-Revision-Date: 2017-09-14 21:53+0000\n" "Last-Translator: Adrian Pappas <pappasadrian(a)gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 14 Sep '17

14 Sep '17

commit d6beda365b6640d529785443c625a8ad5062741b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 14 22:15:10 2017 +0000 Update translations for bridgedb_completed --- el/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po index 9d64247ee..8811add9f 100644 --- a/el/LC_MESSAGES/bridgedb.po +++ b/el/LC_MESSAGES/bridgedb.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" +"PO-Revision-Date: 2017-09-14 22:12+0000\n" "Last-Translator: Ilias Giannaros <iliasgnrs(a)gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 14 Sep '17

14 Sep '17

commit fe680df4c908e678021eca6cc1bf3b68a2fbcfae Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 14 22:15:05 2017 +0000 Update translations for bridgedb --- el/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po index 9d64247ee..8811add9f 100644 --- a/el/LC_MESSAGES/bridgedb.po +++ b/el/LC_MESSAGES/bridgedb.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" +"PO-Revision-Date: 2017-09-14 22:12+0000\n" "Last-Translator: Ilias Giannaros <iliasgnrs(a)gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n"

1 0

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 14 Sep '17

14 Sep '17

commit 50fef9478d9465ebcf7c53f64fd2572e84699753 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 14 21:49:35 2017 +0000 Update translations for exoneratorproperties --- el/exonerator.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/el/exonerator.properties b/el/exonerator.properties index 624e3eb89..ad9539348 100644 --- a/el/exonerator.properties +++ b/el/exonerator.properties @@ -1,13 +1,13 @@ -form.explanation=Γράψε μια διεύθυνση IP και ημερομηνία για να δεις αν αυτή η διεύθυνση χρησιμοποιήθηκε ως Tor relay\: +form.explanation=Γράψε μια διεύθυνση IP και ημερομηνία για να δεις αν αυτή η διεύθυνση χρησιμοποιήθηκε ως Tor relay: form.ip.label=Διεύθυνση IP form.timestamp.label=Ημερομηνία form.search.label=Αναζήτηση summary.heading=Περίληψη summary.serverproblem.dbnoconnect.title=Πρόβλημα με τον Server -summary.serverproblem.dbnoconnect.body.text=Αδύνατη η σύνδεση στην βάση δεδομένων. Προσπαθήστε αργότερα. Αν το συνεχίσει να υπάρχει, παρακαλώ %s\! +summary.serverproblem.dbnoconnect.body.text=Αδύνατη η σύνδεση στην βάση δεδομένων. Προσπαθήστε αργότερα. Αν το συνεχίσει να υπάρχει, παρακαλώ %s! summary.serverproblem.dbnoconnect.body.link=ενημερώστε μας summary.serverproblem.dbempty.title=Πρόβλημα με τον Server -summary.serverproblem.dbempty.body.text=Η βάση δεδομένων φαίνεται να είναι άδεια. Παρακαλώ δοκιμάστε ξανά αργότερα. Εάν το πρόβλημα παραμένει, παρακαλούμε %s\! +summary.serverproblem.dbempty.body.text=Η βάση δεδομένων φαίνεται να είναι άδεια. Παρακαλώ δοκιμάστε ξανά αργότερα. Εάν το πρόβλημα παραμένει, παρακαλούμε %s! summary.serverproblem.dbempty.body.link=ενημερώστε μας summary.invalidparams.notimestamp.title=Δεν δόθηκε ημερομηνία summary.invalidparams.notimestamp.body=Συγγνώμη, πρέπει επίσης να δώσεις μια ημερομηνία. @@ -20,10 +20,10 @@ summary.invalidparams.invalidip.body=Συγγνώμη, η %s δεν είναι summary.invalidparams.invalidtimestamp.title=Άκυρη ημερομηνία summary.invalidparams.invalidtimestamp.body=Συγγνώμη, η %s δεν είναι έγκυρη ημερομηνία. Η αναμενόμενη ημερομηνία είναι της μορφής %s. summary.serverproblem.nodata.title=Πρόβλημα με τον Server -summary.serverproblem.nodata.body.text=Η βάση δεδομένων δεν περιέχει δεδομένα για την επιλεγμένη ημερομηνία. Παρακαλώ δοκιμάστε αργότερα. Εάν το πρόβλημα παραμένει, παρακαλούμε %s\! +summary.serverproblem.nodata.body.text=Η βάση δεδομένων δεν περιέχει δεδομένα για την επιλεγμένη ημερομηνία. Παρακαλώ δοκιμάστε αργότερα. Εάν το πρόβλημα παραμένει, παρακαλούμε %s! summary.serverproblem.nodata.body.link=ενημερώστε μας summary.negativesamenetwork.title=Αρνητικό αποτέλεσμα -summary.negativesamenetwork.body=Δεν βρήκαμε την διεύθυνση IP %s μέσα σε μία μέρα της %s. Όμως βρήκαμε άλλες διευθύνσεις IP από Tor relays στο ίδιο /%d δίκτυο περίπου στον ίδιο χρόνο\: +summary.negativesamenetwork.body=Δεν βρήκαμε την διεύθυνση IP %s μέσα σε μία μέρα της %s. Όμως βρήκαμε άλλες διευθύνσεις IP από Tor relays στο ίδιο /%d δίκτυο περίπου στον ίδιο χρόνο: summary.positive.title=Θετικό αποτέλεσμα summary.positive.body=We found one or more Tor relays on IP address %s on or within a day of %s that Tor clients were likely to know. summary.negative.title=Αρνητικό αποτέλεσμα @@ -50,5 +50,5 @@ footer.aboutexonerator.body=The ExoneraTor service maintains a database of IP ad footer.trademark.text=Το 'Tor' και το 'Onion Logo' είναι %s του Tor Project, Inc. footer.trademark.link=εγγεγραμένα λογότυπα footer.language.name=Αγγλικά -footer.language.text=This page is also available in the following languages\: +footer.language.text=Αυτή η σελίδα είναι επίσης διαθέσιμη στις παρακάτω γλώσσες:

1 0

[tor/master] get rid of a case where we might log a NULL as %s
by nickm＠torproject.org 14 Sep '17

14 Sep '17

commit dcd0aea85e9315c53a6b70a4a2b62ec65d539896 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 13 22:43:31 2017 -0400 get rid of a case where we might log a NULL as %s this doesn't happen in our current code, and now it can't --- src/or/directory.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/directory.c b/src/or/directory.c index 89e2735e6..9551b4155 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3480,8 +3480,10 @@ write_http_status_line(dir_connection_t *conn, int status, const char *reason_phrase) { char buf[256]; + if (!reason_phrase) + reason_phrase = "unspecified"; if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n\r\n", - status, reason_phrase ? reason_phrase : "OK") < 0) { + status, reason_phrase) < 0) { log_warn(LD_BUG,"status line too long."); return; }

1 0

[tor/master] Make dir servers include a "Date:" http header more often
by nickm＠torproject.org 14 Sep '17

14 Sep '17

commit eb429232ef11f15f8a9f2ad60cc106103648a525 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 13 23:19:04 2017 -0400 Make dir servers include a "Date:" http header more often Directory servers now include a "Date:" http header for response codes other than 200. Clients starting with a skewed clock and a recent consensus were getting "304 Not modified" responses from directory authorities, so without a Date header the client would never hear about a wrong clock. Fixes bug 23499; bugfix on 0.0.8rc1. --- changes/bug23499 | 6 ++++++ src/or/directory.c | 22 ++++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/changes/bug23499 b/changes/bug23499 new file mode 100644 index 000000000..e53b03c34 --- /dev/null +++ b/changes/bug23499 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Directory servers now include a "Date:" http header for response + codes other than 200. Clients starting with a skewed clock and a + recent consensus were getting "304 Not modified" responses from + directory authorities, so without a Date header the client would + never hear about a wrong clock. Fixes bug 23499; bugfix on 0.0.8rc1. diff --git a/src/or/directory.c b/src/or/directory.c index 9551b4155..0c79b4659 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3479,14 +3479,28 @@ static void write_http_status_line(dir_connection_t *conn, int status, const char *reason_phrase) { - char buf[256]; - if (!reason_phrase) + char buf[256+RFC1123_TIME_LEN+1]; + char *datestring = NULL; + + if (!reason_phrase) { /* bullet-proofing */ reason_phrase = "unspecified"; - if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n\r\n", - status, reason_phrase) < 0) { + } + + if (server_mode(get_options())) { + /* include the Date: header, but only if we're a relay or bridge */ + char datebuf[RFC1123_TIME_LEN+1]; + format_rfc1123_time(datebuf, time(NULL)); + tor_asprintf(&datestring, "Date: %s\r\n", datebuf); + } + + if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n%s\r\n", + status, reason_phrase, datestring?datestring:"") < 0) { log_warn(LD_BUG,"status line too long."); + tor_free(datestring); return; } + tor_free(datestring); + log_debug(LD_DIRSERV,"Wrote status 'HTTP/1.0 %d %s'", status, reason_phrase); connection_buf_add(buf, strlen(buf), TO_CONN(conn)); }

1 0

[tor/master] Rename write_http_status_line, since it does more now.
by nickm＠torproject.org 14 Sep '17

14 Sep '17

commit 98c103d91d89bbfd7dec6bd4b61ccd297e17aee1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 14 08:39:08 2017 -0400 Rename write_http_status_line, since it does more now. --- src/or/directory.c | 86 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index d6b98ed5d..01d9fc617 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3476,7 +3476,7 @@ connection_dir_about_to_close(dir_connection_t *dir_conn) * status and reason_phrase. Write it to conn. */ static void -write_http_status_line(dir_connection_t *conn, int status, +write_short_http_response(dir_connection_t *conn, int status, const char *reason_phrase) { char *buf = NULL; @@ -3849,7 +3849,7 @@ directory_handle_command_get,(dir_connection_t *conn, const char *headers, conn->base_.state = DIR_CONN_STATE_SERVER_WRITING; if (parse_http_url(headers, &url) < 0) { - write_http_status_line(conn, 400, "Bad request"); + write_short_http_response(conn, 400, "Bad request"); return 0; } if ((header = http_get_header(headers, "If-Modified-Since: "))) { @@ -3910,7 +3910,7 @@ directory_handle_command_get,(dir_connection_t *conn, const char *headers, } /* we didn't recognize the url */ - write_http_status_line(conn, 404, "Not found"); + write_short_http_response(conn, 404, "Not found"); result = 0; done: @@ -3938,7 +3938,7 @@ handle_get_frontpage(dir_connection_t *conn, const get_handler_args_t *args) NULL, DIRPORTFRONTPAGE_CACHE_LIFETIME); connection_buf_add(frontpage, dlen, TO_CONN(conn)); } else { - write_http_status_line(conn, 404, "Not found"); + write_short_http_response(conn, 404, "Not found"); } return 0; } @@ -4320,13 +4320,13 @@ handle_get_current_consensus(dir_connection_t *conn, parsed_consensus_request_t req; if (parse_consensus_request(&req, args) < 0) { - write_http_status_line(conn, 404, "Couldn't parse request"); + write_short_http_response(conn, 404, "Couldn't parse request"); goto done; } if (digest_list_contains_best_consensus(req.flav, req.diff_from_digests)) { - write_http_status_line(conn, 304, "Not modified"); + write_short_http_response(conn, 304, "Not modified"); geoip_note_ns_response(GEOIP_REJECT_NOT_MODIFIED); goto done; } @@ -4341,7 +4341,7 @@ handle_get_current_consensus(dir_connection_t *conn, } if (req.diff_only && !cached_consensus) { - write_http_status_line(conn, 404, "No such diff available"); + write_short_http_response(conn, 404, "No such diff available"); // XXXX warn_consensus_is_too_old(v, req.flavor, now); geoip_note_ns_response(GEOIP_REJECT_NOT_FOUND); goto done; @@ -4364,7 +4364,7 @@ handle_get_current_consensus(dir_connection_t *conn, if (cached_consensus && have_valid_until && !networkstatus_valid_until_is_reasonably_live(valid_until, now)) { - write_http_status_line(conn, 404, "Consensus is too old"); + write_short_http_response(conn, 404, "Consensus is too old"); warn_consensus_is_too_old(cached_consensus, req.flavor, now); geoip_note_ns_response(GEOIP_REJECT_NOT_FOUND); goto done; @@ -4372,7 +4372,7 @@ handle_get_current_consensus(dir_connection_t *conn, if (cached_consensus && req.want_fps && !client_likes_consensus(cached_consensus, req.want_fps)) { - write_http_status_line(conn, 404, "Consensus not signed by sufficient " + write_short_http_response(conn, 404, "Consensus not signed by sufficient " "number of requested authorities"); geoip_note_ns_response(GEOIP_REJECT_NOT_ENOUGH_SIGS); goto done; @@ -4398,11 +4398,11 @@ handle_get_current_consensus(dir_connection_t *conn, &n_expired); if (!smartlist_len(conn->spool) && !n_expired) { - write_http_status_line(conn, 404, "Not found"); + write_short_http_response(conn, 404, "Not found"); geoip_note_ns_response(GEOIP_REJECT_NOT_FOUND); goto done; } else if (!smartlist_len(conn->spool)) { - write_http_status_line(conn, 304, "Not modified"); + write_short_http_response(conn, 304, "Not modified"); geoip_note_ns_response(GEOIP_REJECT_NOT_MODIFIED); goto done; } @@ -4411,7 +4411,7 @@ handle_get_current_consensus(dir_connection_t *conn, log_debug(LD_DIRSERV, "Client asked for network status lists, but we've been " "writing too many bytes lately. Sending 503 Dir busy."); - write_http_status_line(conn, 503, "Directory busy, try again later"); + write_short_http_response(conn, 503, "Directory busy, try again later"); geoip_note_ns_response(GEOIP_REJECT_BUSY); goto done; } @@ -4524,7 +4524,7 @@ handle_get_status_vote(dir_connection_t *conn, const get_handler_args_t *args) smartlist_free(fps); } if (!smartlist_len(dir_items) && !smartlist_len(items)) { - write_http_status_line(conn, 404, "Not found"); + write_short_http_response(conn, 404, "Not found"); goto vote_done; } @@ -4561,7 +4561,7 @@ handle_get_status_vote(dir_connection_t *conn, const get_handler_args_t *args) }); if (global_write_bucket_low(TO_CONN(conn), estimated_len, 2)) { - write_http_status_line(conn, 503, "Directory busy, try again later"); + write_short_http_response(conn, 503, "Directory busy, try again later"); goto vote_done; } write_http_response_header(conn, body_len ? body_len : -1, @@ -4618,14 +4618,14 @@ handle_get_microdesc(dir_connection_t *conn, const get_handler_args_t *args) compress_method != NO_METHOD, &size_guess, NULL); if (smartlist_len(conn->spool) == 0) { - write_http_status_line(conn, 404, "Not found"); + write_short_http_response(conn, 404, "Not found"); goto done; } if (global_write_bucket_low(TO_CONN(conn), size_guess, 2)) { log_info(LD_DIRSERV, "Client asked for server descriptors, but we've been " "writing too many bytes lately. Sending 503 Dir busy."); - write_http_status_line(conn, 503, "Directory busy, try again later"); + write_short_http_response(conn, 503, "Directory busy, try again later"); goto done; } @@ -4717,13 +4717,14 @@ handle_get_descriptor(dir_connection_t *conn, const get_handler_args_t *args) if (res < 0 || size_guess == 0 || smartlist_len(conn->spool) == 0) { if (msg == NULL) msg = "Not found"; - write_http_status_line(conn, 404, msg); + write_short_http_response(conn, 404, msg); } else { if (global_write_bucket_low(TO_CONN(conn), size_guess, 2)) { log_info(LD_DIRSERV, "Client asked for server descriptors, but we've been " "writing too many bytes lately. Sending 503 Dir busy."); - write_http_status_line(conn, 503, "Directory busy, try again later"); + write_short_http_response(conn, 503, + "Directory busy, try again later"); dir_conn_clear_spool(conn); goto done; } @@ -4796,18 +4797,18 @@ handle_get_keys(dir_connection_t *conn, const get_handler_args_t *args) }); smartlist_free(fp_sks); } else { - write_http_status_line(conn, 400, "Bad request"); + write_short_http_response(conn, 400, "Bad request"); goto keys_done; } if (!smartlist_len(certs)) { - write_http_status_line(conn, 404, "Not found"); + write_short_http_response(conn, 404, "Not found"); goto keys_done; } SMARTLIST_FOREACH(certs, authority_cert_t *, c, if (c->cache_info.published_on < if_modified_since) SMARTLIST_DEL_CURRENT(certs, c)); if (!smartlist_len(certs)) { - write_http_status_line(conn, 304, "Not modified"); + write_short_http_response(conn, 304, "Not modified"); goto keys_done; } len = 0; @@ -4817,7 +4818,7 @@ handle_get_keys(dir_connection_t *conn, const get_handler_args_t *args) if (global_write_bucket_low(TO_CONN(conn), compress_method != NO_METHOD ? len/2 : len, 2)) { - write_http_status_line(conn, 503, "Directory busy, try again later"); + write_short_http_response(conn, 503, "Directory busy, try again later"); goto keys_done; } @@ -4868,19 +4869,19 @@ handle_get_hs_descriptor_v2(dir_connection_t *conn, connection_buf_add(descp, strlen(descp), TO_CONN(conn)); break; case 0: /* well-formed but not present */ - write_http_status_line(conn, 404, "Not found"); + write_short_http_response(conn, 404, "Not found"); break; case -1: /* not well-formed */ - write_http_status_line(conn, 400, "Bad request"); + write_short_http_response(conn, 400, "Bad request"); break; } } else { /* not well-formed */ - write_http_status_line(conn, 400, "Bad request"); + write_short_http_response(conn, 400, "Bad request"); } goto done; } else { /* Not encrypted! */ - write_http_status_line(conn, 404, "Not found"); + write_short_http_response(conn, 404, "Not found"); } done: return 0; @@ -4899,7 +4900,7 @@ handle_get_hs_descriptor_v3(dir_connection_t *conn, /* Reject unencrypted dir connections */ if (!connection_dir_is_encrypted(conn)) { - write_http_status_line(conn, 404, "Not found"); + write_short_http_response(conn, 404, "Not found"); goto done; } @@ -4911,7 +4912,7 @@ handle_get_hs_descriptor_v3(dir_connection_t *conn, retval = hs_cache_lookup_as_dir(HS_VERSION_THREE, pubkey_str, &desc_str); if (retval <= 0 || desc_str == NULL) { - write_http_status_line(conn, 404, "Not found"); + write_short_http_response(conn, 404, "Not found"); goto done; } @@ -4946,7 +4947,7 @@ handle_get_networkstatus_bridges(dir_connection_t *conn, if (!header || tor_memneq(digest, options->BridgePassword_AuthDigest_, DIGEST256_LEN)) { - write_http_status_line(conn, 404, "Not found"); + write_short_http_response(conn, 404, "Not found"); tor_free(header); goto done; } @@ -5081,12 +5082,12 @@ directory_handle_command_post,(dir_connection_t *conn, const char *headers, if (!public_server_mode(options)) { log_info(LD_DIR, "Rejected dir post request from %s " "since we're not a public relay.", conn->base_.address); - write_http_status_line(conn, 503, "Not acting as a public relay"); + write_short_http_response(conn, 503, "Not acting as a public relay"); goto done; } if (parse_http_url(headers, &url) < 0) { - write_http_status_line(conn, 400, "Bad request"); + write_short_http_response(conn, 400, "Bad request"); return 0; } log_debug(LD_DIRSERV,"rewritten url as '%s'.", escaped(url)); @@ -5097,10 +5098,10 @@ directory_handle_command_post,(dir_connection_t *conn, const char *headers, if (rend_cache_store_v2_desc_as_dir(body) < 0) { log_warn(LD_REND, "Rejected v2 rend descriptor (body size %d) from %s.", (int)body_len, conn->base_.address); - write_http_status_line(conn, 400, + write_short_http_response(conn, 400, "Invalid v2 service descriptor rejected"); } else { - write_http_status_line(conn, 200, "Service descriptor (v2) stored"); + write_short_http_response(conn, 200, "Service descriptor (v2) stored"); log_info(LD_REND, "Handled v2 rendezvous descriptor post: accepted"); } goto done; @@ -5117,14 +5118,14 @@ directory_handle_command_post,(dir_connection_t *conn, const char *headers, if (code != 200) { msg = "Invalid HS descriptor. Rejected."; } - write_http_status_line(conn, code, msg); + write_short_http_response(conn, code, msg); goto done; } if (!authdir_mode(options)) { /* we just provide cached directories; we don't want to * receive anything. */ - write_http_status_line(conn, 400, "Nonauthoritative directory does not " + write_short_http_response(conn, 400, "Nonauthoritative directory does not " "accept posted server descriptors"); goto done; } @@ -5139,7 +5140,7 @@ directory_handle_command_post,(dir_connection_t *conn, const char *headers, tor_assert(msg); if (r == ROUTER_ADDED_SUCCESSFULLY) { - write_http_status_line(conn, 200, msg); + write_short_http_response(conn, 200, msg); } else if (WRA_WAS_OUTDATED(r)) { write_http_response_header_impl(conn, -1, NULL, NULL, "X-Descriptor-Not-New: Yes\r\n", -1); @@ -5148,7 +5149,7 @@ directory_handle_command_post,(dir_connection_t *conn, const char *headers, "Rejected router descriptor or extra-info from %s " "(\"%s\").", conn->base_.address, msg); - write_http_status_line(conn, 400, msg); + write_short_http_response(conn, 400, msg); } goto done; } @@ -5158,12 +5159,12 @@ directory_handle_command_post,(dir_connection_t *conn, const char *headers, const char *msg = "OK"; int status; if (dirvote_add_vote(body, &msg, &status)) { - write_http_status_line(conn, status, "Vote stored"); + write_short_http_response(conn, status, "Vote stored"); } else { tor_assert(msg); log_warn(LD_DIRSERV, "Rejected vote from %s (\"%s\").", conn->base_.address, msg); - write_http_status_line(conn, status, msg); + write_short_http_response(conn, status, msg); } goto done; } @@ -5172,17 +5173,18 @@ directory_handle_command_post,(dir_connection_t *conn, const char *headers, !strcmp(url,"/tor/post/consensus-signature")) { /* sigs on consensus. */ const char *msg = NULL; if (dirvote_add_signatures(body, conn->base_.address, &msg)>=0) { - write_http_status_line(conn, 200, msg?msg:"Signatures stored"); + write_short_http_response(conn, 200, msg?msg:"Signatures stored"); } else { log_warn(LD_DIR, "Unable to store signatures posted by %s: %s", conn->base_.address, msg?msg:"???"); - write_http_status_line(conn, 400, msg?msg:"Unable to store signatures"); + write_short_http_response(conn, 400, + msg?msg:"Unable to store signatures"); } goto done; } /* we didn't recognize the url */ - write_http_status_line(conn, 404, "Not found"); + write_short_http_response(conn, 404, "Not found"); done: tor_free(url);

1 0

[tor/master] get rid of the scary 256-byte-buf landmine
by nickm＠torproject.org 14 Sep '17

14 Sep '17

commit 771fb7e7baa789c55ba15c4c26c8a4889ff9fe8d Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Sep 14 02:52:00 2017 -0400 get rid of the scary 256-byte-buf landmine --- src/or/directory.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 0c79b4659..ba94c9747 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3479,7 +3479,7 @@ static void write_http_status_line(dir_connection_t *conn, int status, const char *reason_phrase) { - char buf[256+RFC1123_TIME_LEN+1]; + char *buf = NULL; char *datestring = NULL; if (!reason_phrase) { /* bullet-proofing */ @@ -3493,16 +3493,14 @@ write_http_status_line(dir_connection_t *conn, int status, tor_asprintf(&datestring, "Date: %s\r\n", datebuf); } - if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n%s\r\n", - status, reason_phrase, datestring?datestring:"") < 0) { - log_warn(LD_BUG,"status line too long."); - tor_free(datestring); - return; - } - tor_free(datestring); + tor_asprintf(&buf, "HTTP/1.0 %d %s\r\n%s\r\n", + status, reason_phrase, datestring?datestring:""); log_debug(LD_DIRSERV,"Wrote status 'HTTP/1.0 %d %s'", status, reason_phrase); connection_buf_add(buf, strlen(buf), TO_CONN(conn)); + + tor_free(datestring); + tor_free(buf); } /** Write the header for an HTTP/1.0 response onto conn-\>outbuf,

1 0

[tor/master] Make missing reason_phrase into a BUG().
by nickm＠torproject.org 14 Sep '17

14 Sep '17

commit 2385e3f667e329f60e9bde91117fedff9f9cff6c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 14 08:34:58 2017 -0400 Make missing reason_phrase into a BUG(). --- src/or/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/directory.c b/src/or/directory.c index ba94c9747..d6b98ed5d 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3482,7 +3482,7 @@ write_http_status_line(dir_connection_t *conn, int status, char *buf = NULL; char *datestring = NULL; - if (!reason_phrase) { /* bullet-proofing */ + IF_BUG_ONCE(!reason_phrase) { /* bullet-proofing */ reason_phrase = "unspecified"; }

1 0