2006-02-09 06:46:49 +01:00
|
|
|
/* Copyright (c) 2001 Matej Pfajfar.
|
|
|
|
* Copyright (c) 2001-2004, Roger Dingledine.
|
2007-02-12 22:39:53 +01:00
|
|
|
* Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson. */
|
Implemented link padding and receiver token buckets
Each socket reads at most 'bandwidth' bytes per second sustained, but
can handle bursts of up to 10*bandwidth bytes.
Cells are now sent out at evenly-spaced intervals, with padding sent
out otherwise. Set Linkpadding=0 in the rc file to send cells as soon
as they're available (and to never send padding cells).
Added license/copyrights statements at the top of most files.
router->min and router->max have been merged into a single 'bandwidth'
value. We should make the routerinfo_t reflect this (want to do that,
Mat?)
As the bandwidth increases, and we want to stop sleeping more and more
frequently to send a single cell, cpu usage goes up. At 128kB/s we're
pretty much calling poll with a timeout of 1ms or even 0ms. The current
code takes a timeout of 0-9ms and makes it 10ms. prepare_for_poll()
handles everything that should have happened in the past, so as long as
our buffers don't get too full in that 10ms, we're ok.
Speaking of too full, if you run three servers at 100kB/s with -l debug,
it spends too much time printing debugging messages to be able to keep
up with the cells. The outbuf ultimately fills up and it kills that
connection. If you run with -l err, it works fine up through 500kB/s and
probably beyond. Down the road we'll want to teach it to recognize when
an outbuf is getting full, and back off.
svn:r50
2002-07-16 03:12:15 +02:00
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
/* $Id$ */
|
2005-12-14 21:40:40 +01:00
|
|
|
const char command_c_id[] =
|
|
|
|
"$Id$";
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/**
|
|
|
|
* \file command.c
|
2005-06-11 07:31:17 +02:00
|
|
|
* \brief Functions for processing incoming cells.
|
2004-05-09 18:47:25 +02:00
|
|
|
**/
|
|
|
|
|
2004-05-11 05:21:18 +02:00
|
|
|
/* In-points to command.c:
|
|
|
|
*
|
|
|
|
* - command_process_cell(), called from
|
2004-05-13 01:48:57 +02:00
|
|
|
* connection_or_process_cells_from_inbuf() in connection_or.c
|
2004-05-11 05:21:18 +02:00
|
|
|
*/
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
#include "or.h"
|
|
|
|
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Keep statistics about how many of each type of cell we've received. */
|
2005-12-31 09:09:26 +01:00
|
|
|
uint64_t stats_n_padding_cells_processed = 0;
|
|
|
|
uint64_t stats_n_create_cells_processed = 0;
|
|
|
|
uint64_t stats_n_created_cells_processed = 0;
|
|
|
|
uint64_t stats_n_relay_cells_processed = 0;
|
|
|
|
uint64_t stats_n_destroy_cells_processed = 0;
|
2007-10-30 19:31:30 +01:00
|
|
|
uint64_t stats_n_versions_cells_processed = 0;
|
|
|
|
uint64_t stats_n_netinfo_cells_processed = 0;
|
2007-11-05 19:15:56 +01:00
|
|
|
uint64_t stats_n_cert_cells_processed = 0;
|
|
|
|
uint64_t stats_n_link_auth_cells_processed = 0;
|
2003-10-02 22:00:38 +02:00
|
|
|
|
2007-10-30 19:31:30 +01:00
|
|
|
/* These are the main functions for processing cells */
|
2006-07-26 21:07:26 +02:00
|
|
|
static void command_process_create_cell(cell_t *cell, or_connection_t *conn);
|
|
|
|
static void command_process_created_cell(cell_t *cell, or_connection_t *conn);
|
|
|
|
static void command_process_relay_cell(cell_t *cell, or_connection_t *conn);
|
|
|
|
static void command_process_destroy_cell(cell_t *cell, or_connection_t *conn);
|
2007-11-05 22:46:35 +01:00
|
|
|
static void command_process_versions_cell(var_cell_t *cell,
|
|
|
|
or_connection_t *conn);
|
2007-10-30 19:31:30 +01:00
|
|
|
static void command_process_netinfo_cell(cell_t *cell, or_connection_t *conn);
|
2007-12-01 09:09:46 +01:00
|
|
|
#if 0
|
2007-11-05 22:46:35 +01:00
|
|
|
static void command_process_cert_cell(var_cell_t *cell, or_connection_t *conn);
|
2007-11-05 19:15:56 +01:00
|
|
|
static void command_process_link_auth_cell(cell_t *cell,or_connection_t *conn);
|
2007-12-01 09:09:46 +01:00
|
|
|
#endif
|
2003-09-16 07:41:49 +02:00
|
|
|
|
2005-01-03 21:03:49 +01:00
|
|
|
#ifdef KEEP_TIMING_STATS
|
2004-05-09 18:47:25 +02:00
|
|
|
/** This is a wrapper function around the actual function that processes the
|
|
|
|
* <b>cell</b> that just arrived on <b>conn</b>. Increment <b>*time</b>
|
|
|
|
* by the number of microseconds used by the call to <b>*func(cell, conn)</b>.
|
2004-05-07 10:07:41 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
2006-07-26 21:07:26 +02:00
|
|
|
command_time_process_cell(cell_t *cell, or_connection_t *conn, int *time,
|
|
|
|
void (*func)(cell_t *, or_connection_t *))
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2002-11-24 09:45:54 +01:00
|
|
|
struct timeval start, end;
|
2003-12-17 22:09:31 +01:00
|
|
|
long time_passed;
|
2002-11-24 09:45:54 +01:00
|
|
|
|
2003-10-04 05:29:09 +02:00
|
|
|
tor_gettimeofday(&start);
|
2002-11-24 09:45:54 +01:00
|
|
|
|
|
|
|
(*func)(cell, conn);
|
|
|
|
|
2003-10-04 05:29:09 +02:00
|
|
|
tor_gettimeofday(&end);
|
2003-04-16 19:04:58 +02:00
|
|
|
time_passed = tv_udiff(&start, &end) ;
|
2002-11-24 09:45:54 +01:00
|
|
|
|
2004-02-28 08:01:22 +01:00
|
|
|
if (time_passed > 10000) { /* more than 10ms */
|
2006-02-13 09:28:42 +01:00
|
|
|
log_debug(LD_OR,"That call just took %ld ms.",time_passed/1000);
|
2002-11-24 09:45:54 +01:00
|
|
|
}
|
2004-11-23 01:08:26 +01:00
|
|
|
if (time_passed < 0) {
|
2006-02-13 09:28:42 +01:00
|
|
|
log_info(LD_GENERAL,"That call took us back in time!");
|
2004-11-23 01:08:26 +01:00
|
|
|
time_passed = 0;
|
|
|
|
}
|
2002-11-24 09:45:54 +01:00
|
|
|
*time += time_passed;
|
|
|
|
}
|
2005-01-03 21:03:49 +01:00
|
|
|
#endif
|
2002-11-24 09:45:54 +01:00
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Process a <b>cell</b> that was just received on <b>conn</b>. Keep internal
|
2004-05-07 10:07:41 +02:00
|
|
|
* statistics about how many of each cell we've processed so far
|
|
|
|
* this second, and the total number of microseconds it took to
|
|
|
|
* process each type of cell.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
2006-07-26 21:07:26 +02:00
|
|
|
command_process_cell(cell_t *cell, or_connection_t *conn)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2004-12-25 07:10:34 +01:00
|
|
|
#ifdef KEEP_TIMING_STATS
|
2004-05-07 10:07:41 +02:00
|
|
|
/* how many of each cell have we seen so far this second? needs better
|
|
|
|
* name. */
|
2003-05-20 08:41:23 +02:00
|
|
|
static int num_create=0, num_created=0, num_relay=0, num_destroy=0;
|
2004-05-07 10:07:41 +02:00
|
|
|
/* how long has it taken to process each type of cell? */
|
2003-05-20 08:41:23 +02:00
|
|
|
static int create_time=0, created_time=0, relay_time=0, destroy_time=0;
|
2003-10-04 05:29:09 +02:00
|
|
|
static time_t current_second = 0; /* from previous calls to time */
|
2004-05-07 10:07:41 +02:00
|
|
|
|
2003-10-04 05:29:09 +02:00
|
|
|
time_t now = time(NULL);
|
2002-11-24 09:45:54 +01:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (now > current_second) { /* the second has rolled over */
|
2002-11-24 09:45:54 +01:00
|
|
|
/* print stats */
|
2006-02-13 09:28:42 +01:00
|
|
|
log_info(LD_OR,
|
|
|
|
"At end of second: %d creates (%d ms), %d createds (%d ms), "
|
2005-12-14 21:40:40 +01:00
|
|
|
"%d relays (%d ms), %d destroys (%d ms)",
|
2005-12-10 10:36:26 +01:00
|
|
|
num_create, create_time/1000,
|
|
|
|
num_created, created_time/1000,
|
|
|
|
num_relay, relay_time/1000,
|
|
|
|
num_destroy, destroy_time/1000);
|
2002-11-24 09:45:54 +01:00
|
|
|
|
|
|
|
/* zero out stats */
|
2003-05-20 08:41:23 +02:00
|
|
|
num_create = num_created = num_relay = num_destroy = 0;
|
|
|
|
create_time = created_time = relay_time = destroy_time = 0;
|
2002-11-24 09:45:54 +01:00
|
|
|
|
|
|
|
/* remember which second it is, for next time */
|
2003-10-04 05:29:09 +02:00
|
|
|
current_second = now;
|
2002-11-24 09:45:54 +01:00
|
|
|
}
|
2004-12-25 07:10:34 +01:00
|
|
|
#endif
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2007-10-30 19:31:30 +01:00
|
|
|
#ifdef KEEP_TIMING_STATS
|
|
|
|
#define PROCESS_CELL(tp, cl, cn) STMT_BEGIN { \
|
|
|
|
++num ## tp; \
|
|
|
|
command_time_process_cell(cl, cn, & tp ## time , \
|
|
|
|
command_process_ ## tp ## _cell); \
|
|
|
|
} STMT_END
|
|
|
|
#else
|
|
|
|
#define PROCESS_CELL(tp, cl, cn) command_process_ ## tp ## _cell(cl, cn)
|
|
|
|
#endif
|
|
|
|
|
2007-11-05 19:15:56 +01:00
|
|
|
/*XXXX020 reject all but VERSIONS, NETINFO, CERT, LINK_AUTH when
|
|
|
|
* handshaking. */
|
2004-11-28 10:05:49 +01:00
|
|
|
switch (cell->command) {
|
2002-06-27 00:45:49 +02:00
|
|
|
case CELL_PADDING:
|
2003-10-02 22:00:38 +02:00
|
|
|
++stats_n_padding_cells_processed;
|
2002-06-27 00:45:49 +02:00
|
|
|
/* do nothing */
|
|
|
|
break;
|
|
|
|
case CELL_CREATE:
|
2005-05-03 00:35:18 +02:00
|
|
|
case CELL_CREATE_FAST:
|
2003-10-02 22:00:38 +02:00
|
|
|
++stats_n_create_cells_processed;
|
2007-10-30 19:31:30 +01:00
|
|
|
PROCESS_CELL(create, cell, conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
break;
|
2003-05-06 01:24:46 +02:00
|
|
|
case CELL_CREATED:
|
2005-05-03 00:35:18 +02:00
|
|
|
case CELL_CREATED_FAST:
|
2003-10-02 22:00:38 +02:00
|
|
|
++stats_n_created_cells_processed;
|
2007-10-30 19:31:30 +01:00
|
|
|
PROCESS_CELL(created, cell, conn);
|
2003-05-06 01:24:46 +02:00
|
|
|
break;
|
2003-05-01 08:42:29 +02:00
|
|
|
case CELL_RELAY:
|
2007-11-14 21:01:15 +01:00
|
|
|
case CELL_RELAY_EARLY:
|
2003-10-02 22:00:38 +02:00
|
|
|
++stats_n_relay_cells_processed;
|
2007-10-30 19:31:30 +01:00
|
|
|
PROCESS_CELL(relay, cell, conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
break;
|
|
|
|
case CELL_DESTROY:
|
2003-10-02 22:00:38 +02:00
|
|
|
++stats_n_destroy_cells_processed;
|
2007-10-30 19:31:30 +01:00
|
|
|
PROCESS_CELL(destroy, cell, conn);
|
|
|
|
break;
|
|
|
|
case CELL_VERSIONS:
|
2007-11-05 22:46:35 +01:00
|
|
|
tor_fragile_assert();
|
2007-10-30 19:31:30 +01:00
|
|
|
break;
|
|
|
|
case CELL_NETINFO:
|
|
|
|
++stats_n_netinfo_cells_processed;
|
|
|
|
PROCESS_CELL(netinfo, cell, conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
break;
|
2002-07-18 08:37:58 +02:00
|
|
|
default:
|
2007-10-30 19:31:30 +01:00
|
|
|
log_fn(LOG_INFO, LD_PROTOCOL,
|
2005-10-17 02:35:53 +02:00
|
|
|
"Cell of unknown type (%d) received. Dropping.", cell->command);
|
2002-07-18 08:37:58 +02:00
|
|
|
break;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-11-05 22:46:35 +01:00
|
|
|
/** Process a <b>cell</b> that was just received on <b>conn</b>. Keep internal
|
|
|
|
* statistics about how many of each cell we've processed so far
|
|
|
|
* this second, and the total number of microseconds it took to
|
|
|
|
* process each type of cell.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
command_process_var_cell(var_cell_t *cell, or_connection_t *conn)
|
|
|
|
{
|
|
|
|
#ifdef KEEP_TIMING_STATS
|
|
|
|
/* how many of each cell have we seen so far this second? needs better
|
|
|
|
* name. */
|
|
|
|
static int num_versions=0, num_cert=0;
|
|
|
|
|
|
|
|
time_t now = time(NULL);
|
|
|
|
|
|
|
|
if (now > current_second) { /* the second has rolled over */
|
|
|
|
/* print stats */
|
|
|
|
log_info(LD_OR,
|
|
|
|
"At end of second: %d versions (%d ms), %d cert (%d ms)",
|
|
|
|
num_versions, versions_time/1000,
|
|
|
|
cert, cert_time/1000);
|
|
|
|
|
|
|
|
num_versions = num_cert = 0;
|
|
|
|
versions_time = cert_time = 0;
|
|
|
|
|
|
|
|
/* remember which second it is, for next time */
|
|
|
|
current_second = now;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*XXXX020 reject all when not handshaking. */
|
|
|
|
switch (cell->command) {
|
|
|
|
case CELL_VERSIONS:
|
|
|
|
++stats_n_versions_cells_processed;
|
|
|
|
PROCESS_CELL(versions, cell, conn);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
log_warn(LD_BUG,
|
|
|
|
"Variable-length cell of unknown type (%d) received.",
|
|
|
|
cell->command);
|
|
|
|
tor_fragile_assert();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
/** Process a 'create' <b>cell</b> that just arrived from <b>conn</b>. Make a
|
|
|
|
* new circuit with the p_circ_id specified in cell. Put the circuit in state
|
|
|
|
* onionskin_pending, and pass the onionskin to the cpuworker. Circ will get
|
|
|
|
* picked up again when the cpuworker finishes decrypting it.
|
2004-05-07 10:07:41 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
2006-07-26 21:07:26 +02:00
|
|
|
command_process_create_cell(cell_t *cell, or_connection_t *conn)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2006-07-23 09:37:35 +02:00
|
|
|
or_circuit_t *circ;
|
2005-12-14 21:40:40 +01:00
|
|
|
int id_is_high;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (we_are_hibernating()) {
|
2006-02-13 09:28:42 +01:00
|
|
|
log_info(LD_OR,
|
|
|
|
"Received create cell but we're shutting down. Sending back "
|
|
|
|
"destroy.");
|
2006-01-05 22:23:03 +01:00
|
|
|
connection_or_send_destroy(cell->circ_id, conn,
|
|
|
|
END_CIRC_REASON_HIBERNATING);
|
2004-07-21 01:31:00 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-07-30 06:32:58 +02:00
|
|
|
if (!server_mode(get_options())) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
|
|
|
|
"Received create cell (type %d) from %s:%d, but we're a client. "
|
|
|
|
"Sending back a destroy.",
|
|
|
|
(int)cell->command, conn->_base.address, conn->_base.port);
|
|
|
|
connection_or_send_destroy(cell->circ_id, conn,
|
|
|
|
END_CIRC_REASON_TORPROTOCOL);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-07-04 05:27:09 +02:00
|
|
|
/* If the high bit of the circuit ID is not as expected, close the
|
|
|
|
* circ. */
|
2005-12-14 21:40:40 +01:00
|
|
|
id_is_high = cell->circ_id & (1<<15);
|
2006-07-04 05:27:09 +02:00
|
|
|
if ((id_is_high && conn->circ_id_type == CIRC_ID_TYPE_HIGHER) ||
|
|
|
|
(!id_is_high && conn->circ_id_type == CIRC_ID_TYPE_LOWER)) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
|
|
|
|
"Received create cell with unexpected circ_id %d. Closing.",
|
|
|
|
cell->circ_id);
|
|
|
|
connection_or_send_destroy(cell->circ_id, conn,
|
|
|
|
END_CIRC_REASON_TORPROTOCOL);
|
|
|
|
return;
|
2004-11-10 21:14:37 +01:00
|
|
|
}
|
|
|
|
|
2006-07-23 09:37:35 +02:00
|
|
|
if (circuit_get_by_circid_orconn(cell->circ_id, conn)) {
|
2005-10-17 03:46:47 +02:00
|
|
|
routerinfo_t *router = router_get_by_digest(conn->identity_digest);
|
2005-10-25 09:04:36 +02:00
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
|
2006-07-04 05:27:09 +02:00
|
|
|
"Received CREATE cell (circID %d) for known circ. "
|
2005-12-14 21:40:40 +01:00
|
|
|
"Dropping (age %d).",
|
2006-07-26 21:07:26 +02:00
|
|
|
cell->circ_id, (int)(time(NULL) - conn->_base.timestamp_created));
|
2005-10-17 03:46:47 +02:00
|
|
|
if (router)
|
2005-10-25 09:04:36 +02:00
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
|
2006-03-05 10:50:26 +01:00
|
|
|
"Details: nickname \"%s\", platform %s.",
|
|
|
|
router->nickname, escaped(router->platform));
|
2004-12-01 05:55:03 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-07-23 09:37:35 +02:00
|
|
|
circ = or_circuit_new(cell->circ_id, conn);
|
|
|
|
circ->_base.purpose = CIRCUIT_PURPOSE_OR;
|
|
|
|
circuit_set_state(TO_CIRCUIT(circ), CIRCUIT_STATE_ONIONSKIN_PENDING);
|
2005-05-03 00:35:18 +02:00
|
|
|
if (cell->command == CELL_CREATE) {
|
2006-07-23 09:37:35 +02:00
|
|
|
circ->_base.onionskin = tor_malloc(ONIONSKIN_CHALLENGE_LEN);
|
|
|
|
memcpy(circ->_base.onionskin, cell->payload, ONIONSKIN_CHALLENGE_LEN);
|
2003-05-06 01:24:46 +02:00
|
|
|
|
2006-07-04 05:27:09 +02:00
|
|
|
/* hand it off to the cpuworkers, and then return. */
|
2005-05-03 00:35:18 +02:00
|
|
|
if (assign_to_cpuworker(NULL, CPUWORKER_TASK_ONION, circ) < 0) {
|
2006-02-13 09:28:42 +01:00
|
|
|
log_warn(LD_GENERAL,"Failed to hand off onionskin. Closing.");
|
2006-07-23 09:37:35 +02:00
|
|
|
circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL);
|
2005-05-03 00:35:18 +02:00
|
|
|
return;
|
|
|
|
}
|
2006-02-13 09:28:42 +01:00
|
|
|
log_debug(LD_OR,"success: handed off onionskin.");
|
2005-05-03 00:35:18 +02:00
|
|
|
} else {
|
2005-12-08 18:38:32 +01:00
|
|
|
/* This is a CREATE_FAST cell; we can handle it immediately without using
|
2006-07-04 05:27:09 +02:00
|
|
|
* a CPU worker. */
|
2005-05-07 07:55:06 +02:00
|
|
|
char keys[CPATH_KEY_MATERIAL_LEN];
|
|
|
|
char reply[DIGEST_LEN*2];
|
2005-05-03 00:35:18 +02:00
|
|
|
tor_assert(cell->command == CELL_CREATE_FAST);
|
|
|
|
if (fast_server_handshake(cell->payload, reply, keys, sizeof(keys))<0) {
|
2006-02-13 09:28:42 +01:00
|
|
|
log_warn(LD_OR,"Failed to generate key material. Closing.");
|
2006-07-23 09:37:35 +02:00
|
|
|
circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL);
|
2005-05-03 00:35:18 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (onionskin_answer(circ, CELL_CREATED_FAST, reply, keys)<0) {
|
2006-02-13 09:28:42 +01:00
|
|
|
log_warn(LD_OR,"Failed to reply to CREATE_FAST cell. Closing.");
|
2006-07-23 09:37:35 +02:00
|
|
|
circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL);
|
2005-05-03 00:35:18 +02:00
|
|
|
return;
|
|
|
|
}
|
2003-05-06 01:24:46 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-11-19 02:56:58 +01:00
|
|
|
/** Process a 'created' <b>cell</b> that just arrived from <b>conn</b>.
|
|
|
|
* Find the circuit
|
2004-05-09 18:47:25 +02:00
|
|
|
* that it's intended for. If we're not the origin of the circuit, package
|
|
|
|
* the 'created' cell in an 'extended' relay cell and pass it back. If we
|
2004-05-07 10:07:41 +02:00
|
|
|
* are the origin of the circuit, send it to circuit_finish_handshake() to
|
|
|
|
* finish processing keys, and then call circuit_send_next_onion_skin() to
|
|
|
|
* extend to the next hop in the circuit if necessary.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
2006-07-26 21:07:26 +02:00
|
|
|
command_process_created_cell(cell_t *cell, or_connection_t *conn)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2003-05-06 01:24:46 +02:00
|
|
|
circuit_t *circ;
|
|
|
|
|
2005-04-06 07:33:32 +02:00
|
|
|
circ = circuit_get_by_circid_orconn(cell->circ_id, conn);
|
2003-05-06 01:24:46 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!circ) {
|
2006-02-13 09:28:42 +01:00
|
|
|
log_info(LD_OR,
|
|
|
|
"(circID %d) unknown circ (probably got a destroy earlier). "
|
|
|
|
"Dropping.", cell->circ_id);
|
2003-05-06 01:24:46 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (circ->n_circ_id != cell->circ_id) {
|
2005-10-25 09:04:36 +02:00
|
|
|
log_fn(LOG_PROTOCOL_WARN,LD_PROTOCOL,
|
2006-09-07 03:00:37 +02:00
|
|
|
"got created cell from Tor client? Closing.");
|
2006-01-05 22:23:03 +01:00
|
|
|
circuit_mark_for_close(circ, END_CIRC_REASON_TORPROTOCOL);
|
2003-05-06 01:24:46 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (CIRCUIT_IS_ORIGIN(circ)) { /* we're the OP. Handshake this. */
|
2006-07-23 09:37:35 +02:00
|
|
|
origin_circuit_t *origin_circ = TO_ORIGIN_CIRCUIT(circ);
|
2006-10-09 17:47:27 +02:00
|
|
|
int err_reason = 0;
|
2006-02-13 09:28:42 +01:00
|
|
|
log_debug(LD_OR,"at OP. Finishing handshake.");
|
2006-10-09 17:47:27 +02:00
|
|
|
if ((err_reason = circuit_finish_handshake(origin_circ, cell->command,
|
|
|
|
cell->payload)) < 0) {
|
2006-02-13 09:28:42 +01:00
|
|
|
log_warn(LD_OR,"circuit_finish_handshake failed.");
|
2006-10-09 17:47:27 +02:00
|
|
|
circuit_mark_for_close(circ, -err_reason);
|
2002-06-27 00:45:49 +02:00
|
|
|
return;
|
|
|
|
}
|
2006-02-13 09:28:42 +01:00
|
|
|
log_debug(LD_OR,"Moving to next skin.");
|
2006-10-09 17:47:27 +02:00
|
|
|
if ((err_reason = circuit_send_next_onion_skin(origin_circ)) < 0) {
|
2006-02-13 09:28:42 +01:00
|
|
|
log_info(LD_OR,"circuit_send_next_onion_skin failed.");
|
2006-01-05 22:23:03 +01:00
|
|
|
/* XXX push this circuit_close lower */
|
2006-10-09 17:47:27 +02:00
|
|
|
circuit_mark_for_close(circ, -err_reason);
|
2002-06-27 00:45:49 +02:00
|
|
|
return;
|
|
|
|
}
|
2003-05-06 01:24:46 +02:00
|
|
|
} else { /* pack it into an extended relay cell, and send it. */
|
2006-02-13 09:28:42 +01:00
|
|
|
log_debug(LD_OR,
|
|
|
|
"Converting created cell to extended relay cell, sending.");
|
2007-03-24 16:58:11 +01:00
|
|
|
relay_send_command_from_edge(0, circ, RELAY_COMMAND_EXTENDED,
|
|
|
|
cell->payload, ONIONSKIN_REPLY_LEN,
|
|
|
|
NULL);
|
2002-11-27 05:08:20 +01:00
|
|
|
}
|
|
|
|
}
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Process a 'relay' <b>cell</b> that just arrived from <b>conn</b>. Make sure
|
2004-05-07 10:07:41 +02:00
|
|
|
* it came in with a recognized circ_id. Pass it on to
|
|
|
|
* circuit_receive_relay_cell() for actual processing.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
2006-07-26 21:07:26 +02:00
|
|
|
command_process_relay_cell(cell_t *cell, or_connection_t *conn)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2002-07-18 08:37:58 +02:00
|
|
|
circuit_t *circ;
|
2007-03-26 16:07:59 +02:00
|
|
|
int reason, direction;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2005-04-06 07:33:32 +02:00
|
|
|
circ = circuit_get_by_circid_orconn(cell->circ_id, conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!circ) {
|
2006-02-13 09:28:42 +01:00
|
|
|
log_debug(LD_OR,
|
|
|
|
"unknown circuit %d on connection from %s:%d. Dropping.",
|
2006-07-26 21:07:26 +02:00
|
|
|
cell->circ_id, conn->_base.address, conn->_base.port);
|
2002-06-27 00:45:49 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (circ->state == CIRCUIT_STATE_ONIONSKIN_PENDING) {
|
2005-10-25 09:04:36 +02:00
|
|
|
log_fn(LOG_PROTOCOL_WARN,LD_PROTOCOL,"circuit in create_wait. Closing.");
|
2006-01-05 22:23:03 +01:00
|
|
|
circuit_mark_for_close(circ, END_CIRC_REASON_TORPROTOCOL);
|
2002-11-27 05:08:20 +01:00
|
|
|
return;
|
|
|
|
}
|
major overhaul: dns slave subsystem, topics
on startup, it forks off a master dns handler, which forks off dns
slaves (like the apache model). slaves as spawned as load increases,
and then reused. excess slaves are not ever killed, currently.
implemented topics. each topic has a receive window in each direction
at each edge of the circuit, and sends sendme's at the data level, as
per before. each circuit also has receive windows in each direction at
each hop; an edge sends a circuit-level sendme as soon as enough data
cells have arrived (regardless of whether the data cells were flushed
to the exit conns). removed the 'connected' cell type, since it's now
a topic command within data cells.
at the edge of the circuit, there can be multiple connections associated
with a single circuit. you find them via the linked list conn->next_topic.
currently each new ap connection starts its own circuit, so we ought
to see comparable performance to what we had before. but that's only
because i haven't written the code to reattach to old circuits. please
try to break it as-is, and then i'll make it reuse the same circuit and
we'll try to break that.
svn:r152
2003-01-26 10:02:24 +01:00
|
|
|
|
2007-07-30 00:13:44 +02:00
|
|
|
if (CIRCUIT_IS_ORIGIN(circ)) {
|
2007-12-04 19:35:03 +01:00
|
|
|
/* if we're a relay and treating connections with recent local
|
2007-07-30 00:13:44 +02:00
|
|
|
* traffic better, then this is one of them. */
|
|
|
|
conn->client_used = time(NULL);
|
|
|
|
}
|
|
|
|
|
2006-07-23 09:37:35 +02:00
|
|
|
if (!CIRCUIT_IS_ORIGIN(circ) &&
|
2007-03-26 16:07:59 +02:00
|
|
|
cell->circ_id == TO_OR_CIRCUIT(circ)->p_circ_id)
|
|
|
|
direction = CELL_DIRECTION_OUT;
|
|
|
|
else
|
|
|
|
direction = CELL_DIRECTION_IN;
|
|
|
|
|
|
|
|
if ((reason = circuit_receive_relay_cell(cell, circ, direction)) < 0) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN,LD_PROTOCOL,"circuit_receive_relay_cell "
|
|
|
|
"(%s) failed. Closing.",
|
|
|
|
direction==CELL_DIRECTION_OUT?"forward":"backward");
|
|
|
|
circuit_mark_for_close(circ, -reason);
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Process a 'destroy' <b>cell</b> that just arrived from
|
|
|
|
* <b>conn</b>. Find the circ that it refers to (if any).
|
2004-05-07 10:07:41 +02:00
|
|
|
*
|
|
|
|
* If the circ is in state
|
|
|
|
* onionskin_pending, then call onion_pending_remove() to remove it
|
|
|
|
* from the pending onion list (note that if it's already being
|
|
|
|
* processed by the cpuworker, it won't be in the list anymore; but
|
|
|
|
* when the cpuworker returns it, the circuit will be gone, and the
|
|
|
|
* cpuworker response will be dropped).
|
|
|
|
*
|
|
|
|
* Then mark the circuit for close (which marks all edges for close,
|
|
|
|
* and passes the destroy cell onward if necessary).
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
2006-07-26 21:07:26 +02:00
|
|
|
command_process_destroy_cell(cell_t *cell, or_connection_t *conn)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2002-06-27 00:45:49 +02:00
|
|
|
circuit_t *circ;
|
2006-10-20 01:04:49 +02:00
|
|
|
int reason;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2005-04-06 07:33:32 +02:00
|
|
|
circ = circuit_get_by_circid_orconn(cell->circ_id, conn);
|
2006-01-05 22:23:03 +01:00
|
|
|
reason = (uint8_t)cell->payload[0];
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!circ) {
|
2006-02-13 09:28:42 +01:00
|
|
|
log_info(LD_OR,"unknown circuit %d on connection from %s:%d. Dropping.",
|
2006-07-26 21:07:26 +02:00
|
|
|
cell->circ_id, conn->_base.address, conn->_base.port);
|
2002-06-27 00:45:49 +02:00
|
|
|
return;
|
|
|
|
}
|
2006-02-13 09:28:42 +01:00
|
|
|
log_debug(LD_OR,"Received for circID %d.",cell->circ_id);
|
major overhaul: dns slave subsystem, topics
on startup, it forks off a master dns handler, which forks off dns
slaves (like the apache model). slaves as spawned as load increases,
and then reused. excess slaves are not ever killed, currently.
implemented topics. each topic has a receive window in each direction
at each edge of the circuit, and sends sendme's at the data level, as
per before. each circuit also has receive windows in each direction at
each hop; an edge sends a circuit-level sendme as soon as enough data
cells have arrived (regardless of whether the data cells were flushed
to the exit conns). removed the 'connected' cell type, since it's now
a topic command within data cells.
at the edge of the circuit, there can be multiple connections associated
with a single circuit. you find them via the linked list conn->next_topic.
currently each new ap connection starts its own circuit, so we ought
to see comparable performance to what we had before. but that's only
because i haven't written the code to reattach to old circuits. please
try to break it as-is, and then i'll make it reuse the same circuit and
we'll try to break that.
svn:r152
2003-01-26 10:02:24 +01:00
|
|
|
|
2006-07-23 09:37:35 +02:00
|
|
|
if (!CIRCUIT_IS_ORIGIN(circ) &&
|
|
|
|
cell->circ_id == TO_OR_CIRCUIT(circ)->p_circ_id) {
|
2004-04-26 06:32:01 +02:00
|
|
|
/* the destroy came from behind */
|
2006-07-23 09:37:35 +02:00
|
|
|
circuit_set_p_circid_orconn(TO_OR_CIRCUIT(circ), 0, NULL);
|
2006-11-01 00:35:50 +01:00
|
|
|
circuit_mark_for_close(circ, reason|END_CIRC_REASON_FLAG_REMOTE);
|
2003-06-13 11:20:23 +02:00
|
|
|
} else { /* the destroy came from ahead */
|
2006-07-23 09:37:35 +02:00
|
|
|
circuit_set_n_circid_orconn(circ, 0, NULL);
|
2005-04-03 07:25:26 +02:00
|
|
|
if (CIRCUIT_IS_ORIGIN(circ)) {
|
2006-10-20 01:04:49 +02:00
|
|
|
circuit_mark_for_close(circ, reason|END_CIRC_REASON_FLAG_REMOTE);
|
2005-04-03 07:25:26 +02:00
|
|
|
} else {
|
2006-01-05 22:23:03 +01:00
|
|
|
char payload[1];
|
2006-02-13 09:28:42 +01:00
|
|
|
log_debug(LD_OR, "Delivering 'truncated' back.");
|
2006-01-05 22:23:03 +01:00
|
|
|
payload[0] = (char)reason;
|
2007-03-24 16:58:11 +01:00
|
|
|
relay_send_command_from_edge(0, circ, RELAY_COMMAND_TRUNCATED,
|
|
|
|
payload, sizeof(payload), NULL);
|
2004-04-26 06:32:01 +02:00
|
|
|
}
|
2003-06-13 11:20:23 +02:00
|
|
|
}
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
2005-06-09 21:03:31 +02:00
|
|
|
|
2007-10-30 19:31:30 +01:00
|
|
|
/** Process a 'versions' cell. The current link protocol version must be 0
|
|
|
|
* to indicate that no version has yet been negotiated. DOCDOC say more. */
|
|
|
|
static void
|
2007-11-05 22:46:35 +01:00
|
|
|
command_process_versions_cell(var_cell_t *cell, or_connection_t *conn)
|
2007-10-30 19:31:30 +01:00
|
|
|
{
|
|
|
|
int highest_supported_version = 0;
|
|
|
|
const char *cp, *end;
|
2007-10-30 22:46:02 +01:00
|
|
|
if (conn->link_proto != 0 ||
|
2007-11-05 19:15:44 +01:00
|
|
|
conn->_base.state != OR_CONN_STATE_OR_HANDSHAKING ||
|
|
|
|
(conn->handshake_state && conn->handshake_state->received_versions)) {
|
2007-10-30 19:31:30 +01:00
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_OR,
|
|
|
|
"Received a VERSIONS cell on a connection with its version "
|
|
|
|
"already set to %d; dropping", (int) conn->link_proto);
|
|
|
|
return;
|
|
|
|
}
|
2007-11-05 19:15:44 +01:00
|
|
|
tor_assert(conn->handshake_state);
|
2007-11-06 00:34:39 +01:00
|
|
|
end = cell->payload + cell->payload_len;
|
|
|
|
for (cp = cell->payload; cp+1 < end; ++cp) {
|
|
|
|
uint16_t v = ntohs(get_uint16(cp));
|
|
|
|
if (v == 1 || v == 2) {
|
2007-10-30 19:31:30 +01:00
|
|
|
if (v > highest_supported_version)
|
|
|
|
highest_supported_version = v;
|
|
|
|
}
|
|
|
|
}
|
2007-10-30 22:46:02 +01:00
|
|
|
if (!highest_supported_version) {
|
2007-10-30 19:31:30 +01:00
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_OR,
|
2007-11-14 21:01:12 +01:00
|
|
|
"Couldn't find a version in common between my version list and the "
|
|
|
|
"list in the VERSIONS cell; closing connection.");
|
|
|
|
connection_mark_for_close(TO_CONN(conn));
|
2007-10-30 19:31:30 +01:00
|
|
|
return;
|
|
|
|
}
|
2007-10-30 22:46:02 +01:00
|
|
|
conn->link_proto = highest_supported_version;
|
2007-11-05 19:15:44 +01:00
|
|
|
conn->handshake_state->received_versions = 1;
|
2007-10-30 22:46:02 +01:00
|
|
|
|
2007-12-01 09:09:46 +01:00
|
|
|
#if 0
|
|
|
|
/*XXXX020 not right; references dead functions */
|
2007-11-05 20:19:46 +01:00
|
|
|
if (highest_supported_version >= 2) {
|
2007-11-14 21:01:12 +01:00
|
|
|
if (connection_or_send_netinfo(conn) < 0 ||
|
|
|
|
connection_or_send_cert(conn) < 0) {
|
|
|
|
connection_mark_for_close(TO_CONN(conn));
|
|
|
|
return;
|
|
|
|
}
|
2007-11-05 20:19:46 +01:00
|
|
|
if (conn->handshake_state->started_here)
|
|
|
|
connection_or_send_link_auth(conn);
|
|
|
|
} else {
|
|
|
|
/* XXXX020 finish v1 verification. */
|
|
|
|
}
|
2007-12-01 09:09:46 +01:00
|
|
|
#endif
|
2007-10-30 19:31:30 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/** Process a 'netinfo' cell. DOCDOC say more. */
|
|
|
|
static void
|
|
|
|
command_process_netinfo_cell(cell_t *cell, or_connection_t *conn)
|
|
|
|
{
|
|
|
|
time_t timestamp;
|
|
|
|
uint8_t my_addr_type;
|
|
|
|
uint8_t my_addr_len;
|
|
|
|
const char *my_addr_ptr;
|
|
|
|
const char *cp, *end;
|
|
|
|
uint8_t n_other_addrs;
|
|
|
|
time_t now = time(NULL);
|
2007-11-05 19:15:44 +01:00
|
|
|
if (conn->link_proto < 2) {
|
2007-10-30 19:31:30 +01:00
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_OR,
|
|
|
|
"Received a NETINFO cell on %s connection; dropping.",
|
|
|
|
conn->link_proto == 0 ? "non-versioned" : "a v1");
|
|
|
|
return;
|
|
|
|
}
|
2007-11-05 19:15:44 +01:00
|
|
|
if (conn->_base.state != OR_CONN_STATE_OR_HANDSHAKING) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_OR,
|
|
|
|
"Received a NETINFO cell on a non-handshaking; dropping.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
tor_assert(conn->handshake_state &&
|
|
|
|
conn->handshake_state->received_versions);
|
|
|
|
if (conn->handshake_state->received_netinfo) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_OR,
|
|
|
|
"Received a duplicate NETINFO cell; dropping.");
|
|
|
|
return;
|
|
|
|
}
|
2007-10-30 19:31:30 +01:00
|
|
|
/* Decode the cell. */
|
|
|
|
timestamp = ntohl(get_uint32(cell->payload));
|
2007-11-05 19:15:44 +01:00
|
|
|
if (abs(now - conn->handshake_state->sent_versions_at) < 180) {
|
|
|
|
conn->handshake_state->apparent_skew = now - timestamp;
|
|
|
|
}
|
|
|
|
|
2007-10-30 19:31:30 +01:00
|
|
|
my_addr_type = (uint8_t) cell->payload[4];
|
|
|
|
my_addr_len = (uint8_t) cell->payload[5];
|
|
|
|
my_addr_ptr = cell->payload + 6;
|
|
|
|
end = cell->payload + CELL_PAYLOAD_SIZE;
|
|
|
|
cp = cell->payload + 6 + my_addr_len;
|
|
|
|
if (cp >= end) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_OR,
|
2007-11-14 21:01:12 +01:00
|
|
|
"Addresses too long in netinfo cell; closing connection.");
|
|
|
|
connection_mark_for_close(TO_CONN(conn));
|
2007-10-30 19:31:30 +01:00
|
|
|
return;
|
2007-11-05 19:15:44 +01:00
|
|
|
} else if (my_addr_type == RESOLVED_TYPE_IPV4 && my_addr_len == 4) {
|
|
|
|
conn->handshake_state->my_apparent_addr = ntohl(get_uint32(my_addr_ptr));
|
2007-10-30 19:31:30 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
n_other_addrs = (uint8_t) *cp++;
|
|
|
|
while (n_other_addrs && cp < end-2) {
|
|
|
|
/* Consider all the other addresses; if any matches, this connection is
|
|
|
|
* "canonical." */
|
|
|
|
uint8_t other_addr_type = (uint8_t) *cp++;
|
|
|
|
uint8_t other_addr_len = (uint8_t) *cp++;
|
2007-11-14 21:01:12 +01:00
|
|
|
if (cp + other_addr_len >= end) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_OR,
|
|
|
|
"Address too long in netinfo cell; closing connection.");
|
|
|
|
connection_mark_for_close(TO_CONN(conn));
|
|
|
|
return;
|
|
|
|
}
|
2007-10-30 19:31:30 +01:00
|
|
|
if (other_addr_type == RESOLVED_TYPE_IPV4 && other_addr_len == 4) {
|
|
|
|
uint32_t addr = ntohl(get_uint32(cp));
|
|
|
|
if (addr == conn->real_addr) {
|
2007-11-05 19:15:44 +01:00
|
|
|
conn->handshake_state->apparently_canonical = 1;
|
2007-10-30 19:31:30 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
cp += other_addr_len;
|
|
|
|
--n_other_addrs;
|
|
|
|
}
|
2007-11-05 19:15:44 +01:00
|
|
|
|
|
|
|
conn->handshake_state->received_netinfo = 1;
|
2007-10-30 19:31:30 +01:00
|
|
|
}
|
|
|
|
|
2007-11-05 19:15:56 +01:00
|
|
|
/*XXXX020 move to connection_or.c */
|
2007-11-05 19:15:44 +01:00
|
|
|
/** DOCDOC Called when we're done authenticating; act on stuff we
|
|
|
|
* learned in netinfo. */
|
2007-11-14 21:01:12 +01:00
|
|
|
int
|
2007-11-05 19:15:44 +01:00
|
|
|
connection_or_act_on_netinfo(or_connection_t *conn)
|
|
|
|
{
|
|
|
|
long delta;
|
|
|
|
if (!conn->handshake_state)
|
2007-11-14 21:01:12 +01:00
|
|
|
return -1;
|
2007-11-05 19:15:44 +01:00
|
|
|
|
|
|
|
tor_assert(conn->handshake_state->authenticated != 0);
|
|
|
|
|
|
|
|
delta = conn->handshake_state->apparent_skew;
|
|
|
|
/*XXXX020 magic number 3600 */
|
|
|
|
if (abs(delta) > 3600 &&
|
|
|
|
router_get_by_digest(conn->identity_digest)) {
|
|
|
|
char dbuf[64];
|
|
|
|
/*XXXX020 not always warn!*/
|
|
|
|
format_time_interval(dbuf, sizeof(dbuf), delta);
|
|
|
|
log_fn(LOG_WARN, LD_HTTP, "Received NETINFO cell with skewed time from "
|
|
|
|
"server at %s:%d. It seems that our clock is %s by %s, or "
|
|
|
|
"that theirs is %s. Tor requires an accurate clock to work: "
|
|
|
|
"please check your time and date settings.",
|
|
|
|
conn->_base.address, (int)conn->_base.port,
|
|
|
|
delta>0 ? "ahead" : "behind", dbuf,
|
|
|
|
delta>0 ? "behind" : "ahead");
|
|
|
|
control_event_general_status(LOG_WARN,
|
|
|
|
"CLOCK_SKEW SKEW=%ld SOURCE=OR:%s:%d",
|
|
|
|
delta, conn->_base.address, conn->_base.port);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX020 possibly, learn my address from my_apparent_addr */
|
|
|
|
|
|
|
|
if (conn->handshake_state->apparently_canonical) {
|
|
|
|
conn->is_canonical = 1;
|
|
|
|
}
|
2007-11-14 21:01:12 +01:00
|
|
|
|
|
|
|
return 0;
|
2007-11-05 19:15:44 +01:00
|
|
|
}
|
2007-11-05 19:15:56 +01:00
|
|
|
|
2007-12-01 09:09:46 +01:00
|
|
|
#if 0
|
2007-11-06 00:55:43 +01:00
|
|
|
/*DOCDOC*/
|
2007-11-05 19:15:56 +01:00
|
|
|
static void
|
2007-11-05 22:46:35 +01:00
|
|
|
command_process_cert_cell(var_cell_t *cell, or_connection_t *conn)
|
2007-11-05 19:15:56 +01:00
|
|
|
{
|
2007-11-06 00:55:43 +01:00
|
|
|
int n_certs = 0;
|
2007-11-06 19:00:07 +01:00
|
|
|
uint16_t conn_cert_len = 0, id_cert_len = 0;
|
2007-11-06 00:55:43 +01:00
|
|
|
const char *conn_cert = NULL, *id_cert = NULL;
|
|
|
|
const char *cp, *end;
|
2007-11-14 21:01:12 +01:00
|
|
|
int done = 0;
|
2007-11-06 00:55:43 +01:00
|
|
|
|
2007-11-14 21:01:12 +01:00
|
|
|
if (conn->_base.state != OR_CONN_STATE_OR_HANDSHAKING) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_OR, "Got CERT cell when not handshaking. "
|
|
|
|
"Ignoring.");
|
|
|
|
return;
|
|
|
|
}
|
2007-11-06 00:55:43 +01:00
|
|
|
tor_assert(conn->handshake_state);
|
|
|
|
if (!conn->handshake_state->received_versions ||
|
2007-11-14 21:01:12 +01:00
|
|
|
!conn->handshake_state->received_netinfo) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_OR, "Got CERT cell before VERSIONS and "
|
|
|
|
"NETINFO. Closing the connection.");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (conn->handshake_state->received_certs) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_OR, "Got duplicate CERT cell. "
|
|
|
|
"Closing the connection.");
|
2007-11-06 00:55:43 +01:00
|
|
|
goto err;
|
2007-11-14 21:01:12 +01:00
|
|
|
}
|
2007-11-06 00:55:43 +01:00
|
|
|
|
|
|
|
cp = cell->payload;
|
|
|
|
end = cell->payload + cell->payload_len;
|
|
|
|
|
|
|
|
while (cp < end) {
|
|
|
|
uint16_t len;
|
|
|
|
if (end-cp == 1)
|
|
|
|
goto err;
|
|
|
|
len = ntohs(get_uint16(cp));
|
|
|
|
cp += 2;
|
|
|
|
if (end-cp < len)
|
|
|
|
goto err;
|
|
|
|
if (n_certs == 0) {
|
2007-11-06 19:00:07 +01:00
|
|
|
id_cert = cp;
|
|
|
|
id_cert_len = len;
|
2007-11-06 00:55:43 +01:00
|
|
|
} else if (n_certs == 1) {
|
2007-11-06 19:00:07 +01:00
|
|
|
conn_cert = id_cert;
|
|
|
|
conn_cert_len = id_cert_len;
|
2007-11-06 00:55:43 +01:00
|
|
|
id_cert = cp;
|
|
|
|
id_cert_len = len;
|
|
|
|
} else {
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
cp += len;
|
|
|
|
++n_certs;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now we have 0, 1, or 2 certs. */
|
2007-11-06 19:00:07 +01:00
|
|
|
if (n_certs == 0) {
|
|
|
|
/* The other side is unauthenticated. */
|
2007-11-14 21:01:12 +01:00
|
|
|
done = 1;
|
2007-11-06 19:00:07 +01:00
|
|
|
} else {
|
|
|
|
int r;
|
|
|
|
r = tor_tls_verify_certs_v2(LOG_PROTOCOL_WARN, conn->tls,
|
|
|
|
conn_cert, conn_cert_len,
|
|
|
|
id_cert, id_cert_len,
|
|
|
|
&conn->handshake_state->signing_key,
|
|
|
|
(conn->handshake_state->started_here ?
|
|
|
|
conn->handshake_state->server_cert_digest :
|
|
|
|
conn->handshake_state->client_cert_digest),
|
2007-11-14 21:01:12 +01:00
|
|
|
&conn->handshake_state->identity_key,
|
2007-11-06 19:00:07 +01:00
|
|
|
conn->handshake_state->cert_id_digest);
|
|
|
|
if (r < 0)
|
|
|
|
goto err;
|
2007-11-14 21:01:12 +01:00
|
|
|
if (r == 1) {
|
|
|
|
done = 1;
|
|
|
|
conn->handshake_state->authenticated = 1;
|
|
|
|
}
|
2007-11-06 19:00:07 +01:00
|
|
|
}
|
2007-11-06 00:55:43 +01:00
|
|
|
|
|
|
|
conn->handshake_state->received_certs = 1;
|
2007-11-14 21:01:12 +01:00
|
|
|
if (done) {
|
|
|
|
if (connection_or_finish_or_handshake(conn) < 0)
|
|
|
|
goto err;
|
2007-11-06 19:00:07 +01:00
|
|
|
}
|
|
|
|
if (! conn->handshake_state->signing_key)
|
|
|
|
goto err;
|
|
|
|
|
2007-11-06 00:55:43 +01:00
|
|
|
return;
|
|
|
|
err:
|
2007-11-14 21:01:12 +01:00
|
|
|
connection_mark_for_close(TO_CONN(conn));
|
2007-11-05 19:15:56 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#define LINK_AUTH_STRING "Tor initiator certificate verification"
|
|
|
|
|
|
|
|
/** DOCDOC */
|
|
|
|
static void
|
|
|
|
command_process_link_auth_cell(cell_t *cell, or_connection_t *conn)
|
|
|
|
{
|
|
|
|
or_handshake_state_t *s;
|
|
|
|
char hmac[DIGEST_LEN];
|
2007-11-05 20:23:55 +01:00
|
|
|
uint16_t len;
|
2007-11-05 19:15:56 +01:00
|
|
|
size_t sig_len;
|
|
|
|
const char *sig;
|
|
|
|
char *checked = NULL;
|
|
|
|
int checked_len;
|
|
|
|
tor_assert(conn);
|
|
|
|
if (conn->_base.state != OR_CONN_STATE_OR_HANDSHAKING) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_OR,
|
|
|
|
"Received a LINK_AUTH cell on connection in the wrong state; "
|
|
|
|
"dropping.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
s = conn->handshake_state;
|
|
|
|
tor_assert(s);
|
|
|
|
if (s->started_here) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_OR,
|
|
|
|
"Got a LINK_AUTH cell from a server; closing the connection.");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (!s->received_netinfo || !s->received_versions || !s->received_certs) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_OR, "Got a LINK_AUTH cell too early; "
|
|
|
|
"closing the connection");
|
|
|
|
goto err;
|
|
|
|
}
|
2007-11-05 20:23:55 +01:00
|
|
|
len = ntohs(get_uint16(cell->payload));
|
2007-11-06 15:21:08 +01:00
|
|
|
if (len < 2 || len > CELL_PAYLOAD_SIZE - 2) {
|
2007-11-05 20:19:46 +01:00
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_OR, "Bad length field (%d) on LINK_AUTH cell;"
|
|
|
|
" closing the connection", (int)len);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (cell->payload[2] != 0x00) {
|
2007-11-05 19:15:56 +01:00
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_OR, "Unrecognized LINK_AUTH signature "
|
|
|
|
"version; closing the connection");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
connection_or_compute_link_auth_hmac(conn, hmac);
|
|
|
|
|
|
|
|
tor_assert(s->signing_key);
|
|
|
|
|
2007-11-05 20:19:46 +01:00
|
|
|
sig = cell->payload+3;
|
|
|
|
sig_len = len-1;
|
2007-11-05 19:15:56 +01:00
|
|
|
checked = tor_malloc(crypto_pk_keysize(s->signing_key));
|
|
|
|
checked_len = crypto_pk_public_checksig(s->signing_key,checked,sig,sig_len);
|
|
|
|
if (checked_len < 0) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_OR, "Bad signature on LINK_AUTH cell; "
|
|
|
|
"closing the connection");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (checked_len != DIGEST_LEN) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_OR, "Bad length (%d) of signed material in "
|
|
|
|
"LINK_AUTH cell; closing the connection", checked_len);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (memcmp(checked, hmac, DIGEST_LEN) != 0) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_OR, "Bad signed data in LINK_AUTH cell; "
|
|
|
|
"closing the connection.");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
s->authenticated = 1;
|
|
|
|
|
2007-11-14 21:01:12 +01:00
|
|
|
if (connection_or_finish_or_handshake(conn)<0)
|
|
|
|
goto err;
|
2007-11-05 19:15:56 +01:00
|
|
|
|
2007-11-14 21:01:12 +01:00
|
|
|
tor_free(checked);
|
2007-11-05 19:15:56 +01:00
|
|
|
return;
|
|
|
|
err:
|
|
|
|
tor_free(checked);
|
|
|
|
connection_mark_for_close(TO_CONN(conn));
|
|
|
|
}
|
2007-12-01 09:09:46 +01:00
|
|
|
#endif
|