[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Add some functions to escape values from the network before...
Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv11439/src/or
Modified Files:
buffers.c circuituse.c command.c config.c connection.c
connection_edge.c connection_or.c directory.c dirserv.c or.h
routerparse.c test.c
Log Message:
Add some functions to escape values from the network before sending them to the log. Use them everywhere except for routerinfo->plaftorm, routerinfo->contact_info, and rend*.c. (need sleep now)
Index: buffers.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/buffers.c,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -d -r1.185 -r1.186
--- buffers.c 13 Feb 2006 08:28:42 -0000 1.185
+++ buffers.c 5 Mar 2006 09:50:25 -0000 1.186
@@ -1004,6 +1004,14 @@ fetch_from_buf_socks(buf_t *buf, socks_r
req->address[len] = 0;
req->port = ntohs(get_uint16(buf->cur+5+len));
buf_remove_from_front(buf, 5+len+2);
+ if (!tor_strisprint(req->address) || strchr(req->address,'\"')) {
+ log_warn(LD_PROTOCOL,
+ "Your application (using socks5 on port %d) gave Tor "
+ "a malformed hostname: %s. Rejecting the connection.",
+ req->port, escaped(req->address));
+ return -1;
+ }
+
if (log_sockstype)
log_notice(LD_APP,
"Your application (using socks5 on port %d) gave "
@@ -1049,7 +1057,7 @@ fetch_from_buf_socks(buf_t *buf, socks_r
return -1;
}
log_debug(LD_APP,
- "socks4: successfully read destip (%s)",safe_str(tmpbuf));
+ "socks4: successfully read destip (%s)", safe_str(tmpbuf));
socks4_prot = socks4;
}
@@ -1088,6 +1096,7 @@ fetch_from_buf_socks(buf_t *buf, socks_r
return -1;
}
tor_assert(next < buf->cur+buf->datalen);
+
if (log_sockstype)
log_notice(LD_APP,
"Your application (using socks4a on port %d) gave "
@@ -1097,6 +1106,13 @@ fetch_from_buf_socks(buf_t *buf, socks_r
log_debug(LD_APP,"socks4: Everything is here. Success.");
strlcpy(req->address, startaddr ? startaddr : tmpbuf,
sizeof(req->address));
+ if (!tor_strisprint(req->address) || strchr(req->address,'\"')) {
+ log_warn(LD_PROTOCOL,
+ "Your application (using socks4 on port %d) gave Tor "
+ "a malformed hostname: %s. Rejecting the connection.",
+ req->port, escaped(req->address));
+ return -1;
+ }
/* next points to the final \0 on inbuf */
buf_remove_from_front(buf, next-buf->cur+1);
return 1;
Index: circuituse.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuituse.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -d -r1.113 -r1.114
--- circuituse.c 13 Feb 2006 08:28:42 -0000 1.113
+++ circuituse.c 5 Mar 2006 09:50:25 -0000 1.114
@@ -733,7 +733,7 @@ circuit_build_failed(circuit_t *circ)
log_info(LD_REND,
"Couldn't connect to Alice's chosen rend point %s "
"(%s hop failed).",
- build_state_get_exit_nickname(circ->build_state),
+ escaped(build_state_get_exit_nickname(circ->build_state)),
failed_at_last_hop?"last":"non-last");
rend_service_relaunch_rendezvous(circ);
break;
Index: command.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/command.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -d -r1.109 -r1.110
--- command.c 13 Feb 2006 08:28:42 -0000 1.109
+++ command.c 5 Mar 2006 09:50:25 -0000 1.110
@@ -202,8 +202,8 @@ command_process_create_cell(cell_t *cell
cell->circ_id, (int)(time(NULL) - conn->timestamp_created));
if (router)
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
- "Details: nickname '%s', platform '%s'.",
- router->nickname, router->platform);
+ "Details: nickname \"%s\", platform %s.",
+ router->nickname, escaped(router->platform));
return;
}
Index: config.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -p -d -r1.522 -r1.523
--- config.c 5 Mar 2006 05:27:59 -0000 1.522
+++ config.c 5 Mar 2006 09:50:25 -0000 1.523
@@ -518,6 +518,16 @@ safe_str(const char *address)
return address;
}
+/** DOCDOC */
+const char *
+escaped_safe_str(const char *address)
+{
+ if (get_options()->SafeLogging)
+ return "[scrubbed]";
+ else
+ return escaped(address);
+}
+
/** Add the default directory servers directly into the trusted dir list. */
static void
add_default_trusted_dirservers(void)
Index: connection.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/connection.c,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -p -d -r1.443 -r1.444
--- connection.c 13 Feb 2006 09:02:35 -0000 1.443
+++ connection.c 5 Mar 2006 09:50:25 -0000 1.444
@@ -772,7 +772,7 @@ connection_connect(connection_t *conn, c
} else if (!SOCKET_IS_POLLABLE(s)) {
log_warn(LD_NET,
"Too many connections; can't create pollable connection to %s",
- safe_str(address));
+ safe_str(address));
tor_close_socket(s);
return -1;
}
Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/connection_edge.c,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -p -d -r1.381 -r1.382
--- connection_edge.c 13 Feb 2006 09:02:35 -0000 1.381
+++ connection_edge.c 5 Mar 2006 09:50:25 -0000 1.382
@@ -945,7 +945,8 @@ connection_ap_handshake_rewrite_and_atta
hostname_type_t addresstype;
tor_strlower(socks->address); /* normalize it */
- log_debug(LD_APP,"Client asked for %s:%d", safe_str(socks->address),
+ log_debug(LD_APP,"Client asked for %s:%d",
+ safe_str(socks->address),
socks->port);
/* For address map controls, remap the address */
@@ -1519,6 +1520,12 @@ connection_exit_begin_conn(cell_t *cell,
tor_free(address);
return 0;
}
+ if (!tor_strisprint(address)) {
+ log_warn(LD_PROTOCOL,"Non-printing characters in address %s in relay "
+ "begin cell. Dropping.", escaped(address));
+ tor_free(address);
+ return 0;
+ }
log_debug(LD_EXIT,"Creating new exit connection.");
n_stream = connection_new(CONN_TYPE_EXIT);
Index: connection_or.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/connection_or.c,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -d -r1.213 -r1.214
--- connection_or.c 14 Feb 2006 17:48:51 -0000 1.213
+++ connection_or.c 5 Mar 2006 09:50:25 -0000 1.214
@@ -181,8 +181,8 @@ connection_or_read_proxy_response(connec
if (status_code == 200) {
log_info(LD_OR,
- "HTTPS connect to '%s' successful! (200 \"%s\") Starting TLS.",
- conn->address, reason);
+ "HTTPS connect to '%s' successful! (200 %s) Starting TLS.",
+ conn->address, escaped(reason));
tor_free(reason);
if (connection_tls_start_handshake(conn, 0) < 0) {
/* TLS handshaking error of some kind. */
@@ -194,9 +194,9 @@ connection_or_read_proxy_response(connec
}
/* else, bad news on the status code */
log_warn(LD_OR,
- "The https proxy sent back an unexpected status code %d (\"%s\"). "
+ "The https proxy sent back an unexpected status code %d (%s). "
"Closing.",
- status_code, reason);
+ status_code, escaped(reason));
tor_free(reason);
connection_mark_for_close(conn);
return -1;
Index: directory.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/directory.c,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -p -d -r1.359 -r1.360
--- directory.c 21 Feb 2006 06:23:57 -0000 1.359
+++ directory.c 5 Mar 2006 09:50:25 -0000 1.360
@@ -537,7 +537,7 @@ directory_send_command(connection_t *con
tor_assert(!payload);
log_debug(LD_DIR,
"Asking for compressed directory from server running %s",
- platform?platform:"<unknown version>");
+ platform?escaped(platform):"<unknown version>");
httpcommand = "GET";
url = tor_strdup("/tor/dir.z");
break;
@@ -712,7 +712,8 @@ http_get_origin(const char *headers, con
if (fwd) {
size_t len = strlen(fwd)+strlen(conn->address)+32;
char *result = tor_malloc(len);
- tor_snprintf(result, len, "'%s' (forwarded for '%s')", conn->address, fwd);
+ tor_snprintf(result, len, "'%s' (forwarded for %s)", conn->address,
+ escaped(fwd));
tor_free(fwd);
return result;
} else {
@@ -754,7 +755,7 @@ parse_http_response(const char *headers,
if (sscanf(headers, "HTTP/1.%d %d", &n1, &n2) < 2 ||
(n1 != 0 && n1 != 1) ||
(n2 < 100 || n2 >= 600)) {
- log_warn(LD_HTTP,"Failed to parse header '%s'",headers);
+ log_warn(LD_HTTP,"Failed to parse header %s",escaped(headers));
return -1;
}
*code = n2;
@@ -801,8 +802,8 @@ parse_http_response(const char *headers,
} else if (!strcmp(enc, "gzip") || !strcmp(enc, "x-gzip")) {
*compression = GZIP_METHOD;
} else {
- log_info(LD_HTTP, "Unrecognized content encoding: '%s'. Trying to deal.",
- enc);
+ log_info(LD_HTTP, "Unrecognized content encoding: %s. Trying to deal.",
+ escaped(enc));
*compression = -1;
}
}
@@ -891,8 +892,8 @@ connection_dir_client_reached_eof(connec
if (!reason) reason = tor_strdup("[no reason given]");
log_debug(LD_DIR,
- "Received response from directory server '%s:%d': %d \"%s\"",
- conn->address, conn->port, status_code, reason);
+ "Received response from directory server '%s:%d': %d %s",
+ conn->address, conn->port, status_code, escaped(reason));
if (date_header > 0) {
now = time(NULL);
@@ -914,9 +915,9 @@ connection_dir_client_reached_eof(connec
}
if (status_code == 503) {
- log_info(LD_DIR,"Received http status code %d (\"%s\") from server "
+ log_info(LD_DIR,"Received http status code %d (%s) from server "
"'%s:%d'. I'll try again soon.",
- status_code, reason, conn->address, conn->port);
+ status_code, escaped(reason), conn->address, conn->port);
tor_free(body); tor_free(headers); tor_free(reason);
return -1;
}
@@ -982,9 +983,9 @@ connection_dir_client_reached_eof(connec
log_info(LD_DIR,"Received directory (size %d) from server '%s:%d'",
(int)body_len, conn->address, conn->port);
if (status_code != 200) {
- log_warn(LD_DIR,"Received http status code %d (\"%s\") from server "
+ log_warn(LD_DIR,"Received http status code %d (%s) from server "
"'%s:%d'. I'll try again soon.",
- status_code, reason, conn->address, conn->port);
+ status_code, escaped(reason), conn->address, conn->port);
tor_free(body); tor_free(headers); tor_free(reason);
return -1;
}
@@ -999,9 +1000,9 @@ connection_dir_client_reached_eof(connec
/* just update our list of running routers, if this list is new info */
log_info(LD_DIR,"Received running-routers list (size %d)", (int)body_len);
if (status_code != 200) {
- log_warn(LD_DIR,"Received http status code %d (\"%s\") from server "
+ log_warn(LD_DIR,"Received http status code %d (%s) from server "
"'%s:%d'. I'll try again soon.",
- status_code, reason, conn->address, conn->port);
+ status_code, escaped(reason), conn->address, conn->port);
tor_free(body); tor_free(headers); tor_free(reason);
return -1;
}
@@ -1023,9 +1024,9 @@ connection_dir_client_reached_eof(connec
"'%s:%d'",(int) body_len, conn->address, conn->port);
if (status_code != 200) {
log_warn(LD_DIR,
- "Received http status code %d (\"%s\") from server "
+ "Received http status code %d (%s) from server "
"'%s:%d' while fetching \"/tor/status/%s\". I'll try again soon.",
- status_code, reason, conn->address, conn->port,
+ status_code, escaped(reason), conn->address, conn->port,
conn->requested_resource);
tor_free(body); tor_free(headers); tor_free(reason);
connection_dir_download_networkstatus_failed(conn);
@@ -1083,9 +1084,9 @@ connection_dir_client_reached_eof(connec
/* 404 means that it didn't have them; no big deal.
* Older (pre-0.1.1.8) servers said 400 Servers unavailable instead. */
log_fn(dir_okay ? LOG_INFO : LOG_WARN, LD_DIR,
- "Received http status code %d (\"%s\") from server '%s:%d' "
+ "Received http status code %d (%s) from server '%s:%d' "
"while fetching \"/tor/server/%s\". I'll try again soon.",
- status_code, reason, conn->address, conn->port,
+ status_code, escaped(reason), conn->address, conn->port,
conn->requested_resource);
if (!which) {
connection_dir_download_routerdesc_failed(conn);
@@ -1137,22 +1138,22 @@ connection_dir_client_reached_eof(connec
"descriptor: finished.");
break;
case 400:
- log_warn(LD_GENERAL,"http status 400 (\"%s\") response from "
+ log_warn(LD_GENERAL,"http status 400 (%s) response from "
"dirserver '%s:%d'. Please correct.",
- reason, conn->address, conn->port);
+ escaped(reason), conn->address, conn->port);
break;
case 403:
log_warn(LD_GENERAL,
- "http status 403 (\"%s\") response from dirserver "
+ "http status 403 (%s) response from dirserver "
"'%s:%d'. Is your clock skewed? Have you mailed us your key "
"fingerprint? Are you using the right key? Are you using a "
"private IP address? See http://tor.eff.org/doc/";
- "tor-doc-server.html", reason, conn->address, conn->port);
+ "tor-doc-server.html",escaped(reason), conn->address, conn->port);
break;
default:
log_warn(LD_GENERAL,
- "http status %d (\"%s\") reason unexpected (server '%s:%d').",
- status_code, reason, conn->address, conn->port);
+ "http status %d (%s) reason unexpected (server '%s:%d').",
+ status_code, escaped(reason), conn->address, conn->port);
break;
}
/* return 0 in all cases, since we don't want to mark any
@@ -1161,8 +1162,8 @@ connection_dir_client_reached_eof(connec
if (conn->purpose == DIR_PURPOSE_FETCH_RENDDESC) {
log_info(LD_REND,"Received rendezvous descriptor (size %d, status %d "
- "(\"%s\"))",
- (int)body_len, status_code, reason);
+ "(%s))",
+ (int)body_len, status_code, escaped(reason));
switch (status_code) {
case 200:
if (rend_cache_store(body, body_len) < 0) {
@@ -1181,13 +1182,13 @@ connection_dir_client_reached_eof(connec
break;
case 400:
log_warn(LD_REND,
- "http status 400 (\"%s\"). Dirserver didn't like our "
- "rendezvous query?", reason);
+ "http status 400 (%s). Dirserver didn't like our "
+ "rendezvous query?", escaped(reason));
break;
default:
- log_warn(LD_REND,"http status %d (\"%s\") response unexpected (server "
- "'%s:%d').",
- status_code, reason, conn->address, conn->port);
+ log_warn(LD_REND,"http status %d (%s) response unexpected (server "
+ "'%s:%d').",
+ status_code, escaped(reason), conn->address, conn->port);
break;
}
}
@@ -1197,17 +1198,17 @@ connection_dir_client_reached_eof(connec
case 200:
log_info(LD_REND,
"Uploading rendezvous descriptor: finished with status "
- "200 (\"%s\")", reason);
+ "200 (%s)", escaped(reason));
break;
case 400:
- log_warn(LD_REND,"http status 400 (\"%s\") response from dirserver "
+ log_warn(LD_REND,"http status 400 (%s) response from dirserver "
"'%s:%d'. Malformed rendezvous descriptor?",
- reason, conn->address, conn->port);
+ escaped(reason), conn->address, conn->port);
break;
default:
- log_warn(LD_REND,"http status %d (\"%s\") response unexpected (server "
+ log_warn(LD_REND,"http status %d (%s) response unexpected (server "
"'%s:%d').",
- status_code, reason, conn->address, conn->port);
+ status_code, escaped(reason), conn->address, conn->port);
break;
}
}
@@ -1728,7 +1729,7 @@ directory_handle_command_post(connection
#if 0
if (body_len <= 1024) {
base16_encode(tmp, sizeof(tmp), body, body_len);
- log_notice(LD_DIRSERV,"Body was: %s", tmp);
+ log_notice(LD_DIRSERV,"Body was: %s", escaped(tmp));
}
#endif
write_http_status_line(conn, 400, "Invalid service descriptor rejected");
@@ -1775,15 +1776,15 @@ directory_handle_command(connection_t *c
/* case 1, fall through */
}
- log_debug(LD_DIRSERV,"headers '%s', body '%s'.", headers, body);
+ //log_debug(LD_DIRSERV,"headers %s, body %s.", headers, body);
if (!strncasecmp(headers,"GET",3))
r = directory_handle_command_get(conn, headers, body, body_len);
else if (!strncasecmp(headers,"POST",4))
r = directory_handle_command_post(conn, headers, body, body_len);
else {
- log_warn(LD_PROTOCOL,"Got headers '%s' with unknown command. Closing.",
- headers);
+ log_warn(LD_PROTOCOL,"Got headers %s with unknown command. Closing.",
+ escaped(headers));
r = -1;
}
@@ -1904,7 +1905,7 @@ dir_routerdesc_download_failed(smartlist
/* update_router_descriptor_downloads(time(NULL)); */
}
-/* Given a directory <b>resource</b> request generated by us, containing zero
+/* Given a directory <b>resource</b> request, containing zero
* or more strings separated by plus signs, followed optionally by ".z", store
* the strings, in order, into <b>fp_out</b>. If <b>compressed_out</b> is
* non-NULL, set it to 1 if the resource ends in ".z", else set it to 0. If
@@ -1938,13 +1939,13 @@ dir_split_resource_into_fingerprints(con
cp = smartlist_get(fp_out, i);
if (strlen(cp) != HEX_DIGEST_LEN) {
log_info(LD_DIR,
- "Skipping digest \"%s\" with non-standard length.", cp);
+ "Skipping digest %s with non-standard length.", escaped(cp));
smartlist_del(fp_out, i--);
goto again;
}
d = tor_malloc_zero(DIGEST_LEN);
if (base16_decode(d, DIGEST_LEN, cp, HEX_DIGEST_LEN)<0) {
- log_info(LD_DIR, "Skipping non-decodable digest \"%s\"", cp);
+ log_info(LD_DIR, "Skipping non-decodable digest %s", escaped(cp));
smartlist_del(fp_out, i--);
goto again;
}
Index: dirserv.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/dirserv.c,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -p -d -r1.298 -r1.299
--- dirserv.c 13 Feb 2006 09:37:53 -0000 1.298
+++ dirserv.c 5 Mar 2006 09:50:25 -0000 1.299
@@ -346,13 +346,14 @@ dirserv_get_status_impl(const char *fp,
log_debug(LD_DIRSERV,"Good fingerprint for '%s'",nickname);
return FP_NAMED; /* Right fingerprint. */
} else {
- if (should_log)
+ if (should_log) {
log_warn(LD_DIRSERV,
"Mismatched fingerprint for '%s': expected '%s' got '%s'. "
"ContactInfo '%s', platform '%s'.)",
nickname, nn_ent->fingerprint, fp,
contact ? contact : "",
- platform ? platform : "");
+ platform ? escaped(platform) : "");
+ }
if (msg)
*msg = "Rejected: There is already a verified server with this nickname "
"and a different fingerprint.";
Index: or.h
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.797
retrieving revision 1.798
diff -u -p -d -r1.797 -r1.798
--- or.h 23 Feb 2006 06:51:09 -0000 1.797
+++ or.h 5 Mar 2006 09:50:25 -0000 1.798
@@ -1591,6 +1591,7 @@ or_options_t *get_options(void);
int set_options(or_options_t *new_val);
void config_free_all(void);
const char *safe_str(const char *address);
+const char *escaped_safe_str(const char *address);
int config_get_lines(char *string, config_line_t **result);
void config_free_lines(config_line_t *front);
Index: routerparse.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/routerparse.c,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -d -r1.175 -r1.176
--- routerparse.c 5 Mar 2006 05:27:59 -0000 1.175
+++ routerparse.c 5 Mar 2006 09:50:25 -0000 1.176
@@ -468,8 +468,8 @@ router_parse_runningrouters(const char *
log_warn(LD_DIR, "Error tokenizing directory"); goto err;
}
if ((tok = find_first_by_keyword(tokens, _UNRECOGNIZED))) {
- log_warn(LD_DIR, "Unrecognized keyword '%s'; can't parse running-routers",
- tok->args[0]);
+ log_warn(LD_DIR, "Unrecognized keyword %s; can't parse running-routers",
+ escaped(tok->args[0]));
goto err;
}
tok = smartlist_get(tokens,0);
@@ -736,9 +736,9 @@ router_parse_entry_from_string(const cha
}
if ((tok = find_first_by_keyword(tokens, _UNRECOGNIZED))) {
log_warn(LD_DIR,
- "Unrecognized critical keyword '%s'; skipping descriptor. "
+ "Unrecognized critical keyword %s; skipping descriptor. "
"(It may be from another version of Tor.)",
- tok->args[0]);
+ escaped(tok->args[0]));
goto err;
}
@@ -852,7 +852,8 @@ router_parse_entry_from_string(const cha
}
tor_strstrip(tok->args[0], " ");
if (base16_decode(d, DIGEST_LEN, tok->args[0], strlen(tok->args[0]))) {
- log_warn(LD_DIR, "Couldn't decode fingerprint '%s'", tok->args[0]);
+ log_warn(LD_DIR, "Couldn't decode fingerprint %s",
+ escaped(tok->args[0]));
goto err;
}
if (memcmp(d,router->cache_info.identity_digest, DIGEST_LEN)!=0) {
@@ -882,7 +883,8 @@ router_parse_entry_from_string(const cha
router->declared_family = smartlist_create();
for (i=0;i<tok->n_args;++i) {
if (!is_legal_nickname_or_hexdigest(tok->args[i])) {
- log_warn(LD_DIR, "Illegal nickname '%s' in family line", tok->args[i]);
+ log_warn(LD_DIR, "Illegal nickname %s in family line",
+ escaped(tok->args[i]));
goto err;
}
smartlist_add(router->declared_family, tor_strdup(tok->args[i]));
@@ -977,8 +979,8 @@ routerstatus_parse_entry_from_string(con
goto err;
}
if ((tok = find_first_by_keyword(tokens, _UNRECOGNIZED))) {
- log_warn(LD_DIR, "Unrecognized keyword \"%s\" in router status; skipping.",
- tok->args[0]);
+ log_warn(LD_DIR, "Unrecognized keyword %s in router status; skipping.",
+ escaped(tok->args[0]));
goto err;
}
if (!(tok = find_first_by_keyword(tokens, K_R))) {
@@ -993,19 +995,19 @@ routerstatus_parse_entry_from_string(con
if (!is_legal_nickname(tok->args[0])) {
log_warn(LD_DIR,
- "Invalid nickname '%s' in router status; skipping.",
- tok->args[0]);
+ "Invalid nickname %s in router status; skipping.",
+ escaped(tok->args[0]));
goto err;
}
strlcpy(rs->nickname, tok->args[0], sizeof(rs->nickname));
if (digest_from_base64(rs->identity_digest, tok->args[1])) {
- log_warn(LD_DIR, "Error decoding digest '%s'", tok->args[1]);
+ log_warn(LD_DIR, "Error decoding digest %s", escaped(tok->args[1]));
goto err;
}
if (digest_from_base64(rs->descriptor_digest, tok->args[2])) {
- log_warn(LD_DIR, "Error decoding digest '%s'", tok->args[2]);
+ log_warn(LD_DIR, "Error decoding digest %s", escaped(tok->args[2]));
goto err;
}
@@ -1018,7 +1020,7 @@ routerstatus_parse_entry_from_string(con
}
if (tor_inet_aton(tok->args[5], &in) == 0) {
- log_warn(LD_DIR, "Error parsing address '%s'", tok->args[5]);
+ log_warn(LD_DIR, "Error parsing address '%s'", escaped(tok->args[5]));
goto err;
}
rs->addr = ntohl(in.s_addr);
@@ -1097,8 +1099,8 @@ networkstatus_parse_from_string(const ch
goto err;
}
if ((tok = find_first_by_keyword(tokens, _UNRECOGNIZED))) {
- log_warn(LD_DIR, "Unrecognized keyword '%s'; can't parse network-status",
- tok->args[0]);
+ log_warn(LD_DIR, "Unrecognized keyword %s; can't parse network-status",
+ escaped(tok->args[0]));
goto err;
}
ns = tor_malloc_zero(sizeof(networkstatus_t));
@@ -1119,7 +1121,7 @@ networkstatus_parse_from_string(const ch
}
ns->source_address = tok->args[0]; tok->args[0] = NULL;
if (tor_inet_aton(tok->args[1], &in) == 0) {
- log_warn(LD_DIR, "Error parsing address '%s'", tok->args[1]);
+ log_warn(LD_DIR, "Error parsing address %s", escaped(tok->args[1]));
goto err;
}
ns->source_addr = ntohl(in.s_addr);
@@ -1140,7 +1142,7 @@ networkstatus_parse_from_string(const ch
}
if (base16_decode(ns->identity_digest, DIGEST_LEN, tok->args[0],
strlen(tok->args[0]))) {
- log_warn(LD_DIR, "Couldn't decode fingerprint '%s'", tok->args[0]);
+ log_warn(LD_DIR, "Couldn't decode fingerprint %s", escaped(tok->args[0]));
goto err;
}
@@ -1369,7 +1371,7 @@ router_parse_addr_policy(directory_token
policy_read_failed:
tor_assert(newe->string);
- log_warn(LD_DIR,"Couldn't parse line '%s'. Dropping", newe->string);
+ log_warn(LD_DIR,"Couldn't parse line %s. Dropping", escaped(newe->string));
tor_free(newe->string);
tor_free(newe);
return NULL;
Index: test.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/test.c,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -d -r1.221 -r1.222
--- test.c 13 Feb 2006 00:26:43 -0000 1.221
+++ test.c 5 Mar 2006 09:50:26 -0000 1.222
@@ -913,6 +913,12 @@ test_util(void)
test_streq(tmpbuf, "18.244.0.188");
}
+ /* Test 'escaped' */
+ test_streq("\"\"", escaped(""));
+ test_streq("\"abcd\"", escaped("abcd"));
+ test_streq("\"\\\\\\n\\r\\t\\\"\\'\"", escaped("\\\n\r\t\"\'"));
+ test_streq("\"z\\001abc\\277d\"", escaped("z\001abc\277d"));
+
/* XXXX test older functions. */
smartlist_free(sl);
}