nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid spurious warnings in rend_service_introduce

Browse Source 
There was some code in the "err:" block that would always log a
warning, reporting an "unknown error" if we hadn't set err_msg.  But
there were also plenty of "goto err" blocks that did their own
logging, and never set err_msg at all.  Now we should only log when
we have an error message to log.

This fixes bug 6638, from no released Tor version.
This commit is contained in:
Nick Mathewson 2012-08-21 10:15:52 -04:00
parent 661bd3fe71
commit 778d90122c
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/or/rendservice.c
View File

@ -1177,8 +1177,9 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request,
/* Early parsing pass (get pk, ciphertext); type 2 is INTRODUCE2 */ /* Early parsing pass (get pk, ciphertext); type 2 is INTRODUCE2 */
parsed_req = parsed_req =
rend_service_begin_parse_intro(request, request_len, 2, &err_msg); rend_service_begin_parse_intro(request, request_len, 2, &err_msg);
if (!parsed_req) goto err; if (!parsed_req) {
else if (err_msg) { goto log_error;
} else if (err_msg) {
log_info(LD_REND, "%s on circ %d.", err_msg, circuit->_base.n_circ_id); log_info(LD_REND, "%s on circ %d.", err_msg, circuit->_base.n_circ_id);
tor_free(err_msg); tor_free(err_msg);
} }
@ -1186,8 +1187,9 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request,
stage_descr = "early validation"; stage_descr = "early validation";
/* Early validation of pk/ciphertext part */ /* Early validation of pk/ciphertext part */
result = rend_service_validate_intro_early(parsed_req, &err_msg); result = rend_service_validate_intro_early(parsed_req, &err_msg);
if (result < 0) goto err; if (result < 0) {
else if (err_msg) { goto log_error;
} else if (err_msg) {
log_info(LD_REND, "%s on circ %d.", err_msg, circuit->_base.n_circ_id); log_info(LD_REND, "%s on circ %d.", err_msg, circuit->_base.n_circ_id);
tor_free(err_msg); tor_free(err_msg);
} }
@ -1215,14 +1217,15 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request,
"INTRODUCE2 cell with same PK-encrypted part %d " "INTRODUCE2 cell with same PK-encrypted part %d "
"seconds ago. Dropping cell.", "seconds ago. Dropping cell.",
(int)elapsed); (int)elapsed);
goto err; goto err;
} }
stage_descr = "decryption"; stage_descr = "decryption";
/* Now try to decrypt it */ /* Now try to decrypt it */
result = rend_service_decrypt_intro(parsed_req, intro_key, &err_msg); result = rend_service_decrypt_intro(parsed_req, intro_key, &err_msg);
if (result < 0) goto err; if (result < 0) {
else if (err_msg) { goto log_error;
} else if (err_msg) {
log_info(LD_REND, "%s on circ %d.", err_msg, circuit->_base.n_circ_id); log_info(LD_REND, "%s on circ %d.", err_msg, circuit->_base.n_circ_id);
tor_free(err_msg); tor_free(err_msg);
} }
@ -1230,8 +1233,9 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request,
stage_descr = "late parsing"; stage_descr = "late parsing";
/* Parse the plaintext */ /* Parse the plaintext */
result = rend_service_parse_intro_plaintext(parsed_req, &err_msg); result = rend_service_parse_intro_plaintext(parsed_req, &err_msg);
if (result < 0) goto err; if (result < 0) {
else if (err_msg) { goto log_error;
} else if (err_msg) {
log_info(LD_REND, "%s on circ %d.", err_msg, circuit->_base.n_circ_id); log_info(LD_REND, "%s on circ %d.", err_msg, circuit->_base.n_circ_id);
tor_free(err_msg); tor_free(err_msg);
} }
@ -1239,8 +1243,9 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request,
stage_descr = "late validation"; stage_descr = "late validation";
/* Validate the parsed plaintext parts */ /* Validate the parsed plaintext parts */
result = rend_service_validate_intro_late(parsed_req, &err_msg); result = rend_service_validate_intro_late(parsed_req, &err_msg);
if (result < 0) goto err; if (result < 0) {
else if (err_msg) { goto log_error;
} else if (err_msg) {
log_info(LD_REND, "%s on circ %d.", err_msg, circuit->_base.n_circ_id); log_info(LD_REND, "%s on circ %d.", err_msg, circuit->_base.n_circ_id);
tor_free(err_msg); tor_free(err_msg);
} }
@ -1251,7 +1256,8 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request,
/* Find the rendezvous point */ /* Find the rendezvous point */
rp = find_rp_for_intro(parsed_req, &need_rp_free, &err_msg); rp = find_rp_for_intro(parsed_req, &need_rp_free, &err_msg);
if (!rp) goto err; if (!rp)
goto log_error;
/* Check if we'd refuse to talk to this router */ /* Check if we'd refuse to talk to this router */
if (options->StrictNodes && if (options->StrictNodes &&
@ -1379,21 +1385,23 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request,
goto done; goto done;
err: log_error:
status = -1;
if (!err_msg) { if (!err_msg) {
if (stage_descr) { if (stage_descr) {
tor_asprintf(&err_msg, tor_asprintf(&err_msg,
"unknown %s error for INTRODUCE2", stage_descr); "unknown %s error for INTRODUCE2", stage_descr);
} else { } else {
err_msg = tor_strdup("unknown error for INTRODUCE2"); err_msg = tor_strdup("unknown error for INTRODUCE2");
} }
} }
log_warn(LD_REND, "%s on circ %d", err_msg, circuit->_base.n_circ_id);
err:
status = -1;
if (dh) crypto_dh_free(dh); if (dh) crypto_dh_free(dh);
if (launched) { if (launched) {
circuit_mark_for_close(TO_CIRCUIT(launched), reason); circuit_mark_for_close(TO_CIRCUIT(launched), reason);
} }
log_warn(LD_REND, "%s on circ %d", err_msg, circuit->_base.n_circ_id);
tor_free(err_msg); tor_free(err_msg);
done: done: