r15656@catbus: nickm | 2007-10-10 16:23:18 -0400

Fix the implementation of if-modified-since for certificates so that it applies to all types of certificate requests.  Note that the kind of consensus that matters already has a working if-modified-since.


svn:r11852
This commit is contained in:
Nick Mathewson 2007-10-10 20:28:01 +00:00
parent d9a99b9ba6
commit dace37aee8
2 changed files with 13 additions and 4 deletions

View File

@ -31,6 +31,8 @@ Changes in version 0.2.0.8-alpha - 2007-10-12
- Caches now download v3 network status documents as needed. - Caches now download v3 network status documents as needed.
- Send a 503 when low on bandwidth and a vote, consensus, or certificate - Send a 503 when low on bandwidth and a vote, consensus, or certificate
is requested. is requested.
- If-modified-since is now implemented properly for all kinds of
certificate requests.
o Minor features (network statuses): o Minor features (network statuses):
- Tweak the implementation of proposal 109 slightly: allow at most - Tweak the implementation of proposal 109 slightly: allow at most

View File

@ -2161,7 +2161,9 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
if (!strcmpstart(url,"/tor/status-vote/current/") || if (!strcmpstart(url,"/tor/status-vote/current/") ||
!strcmpstart(url,"/tor/status-vote/next/")) { !strcmpstart(url,"/tor/status-vote/next/")) {
/*XXXX020 implement if-modified-since */ /* XXXX If-modified-since is only the implemented for the current
* consensus: that's probably fine, since it's the only vote document
* people fetch much.*/
int current = 1; int current = 1;
ssize_t body_len = 0; ssize_t body_len = 0;
ssize_t estimated_len = 0; ssize_t estimated_len = 0;
@ -2321,7 +2323,6 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
} }
if (!strcmpstart(url,"/tor/keys/")) { if (!strcmpstart(url,"/tor/keys/")) {
/*XXXX020 implement if-modified-since */
smartlist_t *certs = smartlist_create(); smartlist_t *certs = smartlist_create();
ssize_t len = -1; ssize_t len = -1;
if (!strcmp(url, "/tor/keys/all")) { if (!strcmp(url, "/tor/keys/all")) {
@ -2331,8 +2332,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
if (!ds->v3_certs) if (!ds->v3_certs)
continue; continue;
SMARTLIST_FOREACH(ds->v3_certs, authority_cert_t *, cert, SMARTLIST_FOREACH(ds->v3_certs, authority_cert_t *, cert,
if (cert->cache_info.published_on >= if_modified_since) smartlist_add(certs, cert));
smartlist_add(certs, cert));
}); });
} else if (!strcmp(url, "/tor/keys/authority")) { } else if (!strcmp(url, "/tor/keys/authority")) {
authority_cert_t *cert = get_my_v3_authority_cert(); authority_cert_t *cert = get_my_v3_authority_cert();
@ -2368,6 +2368,13 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
smartlist_free(certs); smartlist_free(certs);
goto keys_done; goto keys_done;
} }
SMARTLIST_FOREACH(certs, authority_cert_t *, c,
if (cert->cache_info.published_on < if_modified_since)
SMARTLIST_DEL_CURRENT(certs, c));
if (!smartlist_len(certs)) {
write_status_line(conn, 304, "Not modified");
goto keys_done;
}
len = 0; len = 0;
SMARTLIST_FOREACH(certs, authority_cert_t *, c, SMARTLIST_FOREACH(certs, authority_cert_t *, c,
len += c->cache_info.signed_descriptor_len); len += c->cache_info.signed_descriptor_len);