nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 05:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

We were comparing the raw BridgePassword entry with a base64'ed

Browse Source 
version of it, when handling a "/tor/networkstatus-bridges"
directory request. Now compare correctly. Noticed by Veracode.


svn:r13609
This commit is contained in:
Roger Dingledine 2008-02-20 02:05:28 +00:00
parent f34d46e7dd
commit f2ed011813
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -48,6 +48,9 @@ Changes in version 0.2.0.20-?? - 2008-02-??
- Make the new hidden service code respect the SafeLogging setting.
Bugfix on 0.2.0.x. Patch from Karsten.
- Detect size overflow in zlib code.
- We were comparing the raw BridgePassword entry with a base64'ed
version of it, when handling a "/tor/networkstatus-bridges"
directory request. Now compare correctly. Noticed by Veracode.
o Code simplifications and refactoring:
- Remove the tor_strpartition function: its logic was confused,

18
src/or/directory.c
View File

@ -2639,27 +2639,19 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
connection_dir_is_encrypted(conn) &&
!strcmp(url,"/tor/networkstatus-bridges")) {
char *status;
char decoded[64];
char *secret;
int r;
char *secret = alloc_http_authenticator(options->BridgePassword);
header = http_get_header(headers, "Authorization: Basic ");
if (!header) {
write_http_status_line(conn, 404, "Not found");
goto done;
}
/* now make sure the password is right */
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. */
/* now make sure the password is there and right */
if (!header || strcmp(header, secret)) {
write_http_status_line(conn, 404, "Not found");
tor_free(secret);
tor_free(header);
goto done;
}
tor_free(secret);
tor_free(header);
/* all happy now. send an answer. */
status = networkstatus_getinfo_by_purpose("bridge", time(NULL));