nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 15:23:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make dirserv_get_routerdescs() return better http 404 error messages instead of a generic "Servers unavailable."

Browse Source 
svn:r5274
This commit is contained in:
Peter Palfrader 2005-10-18 17:09:57 +00:00
parent 551e3402a3
commit d8daa910a6
3 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/directory.c
View File

@ -1326,14 +1326,16 @@ directory_handle_command_get(connection_t *conn, char *headers,
if (!strcmpstart(url,"/tor/server/")) { if (!strcmpstart(url,"/tor/server/")) {
size_t url_len = strlen(url); size_t url_len = strlen(url);
int deflated = !strcmp(url+url_len-2, ".z"); int deflated = !strcmp(url+url_len-2, ".z");
int res;
const char *msg;
smartlist_t *descs = smartlist_create(); smartlist_t *descs = smartlist_create();
if (deflated) if (deflated)
url[url_len-2] = '\0'; url[url_len-2] = '\0';
dirserv_get_routerdescs(descs, url); res = dirserv_get_routerdescs(descs, url, &msg);
tor_free(url); tor_free(url);
if (!smartlist_len(descs)) { if (res < 0)
write_http_status_line(conn, 404, "Servers unavailable"); write_http_status_line(conn, 404, msg);
} else { else {
size_t len = 0; size_t len = 0;
format_rfc1123_time(date, time(NULL)); format_rfc1123_time(date, time(NULL));
SMARTLIST_FOREACH(descs, routerinfo_t *, ri, SMARTLIST_FOREACH(descs, routerinfo_t *, ri,

27
src/or/dirserv.c
View File

@ -1393,13 +1393,23 @@ dirserv_get_networkstatus_v2(smartlist_t *result,
* hex identity digests; or * hex identity digests; or
* - "/tor/server/d/D" where D is a plus-separated sequence * - "/tor/server/d/D" where D is a plus-separated sequence
* of server descriptor digests, in hex. * of server descriptor digests, in hex.
*
* Return -1 if we do not have any descriptors, no matching descriptors,
* or if we did not recognize the key (URL), 0 otherwise (i.e. we found some
* matching descriptors). If -1 is returned <b>msg</b> will be set to
* an appropriate error message.
*/ */
void int
dirserv_get_routerdescs(smartlist_t *descs_out, const char *key) dirserv_get_routerdescs(smartlist_t *descs_out, const char *key,
const char **msg)
{ {
smartlist_t *complete_list = get_descriptor_list(); smartlist_t *complete_list = get_descriptor_list();
if (!complete_list) *msg = NULL;
return;
if (!complete_list) {
*msg = "No server descriptors available";
return -1;
}
if (!strcmp(key, "/tor/server/all")) { if (!strcmp(key, "/tor/server/all")) {
smartlist_add_all(descs_out, complete_list); smartlist_add_all(descs_out, complete_list);
@ -1435,7 +1445,16 @@ dirserv_get_routerdescs(smartlist_t *descs_out, const char *key)
}); });
SMARTLIST_FOREACH(digests, char *, d, tor_free(d)); SMARTLIST_FOREACH(digests, char *, d, tor_free(d));
smartlist_free(digests); smartlist_free(digests);
} else {
*msg = "Key not recognized";
return -1;
} }
if (!smartlist_len(descs_out)) {
*msg = "Servers unavailable";
return -1;
}
return 0;
} }
/** Called when a TLS handshake has completed successfully with a /** Called when a TLS handshake has completed successfully with a

3
src/or/or.h
View File

@ -1781,7 +1781,8 @@ void dirserv_set_cached_directory(const char *directory, time_t when,
void dirserv_set_cached_networkstatus_v2(const char *directory, const char *fp, void dirserv_set_cached_networkstatus_v2(const char *directory, const char *fp,
time_t published); time_t published);
int dirserv_get_networkstatus_v2(smartlist_t *result, const char *key); int dirserv_get_networkstatus_v2(smartlist_t *result, const char *key);
void dirserv_get_routerdescs(smartlist_t *descs_out, const char *key); int dirserv_get_routerdescs(smartlist_t *descs_out, const char *key,
const char **msg);
void dirserv_orconn_tls_done(const char *address, void dirserv_orconn_tls_done(const char *address,
uint16_t or_port, uint16_t or_port,
const char *digest_rcvd, const char *digest_rcvd,