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

If bridge authorities set BridgePassword, they will serve a

Browse Source 
snapshot of known bridge routerstatuses from their DirPort to
anybody who knows that password. Unset by default.


svn:r12929
This commit is contained in:
Roger Dingledine 2007-12-22 11:48:17 +00:00
parent 87a616e128
commit 88503e25c7
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -15,6 +15,11 @@ Changes in version 0.2.0.14-alpha - 2007-12-??
currently have a Bridge line for it in our torrc. Bugfix on currently have a Bridge line for it in our torrc. Bugfix on
0.2.0.12-alpha. 0.2.0.12-alpha.
o Major features:
- If bridge authorities set BridgePassword, they will serve a
snapshot of known bridge routerstatuses from their DirPort to
anybody who knows that password. Unset by default.
o Minor bugfixes: o Minor bugfixes:
- Make the unit tests build again. - Make the unit tests build again.
- Make "GETINFO/desc-annotations/id/<OR digest>" actually work. - Make "GETINFO/desc-annotations/id/<OR digest>" actually work.

17
src/or/directory.c
View File

@ -2596,9 +2596,11 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
options->BridgePassword && options->BridgePassword &&
!strcmp(url,"/tor/networkstatus-bridges")) { !strcmp(url,"/tor/networkstatus-bridges")) {
char *status; char *status;
size_t len; char decoded[64];
char *secret;
int r;
header = http_get_header(headers, "Authenticator: "); header = http_get_header(headers, "Authorization: basic ");
if (!header) { if (!header) {
write_http_status_line(conn, 404, "Not found"); write_http_status_line(conn, 404, "Not found");
@ -2606,7 +2608,10 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
} }
/* now make sure the password is right */ /* now make sure the password is right */
if (1) { // check password_is_wrong(header) r = base64_decode(decoded, sizeof(decoded), header, strlen(header));
secret = alloc_http_authenticator(options->BridgePassword);
if (r < 0 || (unsigned)r != strlen(secret) || memcmp(decoded, secret, r)) {
/* failed to decode, or didn't match. Refuse. */
write_http_status_line(conn, 404, "Not found"); write_http_status_line(conn, 404, "Not found");
tor_free(header); tor_free(header);
goto done; goto done;
@ -2614,9 +2619,9 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
/* all happy now. send an answer. */ /* all happy now. send an answer. */
status = networkstatus_getinfo_by_purpose("bridge", time(NULL)); status = networkstatus_getinfo_by_purpose("bridge", time(NULL));
len = strlen(status); dlen = strlen(status);
write_http_response_header(conn, len, 0, 0); write_http_response_header(conn, dlen, 0, 0);
connection_write_to_buf(status, len, TO_CONN(conn)); connection_write_to_buf(status, dlen, TO_CONN(conn));
tor_free(status); tor_free(status);
goto done; goto done;
} }