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. */
|
2003-04-12 00:11:11 +02:00
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
/* $Id$ */
|
2005-12-14 21:40:40 +01:00
|
|
|
const char connection_edge_c_id[] =
|
|
|
|
"$Id$";
|
2003-04-12 00:11:11 +02:00
|
|
|
|
2004-05-10 06:42:22 +02:00
|
|
|
/**
|
|
|
|
* \file connection_edge.c
|
2004-05-13 09:24:49 +02:00
|
|
|
* \brief Handle edge streams.
|
2004-05-10 06:42:22 +02:00
|
|
|
**/
|
|
|
|
|
2003-04-12 00:11:11 +02:00
|
|
|
#include "or.h"
|
|
|
|
|
2006-08-10 11:01:46 +02:00
|
|
|
#ifdef HAVE_LINUX_NETFILTER_IPV4_H
|
|
|
|
#include <linux/netfilter_ipv4.h>
|
|
|
|
#define TRANS_NETFILTER
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(HAVE_NET_IF_H) && defined(HAVE_NET_PFVAR_H)
|
|
|
|
#include <net/if.h>
|
|
|
|
#include <net/pfvar.h>
|
|
|
|
#define TRANS_PF
|
|
|
|
#endif
|
|
|
|
|
2007-02-02 21:06:43 +01:00
|
|
|
/** List of exit_redirect_t for every configured RedirectExit. */
|
2004-11-09 19:22:17 +01:00
|
|
|
static smartlist_t *redirect_exit_list = NULL;
|
2004-05-20 04:42:50 +02:00
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
static int connection_ap_handshake_process_socks(edge_connection_t *conn);
|
2006-11-14 01:06:31 +01:00
|
|
|
static int connection_ap_process_natd(edge_connection_t *conn);
|
2007-05-13 11:25:06 +02:00
|
|
|
static int connection_exit_connect_dir(edge_connection_t *exitconn);
|
2003-09-13 00:45:31 +02:00
|
|
|
|
2005-03-27 06:55:13 +02:00
|
|
|
/** An AP stream has failed/finished. If it hasn't already sent back
|
|
|
|
* a socks reply, send one now (based on endreason). Also set
|
|
|
|
* has_sent_end to 1, and mark the conn.
|
|
|
|
*/
|
|
|
|
void
|
2006-07-26 21:07:26 +02:00
|
|
|
_connection_mark_unattached_ap(edge_connection_t *conn, int endreason,
|
2005-06-11 20:52:12 +02:00
|
|
|
int line, const char *file)
|
|
|
|
{
|
2006-07-26 21:07:26 +02:00
|
|
|
tor_assert(conn->_base.type == CONN_TYPE_AP);
|
|
|
|
conn->_base.edge_has_sent_end = 1; /* no circ yet */
|
2005-03-27 08:37:56 +02:00
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
if (conn->_base.marked_for_close) {
|
2005-04-03 07:22:33 +02:00
|
|
|
/* This call will warn as appropriate. */
|
2006-07-26 21:07:26 +02:00
|
|
|
_connection_mark_for_close(TO_CONN(conn), line, file);
|
2005-04-03 00:11:24 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2005-03-27 06:55:13 +02:00
|
|
|
if (!conn->socks_request->has_finished) {
|
2007-02-07 07:54:27 +01:00
|
|
|
if (endreason & END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED)
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG,
|
2007-03-04 21:11:46 +01:00
|
|
|
"stream (marked at %s:%d) sending two socks replies?",
|
2006-02-13 10:02:35 +01:00
|
|
|
file, line);
|
2005-03-27 08:37:56 +02:00
|
|
|
|
2006-12-13 01:28:56 +01:00
|
|
|
if (SOCKS_COMMAND_IS_CONNECT(conn->socks_request->command))
|
2006-10-20 19:54:43 +02:00
|
|
|
connection_ap_handshake_socks_reply(conn, NULL, 0, endreason);
|
2007-02-12 04:01:36 +01:00
|
|
|
else if (SOCKS_COMMAND_IS_RESOLVE(conn->socks_request->command))
|
2007-06-01 01:40:35 +02:00
|
|
|
connection_ap_handshake_socks_resolved(conn,
|
|
|
|
RESOLVED_TYPE_ERROR_TRANSIENT,
|
2005-12-14 21:40:40 +01:00
|
|
|
0, NULL, -1);
|
2007-02-12 04:01:36 +01:00
|
|
|
else /* unknown or no handshake at all. send no response. */
|
|
|
|
conn->socks_request->has_finished = 1;
|
2005-03-27 06:55:13 +02:00
|
|
|
}
|
2005-03-27 08:37:56 +02:00
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
_connection_mark_for_close(TO_CONN(conn), line, file);
|
|
|
|
conn->_base.hold_open_until_flushed = 1;
|
2006-10-20 19:54:48 +02:00
|
|
|
conn->end_reason = endreason;
|
2005-03-27 06:55:13 +02:00
|
|
|
}
|
|
|
|
|
2004-11-21 11:14:57 +01:00
|
|
|
/** There was an EOF. Send an end and mark the connection for close.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_edge_reached_eof(edge_connection_t *conn)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2006-07-26 21:07:26 +02:00
|
|
|
if (buf_datalen(conn->_base.inbuf) &&
|
|
|
|
connection_state_is_open(TO_CONN(conn))) {
|
2004-11-21 12:30:33 +01:00
|
|
|
/* it still has stuff to process. don't let it die yet. */
|
|
|
|
return 0;
|
|
|
|
}
|
2006-07-26 21:07:26 +02:00
|
|
|
log_info(LD_EDGE,"conn (fd %d) reached eof. Closing.", conn->_base.s);
|
|
|
|
if (!conn->_base.marked_for_close) {
|
2004-11-21 11:14:57 +01:00
|
|
|
/* only mark it if not already marked. it's possible to
|
|
|
|
* get the 'end' right around when the client hangs up on us. */
|
2007-03-24 16:57:51 +01:00
|
|
|
connection_edge_end(conn, END_STREAM_REASON_DONE);
|
2005-03-27 06:55:13 +02:00
|
|
|
if (conn->socks_request) /* eof, so don't send a socks reply back */
|
|
|
|
conn->socks_request->has_finished = 1;
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_mark_for_close(TO_CONN(conn));
|
2004-11-21 11:14:57 +01:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Handle new bytes on conn->inbuf based on state:
|
2004-05-10 06:42:22 +02:00
|
|
|
* - If it's waiting for socks info, try to read another step of the
|
|
|
|
* socks handshake out of conn->inbuf.
|
2006-08-10 11:01:37 +02:00
|
|
|
* - If it's waiting for the original destination, fetch it.
|
2004-05-10 06:42:22 +02:00
|
|
|
* - If it's open, then package more relay cells from the stream.
|
|
|
|
* - Else, leave the bytes on inbuf alone for now.
|
|
|
|
*
|
|
|
|
* Mark and return -1 if there was an unexpected error with the conn,
|
2004-04-01 00:02:13 +02:00
|
|
|
* else return 0.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_edge_process_inbuf(edge_connection_t *conn, int package_partial)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(conn);
|
2003-04-12 00:11:11 +02:00
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
switch (conn->_base.state) {
|
2003-04-12 00:11:11 +02:00
|
|
|
case AP_CONN_STATE_SOCKS_WAIT:
|
2004-11-28 10:05:49 +01:00
|
|
|
if (connection_ap_handshake_process_socks(conn) < 0) {
|
2005-03-27 08:37:56 +02:00
|
|
|
/* already marked */
|
2003-10-21 10:37:07 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
2006-11-14 01:06:31 +01:00
|
|
|
case AP_CONN_STATE_NATD_WAIT:
|
|
|
|
if (connection_ap_process_natd(conn) < 0) {
|
|
|
|
/* already marked */
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
2003-04-12 00:11:11 +02:00
|
|
|
case AP_CONN_STATE_OPEN:
|
|
|
|
case EXIT_CONN_STATE_OPEN:
|
2004-11-28 10:05:49 +01:00
|
|
|
if (connection_edge_package_raw_inbuf(conn, package_partial) < 0) {
|
2005-03-02 04:13:05 +01:00
|
|
|
/* (We already sent an end cell if possible) */
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_mark_for_close(TO_CONN(conn));
|
2003-10-21 10:37:07 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2003-04-12 00:11:11 +02:00
|
|
|
return 0;
|
|
|
|
case EXIT_CONN_STATE_CONNECTING:
|
2004-04-05 02:47:48 +02:00
|
|
|
case AP_CONN_STATE_RENDDESC_WAIT:
|
2004-04-01 00:02:13 +02:00
|
|
|
case AP_CONN_STATE_CIRCUIT_WAIT:
|
|
|
|
case AP_CONN_STATE_CONNECT_WAIT:
|
2004-11-24 07:16:36 +01:00
|
|
|
case AP_CONN_STATE_RESOLVE_WAIT:
|
2005-03-23 06:32:06 +01:00
|
|
|
case AP_CONN_STATE_CONTROLLER_WAIT:
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_EDGE,
|
|
|
|
"data from edge while in '%s' state. Leaving it on buffer.",
|
2006-07-26 21:07:26 +02:00
|
|
|
conn_state_to_string(conn->_base.type, conn->_base.state));
|
2003-04-12 00:11:11 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2007-03-04 21:11:46 +01:00
|
|
|
log_warn(LD_BUG,"Got unexpected state %d. Closing.",conn->_base.state);
|
2005-04-26 20:52:16 +02:00
|
|
|
tor_fragile_assert();
|
2007-03-24 16:57:51 +01:00
|
|
|
connection_edge_end(conn, END_STREAM_REASON_INTERNAL);
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_mark_for_close(TO_CONN(conn));
|
2004-01-20 10:21:46 +01:00
|
|
|
return -1;
|
2003-04-12 00:11:11 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 06:42:22 +02:00
|
|
|
/** This edge needs to be closed, because its circuit has closed.
|
|
|
|
* Mark it for close and return 0.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_edge_destroy(uint16_t circ_id, edge_connection_t *conn)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2006-07-26 21:07:26 +02:00
|
|
|
if (!conn->_base.marked_for_close) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_EDGE,
|
|
|
|
"CircID %d: At an edge. Marking connection for close.", circ_id);
|
2006-07-26 21:07:26 +02:00
|
|
|
if (conn->_base.type == CONN_TYPE_AP) {
|
2005-04-06 08:13:49 +02:00
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_DESTROY);
|
|
|
|
} else {
|
2006-07-26 21:07:37 +02:00
|
|
|
/* closing the circuit, nothing to send an END to */
|
|
|
|
conn->_base.edge_has_sent_end = 1;
|
2006-10-20 19:54:48 +02:00
|
|
|
conn->end_reason = END_STREAM_REASON_DESTROY;
|
2007-02-07 07:54:22 +01:00
|
|
|
conn->end_reason |= END_STREAM_REASON_FLAG_ALREADY_SENT_CLOSED;
|
2007-02-07 19:25:04 +01:00
|
|
|
if (conn->_base.type == CONN_TYPE_AP)
|
|
|
|
control_event_stream_status(conn, STREAM_EVENT_CLOSED,
|
|
|
|
END_STREAM_REASON_DESTROY);
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_mark_for_close(TO_CONN(conn));
|
|
|
|
conn->_base.hold_open_until_flushed = 1;
|
2005-04-06 08:13:49 +02:00
|
|
|
}
|
2005-03-27 06:55:13 +02:00
|
|
|
}
|
2005-03-23 03:52:55 +01:00
|
|
|
conn->cpath_layer = NULL;
|
2005-04-06 08:13:49 +02:00
|
|
|
conn->on_circuit = NULL;
|
2004-02-29 01:11:37 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-03-24 16:57:51 +01:00
|
|
|
/** Send a relay end cell from stream <b>conn</b> down conn's circuit. Set
|
|
|
|
* the relay end cell's reason for closing as <b>reason</b>.
|
2004-05-10 06:42:22 +02:00
|
|
|
*
|
|
|
|
* Return -1 if this function has already been called on this conn,
|
|
|
|
* else return 0.
|
|
|
|
*/
|
2004-05-12 23:12:33 +02:00
|
|
|
int
|
2007-03-24 16:57:51 +01:00
|
|
|
connection_edge_end(edge_connection_t *conn, char reason)
|
2004-05-12 23:12:33 +02:00
|
|
|
{
|
2005-09-12 23:42:59 +02:00
|
|
|
char payload[RELAY_PAYLOAD_SIZE];
|
2004-10-14 04:47:09 +02:00
|
|
|
size_t payload_len=1;
|
2003-10-22 09:55:44 +02:00
|
|
|
circuit_t *circ;
|
2003-10-21 10:37:07 +02:00
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
if (conn->_base.edge_has_sent_end) {
|
2007-03-04 21:11:46 +01:00
|
|
|
log_warn(LD_BUG,"(Harmless.) Calling connection_edge_end (reason %d) "
|
2006-02-13 10:02:35 +01:00
|
|
|
"on an already ended stream?", reason);
|
2005-04-26 20:52:16 +02:00
|
|
|
tor_fragile_assert();
|
2003-12-14 09:32:14 +01:00
|
|
|
return -1;
|
2003-10-21 10:37:07 +02:00
|
|
|
}
|
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
if (conn->_base.marked_for_close) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG,
|
2007-03-04 21:11:46 +01:00
|
|
|
"called on conn that's already marked for close at %s:%d.",
|
2006-07-26 21:07:26 +02:00
|
|
|
conn->_base.marked_for_close_file, conn->_base.marked_for_close);
|
2005-03-23 03:52:55 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-10-22 09:55:44 +02:00
|
|
|
payload[0] = reason;
|
2005-09-13 00:05:17 +02:00
|
|
|
if (reason == END_STREAM_REASON_EXITPOLICY &&
|
|
|
|
!connection_edge_is_rendezvous_stream(conn)) {
|
2006-07-26 21:07:26 +02:00
|
|
|
set_uint32(payload+1, htonl(conn->_base.addr));
|
2006-06-03 23:41:14 +02:00
|
|
|
set_uint32(payload+5, htonl(dns_clip_ttl(conn->address_ttl)));
|
2005-09-02 20:53:31 +02:00
|
|
|
payload_len += 8;
|
2003-10-22 09:55:44 +02:00
|
|
|
}
|
|
|
|
|
2005-04-06 08:43:21 +02:00
|
|
|
circ = circuit_get_by_edge_conn(conn);
|
2004-11-28 10:05:49 +01:00
|
|
|
if (circ && !circ->marked_for_close) {
|
2007-02-13 22:18:56 +01:00
|
|
|
log_debug(LD_EDGE,"Sending end on conn (fd %d).",conn->_base.s);
|
2007-03-24 16:58:11 +01:00
|
|
|
connection_edge_send_command(conn, RELAY_COMMAND_END,
|
2007-03-24 16:57:51 +01:00
|
|
|
payload, payload_len);
|
2004-02-27 23:00:26 +01:00
|
|
|
} else {
|
2007-02-13 22:18:56 +01:00
|
|
|
log_debug(LD_EDGE,"No circ to send end on conn (fd %d).",
|
2006-07-26 21:07:26 +02:00
|
|
|
conn->_base.s);
|
2003-10-21 10:37:07 +02:00
|
|
|
}
|
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
conn->_base.edge_has_sent_end = 1;
|
2006-10-20 19:54:48 +02:00
|
|
|
conn->end_reason = reason;
|
2003-12-14 09:32:14 +01:00
|
|
|
return 0;
|
2003-10-21 10:37:07 +02:00
|
|
|
}
|
|
|
|
|
2005-03-17 13:38:37 +01:00
|
|
|
/** An error has just occured on an operation on an edge connection
|
2007-03-24 16:57:51 +01:00
|
|
|
* <b>conn</b>. Extract the errno; convert it to an end reason, and send an
|
|
|
|
* appropriate relay end cell to the other end of the connection's circuit.
|
2005-03-17 13:38:37 +01:00
|
|
|
**/
|
2005-03-01 23:42:31 +01:00
|
|
|
int
|
2007-03-24 16:57:51 +01:00
|
|
|
connection_edge_end_errno(edge_connection_t *conn)
|
2005-03-01 23:42:31 +01:00
|
|
|
{
|
|
|
|
uint8_t reason;
|
|
|
|
tor_assert(conn);
|
2006-07-26 21:07:26 +02:00
|
|
|
reason = (uint8_t)errno_to_end_reason(tor_socket_errno(conn->_base.s));
|
2007-03-24 16:57:51 +01:00
|
|
|
return connection_edge_end(conn, reason);
|
2005-03-01 23:42:31 +01:00
|
|
|
}
|
|
|
|
|
2004-05-10 06:42:22 +02:00
|
|
|
/** Connection <b>conn</b> has finished writing and has no bytes left on
|
|
|
|
* its outbuf.
|
|
|
|
*
|
|
|
|
* If it's in state 'open', stop writing, consider responding with a
|
|
|
|
* sendme, and return.
|
|
|
|
* Otherwise, stop writing and return.
|
|
|
|
*
|
|
|
|
* If <b>conn</b> is broken, mark it for close and return -1, else
|
|
|
|
* return 0.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_edge_finished_flushing(edge_connection_t *conn)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(conn);
|
2003-04-12 00:11:11 +02:00
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
switch (conn->_base.state) {
|
2003-04-12 00:11:11 +02:00
|
|
|
case AP_CONN_STATE_OPEN:
|
|
|
|
case EXIT_CONN_STATE_OPEN:
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_stop_writing(TO_CONN(conn));
|
2003-10-22 11:08:10 +02:00
|
|
|
connection_edge_consider_sending_sendme(conn);
|
2003-10-04 04:38:18 +02:00
|
|
|
return 0;
|
2003-10-04 03:37:01 +02:00
|
|
|
case AP_CONN_STATE_SOCKS_WAIT:
|
2006-11-14 01:06:31 +01:00
|
|
|
case AP_CONN_STATE_NATD_WAIT:
|
2004-04-05 02:47:48 +02:00
|
|
|
case AP_CONN_STATE_RENDDESC_WAIT:
|
2004-01-01 08:01:09 +01:00
|
|
|
case AP_CONN_STATE_CIRCUIT_WAIT:
|
2004-03-03 05:54:16 +01:00
|
|
|
case AP_CONN_STATE_CONNECT_WAIT:
|
2005-03-23 06:32:06 +01:00
|
|
|
case AP_CONN_STATE_CONTROLLER_WAIT:
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_stop_writing(TO_CONN(conn));
|
2003-10-04 03:37:01 +02:00
|
|
|
return 0;
|
2003-04-12 00:11:11 +02:00
|
|
|
default:
|
2007-03-04 21:11:46 +01:00
|
|
|
log_warn(LD_BUG, "Called in unexpected state %d.",conn->_base.state);
|
2005-04-26 20:52:16 +02:00
|
|
|
tor_fragile_assert();
|
2003-09-26 12:03:50 +02:00
|
|
|
return -1;
|
2003-04-12 00:11:11 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-12 21:17:09 +02:00
|
|
|
/** Connected handler for exit connections: start writing pending
|
|
|
|
* data, deliver 'CONNECTED' relay cells as appropriate, and check
|
|
|
|
* any pending data that may have been received. */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_edge_finished_connecting(edge_connection_t *edge_conn)
|
2004-05-12 21:17:09 +02:00
|
|
|
{
|
2005-07-01 15:40:29 +02:00
|
|
|
char valbuf[INET_NTOA_BUF_LEN];
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_t *conn;
|
2005-07-02 02:18:09 +02:00
|
|
|
struct in_addr in;
|
2004-05-12 21:17:09 +02:00
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
tor_assert(edge_conn);
|
|
|
|
tor_assert(edge_conn->_base.type == CONN_TYPE_EXIT);
|
|
|
|
conn = TO_CONN(edge_conn);
|
2004-05-12 21:17:09 +02:00
|
|
|
tor_assert(conn->state == EXIT_CONN_STATE_CONNECTING);
|
|
|
|
|
2005-07-01 15:40:29 +02:00
|
|
|
in.s_addr = htonl(conn->addr);
|
|
|
|
tor_inet_ntoa(&in,valbuf,sizeof(valbuf));
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_EXIT,"Exit connection to %s:%u (%s) established.",
|
2006-03-19 04:55:48 +01:00
|
|
|
escaped_safe_str(conn->address),conn->port,safe_str(valbuf));
|
2004-05-12 21:17:09 +02:00
|
|
|
|
|
|
|
conn->state = EXIT_CONN_STATE_OPEN;
|
2005-01-12 07:42:32 +01:00
|
|
|
connection_watch_events(conn, EV_READ); /* stop writing, continue reading */
|
2005-12-14 21:40:40 +01:00
|
|
|
if (connection_wants_to_flush(conn)) /* in case there are any queued relay
|
|
|
|
* cells */
|
2004-05-12 21:17:09 +02:00
|
|
|
connection_start_writing(conn);
|
|
|
|
/* deliver a 'connected' relay cell back through the circuit. */
|
2006-07-26 21:07:26 +02:00
|
|
|
if (connection_edge_is_rendezvous_stream(edge_conn)) {
|
|
|
|
if (connection_edge_send_command(edge_conn,
|
2007-03-24 16:57:51 +01:00
|
|
|
RELAY_COMMAND_CONNECTED, NULL, 0) < 0)
|
2004-05-12 21:17:09 +02:00
|
|
|
return 0; /* circuit is closed, don't continue */
|
|
|
|
} else {
|
2005-09-02 20:53:31 +02:00
|
|
|
char connected_payload[8];
|
2005-09-03 03:47:39 +02:00
|
|
|
set_uint32(connected_payload, htonl(conn->addr));
|
2005-09-02 20:53:31 +02:00
|
|
|
set_uint32(connected_payload+4,
|
2006-07-26 21:07:26 +02:00
|
|
|
htonl(dns_clip_ttl(edge_conn->address_ttl)));
|
|
|
|
if (connection_edge_send_command(edge_conn,
|
|
|
|
RELAY_COMMAND_CONNECTED,
|
2007-03-24 16:57:51 +01:00
|
|
|
connected_payload, 8) < 0)
|
2004-05-12 21:17:09 +02:00
|
|
|
return 0; /* circuit is closed, don't continue */
|
|
|
|
}
|
2006-07-26 21:07:26 +02:00
|
|
|
tor_assert(edge_conn->package_window > 0);
|
2004-11-21 08:43:12 +01:00
|
|
|
/* in case the server has written anything */
|
2006-07-26 21:07:26 +02:00
|
|
|
return connection_edge_process_inbuf(edge_conn, 1);
|
2004-05-12 21:17:09 +02:00
|
|
|
}
|
|
|
|
|
2006-07-18 06:42:32 +02:00
|
|
|
/** Define a schedule for how long to wait between retrying
|
|
|
|
* application connections. Rather than waiting a fixed amount of
|
2006-12-20 10:43:28 +01:00
|
|
|
* time between each retry, we wait 10 seconds each for the first
|
2007-01-04 05:35:18 +01:00
|
|
|
* two tries, and 15 seconds for each retry after
|
2006-08-14 09:08:29 +02:00
|
|
|
* that. Hopefully this will improve the expected user experience. */
|
2006-07-18 06:42:32 +02:00
|
|
|
static int
|
2007-02-12 04:01:36 +01:00
|
|
|
compute_retry_timeout(edge_connection_t *conn)
|
2006-07-18 06:42:32 +02:00
|
|
|
{
|
2006-12-20 10:43:28 +01:00
|
|
|
if (conn->num_socks_retries < 2) /* try 0 and try 1 */
|
2006-07-18 06:42:32 +02:00
|
|
|
return 10;
|
|
|
|
return 15;
|
|
|
|
}
|
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
/** Find all general-purpose AP streams waiting for a response that sent their
|
|
|
|
* begin/resolve cell >=15 seconds ago. Detach from their current circuit, and
|
|
|
|
* mark their current circuit as unsuitable for new streams. Then call
|
2004-05-10 06:42:22 +02:00
|
|
|
* connection_ap_handshake_attach_circuit() to attach to a new circuit (if
|
|
|
|
* available) or launch a new one.
|
|
|
|
*
|
2006-03-22 00:27:43 +01:00
|
|
|
* For rendezvous streams, simply give up after SocksTimeout seconds (with no
|
2004-05-10 06:42:22 +02:00
|
|
|
* retry attempt).
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
connection_ap_expire_beginning(void)
|
|
|
|
{
|
2006-07-26 21:07:26 +02:00
|
|
|
edge_connection_t *conn;
|
2004-02-29 10:15:29 +01:00
|
|
|
circuit_t *circ;
|
2004-01-20 10:21:46 +01:00
|
|
|
time_t now = time(NULL);
|
2004-11-06 06:18:11 +01:00
|
|
|
or_options_t *options = get_options();
|
2006-04-09 23:36:37 +02:00
|
|
|
int severity;
|
2006-07-18 06:42:32 +02:00
|
|
|
int cutoff;
|
2007-01-15 10:09:03 +01:00
|
|
|
int seconds_idle;
|
2007-05-22 17:49:14 +02:00
|
|
|
smartlist_t *conns = get_connection_array();
|
2004-01-20 10:21:46 +01:00
|
|
|
|
2007-05-22 17:49:14 +02:00
|
|
|
SMARTLIST_FOREACH(conns, connection_t *, c,
|
|
|
|
{
|
|
|
|
if (c->type != CONN_TYPE_AP)
|
2004-11-30 09:39:14 +01:00
|
|
|
continue;
|
2007-05-22 17:49:14 +02:00
|
|
|
conn = TO_EDGE_CONN(c);
|
2007-06-09 07:17:33 +02:00
|
|
|
/* if it's an internal linked connection, don't yell its status. */
|
2006-07-26 21:07:37 +02:00
|
|
|
severity = (!conn->_base.addr && !conn->_base.port)
|
|
|
|
? LOG_INFO : LOG_NOTICE;
|
2007-01-15 10:09:03 +01:00
|
|
|
seconds_idle = now - conn->_base.timestamp_lastread;
|
|
|
|
|
|
|
|
if (AP_CONN_STATE_IS_UNATTACHED(conn->_base.state)) {
|
|
|
|
if (seconds_idle >= options->SocksTimeout) {
|
2007-02-11 03:15:42 +01:00
|
|
|
log_fn(severity, LD_APP,
|
|
|
|
"Tried for %d seconds to get a connection to %s:%d. "
|
|
|
|
"Giving up. (%s)",
|
2007-01-15 10:09:03 +01:00
|
|
|
seconds_idle, safe_str(conn->socks_request->address),
|
2007-02-11 03:15:42 +01:00
|
|
|
conn->socks_request->port,
|
|
|
|
conn_state_to_string(CONN_TYPE_AP, conn->_base.state));
|
2005-04-03 00:11:24 +02:00
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_TIMEOUT);
|
2005-03-17 13:38:37 +01:00
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2007-01-15 10:09:03 +01:00
|
|
|
if (conn->_base.state == AP_CONN_STATE_OPEN)
|
2004-01-20 10:21:46 +01:00
|
|
|
continue;
|
2007-01-15 10:09:03 +01:00
|
|
|
|
2007-02-12 04:01:36 +01:00
|
|
|
/* We're in state connect_wait or resolve_wait now -- waiting for a
|
|
|
|
* reply to our relay cell. See if we want to retry/give up. */
|
|
|
|
|
|
|
|
cutoff = compute_retry_timeout(conn);
|
2007-01-15 10:09:03 +01:00
|
|
|
if (seconds_idle < cutoff)
|
2004-03-08 00:50:15 +01:00
|
|
|
continue;
|
2005-04-06 08:43:21 +02:00
|
|
|
circ = circuit_get_by_edge_conn(conn);
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!circ) { /* it's vanished? */
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_APP,"Conn is waiting (address %s), but lost its circ.",
|
|
|
|
safe_str(conn->socks_request->address));
|
2005-04-03 00:11:24 +02:00
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_TIMEOUT);
|
2004-04-26 00:48:47 +02:00
|
|
|
continue;
|
|
|
|
}
|
2004-11-28 10:05:49 +01:00
|
|
|
if (circ->purpose == CIRCUIT_PURPOSE_C_REND_JOINED) {
|
2007-02-12 04:01:36 +01:00
|
|
|
if (seconds_idle >= options->SocksTimeout) {
|
2006-04-09 23:36:37 +02:00
|
|
|
log_fn(severity, LD_REND,
|
|
|
|
"Rend stream is %d seconds late. Giving up on address"
|
|
|
|
" '%s.onion'.",
|
2007-01-15 10:09:03 +01:00
|
|
|
seconds_idle,
|
2006-04-09 23:36:37 +02:00
|
|
|
safe_str(conn->socks_request->address));
|
2007-03-24 16:57:51 +01:00
|
|
|
connection_edge_end(conn, END_STREAM_REASON_TIMEOUT);
|
2005-04-03 00:11:24 +02:00
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_TIMEOUT);
|
2004-04-06 00:43:01 +02:00
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(circ->purpose == CIRCUIT_PURPOSE_C_GENERAL);
|
2006-07-18 06:48:59 +02:00
|
|
|
log_fn(cutoff < 15 ? LOG_INFO : severity, LD_APP,
|
2006-04-09 23:36:37 +02:00
|
|
|
"We tried for %d seconds to connect to '%s' using exit '%s'."
|
|
|
|
" Retrying on a new circuit.",
|
2007-01-15 10:09:03 +01:00
|
|
|
seconds_idle, safe_str(conn->socks_request->address),
|
2007-05-01 01:24:38 +02:00
|
|
|
conn->cpath_layer ?
|
|
|
|
conn->cpath_layer->extend_info->nickname : "*unnamed*");
|
2004-12-04 04:26:35 +01:00
|
|
|
/* send an end down the circuit */
|
2007-03-24 16:57:51 +01:00
|
|
|
connection_edge_end(conn, END_STREAM_REASON_TIMEOUT);
|
2004-12-04 04:26:35 +01:00
|
|
|
/* un-mark it as ending, since we're going to reuse it */
|
2006-07-26 21:07:26 +02:00
|
|
|
conn->_base.edge_has_sent_end = 0;
|
2006-10-20 19:54:48 +02:00
|
|
|
conn->end_reason = 0;
|
2004-12-04 04:26:35 +01:00
|
|
|
/* kludge to make us not try this circuit again, yet to allow
|
|
|
|
* current streams on it to survive if they can: make it
|
|
|
|
* unattractive to use for new streams */
|
|
|
|
tor_assert(circ->timestamp_dirty);
|
Introduce a notion of 'internal' circs, which are chosen without regard
to the exit policy of the last hop. Intro and rendezvous circs must
be internal circs, to avoid leaking information. Resolve and connect
streams can use internal circs if they want.
New circuit pooling algorithm: make sure to have enough circs around
to satisfy any predicted ports, and also make sure to have 2 internal
circs around if we've required internal circs lately (with high uptime
if we've seen that lately).
Split NewCircuitPeriod config option into NewCircuitPeriod (30 secs),
which describes how often we retry making new circuits if current ones
are dirty, and MaxCircuitDirtiness (10 mins), which describes how long
we're willing to make use of an already-dirty circuit.
Once rendezvous circuits are established, keep using the same circuit as
long as you attach a new stream to it at least every 10 minutes. (So web
browsing doesn't require you to build new rend circs every 30 seconds.)
Cannibalize GENERAL circs to be C_REND, C_INTRO, S_INTRO, and S_REND
circ as necessary, if there are any completed ones lying around when
we try to launch one.
Re-instate the ifdef's to use version-0 style introduce cells, since
there was yet another bug in handling version-1 style. We'll try switching
over again after 0.0.9 is obsolete.
Bugfix: when choosing an exit node for a new non-internal circ, don't take
into account whether it'll be useful for any pending x.onion addresses --
it won't.
Bugfix: we weren't actually publishing the hidden service descriptor when
it became dirty. So we only published it every 20 minutes or so, which
means when you first start your Tor, the hidden service will seem broken.
svn:r3360
2005-01-17 19:13:09 +01:00
|
|
|
circ->timestamp_dirty -= options->MaxCircuitDirtiness;
|
2006-07-18 06:42:32 +02:00
|
|
|
/* give our stream another 'cutoff' seconds to try */
|
2006-07-26 21:07:26 +02:00
|
|
|
conn->_base.timestamp_lastread += cutoff;
|
2006-08-14 07:53:57 +02:00
|
|
|
if (conn->num_socks_retries < 250) /* avoid overflow */
|
|
|
|
conn->num_socks_retries++;
|
2005-03-14 04:12:59 +01:00
|
|
|
/* move it back into 'pending' state, and try to attach. */
|
2006-10-20 19:54:43 +02:00
|
|
|
if (connection_ap_detach_retriable(conn, TO_ORIGIN_CIRCUIT(circ),
|
|
|
|
END_STREAM_REASON_TIMEOUT)<0) {
|
2005-04-03 00:11:24 +02:00
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH);
|
2004-12-04 04:26:35 +01:00
|
|
|
}
|
2007-05-22 17:49:14 +02:00
|
|
|
}); /* end foreach */
|
2004-01-20 10:21:46 +01:00
|
|
|
}
|
|
|
|
|
2006-12-10 09:04:50 +01:00
|
|
|
/** Tell any AP streams that are waiting for a new circuit to try again,
|
|
|
|
* either attaching to an available circ or launching a new one.
|
2004-05-10 06:42:22 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
connection_ap_attach_pending(void)
|
2003-11-11 03:41:31 +01:00
|
|
|
{
|
2006-07-26 21:07:26 +02:00
|
|
|
edge_connection_t *edge_conn;
|
2007-05-22 17:49:14 +02:00
|
|
|
smartlist_t *conns = get_connection_array();
|
|
|
|
SMARTLIST_FOREACH(conns, connection_t *, conn,
|
|
|
|
{
|
2004-05-21 00:39:01 +02:00
|
|
|
if (conn->marked_for_close ||
|
|
|
|
conn->type != CONN_TYPE_AP ||
|
2003-12-03 10:50:02 +01:00
|
|
|
conn->state != AP_CONN_STATE_CIRCUIT_WAIT)
|
2003-11-16 06:33:45 +01:00
|
|
|
continue;
|
2006-07-26 21:07:26 +02:00
|
|
|
edge_conn = TO_EDGE_CONN(conn);
|
|
|
|
if (connection_ap_handshake_attach_circuit(edge_conn) < 0) {
|
|
|
|
connection_mark_unattached_ap(edge_conn, END_STREAM_REASON_CANT_ATTACH);
|
2003-11-16 06:33:45 +01:00
|
|
|
}
|
2007-05-22 17:49:14 +02:00
|
|
|
});
|
2003-11-11 03:41:31 +01:00
|
|
|
}
|
|
|
|
|
2006-10-01 08:41:13 +02:00
|
|
|
/** A circuit failed to finish on its last hop <b>info</b>. If there
|
|
|
|
* are any streams waiting with this exit node in mind, but they
|
|
|
|
* don't absolutely require it, make them give up on it.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
circuit_discard_optional_exit_enclaves(extend_info_t *info)
|
|
|
|
{
|
|
|
|
edge_connection_t *edge_conn;
|
|
|
|
routerinfo_t *r1, *r2;
|
|
|
|
|
2007-05-22 17:49:14 +02:00
|
|
|
smartlist_t *conns = get_connection_array();
|
|
|
|
SMARTLIST_FOREACH(conns, connection_t *, conn,
|
|
|
|
{
|
2006-10-01 08:41:13 +02:00
|
|
|
if (conn->marked_for_close ||
|
|
|
|
conn->type != CONN_TYPE_AP ||
|
|
|
|
!conn->chosen_exit_optional)
|
|
|
|
continue;
|
|
|
|
edge_conn = TO_EDGE_CONN(conn);
|
|
|
|
r1 = router_get_by_nickname(edge_conn->chosen_exit_name, 0);
|
|
|
|
r2 = router_get_by_nickname(info->nickname, 0);
|
|
|
|
if (r1 && r2 && r1==r2) {
|
|
|
|
tor_assert(edge_conn->socks_request);
|
|
|
|
log_info(LD_APP, "Giving up on enclave exit '%s' for destination %s.",
|
|
|
|
safe_str(edge_conn->chosen_exit_name),
|
|
|
|
escaped_safe_str(edge_conn->socks_request->address));
|
|
|
|
conn->chosen_exit_optional = 0;
|
|
|
|
tor_free(edge_conn->chosen_exit_name); /* clears it */
|
|
|
|
}
|
2007-05-22 17:49:14 +02:00
|
|
|
});
|
2006-10-01 08:41:13 +02:00
|
|
|
}
|
|
|
|
|
2005-03-17 13:38:37 +01:00
|
|
|
/** The AP connection <b>conn</b> has just failed while attaching or
|
|
|
|
* sending a BEGIN or resolving on <b>circ</b>, but another circuit
|
2006-12-10 09:04:50 +01:00
|
|
|
* might work. Detach the circuit, and either reattach it, launch a
|
2005-03-17 13:38:37 +01:00
|
|
|
* new circuit, tell the controller, or give up as a appropriate.
|
|
|
|
*
|
|
|
|
* Returns -1 on err, 1 on success, 0 on not-yet-sure.
|
2005-03-14 04:12:59 +01:00
|
|
|
*/
|
|
|
|
int
|
2006-10-20 19:54:43 +02:00
|
|
|
connection_ap_detach_retriable(edge_connection_t *conn, origin_circuit_t *circ,
|
|
|
|
int reason)
|
2005-03-14 04:12:59 +01:00
|
|
|
{
|
2006-10-20 19:54:43 +02:00
|
|
|
control_event_stream_status(conn, STREAM_EVENT_FAILED_RETRIABLE, reason);
|
2006-07-26 21:07:26 +02:00
|
|
|
conn->_base.timestamp_lastread = time(NULL);
|
2005-03-27 08:25:33 +02:00
|
|
|
if (! get_options()->LeaveStreamsUnattached) {
|
2006-07-26 21:07:26 +02:00
|
|
|
conn->_base.state = AP_CONN_STATE_CIRCUIT_WAIT;
|
2006-07-23 09:37:35 +02:00
|
|
|
circuit_detach_stream(TO_CIRCUIT(circ),conn);
|
2005-03-14 04:12:59 +01:00
|
|
|
return connection_ap_handshake_attach_circuit(conn);
|
|
|
|
} else {
|
2006-07-26 21:07:26 +02:00
|
|
|
conn->_base.state = AP_CONN_STATE_CONTROLLER_WAIT;
|
2006-07-23 09:37:35 +02:00
|
|
|
circuit_detach_stream(TO_CIRCUIT(circ),conn);
|
2005-03-14 04:12:59 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-02-22 01:53:08 +01:00
|
|
|
/** A client-side struct to remember requests to rewrite addresses
|
2005-12-03 17:32:29 +01:00
|
|
|
* to new addresses. These structs are stored in the hash table
|
2005-12-03 03:21:31 +01:00
|
|
|
* "addressmap" below.
|
2005-02-22 01:53:08 +01:00
|
|
|
*
|
|
|
|
* There are 5 ways to set an address mapping:
|
|
|
|
* - A MapAddress command from the controller [permanent]
|
|
|
|
* - An AddressMap directive in the torrc [permanent]
|
|
|
|
* - When a TrackHostExits torrc directive is triggered [temporary]
|
|
|
|
* - When a dns resolve succeeds [temporary]
|
|
|
|
* - When a dns resolve fails [temporary]
|
|
|
|
*
|
|
|
|
* When an addressmap request is made but one is already registered,
|
|
|
|
* the new one is replaced only if the currently registered one has
|
|
|
|
* no "new_address" (that is, it's in the process of dns resolve),
|
2005-03-03 07:37:54 +01:00
|
|
|
* or if the new one is permanent (expires==0 or 1).
|
|
|
|
*
|
|
|
|
* (We overload the 'expires' field, using "0" for mappings set via
|
|
|
|
* the configuration file, "1" for mappings set from the control
|
|
|
|
* interface, and other values for DNS mappings that can expire.)
|
2005-02-22 01:53:08 +01:00
|
|
|
*/
|
|
|
|
typedef struct {
|
|
|
|
char *new_address;
|
|
|
|
time_t expires;
|
|
|
|
int num_resolve_failures;
|
|
|
|
} addressmap_entry_t;
|
|
|
|
|
2005-10-06 06:33:40 +02:00
|
|
|
/** Entry for mapping addresses to which virtual address we mapped them to. */
|
2005-03-02 23:01:10 +01:00
|
|
|
typedef struct {
|
|
|
|
char *ipv4_address;
|
|
|
|
char *hostname_address;
|
|
|
|
} virtaddress_entry_t;
|
|
|
|
|
2005-12-03 03:21:31 +01:00
|
|
|
/** A hash table to store client-side address rewrite instructions. */
|
2005-03-23 09:40:11 +01:00
|
|
|
static strmap_t *addressmap=NULL;
|
2005-03-02 23:01:10 +01:00
|
|
|
/**
|
2005-12-03 03:21:31 +01:00
|
|
|
* Table mapping addresses to which virtual address, if any, we
|
2005-03-02 23:01:10 +01:00
|
|
|
* assigned them to.
|
|
|
|
*
|
|
|
|
* We maintain the following invariant: if [A,B] is in
|
|
|
|
* virtaddress_reversemap, then B must be a virtual address, and [A,B]
|
|
|
|
* must be in addressmap. We do not require that the converse hold:
|
|
|
|
* if it fails, then we could end up mapping two virtual addresses to
|
|
|
|
* the same address, which is no disaster.
|
|
|
|
**/
|
2005-03-23 09:40:11 +01:00
|
|
|
static strmap_t *virtaddress_reversemap=NULL;
|
2005-02-22 01:53:08 +01:00
|
|
|
|
|
|
|
/** Initialize addressmap. */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
addressmap_init(void)
|
|
|
|
{
|
2005-02-22 01:53:08 +01:00
|
|
|
addressmap = strmap_new();
|
2005-03-02 22:02:11 +01:00
|
|
|
virtaddress_reversemap = strmap_new();
|
2005-02-22 01:53:08 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/** Free the memory associated with the addressmap entry <b>_ent</b>. */
|
|
|
|
static void
|
2005-06-11 20:52:12 +02:00
|
|
|
addressmap_ent_free(void *_ent)
|
|
|
|
{
|
2005-02-22 01:53:08 +01:00
|
|
|
addressmap_entry_t *ent = _ent;
|
|
|
|
tor_free(ent->new_address);
|
|
|
|
tor_free(ent);
|
|
|
|
}
|
|
|
|
|
2007-05-25 21:41:31 +02:00
|
|
|
/** Free storage held by a virtaddress_entry_t* entry in <b>ent</b>. */
|
2005-03-02 22:02:11 +01:00
|
|
|
static void
|
2005-06-11 20:52:12 +02:00
|
|
|
addressmap_virtaddress_ent_free(void *_ent)
|
|
|
|
{
|
2005-03-02 23:01:10 +01:00
|
|
|
virtaddress_entry_t *ent = _ent;
|
|
|
|
tor_free(ent->ipv4_address);
|
|
|
|
tor_free(ent->hostname_address);
|
|
|
|
tor_free(ent);
|
|
|
|
}
|
|
|
|
|
2007-05-25 21:41:31 +02:00
|
|
|
/** Free storage held by a virtaddress_entry_t* entry in <b>ent</b>. */
|
2005-03-02 23:01:10 +01:00
|
|
|
static void
|
2005-10-05 04:06:36 +02:00
|
|
|
addressmap_virtaddress_remove(const char *address, addressmap_entry_t *ent)
|
2005-03-02 22:02:11 +01:00
|
|
|
{
|
2005-12-14 21:40:40 +01:00
|
|
|
if (ent && ent->new_address &&
|
|
|
|
address_is_in_virtual_range(ent->new_address)) {
|
2005-03-02 23:01:10 +01:00
|
|
|
virtaddress_entry_t *ve =
|
|
|
|
strmap_get(virtaddress_reversemap, ent->new_address);
|
2005-03-23 09:40:11 +01:00
|
|
|
/*log_fn(LOG_NOTICE,"remove reverse mapping for %s",ent->new_address);*/
|
2005-03-02 23:01:10 +01:00
|
|
|
if (ve) {
|
2005-10-05 04:06:36 +02:00
|
|
|
if (!strcmp(address, ve->ipv4_address))
|
2005-03-02 23:01:10 +01:00
|
|
|
tor_free(ve->ipv4_address);
|
2005-10-05 04:06:36 +02:00
|
|
|
if (!strcmp(address, ve->hostname_address))
|
2005-03-02 23:01:10 +01:00
|
|
|
tor_free(ve->hostname_address);
|
|
|
|
if (!ve->ipv4_address && !ve->hostname_address) {
|
|
|
|
tor_free(ve);
|
|
|
|
strmap_remove(virtaddress_reversemap, ent->new_address);
|
|
|
|
}
|
2005-03-02 22:02:11 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-02-02 19:58:11 +01:00
|
|
|
/** Remove <b>ent</b> (which must be mapped to by <b>address</b>) from the
|
|
|
|
* client address maps. */
|
2005-03-02 23:01:10 +01:00
|
|
|
static void
|
2005-10-05 04:06:36 +02:00
|
|
|
addressmap_ent_remove(const char *address, addressmap_entry_t *ent)
|
2005-03-02 23:01:10 +01:00
|
|
|
{
|
2005-10-05 04:06:36 +02:00
|
|
|
addressmap_virtaddress_remove(address, ent);
|
2005-03-02 23:01:10 +01:00
|
|
|
addressmap_ent_free(ent);
|
|
|
|
}
|
2005-03-02 22:02:11 +01:00
|
|
|
|
2005-03-11 22:39:39 +01:00
|
|
|
/** Remove all entries from the addressmap that were set via the
|
|
|
|
* configuration file or the command line. */
|
|
|
|
void
|
|
|
|
addressmap_clear_configured(void)
|
|
|
|
{
|
|
|
|
addressmap_get_mappings(NULL, 0, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Remove all entries from the addressmap that are set to expire, ever. */
|
|
|
|
void
|
|
|
|
addressmap_clear_transient(void)
|
|
|
|
{
|
|
|
|
addressmap_get_mappings(NULL, 2, TIME_MAX);
|
2005-02-22 01:53:08 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/** Clean out entries from the addressmap cache that were
|
|
|
|
* added long enough ago that they are no longer valid.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
addressmap_clean(time_t now)
|
|
|
|
{
|
2005-03-11 22:39:39 +01:00
|
|
|
addressmap_get_mappings(NULL, 2, now);
|
2005-02-22 01:53:08 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/** Free all the elements in the addressmap, and free the addressmap
|
|
|
|
* itself. */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
addressmap_free_all(void)
|
|
|
|
{
|
2005-10-12 21:08:48 +02:00
|
|
|
if (addressmap) {
|
|
|
|
strmap_free(addressmap, addressmap_ent_free);
|
|
|
|
addressmap = NULL;
|
|
|
|
}
|
|
|
|
if (virtaddress_reversemap) {
|
|
|
|
strmap_free(virtaddress_reversemap, addressmap_virtaddress_ent_free);
|
|
|
|
virtaddress_reversemap = NULL;
|
|
|
|
}
|
2005-02-22 01:53:08 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/** Look at address, and rewrite it until it doesn't want any
|
|
|
|
* more rewrites; but don't get into an infinite loop.
|
2007-02-05 20:15:13 +01:00
|
|
|
* Don't write more than maxlen chars into address. Return true if the
|
|
|
|
* address changed; false otherwise.
|
2005-02-22 01:53:08 +01:00
|
|
|
*/
|
2007-02-05 20:15:13 +01:00
|
|
|
int
|
2005-06-11 20:52:12 +02:00
|
|
|
addressmap_rewrite(char *address, size_t maxlen)
|
|
|
|
{
|
2005-02-22 01:53:08 +01:00
|
|
|
addressmap_entry_t *ent;
|
|
|
|
int rewrites;
|
2006-12-26 23:41:43 +01:00
|
|
|
char *cp;
|
2005-02-22 01:53:08 +01:00
|
|
|
|
|
|
|
for (rewrites = 0; rewrites < 16; rewrites++) {
|
|
|
|
ent = strmap_get(addressmap, address);
|
|
|
|
|
|
|
|
if (!ent || !ent->new_address)
|
2007-02-05 20:15:13 +01:00
|
|
|
return (rewrites > 0); /* done, no rewrite needed */
|
2005-02-22 01:53:08 +01:00
|
|
|
|
2006-12-26 23:41:43 +01:00
|
|
|
cp = tor_strdup(escaped_safe_str(ent->new_address));
|
2007-05-25 20:22:42 +02:00
|
|
|
log_info(LD_APP, "Addressmap: rewriting %s to %s",
|
2006-12-26 23:41:43 +01:00
|
|
|
escaped_safe_str(address), cp);
|
|
|
|
tor_free(cp);
|
2005-02-22 01:53:08 +01:00
|
|
|
strlcpy(address, ent->new_address, maxlen);
|
|
|
|
}
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,
|
2007-01-04 10:12:23 +01:00
|
|
|
"Loop detected: we've rewritten %s 16 times! Using it as-is.",
|
|
|
|
escaped_safe_str(address));
|
2005-02-22 01:53:08 +01:00
|
|
|
/* it's fine to rewrite a rewrite, but don't loop forever */
|
2007-02-05 20:15:13 +01:00
|
|
|
return 1;
|
2005-02-22 01:53:08 +01:00
|
|
|
}
|
|
|
|
|
2007-02-02 19:58:11 +01:00
|
|
|
/** If we have a cached reverse DNS entry for the address stored in the
|
2007-02-06 03:49:07 +01:00
|
|
|
* <b>maxlen</b>-byte buffer <b>address</b> (typically, a dotted quad) then
|
|
|
|
* rewrite to the cached value and return 1. Otherwise return 0. */
|
2006-12-26 23:41:43 +01:00
|
|
|
static int
|
|
|
|
addressmap_rewrite_reverse(char *address, size_t maxlen)
|
|
|
|
{
|
|
|
|
size_t len = maxlen + 16;
|
|
|
|
char *s = tor_malloc(len), *cp;
|
|
|
|
addressmap_entry_t *ent;
|
|
|
|
int r = 0;
|
|
|
|
tor_snprintf(s, len, "REVERSE[%s]", address);
|
|
|
|
ent = strmap_get(addressmap, s);
|
|
|
|
if (ent) {
|
|
|
|
cp = tor_strdup(escaped_safe_str(ent->new_address));
|
2007-01-04 10:12:23 +01:00
|
|
|
log_info(LD_APP, "Rewrote reverse lookup %s -> %s",
|
2006-12-26 23:41:43 +01:00
|
|
|
escaped_safe_str(s), cp);
|
|
|
|
tor_free(cp);
|
|
|
|
strlcpy(address, ent->new_address, maxlen);
|
|
|
|
r = 1;
|
|
|
|
}
|
|
|
|
tor_free(s);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2005-02-22 01:53:08 +01:00
|
|
|
/** Return 1 if <b>address</b> is already registered, else return 0 */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
2006-08-25 23:16:22 +02:00
|
|
|
addressmap_have_mapping(const char *address)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2006-08-25 23:16:22 +02:00
|
|
|
return strmap_get_lc(addressmap, address) ? 1 : 0;
|
2005-02-22 01:53:08 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/** Register a request to map <b>address</b> to <b>new_address</b>,
|
2005-03-23 09:40:11 +01:00
|
|
|
* which will expire on <b>expires</b> (or 0 if never expires from
|
|
|
|
* config file, 1 if never expires from controller, 2 if never expires
|
|
|
|
* (virtual address mapping) from the controller.)
|
2005-02-22 01:53:08 +01:00
|
|
|
*
|
2005-02-23 07:40:48 +01:00
|
|
|
* <b>new_address</b> should be a newly dup'ed string, which we'll use or
|
2005-02-22 01:53:08 +01:00
|
|
|
* free as appropriate. We will leave address alone.
|
2005-02-23 07:40:48 +01:00
|
|
|
*
|
|
|
|
* If <b>new_address</b> is NULL, or equal to <b>address</b>, remove
|
|
|
|
* any mappings that exist from <b>address</b>.
|
2005-02-22 01:53:08 +01:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
addressmap_register(const char *address, char *new_address, time_t expires)
|
|
|
|
{
|
2005-02-22 01:53:08 +01:00
|
|
|
addressmap_entry_t *ent;
|
|
|
|
|
|
|
|
ent = strmap_get(addressmap, address);
|
2005-02-23 07:40:48 +01:00
|
|
|
if (!new_address || !strcasecmp(address,new_address)) {
|
2005-03-02 22:02:11 +01:00
|
|
|
/* Remove the mapping, if any. */
|
2005-02-23 07:40:48 +01:00
|
|
|
tor_free(new_address);
|
|
|
|
if (ent) {
|
2005-03-02 22:02:11 +01:00
|
|
|
addressmap_ent_remove(address,ent);
|
2005-02-23 07:40:48 +01:00
|
|
|
strmap_remove(addressmap, address);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
2005-03-23 06:32:06 +01:00
|
|
|
if (!ent) { /* make a new one and register it */
|
|
|
|
ent = tor_malloc_zero(sizeof(addressmap_entry_t));
|
|
|
|
strmap_set(addressmap, address, ent);
|
|
|
|
} else if (ent->new_address) { /* we need to clean up the old mapping. */
|
|
|
|
if (expires > 1) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_APP,"Temporary addressmap ('%s' to '%s') not performed, "
|
|
|
|
"since it's already mapped to '%s'",
|
2005-05-03 12:04:08 +02:00
|
|
|
safe_str(address), safe_str(new_address), safe_str(ent->new_address));
|
2005-03-23 06:32:06 +01:00
|
|
|
tor_free(new_address);
|
|
|
|
return;
|
|
|
|
}
|
2005-03-23 09:40:11 +01:00
|
|
|
if (address_is_in_virtual_range(ent->new_address) &&
|
|
|
|
expires != 2) {
|
|
|
|
/* XXX This isn't the perfect test; we want to avoid removing
|
|
|
|
* mappings set from the control interface _as virtual mapping */
|
2005-03-02 23:01:10 +01:00
|
|
|
addressmap_virtaddress_remove(address, ent);
|
2005-03-02 22:02:11 +01:00
|
|
|
}
|
2005-02-22 01:53:08 +01:00
|
|
|
tor_free(ent->new_address);
|
2005-03-23 06:32:06 +01:00
|
|
|
} /* else { we have an in-progress resolve with no mapping. } */
|
|
|
|
|
2005-02-22 01:53:08 +01:00
|
|
|
ent->new_address = new_address;
|
2005-03-23 09:40:11 +01:00
|
|
|
ent->expires = expires==2 ? 1 : expires;
|
2005-02-22 01:53:08 +01:00
|
|
|
ent->num_resolve_failures = 0;
|
|
|
|
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_CONFIG, "Addressmap: (re)mapped '%s' to '%s'",
|
|
|
|
safe_str(address), safe_str(ent->new_address));
|
2005-06-19 22:40:41 +02:00
|
|
|
control_event_address_mapped(address, ent->new_address, expires);
|
2005-02-22 01:53:08 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/** An attempt to resolve <b>address</b> failed at some OR.
|
|
|
|
* Increment the number of resolve failures we have on record
|
|
|
|
* for it, and then return that number.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
client_dns_incr_failures(const char *address)
|
2005-02-22 01:53:08 +01:00
|
|
|
{
|
2005-08-15 05:35:15 +02:00
|
|
|
addressmap_entry_t *ent = strmap_get(addressmap, address);
|
2005-02-22 01:53:08 +01:00
|
|
|
if (!ent) {
|
|
|
|
ent = tor_malloc_zero(sizeof(addressmap_entry_t));
|
2006-06-03 23:41:14 +02:00
|
|
|
ent->expires = time(NULL) + MAX_DNS_ENTRY_AGE;
|
2005-02-22 01:53:08 +01:00
|
|
|
strmap_set(addressmap,address,ent);
|
|
|
|
}
|
|
|
|
++ent->num_resolve_failures;
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_APP, "Address %s now has %d resolve failures.",
|
|
|
|
safe_str(address), ent->num_resolve_failures);
|
2005-02-22 01:53:08 +01:00
|
|
|
return ent->num_resolve_failures;
|
|
|
|
}
|
|
|
|
|
2005-08-15 05:35:15 +02:00
|
|
|
/** If <b>address</b> is in the client dns addressmap, reset
|
|
|
|
* the number of resolve failures we have on record for it.
|
|
|
|
* This is used when we fail a stream because it won't resolve:
|
|
|
|
* otherwise future attempts on that address will only try once.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
client_dns_clear_failures(const char *address)
|
|
|
|
{
|
|
|
|
addressmap_entry_t *ent = strmap_get(addressmap, address);
|
|
|
|
if (ent)
|
|
|
|
ent->num_resolve_failures = 0;
|
|
|
|
}
|
|
|
|
|
2006-12-26 23:41:43 +01:00
|
|
|
/** Record the fact that <b>address</b> resolved to <b>name</b>.
|
2005-02-22 01:53:08 +01:00
|
|
|
* We can now use this in subsequent streams via addressmap_rewrite()
|
|
|
|
* so we can more correctly choose an exit that will allow <b>address</b>.
|
2005-02-24 12:44:08 +01:00
|
|
|
*
|
|
|
|
* If <b>exitname</b> is defined, then append the addresses with
|
|
|
|
* ".exitname.exit" before registering the mapping.
|
2005-09-02 20:53:31 +02:00
|
|
|
*
|
|
|
|
* If <b>ttl</b> is nonnegative, the mapping will be valid for
|
2006-06-03 23:47:26 +02:00
|
|
|
* <b>ttl</b>seconds; otherwise, we use the default.
|
2005-02-22 01:53:08 +01:00
|
|
|
*/
|
2006-12-26 23:41:43 +01:00
|
|
|
static void
|
|
|
|
client_dns_set_addressmap_impl(const char *address, const char *name,
|
|
|
|
const char *exitname,
|
|
|
|
int ttl)
|
2005-02-22 01:53:08 +01:00
|
|
|
{
|
2006-03-17 05:43:37 +01:00
|
|
|
/* <address>.<hex or nickname>.exit\0 or just <address>\0 */
|
2006-10-03 20:58:47 +02:00
|
|
|
char extendedaddress[MAX_SOCKS_ADDR_LEN+MAX_VERBOSE_NICKNAME_LEN+10];
|
2006-12-20 10:25:58 +01:00
|
|
|
/* 123.123.123.123.<hex or nickname>.exit\0 or just 123.123.123.123\0 */
|
2006-10-03 20:58:47 +02:00
|
|
|
char extendedval[INET_NTOA_BUF_LEN+MAX_VERBOSE_NICKNAME_LEN+10];
|
2005-02-22 01:53:08 +01:00
|
|
|
|
2006-06-03 23:41:14 +02:00
|
|
|
tor_assert(address);
|
2006-12-26 23:41:43 +01:00
|
|
|
tor_assert(name);
|
2005-02-22 01:53:08 +01:00
|
|
|
|
2006-06-03 23:47:26 +02:00
|
|
|
if (ttl<0)
|
|
|
|
ttl = DEFAULT_DNS_TTL;
|
|
|
|
else
|
|
|
|
ttl = dns_clip_ttl(ttl);
|
2005-09-02 20:53:31 +02:00
|
|
|
|
2005-02-24 12:44:08 +01:00
|
|
|
if (exitname) {
|
2006-10-03 20:58:47 +02:00
|
|
|
/* XXXX fails to ever get attempts to get an exit address of
|
|
|
|
* google.com.digest[=~]nickname.exit; we need a syntax for this that
|
|
|
|
* won't make strict RFC952-compliant applications (like us) barf. */
|
2005-02-24 12:44:08 +01:00
|
|
|
tor_snprintf(extendedaddress, sizeof(extendedaddress),
|
|
|
|
"%s.%s.exit", address, exitname);
|
|
|
|
tor_snprintf(extendedval, sizeof(extendedval),
|
2006-12-26 23:41:43 +01:00
|
|
|
"%s.%s.exit", name, exitname);
|
2005-02-24 12:44:08 +01:00
|
|
|
} else {
|
|
|
|
tor_snprintf(extendedaddress, sizeof(extendedaddress),
|
|
|
|
"%s", address);
|
|
|
|
tor_snprintf(extendedval, sizeof(extendedval),
|
2006-12-26 23:41:43 +01:00
|
|
|
"%s", name);
|
2005-02-24 12:44:08 +01:00
|
|
|
}
|
2005-12-14 21:40:40 +01:00
|
|
|
addressmap_register(extendedaddress, tor_strdup(extendedval),
|
|
|
|
time(NULL) + ttl);
|
2005-02-22 01:53:08 +01:00
|
|
|
}
|
|
|
|
|
2006-12-26 23:41:43 +01:00
|
|
|
/** Record the fact that <b>address</b> resolved to <b>val</b>.
|
|
|
|
* We can now use this in subsequent streams via addressmap_rewrite()
|
|
|
|
* so we can more correctly choose an exit that will allow <b>address</b>.
|
|
|
|
*
|
|
|
|
* If <b>exitname</b> is defined, then append the addresses with
|
|
|
|
* ".exitname.exit" before registering the mapping.
|
|
|
|
*
|
|
|
|
* If <b>ttl</b> is nonnegative, the mapping will be valid for
|
|
|
|
* <b>ttl</b>seconds; otherwise, we use the default.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
client_dns_set_addressmap(const char *address, uint32_t val,
|
|
|
|
const char *exitname,
|
|
|
|
int ttl)
|
|
|
|
{
|
|
|
|
struct in_addr in;
|
|
|
|
char valbuf[INET_NTOA_BUF_LEN];
|
|
|
|
|
|
|
|
tor_assert(address);
|
|
|
|
|
|
|
|
if (tor_inet_aton(address, &in))
|
|
|
|
return; /* If address was an IP address already, don't add a mapping. */
|
|
|
|
in.s_addr = htonl(val);
|
|
|
|
tor_inet_ntoa(&in,valbuf,sizeof(valbuf));
|
|
|
|
|
|
|
|
client_dns_set_addressmap_impl(address, valbuf, exitname, ttl);
|
|
|
|
}
|
|
|
|
|
2007-02-02 19:58:11 +01:00
|
|
|
/** Add a cache entry noting that <b>address</b> (ordinarily a dotted quad)
|
|
|
|
* resolved via a RESOLVE_PTR request to the hostname <b>v</b>.
|
|
|
|
*
|
|
|
|
* If <b>exitname</b> is defined, then append the addresses with
|
|
|
|
* ".exitname.exit" before registering the mapping.
|
|
|
|
*
|
|
|
|
* If <b>ttl</b> is nonnegative, the mapping will be valid for
|
|
|
|
* <b>ttl</b>seconds; otherwise, we use the default.
|
|
|
|
*/
|
2006-12-26 23:41:43 +01:00
|
|
|
static void
|
|
|
|
client_dns_set_reverse_addressmap(const char *address, const char *v,
|
|
|
|
const char *exitname,
|
|
|
|
int ttl)
|
|
|
|
{
|
|
|
|
size_t len = strlen(address) + 16;
|
|
|
|
char *s = tor_malloc(len);
|
|
|
|
tor_snprintf(s, len, "REVERSE[%s]", address);
|
|
|
|
client_dns_set_addressmap_impl(s, v, exitname, ttl);
|
|
|
|
tor_free(s);
|
|
|
|
}
|
|
|
|
|
2006-04-18 05:36:28 +02:00
|
|
|
/* By default, we hand out 127.192.0.1 through 127.254.254.254.
|
2005-03-02 20:26:46 +01:00
|
|
|
* These addresses should map to localhost, so even if the
|
|
|
|
* application accidentally tried to connect to them directly (not
|
|
|
|
* via Tor), it wouldn't get too far astray.
|
|
|
|
*
|
2007-02-02 21:06:43 +01:00
|
|
|
* These options are configured by parse_virtual_addr_network().
|
2005-03-02 20:26:46 +01:00
|
|
|
*/
|
2006-04-18 05:36:28 +02:00
|
|
|
static uint32_t virtual_addr_network = 0x7fc00000u;
|
|
|
|
static uint32_t virtual_addr_netmask = 0xffc00000u;
|
|
|
|
static int virtual_addr_netmask_bits = 10;
|
|
|
|
static uint32_t next_virtual_addr = 0x7fc00000u;
|
|
|
|
|
|
|
|
/** Read a netmask of the form 127.192.0.0/10 from "val", and check whether
|
|
|
|
* it's a valid set of virtual addresses to hand out in response to MAPADDRESS
|
2006-04-18 05:51:18 +02:00
|
|
|
* requests. Return 0 on success; set *msg (if provided) to a newly allocated
|
|
|
|
* string and return -1 on failure. If validate_only is false, sets the
|
|
|
|
* actual virtual address range to the parsed value. */
|
2006-04-18 05:36:28 +02:00
|
|
|
int
|
|
|
|
parse_virtual_addr_network(const char *val, int validate_only,
|
2006-04-18 05:51:18 +02:00
|
|
|
char **msg)
|
2006-04-18 05:36:28 +02:00
|
|
|
{
|
|
|
|
uint32_t addr, mask;
|
|
|
|
uint16_t port_min, port_max;
|
|
|
|
int bits;
|
|
|
|
|
|
|
|
if (parse_addr_and_port_range(val, &addr, &mask, &port_min, &port_max)) {
|
2006-04-18 05:51:18 +02:00
|
|
|
if (msg) *msg = tor_strdup("Error parsing VirtualAddressNetwork");
|
2006-04-18 05:36:28 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (port_min != 1 || port_max != 65535) {
|
2006-04-18 05:51:18 +02:00
|
|
|
if (msg) *msg = tor_strdup("Can't specify ports on VirtualAddressNetwork");
|
2006-04-18 05:36:28 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
bits = addr_mask_get_bits(mask);
|
|
|
|
if (bits < 0) {
|
2006-04-18 05:51:18 +02:00
|
|
|
if (msg) *msg = tor_strdup("VirtualAddressNetwork must have a mask that "
|
|
|
|
"can be expressed as a prefix");
|
2006-04-18 05:36:28 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (bits > 16) {
|
2006-04-18 07:03:09 +02:00
|
|
|
if (msg) *msg = tor_strdup("VirtualAddressNetwork expects a /16 "
|
2006-04-18 05:51:18 +02:00
|
|
|
"network or larger");
|
2006-04-18 05:36:28 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (validate_only)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
virtual_addr_network = addr & mask;
|
|
|
|
virtual_addr_netmask = mask;
|
|
|
|
virtual_addr_netmask_bits = bits;
|
|
|
|
|
|
|
|
if ((next_virtual_addr & mask) != addr)
|
|
|
|
next_virtual_addr = addr;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2005-03-02 20:26:46 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Return true iff <b>addr</b> is likely to have been returned by
|
2005-03-02 22:02:11 +01:00
|
|
|
* client_dns_get_unused_address.
|
2005-03-02 20:26:46 +01:00
|
|
|
**/
|
2005-09-24 23:56:04 +02:00
|
|
|
int
|
2005-10-05 04:06:36 +02:00
|
|
|
address_is_in_virtual_range(const char *address)
|
2005-03-02 20:26:46 +01:00
|
|
|
{
|
|
|
|
struct in_addr in;
|
2005-10-05 04:06:36 +02:00
|
|
|
tor_assert(address);
|
|
|
|
if (!strcasecmpend(address, ".virtual")) {
|
2005-03-02 20:26:46 +01:00
|
|
|
return 1;
|
2005-10-05 04:06:36 +02:00
|
|
|
} else if (tor_inet_aton(address, &in)) {
|
|
|
|
uint32_t addr = ntohl(in.s_addr);
|
2006-04-18 05:36:28 +02:00
|
|
|
if ((addr & virtual_addr_netmask) == virtual_addr_network)
|
2005-03-02 20:26:46 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Return a newly allocated string holding an address of <b>type</b>
|
|
|
|
* (one of RESOLVED_TYPE_{IPV4|HOSTNAME}) that has not yet been mapped,
|
|
|
|
* and that is very unlikely to be the address of any real host.
|
|
|
|
*/
|
2005-03-02 22:02:11 +01:00
|
|
|
static char *
|
|
|
|
addressmap_get_virtual_address(int type)
|
2005-03-02 20:26:46 +01:00
|
|
|
{
|
|
|
|
char buf[64];
|
|
|
|
struct in_addr in;
|
|
|
|
|
|
|
|
if (type == RESOLVED_TYPE_HOSTNAME) {
|
2005-03-23 09:40:11 +01:00
|
|
|
char rand[10];
|
2005-03-02 20:26:46 +01:00
|
|
|
do {
|
|
|
|
crypto_rand(rand, sizeof(rand));
|
|
|
|
base32_encode(buf,sizeof(buf),rand,sizeof(rand));
|
|
|
|
strlcat(buf, ".virtual", sizeof(buf));
|
|
|
|
} while (strmap_get(addressmap, buf));
|
|
|
|
return tor_strdup(buf);
|
|
|
|
} else if (type == RESOLVED_TYPE_IPV4) {
|
2006-04-18 05:51:18 +02:00
|
|
|
// This is an imperfect estimate of how many addresses are available, but
|
|
|
|
// that's ok.
|
|
|
|
uint32_t available = 1u << (32-virtual_addr_netmask_bits);
|
2006-04-18 05:36:28 +02:00
|
|
|
while (available) {
|
2005-03-02 20:26:46 +01:00
|
|
|
/* Don't hand out any .0 or .255 address. */
|
2006-04-18 05:36:28 +02:00
|
|
|
while ((next_virtual_addr & 0xff) == 0 ||
|
|
|
|
(next_virtual_addr & 0xff) == 0xff) {
|
|
|
|
++next_virtual_addr;
|
|
|
|
}
|
|
|
|
in.s_addr = htonl(next_virtual_addr);
|
2005-03-02 20:26:46 +01:00
|
|
|
tor_inet_ntoa(&in, buf, sizeof(buf));
|
|
|
|
if (!strmap_get(addressmap, buf))
|
|
|
|
break;
|
|
|
|
|
2006-04-18 05:36:28 +02:00
|
|
|
++next_virtual_addr;
|
|
|
|
--available;
|
2007-05-25 16:48:16 +02:00
|
|
|
log_info(LD_CONFIG, "%d addrs available", (int)available);
|
2006-04-18 05:36:28 +02:00
|
|
|
if (! --available) {
|
|
|
|
log_warn(LD_CONFIG, "Ran out of virtual addresses!");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if ((next_virtual_addr & virtual_addr_netmask) != virtual_addr_network)
|
|
|
|
next_virtual_addr = virtual_addr_network;
|
2005-03-02 20:26:46 +01:00
|
|
|
}
|
|
|
|
return tor_strdup(buf);
|
|
|
|
} else {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG, "Called with unsupported address type (%d)", type);
|
2005-03-02 20:26:46 +01:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-03-17 13:38:37 +01:00
|
|
|
/** A controller has requested that we map some address of type
|
|
|
|
* <b>type</b> to the address <b>new_address</b>. Choose an address
|
|
|
|
* that is unlikely to be used, and map it, and return it in a newly
|
|
|
|
* allocated string. If another address of the same type is already
|
|
|
|
* mapped to <b>new_address</b>, try to return a copy of that address.
|
|
|
|
*
|
|
|
|
* The string in <b>new_address</b> may be freed, or inserted into a map
|
|
|
|
* as appropriate.
|
|
|
|
**/
|
2005-03-23 09:40:11 +01:00
|
|
|
const char *
|
2005-03-02 22:02:11 +01:00
|
|
|
addressmap_register_virtual_address(int type, char *new_address)
|
|
|
|
{
|
2005-03-02 23:01:10 +01:00
|
|
|
char **addrp;
|
|
|
|
virtaddress_entry_t *vent;
|
|
|
|
|
2005-03-02 22:02:11 +01:00
|
|
|
tor_assert(new_address);
|
2005-03-23 09:40:11 +01:00
|
|
|
tor_assert(addressmap);
|
|
|
|
tor_assert(virtaddress_reversemap);
|
2005-03-02 22:02:11 +01:00
|
|
|
|
2005-03-02 23:01:10 +01:00
|
|
|
vent = strmap_get(virtaddress_reversemap, new_address);
|
2005-03-23 09:40:11 +01:00
|
|
|
if (!vent) {
|
2005-03-02 23:01:10 +01:00
|
|
|
vent = tor_malloc_zero(sizeof(virtaddress_entry_t));
|
2005-03-23 09:40:11 +01:00
|
|
|
strmap_set(virtaddress_reversemap, new_address, vent);
|
|
|
|
}
|
2005-03-02 23:01:10 +01:00
|
|
|
|
|
|
|
addrp = (type == RESOLVED_TYPE_IPV4) ?
|
|
|
|
&vent->ipv4_address : &vent->hostname_address;
|
|
|
|
if (*addrp) {
|
|
|
|
addressmap_entry_t *ent = strmap_get(addressmap, *addrp);
|
2005-12-14 21:40:40 +01:00
|
|
|
if (ent && ent->new_address &&
|
|
|
|
!strcasecmp(new_address, ent->new_address)) {
|
2005-03-23 09:40:11 +01:00
|
|
|
tor_free(new_address);
|
2005-03-02 23:01:10 +01:00
|
|
|
return tor_strdup(*addrp);
|
2005-03-23 09:40:11 +01:00
|
|
|
} else
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG,
|
|
|
|
"Internal confusion: I thought that '%s' was mapped to by "
|
|
|
|
"'%s', but '%s' really maps to '%s'. This is a harmless bug.",
|
|
|
|
safe_str(new_address), safe_str(*addrp), safe_str(*addrp),
|
|
|
|
ent?safe_str(ent->new_address):"(nothing)");
|
2005-03-02 22:02:11 +01:00
|
|
|
}
|
|
|
|
|
2005-03-02 23:01:10 +01:00
|
|
|
tor_free(*addrp);
|
|
|
|
*addrp = addressmap_get_virtual_address(type);
|
2007-05-25 16:48:16 +02:00
|
|
|
log_info(LD_APP, "Registering map from %s to %s", *addrp, new_address);
|
2005-03-23 09:40:11 +01:00
|
|
|
addressmap_register(*addrp, new_address, 2);
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
{
|
2005-06-15 20:34:46 +02:00
|
|
|
/* Try to catch possible bugs */
|
2005-03-23 09:40:11 +01:00
|
|
|
addressmap_entry_t *ent;
|
|
|
|
ent = strmap_get(addressmap, *addrp);
|
|
|
|
tor_assert(ent);
|
|
|
|
tor_assert(!strcasecmp(ent->new_address,new_address));
|
|
|
|
vent = strmap_get(virtaddress_reversemap, new_address);
|
|
|
|
tor_assert(vent);
|
|
|
|
tor_assert(!strcasecmp(*addrp,
|
|
|
|
(type == RESOLVED_TYPE_IPV4) ?
|
|
|
|
vent->ipv4_address : vent->hostname_address));
|
2007-05-25 16:48:16 +02:00
|
|
|
log_info(LD_APP, "Map from %s to %s okay.",
|
2005-05-03 12:04:08 +02:00
|
|
|
safe_str(*addrp),safe_str(new_address));
|
2005-03-23 09:40:11 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-03-02 23:01:10 +01:00
|
|
|
return *addrp;
|
2005-03-02 22:02:11 +01:00
|
|
|
}
|
|
|
|
|
2007-01-11 17:02:39 +01:00
|
|
|
/** Return 1 if <b>address</b> has funny characters in it like colons. Return
|
|
|
|
* 0 if it's fine, or if we're configured to allow it anyway. <b>client</b>
|
|
|
|
* should be true if we're using this address as a client; false if we're
|
|
|
|
* using it as a server.
|
2005-02-01 13:19:44 +01:00
|
|
|
*/
|
2006-12-29 06:51:50 +01:00
|
|
|
int
|
2007-01-11 17:02:39 +01:00
|
|
|
address_is_invalid_destination(const char *address, int client)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2007-01-11 17:02:39 +01:00
|
|
|
if (client) {
|
|
|
|
if (get_options()->AllowNonRFC953Hostnames)
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
if (get_options()->ServerDNSAllowNonRFC953Hostnames)
|
|
|
|
return 0;
|
|
|
|
}
|
2006-12-19 20:48:58 +01:00
|
|
|
|
|
|
|
while (*address) {
|
|
|
|
if (TOR_ISALNUM(*address) ||
|
|
|
|
*address == '-' ||
|
|
|
|
*address == '.' ||
|
|
|
|
*address == '_') /* Underscore is not allowed, but Windows does it
|
|
|
|
* sometimes, just to thumb its nose at the IETF. */
|
|
|
|
++address;
|
|
|
|
else
|
|
|
|
return 1;
|
|
|
|
}
|
2005-02-01 13:19:44 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-10-09 23:11:50 +02:00
|
|
|
/** Iterate over all address mappings which have expiry times between
|
2005-03-11 22:39:39 +01:00
|
|
|
* min_expires and max_expires, inclusive. If sl is provided, add an
|
2007-03-15 07:25:00 +01:00
|
|
|
* "old-addr new-addr" string to sl for each mapping. If sl is NULL,
|
2005-03-11 22:39:39 +01:00
|
|
|
* remove the mappings.
|
|
|
|
*/
|
2005-03-03 07:37:54 +01:00
|
|
|
void
|
2005-12-14 21:40:40 +01:00
|
|
|
addressmap_get_mappings(smartlist_t *sl, time_t min_expires,
|
|
|
|
time_t max_expires)
|
2005-03-03 07:37:54 +01:00
|
|
|
{
|
|
|
|
strmap_iter_t *iter;
|
|
|
|
const char *key;
|
|
|
|
void *_val;
|
|
|
|
addressmap_entry_t *val;
|
|
|
|
|
2005-08-22 02:34:42 +02:00
|
|
|
if (!addressmap)
|
|
|
|
addressmap_init();
|
|
|
|
|
2005-03-11 22:42:32 +01:00
|
|
|
for (iter = strmap_iter_init(addressmap); !strmap_iter_done(iter); ) {
|
2005-03-03 07:37:54 +01:00
|
|
|
strmap_iter_get(iter, &key, &_val);
|
|
|
|
val = _val;
|
|
|
|
if (val->expires >= min_expires && val->expires <= max_expires) {
|
2005-03-11 22:42:32 +01:00
|
|
|
if (!sl) {
|
|
|
|
iter = strmap_iter_next_rmv(addressmap,iter);
|
2005-11-23 05:18:45 +01:00
|
|
|
addressmap_ent_remove(key, val);
|
2005-03-11 22:42:32 +01:00
|
|
|
continue;
|
2005-03-28 04:03:51 +02:00
|
|
|
} else if (val->new_address) {
|
2005-03-11 22:39:39 +01:00
|
|
|
size_t len = strlen(key)+strlen(val->new_address)+2;
|
|
|
|
char *line = tor_malloc(len);
|
2007-03-15 07:25:00 +01:00
|
|
|
tor_snprintf(line, len, "%s %s", key, val->new_address);
|
2005-03-11 22:39:39 +01:00
|
|
|
smartlist_add(sl, line);
|
|
|
|
}
|
2005-03-03 07:37:54 +01:00
|
|
|
}
|
2005-03-11 22:42:32 +01:00
|
|
|
iter = strmap_iter_next(addressmap,iter);
|
2005-03-03 07:37:54 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-02-02 21:06:43 +01:00
|
|
|
/** Connection <b>conn</b> just finished its socks handshake, or the
|
2006-03-12 06:04:16 +01:00
|
|
|
* controller asked us to take care of it. If <b>circ</b> is defined,
|
|
|
|
* then that's where we'll want to attach it. Otherwise we have to
|
|
|
|
* figure it out ourselves.
|
2004-05-10 06:42:22 +02:00
|
|
|
*
|
2006-02-03 12:37:19 +01:00
|
|
|
* First, parse whether it's a .exit address, remap it, and so on. Then
|
2006-12-10 09:04:50 +01:00
|
|
|
* if it's for a general circuit, try to attach it to a circuit (or launch
|
2006-02-03 12:37:19 +01:00
|
|
|
* one as needed), else if it's for a rendezvous circuit, fetch a
|
|
|
|
* rendezvous descriptor first (or attach/launch a circuit if the
|
|
|
|
* rendezvous descriptor is already here and fresh enough).
|
2007-04-30 16:09:11 +02:00
|
|
|
*
|
|
|
|
* The stream will exit from the hop
|
2007-05-01 01:24:38 +02:00
|
|
|
* indicated by <b>cpath</b>, or from the last hop in circ's cpath if
|
2007-04-30 16:09:11 +02:00
|
|
|
* <b>cpath</b> is NULL.
|
2004-05-10 06:42:22 +02:00
|
|
|
*/
|
2006-02-03 12:37:19 +01:00
|
|
|
int
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_ap_handshake_rewrite_and_attach(edge_connection_t *conn,
|
2007-04-30 13:10:45 +02:00
|
|
|
origin_circuit_t *circ,
|
|
|
|
crypt_path_t *cpath)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2006-02-03 12:37:19 +01:00
|
|
|
socks_request_t *socks = conn->socks_request;
|
2004-11-30 04:44:10 +01:00
|
|
|
hostname_type_t addresstype;
|
2007-05-25 16:48:16 +02:00
|
|
|
or_options_t *options = get_options();
|
|
|
|
struct in_addr addr_tmp;
|
|
|
|
int automap = 0;
|
2007-05-25 20:22:43 +02:00
|
|
|
char orig_address[MAX_SOCKS_ADDR_LEN];
|
2003-09-13 00:45:31 +02:00
|
|
|
|
2005-02-22 01:53:08 +01:00
|
|
|
tor_strlower(socks->address); /* normalize it */
|
2007-05-25 20:22:43 +02:00
|
|
|
strlcpy(orig_address, socks->address, sizeof(orig_address));
|
2006-03-05 10:50:26 +01:00
|
|
|
log_debug(LD_APP,"Client asked for %s:%d",
|
|
|
|
safe_str(socks->address),
|
2006-02-13 10:02:35 +01:00
|
|
|
socks->port);
|
2005-02-22 01:53:08 +01:00
|
|
|
|
2007-05-25 16:48:16 +02:00
|
|
|
if (socks->command == SOCKS_COMMAND_RESOLVE &&
|
|
|
|
!tor_inet_aton(socks->address, &addr_tmp) &&
|
|
|
|
options->AutomapHostsOnResolve && options->AutomapHostsSuffixes) {
|
|
|
|
SMARTLIST_FOREACH(options->AutomapHostsSuffixes, const char *, cp,
|
|
|
|
if (!strcasecmpend(socks->address, cp)) {
|
|
|
|
automap = 1;
|
|
|
|
break;
|
|
|
|
});
|
|
|
|
if (automap) {
|
|
|
|
const char *new_addr;
|
|
|
|
new_addr = addressmap_register_virtual_address(
|
|
|
|
RESOLVED_TYPE_IPV4, tor_strdup(socks->address));
|
|
|
|
tor_assert(new_addr);
|
|
|
|
log_info(LD_APP, "Automapping %s to %s",
|
|
|
|
escaped_safe_str(socks->address), safe_str(new_addr));
|
|
|
|
strlcpy(socks->address, new_addr, sizeof(socks->address));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-12-26 23:41:43 +01:00
|
|
|
if (socks->command == SOCKS_COMMAND_RESOLVE_PTR) {
|
|
|
|
if (addressmap_rewrite_reverse(socks->address, sizeof(socks->address))) {
|
2007-05-25 20:49:26 +02:00
|
|
|
char *result = tor_strdup(socks->address);
|
|
|
|
/* remember _what_ is supposed to have been resolved. */
|
|
|
|
strlcpy(socks->address, orig_address, sizeof(socks->address));
|
2006-12-26 23:41:43 +01:00
|
|
|
connection_ap_handshake_socks_resolved(conn, RESOLVED_TYPE_HOSTNAME,
|
2007-05-25 20:49:26 +02:00
|
|
|
strlen(result), result, -1);
|
2006-12-26 23:41:43 +01:00
|
|
|
connection_mark_unattached_ap(conn,
|
2007-02-07 07:54:27 +01:00
|
|
|
END_STREAM_REASON_DONE |
|
|
|
|
END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED);
|
2006-12-26 23:41:43 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2007-05-25 16:48:16 +02:00
|
|
|
} else if (!automap) {
|
|
|
|
/* For address map controls, remap the address. */
|
2007-02-05 20:15:13 +01:00
|
|
|
if (addressmap_rewrite(socks->address, sizeof(socks->address))) {
|
2007-02-23 21:13:02 +01:00
|
|
|
control_event_stream_status(conn, STREAM_EVENT_REMAP,
|
|
|
|
REMAP_STREAM_SOURCE_CACHE);
|
2007-02-05 20:15:13 +01:00
|
|
|
}
|
2006-12-26 23:41:43 +01:00
|
|
|
}
|
2005-02-22 01:53:08 +01:00
|
|
|
|
2007-05-25 16:48:16 +02:00
|
|
|
if (!automap && address_is_in_virtual_range(socks->address)) {
|
2005-03-02 20:26:46 +01:00
|
|
|
/* This address was probably handed out by client_dns_get_unmapped_address,
|
|
|
|
* but the mapping was discarded for some reason. We *don't* want to send
|
2006-02-03 12:37:19 +01:00
|
|
|
* the address through Tor; that's likely to fail, and may leak
|
2005-03-02 20:26:46 +01:00
|
|
|
* information.
|
|
|
|
*/
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_APP,"Missing mapping for virtual address '%s'. Refusing.",
|
|
|
|
socks->address); /* don't safe_str() this yet. */
|
2005-04-03 00:11:24 +02:00
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_INTERNAL);
|
2005-03-02 20:26:46 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-11-29 09:34:54 +01:00
|
|
|
/* Parse the address provided by SOCKS. Modify it in-place if it
|
|
|
|
* specifies a hidden-service (.onion) or particular exit node (.exit).
|
|
|
|
*/
|
2004-11-30 04:44:10 +01:00
|
|
|
addresstype = parse_extended_hostname(socks->address);
|
2004-11-29 09:34:54 +01:00
|
|
|
|
2006-02-03 12:37:19 +01:00
|
|
|
if (addresstype == BAD_HOSTNAME) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_APP, "Invalid hostname %s; rejecting", socks->address);
|
2007-01-19 22:25:32 +01:00
|
|
|
control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s",
|
|
|
|
escaped(socks->address));
|
2005-06-07 20:01:46 +02:00
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-11-30 04:44:10 +01:00
|
|
|
if (addresstype == EXIT_HOSTNAME) {
|
2005-05-11 00:12:48 +02:00
|
|
|
/* foo.exit -- modify conn->chosen_exit_node to specify the exit
|
|
|
|
* node, and conn->address to hold only the address portion.*/
|
2004-11-29 09:34:54 +01:00
|
|
|
char *s = strrchr(socks->address,'.');
|
2007-05-25 16:48:16 +02:00
|
|
|
tor_assert(!automap);
|
2005-05-11 06:14:17 +02:00
|
|
|
if (s) {
|
|
|
|
if (s[1] != '\0') {
|
|
|
|
conn->chosen_exit_name = tor_strdup(s+1);
|
|
|
|
*s = 0;
|
|
|
|
} else {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_APP,"Malformed exit address '%s.exit'. Refusing.",
|
|
|
|
safe_str(socks->address));
|
2007-01-19 22:25:32 +01:00
|
|
|
control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s",
|
|
|
|
escaped(socks->address));
|
2005-05-11 06:14:17 +02:00
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);
|
|
|
|
return -1;
|
|
|
|
}
|
2005-05-11 00:12:48 +02:00
|
|
|
} else {
|
2005-12-07 05:43:39 +01:00
|
|
|
routerinfo_t *r;
|
2005-12-06 22:03:48 +01:00
|
|
|
conn->chosen_exit_name = tor_strdup(socks->address);
|
2005-12-07 05:43:39 +01:00
|
|
|
r = router_get_by_nickname(conn->chosen_exit_name, 1);
|
2005-12-06 18:01:36 +01:00
|
|
|
*socks->address = 0;
|
2005-05-11 00:12:48 +02:00
|
|
|
if (r) {
|
2006-03-18 23:54:08 +01:00
|
|
|
strlcpy(socks->address, r->address, sizeof(socks->address));
|
2006-02-03 12:37:19 +01:00
|
|
|
} else {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_APP,
|
|
|
|
"Unrecognized server in exit address '%s.exit'. Refusing.",
|
|
|
|
safe_str(socks->address));
|
2005-05-11 00:12:48 +02:00
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);
|
|
|
|
return -1;
|
|
|
|
}
|
2004-11-29 09:34:54 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-11-30 04:44:10 +01:00
|
|
|
if (addresstype != ONION_HOSTNAME) {
|
2004-11-29 09:34:54 +01:00
|
|
|
/* not a hidden-service request (i.e. normal or .exit) */
|
2007-01-11 17:02:39 +01:00
|
|
|
if (address_is_invalid_destination(socks->address, 1)) {
|
2007-01-19 22:25:32 +01:00
|
|
|
control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s",
|
|
|
|
escaped(socks->address));
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_APP,
|
|
|
|
"Destination '%s' seems to be an invalid hostname. Failing.",
|
|
|
|
safe_str(socks->address));
|
2005-04-03 00:11:24 +02:00
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);
|
2005-02-01 13:19:44 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2006-09-22 02:44:07 +02:00
|
|
|
if (socks->command == SOCKS_COMMAND_RESOLVE) {
|
2005-02-22 01:53:08 +01:00
|
|
|
uint32_t answer;
|
2004-12-06 07:06:13 +01:00
|
|
|
struct in_addr in;
|
2004-12-05 13:47:46 +01:00
|
|
|
/* Reply to resolves immediately if we can. */
|
|
|
|
if (strlen(socks->address) > RELAY_PAYLOAD_SIZE) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_APP,"Address to be resolved is too large. Failing.");
|
2007-01-19 22:25:32 +01:00
|
|
|
control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s",
|
|
|
|
escaped(socks->address));
|
2007-06-01 01:40:35 +02:00
|
|
|
connection_ap_handshake_socks_resolved(conn,
|
|
|
|
RESOLVED_TYPE_ERROR_TRANSIENT,
|
2005-12-14 21:40:40 +01:00
|
|
|
0,NULL,-1);
|
|
|
|
connection_mark_unattached_ap(conn,
|
2007-02-07 07:54:27 +01:00
|
|
|
END_STREAM_REASON_SOCKSPROTOCOL |
|
|
|
|
END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED);
|
2004-12-05 13:47:46 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2005-02-22 01:53:08 +01:00
|
|
|
if (tor_inet_aton(socks->address, &in)) { /* see if it's an IP already */
|
2007-05-25 20:22:43 +02:00
|
|
|
/* leave it in network order */
|
|
|
|
answer = in.s_addr;
|
|
|
|
/* remember _what_ is supposed to have been resolved. */
|
|
|
|
strlcpy(socks->address, orig_address, sizeof(socks->address));
|
2004-12-05 13:47:46 +01:00
|
|
|
connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV4,4,
|
2005-09-02 20:53:31 +02:00
|
|
|
(char*)&answer,-1);
|
2005-12-14 21:40:40 +01:00
|
|
|
connection_mark_unattached_ap(conn,
|
2007-02-07 07:54:27 +01:00
|
|
|
END_STREAM_REASON_DONE |
|
|
|
|
END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED);
|
2004-12-05 13:47:46 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2007-05-25 16:48:16 +02:00
|
|
|
tor_assert(!automap);
|
Introduce a notion of 'internal' circs, which are chosen without regard
to the exit policy of the last hop. Intro and rendezvous circs must
be internal circs, to avoid leaking information. Resolve and connect
streams can use internal circs if they want.
New circuit pooling algorithm: make sure to have enough circs around
to satisfy any predicted ports, and also make sure to have 2 internal
circs around if we've required internal circs lately (with high uptime
if we've seen that lately).
Split NewCircuitPeriod config option into NewCircuitPeriod (30 secs),
which describes how often we retry making new circuits if current ones
are dirty, and MaxCircuitDirtiness (10 mins), which describes how long
we're willing to make use of an already-dirty circuit.
Once rendezvous circuits are established, keep using the same circuit as
long as you attach a new stream to it at least every 10 minutes. (So web
browsing doesn't require you to build new rend circs every 30 seconds.)
Cannibalize GENERAL circs to be C_REND, C_INTRO, S_INTRO, and S_REND
circ as necessary, if there are any completed ones lying around when
we try to launch one.
Re-instate the ifdef's to use version-0 style introduce cells, since
there was yet another bug in handling version-1 style. We'll try switching
over again after 0.0.9 is obsolete.
Bugfix: when choosing an exit node for a new non-internal circ, don't take
into account whether it'll be useful for any pending x.onion addresses --
it won't.
Bugfix: we weren't actually publishing the hidden service descriptor when
it became dirty. So we only published it every 20 minutes or so, which
means when you first start your Tor, the hidden service will seem broken.
svn:r3360
2005-01-17 19:13:09 +01:00
|
|
|
rep_hist_note_used_resolve(time(NULL)); /* help predict this next time */
|
2006-09-22 02:44:07 +02:00
|
|
|
} else if (socks->command == SOCKS_COMMAND_CONNECT) {
|
2007-05-25 16:48:16 +02:00
|
|
|
tor_assert(!automap);
|
Introduce a notion of 'internal' circs, which are chosen without regard
to the exit policy of the last hop. Intro and rendezvous circs must
be internal circs, to avoid leaking information. Resolve and connect
streams can use internal circs if they want.
New circuit pooling algorithm: make sure to have enough circs around
to satisfy any predicted ports, and also make sure to have 2 internal
circs around if we've required internal circs lately (with high uptime
if we've seen that lately).
Split NewCircuitPeriod config option into NewCircuitPeriod (30 secs),
which describes how often we retry making new circuits if current ones
are dirty, and MaxCircuitDirtiness (10 mins), which describes how long
we're willing to make use of an already-dirty circuit.
Once rendezvous circuits are established, keep using the same circuit as
long as you attach a new stream to it at least every 10 minutes. (So web
browsing doesn't require you to build new rend circs every 30 seconds.)
Cannibalize GENERAL circs to be C_REND, C_INTRO, S_INTRO, and S_REND
circ as necessary, if there are any completed ones lying around when
we try to launch one.
Re-instate the ifdef's to use version-0 style introduce cells, since
there was yet another bug in handling version-1 style. We'll try switching
over again after 0.0.9 is obsolete.
Bugfix: when choosing an exit node for a new non-internal circ, don't take
into account whether it'll be useful for any pending x.onion addresses --
it won't.
Bugfix: we weren't actually publishing the hidden service descriptor when
it became dirty. So we only published it every 20 minutes or so, which
means when you first start your Tor, the hidden service will seem broken.
svn:r3360
2005-01-17 19:13:09 +01:00
|
|
|
if (socks->port == 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_notice(LD_APP,"Application asked to connect to port 0. Refusing.");
|
2005-04-03 00:11:24 +02:00
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);
|
Introduce a notion of 'internal' circs, which are chosen without regard
to the exit policy of the last hop. Intro and rendezvous circs must
be internal circs, to avoid leaking information. Resolve and connect
streams can use internal circs if they want.
New circuit pooling algorithm: make sure to have enough circs around
to satisfy any predicted ports, and also make sure to have 2 internal
circs around if we've required internal circs lately (with high uptime
if we've seen that lately).
Split NewCircuitPeriod config option into NewCircuitPeriod (30 secs),
which describes how often we retry making new circuits if current ones
are dirty, and MaxCircuitDirtiness (10 mins), which describes how long
we're willing to make use of an already-dirty circuit.
Once rendezvous circuits are established, keep using the same circuit as
long as you attach a new stream to it at least every 10 minutes. (So web
browsing doesn't require you to build new rend circs every 30 seconds.)
Cannibalize GENERAL circs to be C_REND, C_INTRO, S_INTRO, and S_REND
circ as necessary, if there are any completed ones lying around when
we try to launch one.
Re-instate the ifdef's to use version-0 style introduce cells, since
there was yet another bug in handling version-1 style. We'll try switching
over again after 0.0.9 is obsolete.
Bugfix: when choosing an exit node for a new non-internal circ, don't take
into account whether it'll be useful for any pending x.onion addresses --
it won't.
Bugfix: we weren't actually publishing the hidden service descriptor when
it became dirty. So we only published it every 20 minutes or so, which
means when you first start your Tor, the hidden service will seem broken.
svn:r3360
2005-01-17 19:13:09 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2005-08-15 05:25:40 +02:00
|
|
|
|
2006-03-12 06:04:16 +01:00
|
|
|
if (!conn->chosen_exit_name && !circ) {
|
2005-08-15 05:25:40 +02:00
|
|
|
/* see if we can find a suitable enclave exit */
|
|
|
|
routerinfo_t *r =
|
|
|
|
router_find_exact_exit_enclave(socks->address, socks->port);
|
|
|
|
if (r) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_APP,
|
|
|
|
"Redirecting address %s to exit at enclave router %s",
|
|
|
|
safe_str(socks->address), r->nickname);
|
2005-08-15 05:25:40 +02:00
|
|
|
/* use the hex digest, not nickname, in case there are two
|
|
|
|
routers with this nickname */
|
|
|
|
conn->chosen_exit_name =
|
2005-11-05 21:15:27 +01:00
|
|
|
tor_strdup(hex_str(r->cache_info.identity_digest, DIGEST_LEN));
|
2006-07-27 07:03:57 +02:00
|
|
|
conn->_base.chosen_exit_optional = 1;
|
2005-08-15 05:25:40 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
/* help predict this next time */
|
|
|
|
rep_hist_note_used_port(socks->port, time(NULL));
|
2006-09-22 02:44:07 +02:00
|
|
|
} else if (socks->command == SOCKS_COMMAND_RESOLVE_PTR) {
|
|
|
|
rep_hist_note_used_resolve(time(NULL)); /* help predict this next time */
|
2006-12-13 01:28:56 +01:00
|
|
|
} else if (socks->command == SOCKS_COMMAND_CONNECT_DIR) {
|
|
|
|
; /* nothing */
|
2006-09-22 02:44:07 +02:00
|
|
|
} else {
|
|
|
|
tor_fragile_assert();
|
2005-03-12 05:22:01 +01:00
|
|
|
}
|
2006-07-26 21:07:26 +02:00
|
|
|
conn->_base.state = AP_CONN_STATE_CIRCUIT_WAIT;
|
2007-04-30 13:10:45 +02:00
|
|
|
if ((circ && connection_ap_handshake_attach_chosen_circuit(
|
|
|
|
conn, circ, cpath) < 0) ||
|
2006-03-12 06:04:16 +01:00
|
|
|
(!circ &&
|
|
|
|
connection_ap_handshake_attach_circuit(conn) < 0)) {
|
2007-05-31 21:03:49 +02:00
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH);
|
2006-02-03 12:37:19 +01:00
|
|
|
return -1;
|
2004-11-15 08:50:15 +01:00
|
|
|
}
|
2005-08-15 05:25:40 +02:00
|
|
|
return 0;
|
2004-04-01 04:41:41 +02:00
|
|
|
} else {
|
|
|
|
/* it's a hidden-service request */
|
2004-04-08 00:41:00 +02:00
|
|
|
rend_cache_entry_t *entry;
|
2004-04-18 11:04:37 +02:00
|
|
|
int r;
|
2007-05-25 16:48:16 +02:00
|
|
|
tor_assert(!automap);
|
2007-02-12 04:01:36 +01:00
|
|
|
if (SOCKS_COMMAND_IS_RESOLVE(socks->command)) {
|
2004-08-07 02:19:14 +02:00
|
|
|
/* if it's a resolve request, fail it right now, rather than
|
|
|
|
* building all the circuits and then realizing it won't work. */
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_APP,
|
|
|
|
"Resolve requests to hidden services not allowed. Failing.");
|
2005-12-14 21:40:40 +01:00
|
|
|
connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_ERROR,
|
|
|
|
0,NULL,-1);
|
|
|
|
connection_mark_unattached_ap(conn,
|
2007-02-07 07:54:27 +01:00
|
|
|
END_STREAM_REASON_SOCKSPROTOCOL |
|
|
|
|
END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED);
|
2004-11-15 08:50:15 +01:00
|
|
|
return -1;
|
2004-08-07 02:19:14 +02:00
|
|
|
}
|
|
|
|
|
2006-03-12 06:04:16 +01:00
|
|
|
if (circ) {
|
|
|
|
log_warn(LD_CONTROL, "Attachstream to a circuit is not "
|
|
|
|
"supported for .onion addresses currently. Failing.");
|
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-10-27 08:48:16 +02:00
|
|
|
strlcpy(conn->rend_query, socks->address, sizeof(conn->rend_query));
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_REND,"Got a hidden service request for ID '%s'",
|
|
|
|
safe_str(conn->rend_query));
|
2004-04-01 04:41:41 +02:00
|
|
|
/* see if we already have it cached */
|
2005-06-29 23:46:55 +02:00
|
|
|
r = rend_cache_lookup_entry(conn->rend_query, -1, &entry);
|
2004-11-28 10:05:49 +01:00
|
|
|
if (r<0) {
|
2007-03-04 21:11:46 +01:00
|
|
|
log_warn(LD_BUG,"Invalid service name '%s'",
|
2006-02-13 10:02:35 +01:00
|
|
|
safe_str(conn->rend_query));
|
2005-04-03 00:11:24 +02:00
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);
|
2004-04-18 11:04:37 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2004-11-28 10:05:49 +01:00
|
|
|
if (r==0) {
|
2006-07-26 21:07:26 +02:00
|
|
|
conn->_base.state = AP_CONN_STATE_RENDDESC_WAIT;
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_REND, "Unknown descriptor %s. Fetching.",
|
|
|
|
safe_str(conn->rend_query));
|
2004-04-18 09:37:16 +02:00
|
|
|
rend_client_refetch_renddesc(conn->rend_query);
|
2005-12-07 00:43:52 +01:00
|
|
|
} else { /* r > 0 */
|
2007-02-16 21:01:02 +01:00
|
|
|
/** How long after we receive a hidden service descriptor do we consider
|
|
|
|
* it valid? */
|
|
|
|
#define NUM_SECONDS_BEFORE_HS_REFETCH (60*15)
|
|
|
|
if (time(NULL) - entry->received < NUM_SECONDS_BEFORE_HS_REFETCH) {
|
2006-07-26 21:07:26 +02:00
|
|
|
conn->_base.state = AP_CONN_STATE_CIRCUIT_WAIT;
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_REND, "Descriptor is here and fresh enough. Great.");
|
2005-03-27 08:37:56 +02:00
|
|
|
if (connection_ap_handshake_attach_circuit(conn) < 0) {
|
2005-04-03 00:11:24 +02:00
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH);
|
2005-03-27 08:37:56 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2004-04-18 11:04:37 +02:00
|
|
|
} else {
|
2006-07-26 21:07:26 +02:00
|
|
|
conn->_base.state = AP_CONN_STATE_RENDDESC_WAIT;
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_REND, "Stale descriptor %s. Refetching.",
|
|
|
|
safe_str(conn->rend_query));
|
2004-04-18 11:04:37 +02:00
|
|
|
rend_client_refetch_renddesc(conn->rend_query);
|
|
|
|
}
|
|
|
|
}
|
2005-12-07 00:43:52 +01:00
|
|
|
return 0;
|
2004-04-01 04:41:41 +02:00
|
|
|
}
|
2004-11-29 09:34:54 +01:00
|
|
|
return 0; /* unreached but keeps the compiler happy */
|
2004-02-18 02:21:20 +01:00
|
|
|
}
|
|
|
|
|
2006-08-10 11:01:54 +02:00
|
|
|
#ifdef TRANS_PF
|
|
|
|
static int pf_socket = -1;
|
|
|
|
static int
|
|
|
|
get_pf_socket(void)
|
|
|
|
{
|
|
|
|
int pf;
|
|
|
|
/* Ideally, this should be opened before dropping privs. */
|
|
|
|
if (pf_socket >= 0)
|
|
|
|
return pf_socket;
|
|
|
|
|
|
|
|
#ifdef OPENBSD
|
|
|
|
/* only works on OpenBSD */
|
|
|
|
pf = open("/dev/pf", O_RDONLY);
|
|
|
|
#else
|
|
|
|
/* works on NetBSD and FreeBSD */
|
|
|
|
pf = open("/dev/pf", O_RDWR);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (pf < 0) {
|
|
|
|
log_warn(LD_NET, "open(\"/dev/pf\") failed: %s", strerror(errno));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
pf_socket = pf;
|
2006-12-04 06:09:09 +01:00
|
|
|
return pf_socket;
|
2006-08-10 11:01:54 +02:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-08-10 11:01:37 +02:00
|
|
|
/** Fetch the original destination address and port from a
|
|
|
|
* system-specific interface and put them into a
|
|
|
|
* socks_request_t as if they came from a socks request.
|
|
|
|
*
|
|
|
|
* Return -1 if an error prevents fetching the destination,
|
|
|
|
* else return 0.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
connection_ap_get_original_destination(edge_connection_t *conn,
|
|
|
|
socks_request_t *req)
|
|
|
|
{
|
|
|
|
#ifdef TRANS_NETFILTER
|
|
|
|
/* Linux 2.4+ */
|
|
|
|
struct sockaddr_in orig_dst;
|
|
|
|
socklen_t orig_dst_len = sizeof(orig_dst);
|
|
|
|
char tmpbuf[INET_NTOA_BUF_LEN];
|
|
|
|
|
|
|
|
if (getsockopt(conn->_base.s, SOL_IP, SO_ORIGINAL_DST,
|
|
|
|
(struct sockaddr*)&orig_dst, &orig_dst_len) < 0) {
|
|
|
|
int e = tor_socket_errno(conn->_base.s);
|
|
|
|
log_warn(LD_NET, "getsockopt() failed: %s", tor_socket_strerror(e));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
tor_inet_ntoa(&orig_dst.sin_addr, tmpbuf, sizeof(tmpbuf));
|
|
|
|
strlcpy(req->address, tmpbuf, sizeof(req->address));
|
|
|
|
req->port = ntohs(orig_dst.sin_port);
|
|
|
|
|
2006-08-10 11:02:26 +02:00
|
|
|
return 0;
|
|
|
|
#elif defined(TRANS_PF)
|
2006-08-10 11:01:37 +02:00
|
|
|
struct sockaddr_in proxy_addr;
|
|
|
|
socklen_t proxy_addr_len = sizeof(proxy_addr);
|
|
|
|
char tmpbuf[INET_NTOA_BUF_LEN];
|
|
|
|
struct pfioc_natlook pnl;
|
|
|
|
int pf = -1;
|
|
|
|
|
|
|
|
if (getsockname(conn->_base.s, (struct sockaddr*)&proxy_addr,
|
|
|
|
&proxy_addr_len) < 0) {
|
|
|
|
int e = tor_socket_errno(conn->_base.s);
|
2006-09-30 00:33:40 +02:00
|
|
|
log_warn(LD_NET, "getsockname() to determine transocks destination "
|
|
|
|
"failed: %s", tor_socket_strerror(e));
|
2006-08-10 11:01:37 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
memset(&pnl, 0, sizeof(pnl));
|
|
|
|
pnl.af = AF_INET;
|
|
|
|
pnl.proto = IPPROTO_TCP;
|
|
|
|
pnl.direction = PF_OUT;
|
|
|
|
pnl.saddr.v4.s_addr = htonl(conn->_base.addr);
|
|
|
|
pnl.sport = htons(conn->_base.port);
|
|
|
|
pnl.daddr.v4.s_addr = proxy_addr.sin_addr.s_addr;
|
|
|
|
pnl.dport = proxy_addr.sin_port;
|
2006-08-10 11:02:12 +02:00
|
|
|
|
2006-08-10 11:01:54 +02:00
|
|
|
pf = get_pf_socket();
|
|
|
|
if (pf<0)
|
2006-08-10 11:01:37 +02:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (ioctl(pf, DIOCNATLOOK, &pnl) < 0) {
|
|
|
|
log_warn(LD_NET, "ioctl(DIOCNATLOOK) failed: %s", strerror(errno));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
tor_inet_ntoa(&pnl.rdaddr.v4, tmpbuf, sizeof(tmpbuf));
|
|
|
|
strlcpy(req->address, tmpbuf, sizeof(req->address));
|
|
|
|
req->port = ntohs(pnl.rdport);
|
|
|
|
|
|
|
|
return 0;
|
2006-08-10 11:02:26 +02:00
|
|
|
#else
|
|
|
|
(void)conn;
|
|
|
|
(void)req;
|
|
|
|
log_warn(LD_BUG, "Called connection_ap_get_original_destination, but no "
|
|
|
|
"transparent proxy method was configured.");
|
|
|
|
return -1;
|
|
|
|
#endif
|
2006-08-10 11:01:37 +02:00
|
|
|
}
|
|
|
|
|
2006-02-03 12:37:19 +01:00
|
|
|
/** connection_edge_process_inbuf() found a conn in state
|
|
|
|
* socks_wait. See if conn->inbuf has the right bytes to proceed with
|
|
|
|
* the socks handshake.
|
|
|
|
*
|
|
|
|
* If the handshake is complete, send it to
|
|
|
|
* connection_ap_handshake_rewrite_and_attach().
|
|
|
|
*
|
2006-12-02 23:47:46 +01:00
|
|
|
* Return -1 if an unexpected error with conn occurs (and mark it for close),
|
2006-11-17 04:34:58 +01:00
|
|
|
* else return 0.
|
2006-02-03 12:37:19 +01:00
|
|
|
*/
|
|
|
|
static int
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_ap_handshake_process_socks(edge_connection_t *conn)
|
2006-02-03 12:37:19 +01:00
|
|
|
{
|
|
|
|
socks_request_t *socks;
|
|
|
|
int sockshere;
|
|
|
|
or_options_t *options = get_options();
|
|
|
|
|
|
|
|
tor_assert(conn);
|
2006-07-26 21:07:26 +02:00
|
|
|
tor_assert(conn->_base.type == CONN_TYPE_AP);
|
|
|
|
tor_assert(conn->_base.state == AP_CONN_STATE_SOCKS_WAIT);
|
2006-02-03 12:37:19 +01:00
|
|
|
tor_assert(conn->socks_request);
|
|
|
|
socks = conn->socks_request;
|
|
|
|
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_APP,"entered.");
|
2006-02-03 12:37:19 +01:00
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
sockshere = fetch_from_buf_socks(conn->_base.inbuf, socks,
|
2006-03-19 02:59:02 +01:00
|
|
|
options->TestSocks, options->SafeSocks);
|
2006-02-03 12:37:19 +01:00
|
|
|
if (sockshere == 0) {
|
|
|
|
if (socks->replylen) {
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_write_to_buf(socks->reply, socks->replylen, TO_CONN(conn));
|
2006-02-03 12:37:19 +01:00
|
|
|
/* zero it out so we can do another round of negotiation */
|
|
|
|
socks->replylen = 0;
|
|
|
|
} else {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_APP,"socks handshake not all here yet.");
|
2006-02-03 12:37:19 +01:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
} else if (sockshere == -1) {
|
|
|
|
if (socks->replylen) { /* we should send reply back */
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_APP,"reply is already set for us. Using it.");
|
2006-02-03 12:37:19 +01:00
|
|
|
connection_ap_handshake_socks_reply(conn, socks->reply, socks->replylen,
|
2006-10-20 19:54:43 +02:00
|
|
|
END_STREAM_REASON_SOCKSPROTOCOL);
|
|
|
|
|
2006-02-03 12:37:19 +01:00
|
|
|
} else {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_APP,"Fetching socks handshake failed. Closing.");
|
2006-10-20 19:54:43 +02:00
|
|
|
connection_ap_handshake_socks_reply(conn, NULL, 0,
|
|
|
|
END_STREAM_REASON_SOCKSPROTOCOL);
|
2006-02-03 12:37:19 +01:00
|
|
|
}
|
|
|
|
connection_mark_unattached_ap(conn,
|
2007-02-07 07:54:27 +01:00
|
|
|
END_STREAM_REASON_SOCKSPROTOCOL |
|
|
|
|
END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED);
|
2006-02-03 12:37:19 +01:00
|
|
|
return -1;
|
|
|
|
} /* else socks handshake is done, continue processing */
|
|
|
|
|
2006-11-17 04:34:58 +01:00
|
|
|
if (hostname_is_noconnect_address(socks->address))
|
2006-11-17 04:34:44 +01:00
|
|
|
{
|
2006-11-17 04:34:58 +01:00
|
|
|
control_event_stream_status(conn, STREAM_EVENT_NEW, 0);
|
|
|
|
control_event_stream_status(conn, STREAM_EVENT_CLOSED, 0);
|
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_DONE);
|
2006-11-17 04:34:44 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2006-12-13 01:28:56 +01:00
|
|
|
if (SOCKS_COMMAND_IS_CONNECT(socks->command))
|
2006-10-20 19:54:36 +02:00
|
|
|
control_event_stream_status(conn, STREAM_EVENT_NEW, 0);
|
2006-02-03 12:37:19 +01:00
|
|
|
else
|
2006-10-20 19:54:36 +02:00
|
|
|
control_event_stream_status(conn, STREAM_EVENT_NEW_RESOLVE, 0);
|
2006-02-03 12:37:19 +01:00
|
|
|
|
|
|
|
if (options->LeaveStreamsUnattached) {
|
2006-07-26 21:07:26 +02:00
|
|
|
conn->_base.state = AP_CONN_STATE_CONTROLLER_WAIT;
|
2006-02-03 12:37:19 +01:00
|
|
|
return 0;
|
2006-03-12 06:04:16 +01:00
|
|
|
}
|
2007-04-30 13:10:45 +02:00
|
|
|
return connection_ap_handshake_rewrite_and_attach(conn, NULL, NULL);
|
2006-02-03 12:37:19 +01:00
|
|
|
}
|
|
|
|
|
2006-11-14 01:06:02 +01:00
|
|
|
/** connection_init_accepted_conn() found a new trans AP conn.
|
|
|
|
* Get the original destination and send it to
|
|
|
|
* connection_ap_handshake_rewrite_and_attach().
|
2006-08-10 11:01:37 +02:00
|
|
|
*
|
|
|
|
* Return -1 if an unexpected error with conn (and it should be marked
|
|
|
|
* for close), else return 0.
|
|
|
|
*/
|
2006-11-14 01:06:02 +01:00
|
|
|
int
|
2006-08-10 11:01:37 +02:00
|
|
|
connection_ap_process_transparent(edge_connection_t *conn)
|
|
|
|
{
|
|
|
|
socks_request_t *socks;
|
|
|
|
or_options_t *options = get_options();
|
|
|
|
|
|
|
|
tor_assert(conn);
|
|
|
|
tor_assert(conn->_base.type == CONN_TYPE_AP);
|
|
|
|
tor_assert(conn->socks_request);
|
|
|
|
socks = conn->socks_request;
|
|
|
|
|
|
|
|
/* pretend that a socks handshake completed so we don't try to
|
|
|
|
* send a socks reply down a transparent conn */
|
|
|
|
socks->command = SOCKS_COMMAND_CONNECT;
|
|
|
|
socks->has_finished = 1;
|
|
|
|
|
|
|
|
log_debug(LD_APP,"entered.");
|
|
|
|
|
|
|
|
if (connection_ap_get_original_destination(conn, socks) < 0) {
|
|
|
|
log_warn(LD_APP,"Fetching original destination failed. Closing.");
|
2006-11-14 01:06:45 +01:00
|
|
|
connection_mark_unattached_ap(conn,
|
|
|
|
END_STREAM_REASON_CANT_FETCH_ORIG_DEST);
|
2006-08-10 11:01:37 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
/* we have the original destination */
|
|
|
|
|
2006-10-20 19:54:36 +02:00
|
|
|
control_event_stream_status(conn, STREAM_EVENT_NEW, 0);
|
2006-08-10 11:01:37 +02:00
|
|
|
|
|
|
|
if (options->LeaveStreamsUnattached) {
|
|
|
|
conn->_base.state = AP_CONN_STATE_CONTROLLER_WAIT;
|
|
|
|
return 0;
|
|
|
|
}
|
2007-04-30 13:10:45 +02:00
|
|
|
return connection_ap_handshake_rewrite_and_attach(conn, NULL, NULL);
|
2006-08-10 11:01:37 +02:00
|
|
|
}
|
|
|
|
|
2006-12-29 03:47:51 +01:00
|
|
|
/** connection_edge_process_inbuf() found a conn in state natd_wait. See if
|
|
|
|
* conn-\>inbuf has the right bytes to proceed. See FreeBSD's libalias(3) and
|
|
|
|
* ProxyEncodeTcpStream() in src/lib/libalias/alias_proxy.c for the encoding
|
|
|
|
* form of the original destination.
|
2006-11-14 01:06:31 +01:00
|
|
|
*
|
|
|
|
* If the original destination is complete, send it to
|
|
|
|
* connection_ap_handshake_rewrite_and_attach().
|
|
|
|
*
|
|
|
|
* Return -1 if an unexpected error with conn (and it should be marked
|
|
|
|
* for close), else return 0.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
connection_ap_process_natd(edge_connection_t *conn)
|
|
|
|
{
|
|
|
|
char tmp_buf[36], *tbuf, *daddr;
|
|
|
|
size_t tlen = 30;
|
2006-11-14 01:06:45 +01:00
|
|
|
int err, port_ok;
|
2006-11-14 01:06:31 +01:00
|
|
|
socks_request_t *socks;
|
|
|
|
or_options_t *options = get_options();
|
|
|
|
|
|
|
|
tor_assert(conn);
|
|
|
|
tor_assert(conn->_base.type == CONN_TYPE_AP);
|
|
|
|
tor_assert(conn->_base.state == AP_CONN_STATE_NATD_WAIT);
|
|
|
|
tor_assert(conn->socks_request);
|
|
|
|
socks = conn->socks_request;
|
|
|
|
|
|
|
|
log_debug(LD_APP,"entered.");
|
|
|
|
|
|
|
|
/* look for LF-terminated "[DEST ip_addr port]"
|
|
|
|
* where ip_addr is a dotted-quad and port is in string form */
|
|
|
|
err = fetch_from_buf_line_lf(conn->_base.inbuf, tmp_buf, &tlen);
|
|
|
|
if (err == 0)
|
|
|
|
return 0;
|
|
|
|
if (err < 0) {
|
|
|
|
log_warn(LD_APP,"Natd handshake failed (DEST too long). Closing");
|
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_INVALID_NATD_DEST);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2006-11-14 01:06:45 +01:00
|
|
|
if (strcmpstart(tmp_buf, "[DEST ")) {
|
|
|
|
log_warn(LD_APP,"Natd handshake was ill-formed; closing. The client "
|
2006-12-13 01:28:56 +01:00
|
|
|
"said: %s",
|
2006-11-14 01:06:45 +01:00
|
|
|
escaped(tmp_buf));
|
2006-11-14 01:06:31 +01:00
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_INVALID_NATD_DEST);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2006-11-14 01:06:45 +01:00
|
|
|
daddr = tbuf = &tmp_buf[0] + 6; /* after end of "[DEST " */
|
|
|
|
while (*tbuf != '\0' && *tbuf != ' ')
|
2006-11-14 01:06:31 +01:00
|
|
|
tbuf++;
|
2006-11-14 01:06:45 +01:00
|
|
|
*tbuf = '\0';
|
2006-11-14 01:06:31 +01:00
|
|
|
tbuf++;
|
|
|
|
|
|
|
|
/* pretend that a socks handshake completed so we don't try to
|
|
|
|
* send a socks reply down a natd conn */
|
2006-11-14 01:06:45 +01:00
|
|
|
strlcpy(socks->address, daddr, sizeof(socks->address));
|
2006-11-14 19:05:01 +01:00
|
|
|
socks->port = (uint16_t)
|
|
|
|
tor_parse_long(tbuf, 10, 1, 65535, &port_ok, &daddr);
|
2006-11-14 01:06:45 +01:00
|
|
|
if (!port_ok) {
|
2006-12-13 01:28:56 +01:00
|
|
|
log_warn(LD_APP,"Natd handshake failed; port %s is ill-formed or out "
|
2006-11-14 01:06:45 +01:00
|
|
|
"of range.", escaped(tbuf));
|
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_INVALID_NATD_DEST);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2006-11-14 01:06:31 +01:00
|
|
|
socks->command = SOCKS_COMMAND_CONNECT;
|
|
|
|
socks->has_finished = 1;
|
|
|
|
|
|
|
|
control_event_stream_status(conn, STREAM_EVENT_NEW, 0);
|
|
|
|
|
|
|
|
if (options->LeaveStreamsUnattached) {
|
|
|
|
conn->_base.state = AP_CONN_STATE_CONTROLLER_WAIT;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
conn->_base.state = AP_CONN_STATE_CIRCUIT_WAIT;
|
|
|
|
|
2007-04-30 13:10:45 +02:00
|
|
|
return connection_ap_handshake_rewrite_and_attach(conn, NULL, NULL);
|
2006-11-14 01:06:31 +01:00
|
|
|
}
|
|
|
|
|
2004-05-10 06:42:22 +02:00
|
|
|
/** Iterate over the two bytes of stream_id until we get one that is not
|
|
|
|
* already in use; return it. Return 0 if can't get a unique stream_id.
|
2003-12-19 22:25:44 +01:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static uint16_t
|
2006-07-23 09:37:35 +02:00
|
|
|
get_unique_stream_id_by_circ(origin_circuit_t *circ)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2006-07-26 21:07:26 +02:00
|
|
|
edge_connection_t *tmpconn;
|
2003-12-19 22:25:44 +01:00
|
|
|
uint16_t test_stream_id;
|
|
|
|
uint32_t attempts=0;
|
|
|
|
|
|
|
|
again:
|
|
|
|
test_stream_id = circ->next_stream_id++;
|
2004-11-28 10:05:49 +01:00
|
|
|
if (++attempts > 1<<16) {
|
2003-12-19 22:25:44 +01:00
|
|
|
/* Make sure we don't loop forever if all stream_id's are used. */
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_APP,"No unused stream IDs. Failing.");
|
2003-12-19 22:25:44 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (test_stream_id == 0)
|
|
|
|
goto again;
|
2004-11-28 10:05:49 +01:00
|
|
|
for (tmpconn = circ->p_streams; tmpconn; tmpconn=tmpconn->next_stream)
|
|
|
|
if (tmpconn->stream_id == test_stream_id)
|
2003-12-19 22:25:44 +01:00
|
|
|
goto again;
|
|
|
|
return test_stream_id;
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:42:22 +02:00
|
|
|
/** Write a relay begin cell, using destaddr and destport from ap_conn's
|
|
|
|
* socks_request field, and send it down circ.
|
|
|
|
*
|
|
|
|
* If ap_conn is broken, mark it for close and return -1. Else return 0.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
2007-03-24 16:58:11 +01:00
|
|
|
connection_ap_handshake_send_begin(edge_connection_t *ap_conn)
|
2003-11-11 03:41:31 +01:00
|
|
|
{
|
2003-10-04 10:19:23 +02:00
|
|
|
char payload[CELL_PAYLOAD_SIZE];
|
|
|
|
int payload_len;
|
2006-12-13 01:28:56 +01:00
|
|
|
int begin_type;
|
2007-03-24 16:58:11 +01:00
|
|
|
origin_circuit_t *circ;
|
|
|
|
tor_assert(ap_conn->on_circuit);
|
|
|
|
circ = TO_ORIGIN_CIRCUIT(ap_conn->on_circuit);
|
2003-09-18 10:11:31 +02:00
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
tor_assert(ap_conn->_base.type == CONN_TYPE_AP);
|
|
|
|
tor_assert(ap_conn->_base.state == AP_CONN_STATE_CIRCUIT_WAIT);
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(ap_conn->socks_request);
|
2006-12-13 01:28:56 +01:00
|
|
|
tor_assert(SOCKS_COMMAND_IS_CONNECT(ap_conn->socks_request->command));
|
2003-11-11 03:41:31 +01:00
|
|
|
|
2003-12-19 22:25:44 +01:00
|
|
|
ap_conn->stream_id = get_unique_stream_id_by_circ(circ);
|
|
|
|
if (ap_conn->stream_id==0) {
|
2005-04-03 00:11:24 +02:00
|
|
|
connection_mark_unattached_ap(ap_conn, END_STREAM_REASON_INTERNAL);
|
2006-07-23 09:37:35 +02:00
|
|
|
circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT);
|
2004-04-05 09:41:31 +02:00
|
|
|
return -1;
|
2003-12-19 22:25:44 +01:00
|
|
|
}
|
2003-10-04 10:19:23 +02:00
|
|
|
|
2005-02-22 01:53:08 +01:00
|
|
|
tor_snprintf(payload,RELAY_PAYLOAD_SIZE, "%s:%d",
|
2006-07-23 09:37:35 +02:00
|
|
|
(circ->_base.purpose == CIRCUIT_PURPOSE_C_GENERAL) ?
|
2005-02-22 01:53:08 +01:00
|
|
|
ap_conn->socks_request->address : "",
|
|
|
|
ap_conn->socks_request->port);
|
2003-12-19 06:09:51 +01:00
|
|
|
payload_len = strlen(payload)+1;
|
2003-10-04 10:19:23 +02:00
|
|
|
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_APP,
|
|
|
|
"Sending relay cell to begin stream %d.", ap_conn->stream_id);
|
2003-10-04 10:19:23 +02:00
|
|
|
|
2006-12-13 01:28:56 +01:00
|
|
|
begin_type = ap_conn->socks_request->command == SOCKS_COMMAND_CONNECT ?
|
|
|
|
RELAY_COMMAND_BEGIN : RELAY_COMMAND_BEGIN_DIR;
|
2006-12-13 03:49:45 +01:00
|
|
|
if (begin_type == RELAY_COMMAND_BEGIN) {
|
|
|
|
tor_assert(circ->build_state->onehop_tunnel == 0);
|
|
|
|
}
|
2006-12-13 01:28:56 +01:00
|
|
|
|
2007-03-24 16:58:11 +01:00
|
|
|
if (connection_edge_send_command(ap_conn, begin_type,
|
2006-12-13 23:42:52 +01:00
|
|
|
begin_type == RELAY_COMMAND_BEGIN ? payload : NULL,
|
2007-03-24 16:57:51 +01:00
|
|
|
begin_type == RELAY_COMMAND_BEGIN ? payload_len : 0) < 0)
|
2004-04-05 09:41:31 +02:00
|
|
|
return -1; /* circuit is closed, don't continue */
|
2003-10-04 10:19:23 +02:00
|
|
|
|
2003-09-13 00:45:31 +02:00
|
|
|
ap_conn->package_window = STREAMWINDOW_START;
|
|
|
|
ap_conn->deliver_window = STREAMWINDOW_START;
|
2006-07-26 21:07:26 +02:00
|
|
|
ap_conn->_base.state = AP_CONN_STATE_CONNECT_WAIT;
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_APP,"Address/port sent, ap socket %d, n_circ_id %d",
|
2006-07-26 21:07:26 +02:00
|
|
|
ap_conn->_base.s, circ->_base.n_circ_id);
|
2006-10-20 19:54:36 +02:00
|
|
|
control_event_stream_status(ap_conn, STREAM_EVENT_SENT_CONNECT, 0);
|
2004-04-05 09:41:31 +02:00
|
|
|
return 0;
|
2003-09-13 00:45:31 +02:00
|
|
|
}
|
|
|
|
|
2004-06-17 20:13:09 +02:00
|
|
|
/** Write a relay resolve cell, using destaddr and destport from ap_conn's
|
|
|
|
* socks_request field, and send it down circ.
|
|
|
|
*
|
|
|
|
* If ap_conn is broken, mark it for close and return -1. Else return 0.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
2007-03-24 16:58:11 +01:00
|
|
|
connection_ap_handshake_send_resolve(edge_connection_t *ap_conn)
|
2004-06-17 20:13:09 +02:00
|
|
|
{
|
2006-09-22 02:43:55 +02:00
|
|
|
int payload_len, command;
|
2004-06-17 20:13:09 +02:00
|
|
|
const char *string_addr;
|
2006-09-22 02:43:55 +02:00
|
|
|
char inaddr_buf[32];
|
2007-03-24 16:58:11 +01:00
|
|
|
origin_circuit_t *circ;
|
|
|
|
tor_assert(ap_conn->on_circuit);
|
|
|
|
circ = TO_ORIGIN_CIRCUIT(ap_conn->on_circuit);
|
2006-09-22 02:43:55 +02:00
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
tor_assert(ap_conn->_base.type == CONN_TYPE_AP);
|
|
|
|
tor_assert(ap_conn->_base.state == AP_CONN_STATE_CIRCUIT_WAIT);
|
2004-06-17 20:13:09 +02:00
|
|
|
tor_assert(ap_conn->socks_request);
|
2006-07-23 09:37:35 +02:00
|
|
|
tor_assert(circ->_base.purpose == CIRCUIT_PURPOSE_C_GENERAL);
|
2004-06-17 20:13:09 +02:00
|
|
|
|
2006-12-13 01:28:56 +01:00
|
|
|
command = ap_conn->socks_request->command;
|
|
|
|
tor_assert(SOCKS_COMMAND_IS_RESOLVE(command));
|
|
|
|
|
2004-06-17 20:13:09 +02:00
|
|
|
ap_conn->stream_id = get_unique_stream_id_by_circ(circ);
|
|
|
|
if (ap_conn->stream_id==0) {
|
2005-04-03 00:11:24 +02:00
|
|
|
connection_mark_unattached_ap(ap_conn, END_STREAM_REASON_INTERNAL);
|
2006-07-23 09:37:35 +02:00
|
|
|
circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT);
|
2004-06-17 20:13:09 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2006-09-22 02:43:55 +02:00
|
|
|
if (command == SOCKS_COMMAND_RESOLVE) {
|
|
|
|
string_addr = ap_conn->socks_request->address;
|
|
|
|
payload_len = strlen(string_addr)+1;
|
|
|
|
tor_assert(payload_len <= RELAY_PAYLOAD_SIZE);
|
|
|
|
} else {
|
|
|
|
struct in_addr in;
|
|
|
|
uint32_t a;
|
2007-05-25 20:49:26 +02:00
|
|
|
size_t len = strlen(ap_conn->socks_request->address);
|
|
|
|
char c = 0;
|
2007-05-29 19:31:13 +02:00
|
|
|
/* XXXX020 This logic is a little ugly: we check for an in-addr.arpa ending
|
|
|
|
* on the address. If we have one, the address is already in the right
|
|
|
|
* order, so we'll leave it alone later. Otherwise, we reverse it and
|
|
|
|
* turn it into an in-addr.arpa address. */
|
2007-05-25 20:49:26 +02:00
|
|
|
if (!strcasecmpend(ap_conn->socks_request->address, ".in-addr.arpa")) {
|
2007-05-29 19:31:13 +02:00
|
|
|
/* Temporarily truncate the address, so we can give it to inet_aton. */
|
2007-05-25 20:49:26 +02:00
|
|
|
c = ap_conn->socks_request->address[len-13];
|
|
|
|
ap_conn->socks_request->address[len-13] = '\0';
|
|
|
|
}
|
2006-09-22 02:43:55 +02:00
|
|
|
if (tor_inet_aton(ap_conn->socks_request->address, &in) == 0) {
|
|
|
|
connection_mark_unattached_ap(ap_conn, END_STREAM_REASON_INTERNAL);
|
|
|
|
return -1;
|
|
|
|
}
|
2007-05-25 20:49:26 +02:00
|
|
|
if (c) {
|
|
|
|
/* this path happens on DNS. Can we unify? XXXX020 */
|
|
|
|
ap_conn->socks_request->address[len-13] = c;
|
|
|
|
strlcpy(inaddr_buf, ap_conn->socks_request->address, sizeof(inaddr_buf));
|
|
|
|
} else {
|
|
|
|
/* this path happens on tor-resolve. Can we unify? XXXX020 */
|
|
|
|
a = ntohl(in.s_addr);
|
|
|
|
tor_snprintf(inaddr_buf, sizeof(inaddr_buf), "%d.%d.%d.%d.in-addr.arpa",
|
|
|
|
(int)(uint8_t)((a )&0xff),
|
|
|
|
(int)(uint8_t)((a>>8 )&0xff),
|
|
|
|
(int)(uint8_t)((a>>16)&0xff),
|
|
|
|
(int)(uint8_t)((a>>24)&0xff));
|
|
|
|
}
|
2006-09-22 02:43:55 +02:00
|
|
|
string_addr = inaddr_buf;
|
|
|
|
payload_len = strlen(inaddr_buf)+1;
|
|
|
|
tor_assert(payload_len <= RELAY_PAYLOAD_SIZE);
|
|
|
|
}
|
2004-06-17 20:13:09 +02:00
|
|
|
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_APP,
|
|
|
|
"Sending relay cell to begin stream %d.", ap_conn->stream_id);
|
2004-06-17 20:13:09 +02:00
|
|
|
|
2007-03-24 16:58:11 +01:00
|
|
|
if (connection_edge_send_command(ap_conn,
|
2006-07-23 09:37:35 +02:00
|
|
|
RELAY_COMMAND_RESOLVE,
|
2007-03-24 16:57:51 +01:00
|
|
|
string_addr, payload_len) < 0)
|
2004-06-17 20:13:09 +02:00
|
|
|
return -1; /* circuit is closed, don't continue */
|
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
ap_conn->_base.state = AP_CONN_STATE_RESOLVE_WAIT;
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_APP,"Address sent for resolve, ap socket %d, n_circ_id %d",
|
2006-07-26 21:07:26 +02:00
|
|
|
ap_conn->_base.s, circ->_base.n_circ_id);
|
2006-10-20 19:54:36 +02:00
|
|
|
control_event_stream_status(ap_conn, STREAM_EVENT_SENT_RESOLVE, 0);
|
2004-06-17 20:13:09 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-05-29 19:31:13 +02:00
|
|
|
/** Make an AP connection_t, make a new linked connection pair, and attach
|
|
|
|
* one side to the conn, connection_add it, initialize it to circuit_wait,
|
2004-04-01 00:02:13 +02:00
|
|
|
* and call connection_ap_handshake_attach_circuit(conn) on it.
|
2004-05-10 06:42:22 +02:00
|
|
|
*
|
2007-05-29 19:31:13 +02:00
|
|
|
* Return the other end of the linked connection pair, or -1 if error.
|
2007-04-21 19:26:12 +02:00
|
|
|
*
|
|
|
|
* DOCDOC start_reading
|
2004-04-01 00:02:13 +02:00
|
|
|
*/
|
2007-04-21 19:26:12 +02:00
|
|
|
edge_connection_t *
|
2007-06-09 07:17:33 +02:00
|
|
|
connection_ap_make_link(char *address, uint16_t port,
|
|
|
|
const char *digest, int command)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2006-07-26 21:07:26 +02:00
|
|
|
edge_connection_t *conn;
|
2006-06-06 02:06:52 +02:00
|
|
|
|
2007-06-09 07:17:33 +02:00
|
|
|
log_info(LD_APP,"Making internal anonymized tunnel to %s:%d ...",
|
|
|
|
safe_str(address),port);
|
2004-04-01 00:02:13 +02:00
|
|
|
|
2007-06-05 22:54:49 +02:00
|
|
|
conn = TO_EDGE_CONN(connection_new(CONN_TYPE_AP, AF_INET));
|
2007-04-21 19:26:12 +02:00
|
|
|
conn->_base.linked = 1; /* so that we can add it safely below. */
|
2004-04-01 00:02:13 +02:00
|
|
|
|
|
|
|
/* populate conn->socks_request */
|
|
|
|
|
|
|
|
/* leave version at zero, so the socks_reply is empty */
|
|
|
|
conn->socks_request->socks_version = 0;
|
|
|
|
conn->socks_request->has_finished = 0; /* waiting for 'connected' */
|
2004-10-27 08:48:16 +02:00
|
|
|
strlcpy(conn->socks_request->address, address,
|
|
|
|
sizeof(conn->socks_request->address));
|
2004-04-01 00:02:13 +02:00
|
|
|
conn->socks_request->port = port;
|
2006-12-13 01:28:56 +01:00
|
|
|
conn->socks_request->command = command;
|
|
|
|
if (command == SOCKS_COMMAND_CONNECT_DIR) {
|
|
|
|
conn->chosen_exit_name = tor_malloc(HEX_DIGEST_LEN+2);
|
|
|
|
conn->chosen_exit_name[0] = '$';
|
|
|
|
base16_encode(conn->chosen_exit_name+1,HEX_DIGEST_LEN+1,
|
|
|
|
digest, DIGEST_LEN);
|
|
|
|
}
|
2004-04-01 00:02:13 +02:00
|
|
|
|
2007-05-24 20:12:52 +02:00
|
|
|
conn->_base.address = tor_strdup("(local link)");
|
2006-07-26 21:07:26 +02:00
|
|
|
conn->_base.addr = 0;
|
|
|
|
conn->_base.port = 0;
|
2004-04-01 00:02:13 +02:00
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
if (connection_add(TO_CONN(conn)) < 0) { /* no space, forget it */
|
2007-04-21 19:26:12 +02:00
|
|
|
connection_free(TO_CONN(conn));
|
|
|
|
return NULL;
|
2004-04-01 00:02:13 +02:00
|
|
|
}
|
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
conn->_base.state = AP_CONN_STATE_CIRCUIT_WAIT;
|
2004-04-01 00:02:13 +02:00
|
|
|
|
2004-04-01 01:06:16 +02:00
|
|
|
/* attaching to a dirty circuit is fine */
|
2004-04-03 00:23:15 +02:00
|
|
|
if (connection_ap_handshake_attach_circuit(conn) < 0) {
|
2005-04-03 00:11:24 +02:00
|
|
|
connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH);
|
2007-04-21 19:26:12 +02:00
|
|
|
return NULL;
|
2004-04-01 00:02:13 +02:00
|
|
|
}
|
|
|
|
|
2007-06-09 07:17:33 +02:00
|
|
|
log_info(LD_APP,"... application connection created and linked.");
|
2007-04-21 19:26:12 +02:00
|
|
|
return conn;
|
2004-04-01 00:02:13 +02:00
|
|
|
}
|
|
|
|
|
2005-03-17 13:38:37 +01:00
|
|
|
/** Send an answer to an AP connection that has requested a DNS lookup
|
2006-09-22 02:43:55 +02:00
|
|
|
* via SOCKS. The type should be one of RESOLVED_TYPE_(IPV4|IPV6|HOSTNAME) or
|
2005-03-17 13:38:37 +01:00
|
|
|
* -1 for unreachable; the answer should be in the format specified
|
|
|
|
* in the socks extensions document.
|
|
|
|
**/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_ap_handshake_socks_resolved(edge_connection_t *conn,
|
2005-06-11 20:52:12 +02:00
|
|
|
int answer_type,
|
|
|
|
size_t answer_len,
|
2005-09-02 20:53:31 +02:00
|
|
|
const char *answer,
|
|
|
|
int ttl)
|
2004-06-17 20:13:09 +02:00
|
|
|
{
|
2006-09-22 02:43:55 +02:00
|
|
|
char buf[384];
|
2004-10-14 04:47:09 +02:00
|
|
|
size_t replylen;
|
2004-06-17 20:13:09 +02:00
|
|
|
|
2006-12-26 23:41:43 +01:00
|
|
|
if (ttl >= 0) {
|
|
|
|
if (answer_type == RESOLVED_TYPE_IPV4 && answer_len == 4) {
|
|
|
|
uint32_t a = ntohl(get_uint32(answer));
|
|
|
|
if (a)
|
|
|
|
client_dns_set_addressmap(conn->socks_request->address, a,
|
|
|
|
conn->chosen_exit_name, ttl);
|
|
|
|
} else if (answer_type == RESOLVED_TYPE_HOSTNAME && answer_len < 256) {
|
|
|
|
char *cp = tor_strndup(answer, answer_len);
|
|
|
|
client_dns_set_reverse_addressmap(conn->socks_request->address,
|
|
|
|
cp,
|
|
|
|
conn->chosen_exit_name, ttl);
|
|
|
|
tor_free(cp);
|
|
|
|
}
|
2004-06-17 20:13:09 +02:00
|
|
|
}
|
|
|
|
|
2007-05-25 20:22:42 +02:00
|
|
|
if (conn->dns_server_request) {
|
2007-05-29 19:31:13 +02:00
|
|
|
/* We had a request on our DNS port: answer it. */
|
2007-05-25 20:22:42 +02:00
|
|
|
dnsserv_resolved(conn, answer_type, answer_len, answer, ttl);
|
2007-05-29 19:31:13 +02:00
|
|
|
conn->socks_request->has_finished = 1;
|
2007-05-25 20:22:42 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2004-06-17 20:13:09 +02:00
|
|
|
if (conn->socks_request->socks_version == 4) {
|
|
|
|
buf[0] = 0x00; /* version */
|
|
|
|
if (answer_type == RESOLVED_TYPE_IPV4 && answer_len == 4) {
|
|
|
|
buf[1] = 90; /* "Granted" */
|
|
|
|
set_uint16(buf+2, 0);
|
|
|
|
memcpy(buf+4, answer, 4); /* address */
|
|
|
|
replylen = SOCKS4_NETWORK_LEN;
|
2004-12-06 06:26:19 +01:00
|
|
|
} else {
|
2004-06-17 20:13:09 +02:00
|
|
|
buf[1] = 91; /* "error" */
|
|
|
|
memset(buf+2, 0, 6);
|
|
|
|
replylen = SOCKS4_NETWORK_LEN;
|
|
|
|
}
|
2007-01-27 19:56:13 +01:00
|
|
|
} else if (conn->socks_request->socks_version == 5) {
|
2004-06-17 20:13:09 +02:00
|
|
|
/* SOCKS5 */
|
|
|
|
buf[0] = 0x05; /* version */
|
|
|
|
if (answer_type == RESOLVED_TYPE_IPV4 && answer_len == 4) {
|
2005-03-01 23:16:15 +01:00
|
|
|
buf[1] = SOCKS5_SUCCEEDED;
|
2004-06-17 20:13:09 +02:00
|
|
|
buf[2] = 0; /* reserved */
|
|
|
|
buf[3] = 0x01; /* IPv4 address type */
|
|
|
|
memcpy(buf+4, answer, 4); /* address */
|
|
|
|
set_uint16(buf+8, 0); /* port == 0. */
|
|
|
|
replylen = 10;
|
|
|
|
} else if (answer_type == RESOLVED_TYPE_IPV6 && answer_len == 16) {
|
2005-03-01 23:16:15 +01:00
|
|
|
buf[1] = SOCKS5_SUCCEEDED;
|
2004-06-17 20:13:09 +02:00
|
|
|
buf[2] = 0; /* reserved */
|
|
|
|
buf[3] = 0x04; /* IPv6 address type */
|
|
|
|
memcpy(buf+4, answer, 16); /* address */
|
|
|
|
set_uint16(buf+20, 0); /* port == 0. */
|
|
|
|
replylen = 22;
|
2006-09-22 02:43:55 +02:00
|
|
|
} else if (answer_type == RESOLVED_TYPE_HOSTNAME && answer_len < 256) {
|
|
|
|
buf[1] = SOCKS5_SUCCEEDED;
|
|
|
|
buf[2] = 0; /* reserved */
|
|
|
|
buf[3] = 0x03; /* Domainname address type */
|
2006-09-22 02:44:07 +02:00
|
|
|
buf[4] = (char)answer_len;
|
|
|
|
memcpy(buf+5, answer, answer_len); /* address */
|
|
|
|
set_uint16(buf+5+answer_len, 0); /* port == 0. */
|
|
|
|
replylen = 5+answer_len+2;
|
2004-06-17 20:13:09 +02:00
|
|
|
} else {
|
2005-03-01 23:16:15 +01:00
|
|
|
buf[1] = SOCKS5_HOST_UNREACHABLE;
|
2004-06-17 20:13:09 +02:00
|
|
|
memset(buf+2, 0, 8);
|
|
|
|
replylen = 10;
|
|
|
|
}
|
2007-01-27 19:56:13 +01:00
|
|
|
} else {
|
|
|
|
/* no socks version info; don't send anything back */
|
|
|
|
return;
|
2004-06-17 20:13:09 +02:00
|
|
|
}
|
|
|
|
connection_ap_handshake_socks_reply(conn, buf, replylen,
|
2005-03-17 13:38:37 +01:00
|
|
|
(answer_type == RESOLVED_TYPE_IPV4 ||
|
|
|
|
answer_type == RESOLVED_TYPE_IPV6) ?
|
2006-10-20 19:54:43 +02:00
|
|
|
0 : END_STREAM_REASON_RESOLVEFAILED);
|
2004-06-17 20:13:09 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 06:42:22 +02:00
|
|
|
/** Send a socks reply to stream <b>conn</b>, using the appropriate
|
2005-03-17 13:38:37 +01:00
|
|
|
* socks version, etc, and mark <b>conn</b> as completed with SOCKS
|
|
|
|
* handshaking.
|
2004-11-04 00:13:28 +01:00
|
|
|
*
|
2007-02-02 19:58:11 +01:00
|
|
|
* If <b>reply</b> is defined, then write <b>replylen</b> bytes of it to conn
|
|
|
|
* and return, else reply based on <b>endreason</b> (one of
|
2007-02-06 03:49:07 +01:00
|
|
|
* END_STREAM_REASON_*). If <b>reply</b> is undefined, <b>endreason</b> can't
|
|
|
|
* be 0 or REASON_DONE. Send endreason to the controller, if appropriate.
|
2004-05-10 06:42:22 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_ap_handshake_socks_reply(edge_connection_t *conn, char *reply,
|
2006-10-20 19:54:43 +02:00
|
|
|
size_t replylen, int endreason)
|
2006-09-22 02:43:55 +02:00
|
|
|
{
|
2003-10-04 03:37:01 +02:00
|
|
|
char buf[256];
|
2006-10-20 19:54:43 +02:00
|
|
|
socks5_reply_status_t status =
|
|
|
|
connection_edge_end_reason_socks5_response(endreason);
|
|
|
|
|
2005-03-26 07:27:51 +01:00
|
|
|
tor_assert(conn->socks_request); /* make sure it's an AP stream */
|
2003-09-13 00:45:31 +02:00
|
|
|
|
2005-03-17 13:38:37 +01:00
|
|
|
control_event_stream_status(conn,
|
2006-10-20 19:54:36 +02:00
|
|
|
status==SOCKS5_SUCCEEDED ? STREAM_EVENT_SUCCEEDED : STREAM_EVENT_FAILED,
|
2006-10-20 19:54:43 +02:00
|
|
|
endreason);
|
2004-11-03 19:33:07 +01:00
|
|
|
|
2005-03-17 13:38:37 +01:00
|
|
|
if (conn->socks_request->has_finished) {
|
2007-03-04 21:11:46 +01:00
|
|
|
log_warn(LD_BUG, "(Harmless.) duplicate calls to "
|
2006-02-13 10:02:35 +01:00
|
|
|
"connection_ap_handshake_socks_reply.");
|
2005-03-17 13:38:37 +01:00
|
|
|
return;
|
|
|
|
}
|
2004-11-28 10:05:49 +01:00
|
|
|
if (replylen) { /* we already have a reply in mind */
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_write_to_buf(reply, replylen, TO_CONN(conn));
|
2005-03-17 13:38:37 +01:00
|
|
|
conn->socks_request->has_finished = 1;
|
2004-03-03 07:26:34 +01:00
|
|
|
return;
|
2003-10-04 03:37:01 +02:00
|
|
|
}
|
2004-11-28 10:05:49 +01:00
|
|
|
if (conn->socks_request->socks_version == 4) {
|
2003-10-04 03:37:01 +02:00
|
|
|
memset(buf,0,SOCKS4_NETWORK_LEN);
|
|
|
|
#define SOCKS4_GRANTED 90
|
|
|
|
#define SOCKS4_REJECT 91
|
2005-03-17 13:38:37 +01:00
|
|
|
buf[1] = (status==SOCKS5_SUCCEEDED ? SOCKS4_GRANTED : SOCKS4_REJECT);
|
2003-10-04 03:37:01 +02:00
|
|
|
/* leave version, destport, destip zero */
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_write_to_buf(buf, SOCKS4_NETWORK_LEN, TO_CONN(conn));
|
2005-03-24 02:11:28 +01:00
|
|
|
} else if (conn->socks_request->socks_version == 5) {
|
2003-10-04 03:37:01 +02:00
|
|
|
buf[0] = 5; /* version 5 */
|
2005-03-17 13:38:37 +01:00
|
|
|
buf[1] = (char)status;
|
2003-10-04 03:37:01 +02:00
|
|
|
buf[2] = 0;
|
|
|
|
buf[3] = 1; /* ipv4 addr */
|
2003-11-18 09:20:19 +01:00
|
|
|
memset(buf+4,0,6); /* Set external addr/port to 0.
|
|
|
|
The spec doesn't seem to say what to do here. -RD */
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_write_to_buf(buf,10,TO_CONN(conn));
|
2003-10-04 03:37:01 +02:00
|
|
|
}
|
2004-04-01 00:02:13 +02:00
|
|
|
/* If socks_version isn't 4 or 5, don't send anything.
|
|
|
|
* This can happen in the case of AP bridges. */
|
2005-03-17 13:38:37 +01:00
|
|
|
conn->socks_request->has_finished = 1;
|
2004-03-03 07:26:34 +01:00
|
|
|
return;
|
2003-09-13 00:45:31 +02:00
|
|
|
}
|
|
|
|
|
2007-05-25 21:41:31 +02:00
|
|
|
/** A relay 'begin' or 'begin_dir' cell has arrived, and either we are
|
|
|
|
* an exit hop for the circuit, or we are the origin and it is a
|
|
|
|
* rendezvous begin.
|
2004-05-10 06:42:22 +02:00
|
|
|
*
|
|
|
|
* Launch a new exit connection and initialize things appropriately.
|
|
|
|
*
|
|
|
|
* If it's a rendezvous stream, call connection_exit_connect() on
|
|
|
|
* it.
|
|
|
|
*
|
|
|
|
* For general streams, call dns_resolve() on it first, and only call
|
|
|
|
* connection_exit_connect() if the dns answer is already known.
|
|
|
|
*
|
|
|
|
* Note that we don't call connection_add() on the new stream! We wait
|
|
|
|
* for connection_exit_connect() to do that.
|
|
|
|
*
|
2006-10-20 17:26:02 +02:00
|
|
|
* Return -(some circuit end reason) if we want to tear down <b>circ</b>.
|
|
|
|
* Else return 0.
|
2004-05-10 06:42:22 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
connection_exit_begin_conn(cell_t *cell, circuit_t *circ)
|
|
|
|
{
|
2006-07-26 21:07:26 +02:00
|
|
|
edge_connection_t *n_stream;
|
2003-12-19 06:09:51 +01:00
|
|
|
relay_header_t rh;
|
2004-10-12 17:52:09 +02:00
|
|
|
char *address=NULL;
|
|
|
|
uint16_t port;
|
2006-10-20 16:57:46 +02:00
|
|
|
char end_payload[1];
|
2006-12-25 04:42:38 +01:00
|
|
|
or_circuit_t *or_circ = NULL;
|
2003-09-13 00:45:31 +02:00
|
|
|
|
2004-04-15 02:03:48 +02:00
|
|
|
assert_circuit_ok(circ);
|
2006-12-25 04:42:38 +01:00
|
|
|
if (!CIRCUIT_IS_ORIGIN(circ))
|
|
|
|
or_circ = TO_OR_CIRCUIT(circ);
|
2003-12-19 06:09:51 +01:00
|
|
|
|
2006-10-20 16:57:46 +02:00
|
|
|
relay_header_unpack(&rh, cell->payload);
|
|
|
|
|
|
|
|
/* Note: we have to use relay_send_command_from_edge here, not
|
|
|
|
* connection_edge_end or connection_edge_send_command, since those require
|
|
|
|
* that we have a stream connected to a circuit, and we don't connect to a
|
2006-10-20 21:11:12 +02:00
|
|
|
* circuit until we have a pending/successful resolve. */
|
2003-10-21 10:37:07 +02:00
|
|
|
|
2006-07-30 06:32:58 +02:00
|
|
|
if (!server_mode(get_options()) &&
|
|
|
|
circ->purpose != CIRCUIT_PURPOSE_S_REND_JOINED) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
|
2006-10-20 21:11:12 +02:00
|
|
|
"Relay begin cell at non-server. Closing.");
|
2006-10-20 16:57:46 +02:00
|
|
|
end_payload[0] = END_STREAM_REASON_EXITPOLICY;
|
|
|
|
relay_send_command_from_edge(rh.stream_id, circ, RELAY_COMMAND_END,
|
|
|
|
end_payload, 1, NULL);
|
2006-07-30 06:32:58 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-09-29 05:50:11 +02:00
|
|
|
if (rh.command == RELAY_COMMAND_BEGIN) {
|
|
|
|
if (!memchr(cell->payload+RELAY_HEADER_SIZE, 0, rh.length)) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
|
2006-10-20 21:11:12 +02:00
|
|
|
"Relay begin cell has no \\0. Closing.");
|
2006-10-20 16:57:46 +02:00
|
|
|
end_payload[0] = END_STREAM_REASON_TORPROTOCOL;
|
|
|
|
relay_send_command_from_edge(rh.stream_id, circ, RELAY_COMMAND_END,
|
|
|
|
end_payload, 1, NULL);
|
2006-09-29 05:50:11 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (parse_addr_port(LOG_PROTOCOL_WARN, cell->payload+RELAY_HEADER_SIZE,
|
|
|
|
&address,NULL,&port)<0) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
|
2006-10-20 21:11:12 +02:00
|
|
|
"Unable to parse addr:port in relay begin cell. Closing.");
|
2006-10-20 16:57:46 +02:00
|
|
|
end_payload[0] = END_STREAM_REASON_TORPROTOCOL;
|
|
|
|
relay_send_command_from_edge(rh.stream_id, circ, RELAY_COMMAND_END,
|
|
|
|
end_payload, 1, NULL);
|
2006-09-29 05:50:11 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (port==0) {
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
|
2006-10-20 21:11:12 +02:00
|
|
|
"Missing port in relay begin cell. Closing.");
|
2006-10-20 16:57:46 +02:00
|
|
|
end_payload[0] = END_STREAM_REASON_TORPROTOCOL;
|
|
|
|
relay_send_command_from_edge(rh.stream_id, circ, RELAY_COMMAND_END,
|
|
|
|
end_payload, 1, NULL);
|
2006-09-29 05:50:11 +02:00
|
|
|
tor_free(address);
|
|
|
|
return 0;
|
|
|
|
}
|
2006-12-25 04:42:38 +01:00
|
|
|
if (or_circ && or_circ->is_first_hop) {
|
2006-10-01 22:50:11 +02:00
|
|
|
/* Don't let clients use us as a single-hop proxy; it attracts attackers
|
|
|
|
* and users who'd be better off with, well, single-hop proxies.
|
|
|
|
*/
|
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
|
2006-10-20 21:11:12 +02:00
|
|
|
"Attempt to open a stream on first hop of circuit. Closing.");
|
2006-10-20 16:57:46 +02:00
|
|
|
end_payload[0] = END_STREAM_REASON_TORPROTOCOL;
|
|
|
|
relay_send_command_from_edge(rh.stream_id, circ, RELAY_COMMAND_END,
|
|
|
|
end_payload, 1, NULL);
|
2006-10-01 22:50:11 +02:00
|
|
|
tor_free(address);
|
|
|
|
return 0;
|
|
|
|
}
|
2006-09-29 05:50:11 +02:00
|
|
|
} else if (rh.command == RELAY_COMMAND_BEGIN_DIR) {
|
|
|
|
or_options_t *options = get_options();
|
2006-10-20 16:57:46 +02:00
|
|
|
port = options->DirPort; /* not actually used to open a connection */
|
|
|
|
if (!port || circ->purpose != CIRCUIT_PURPOSE_OR) {
|
|
|
|
end_payload[0] = END_STREAM_REASON_NOTDIRECTORY;
|
|
|
|
relay_send_command_from_edge(rh.stream_id, circ, RELAY_COMMAND_END,
|
|
|
|
end_payload, 1, NULL);
|
|
|
|
return 0;
|
|
|
|
}
|
2006-12-25 04:42:38 +01:00
|
|
|
if (or_circ && or_circ->p_conn && or_circ->p_conn->_base.address)
|
|
|
|
address = tor_strdup(or_circ->p_conn->_base.address);
|
|
|
|
else
|
|
|
|
address = tor_strdup("127.0.0.1");
|
2006-09-29 05:50:11 +02:00
|
|
|
} else {
|
|
|
|
log_warn(LD_BUG, "Got an unexpected command %d", (int)rh.command);
|
2006-10-20 16:57:46 +02:00
|
|
|
end_payload[0] = END_STREAM_REASON_INTERNAL;
|
|
|
|
relay_send_command_from_edge(rh.stream_id, circ, RELAY_COMMAND_END,
|
|
|
|
end_payload, 1, NULL);
|
2006-03-16 00:36:57 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2003-09-13 00:45:31 +02:00
|
|
|
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_EXIT,"Creating new exit connection.");
|
2007-06-05 22:54:49 +02:00
|
|
|
n_stream = TO_EDGE_CONN(connection_new(CONN_TYPE_EXIT, AF_INET));
|
2006-07-26 21:07:26 +02:00
|
|
|
n_stream->_base.purpose = EXIT_PURPOSE_CONNECT;
|
2003-09-13 00:45:31 +02:00
|
|
|
|
2003-12-19 06:09:51 +01:00
|
|
|
n_stream->stream_id = rh.stream_id;
|
2006-07-26 21:07:26 +02:00
|
|
|
n_stream->_base.port = port;
|
2003-10-15 20:50:16 +02:00
|
|
|
/* leave n_stream->s at -1, because it's not yet valid */
|
2003-09-13 00:45:31 +02:00
|
|
|
n_stream->package_window = STREAMWINDOW_START;
|
|
|
|
n_stream->deliver_window = STREAMWINDOW_START;
|
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (circ->purpose == CIRCUIT_PURPOSE_S_REND_JOINED) {
|
2006-07-23 09:37:35 +02:00
|
|
|
origin_circuit_t *origin_circ = TO_ORIGIN_CIRCUIT(circ);
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_REND,"begin is for rendezvous. configuring stream.");
|
2006-07-26 21:07:26 +02:00
|
|
|
n_stream->_base.address = tor_strdup("(rendezvous)");
|
|
|
|
n_stream->_base.state = EXIT_CONN_STATE_CONNECTING;
|
2006-07-26 21:05:34 +02:00
|
|
|
strlcpy(n_stream->rend_query, origin_circ->rend_query,
|
2004-10-27 08:48:16 +02:00
|
|
|
sizeof(n_stream->rend_query));
|
2004-10-17 23:10:41 +02:00
|
|
|
tor_assert(connection_edge_is_rendezvous_stream(n_stream));
|
2004-04-15 02:03:48 +02:00
|
|
|
assert_circuit_ok(circ);
|
2006-07-23 09:37:35 +02:00
|
|
|
if (rend_service_set_connection_addr_port(n_stream, origin_circ) < 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_REND,"Didn't find rendezvous service (port %d)",
|
2006-07-26 21:07:26 +02:00
|
|
|
n_stream->_base.port);
|
2006-10-20 16:57:46 +02:00
|
|
|
end_payload[0] = END_STREAM_REASON_EXITPOLICY;
|
|
|
|
relay_send_command_from_edge(rh.stream_id, circ, RELAY_COMMAND_END,
|
|
|
|
end_payload, 1, NULL);
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_free(TO_CONN(n_stream));
|
2004-10-12 17:52:09 +02:00
|
|
|
tor_free(address);
|
2004-04-06 22:25:18 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2004-04-15 02:03:48 +02:00
|
|
|
assert_circuit_ok(circ);
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_REND,"Finished assigning addr/port");
|
2006-07-23 09:37:35 +02:00
|
|
|
n_stream->cpath_layer = origin_circ->cpath->prev; /* link it */
|
2004-05-06 13:08:04 +02:00
|
|
|
|
|
|
|
/* add it into the linked list of n_streams on this circuit */
|
2006-07-23 09:37:35 +02:00
|
|
|
n_stream->next_stream = origin_circ->p_streams;
|
2005-04-06 08:13:49 +02:00
|
|
|
n_stream->on_circuit = circ;
|
2006-07-23 09:37:35 +02:00
|
|
|
origin_circ->p_streams = n_stream;
|
2004-05-06 13:08:04 +02:00
|
|
|
assert_circuit_ok(circ);
|
|
|
|
|
2004-04-06 22:25:18 +02:00
|
|
|
connection_exit_connect(n_stream);
|
2004-10-12 17:52:09 +02:00
|
|
|
tor_free(address);
|
2004-04-06 22:25:18 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2005-02-22 01:53:08 +01:00
|
|
|
tor_strlower(address);
|
2006-07-26 21:07:26 +02:00
|
|
|
n_stream->_base.address = address;
|
|
|
|
n_stream->_base.state = EXIT_CONN_STATE_RESOLVEFAILED;
|
2004-04-09 23:31:09 +02:00
|
|
|
/* default to failed, change in dns_resolve if it turns out not to fail */
|
2004-04-06 22:25:18 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (we_are_hibernating()) {
|
2006-10-20 16:57:46 +02:00
|
|
|
end_payload[0] = END_STREAM_REASON_HIBERNATING;
|
|
|
|
relay_send_command_from_edge(rh.stream_id, circ, RELAY_COMMAND_END,
|
|
|
|
end_payload, 1, NULL);
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_free(TO_CONN(n_stream));
|
2004-12-07 22:57:37 +01:00
|
|
|
return 0;
|
2004-10-31 21:28:41 +01:00
|
|
|
}
|
2007-05-10 10:53:05 +02:00
|
|
|
|
|
|
|
n_stream->on_circuit = circ;
|
2004-10-31 21:28:41 +01:00
|
|
|
|
2006-09-29 05:50:11 +02:00
|
|
|
if (rh.command == RELAY_COMMAND_BEGIN_DIR) {
|
2007-05-10 10:53:05 +02:00
|
|
|
tor_assert(or_circ);
|
|
|
|
if (or_circ->p_conn && or_circ->p_conn->_base.addr)
|
2006-12-25 04:42:38 +01:00
|
|
|
n_stream->_base.addr = or_circ->p_conn->_base.addr;
|
2007-05-13 11:25:06 +02:00
|
|
|
return connection_exit_connect_dir(n_stream);
|
2006-09-29 05:50:11 +02:00
|
|
|
}
|
|
|
|
|
2007-05-10 10:53:05 +02:00
|
|
|
log_debug(LD_EXIT,"about to start the dns_resolve().");
|
2007-03-24 16:58:11 +01:00
|
|
|
|
2003-09-13 00:45:31 +02:00
|
|
|
/* send it off to the gethostbyname farm */
|
2007-03-24 16:58:11 +01:00
|
|
|
switch (dns_resolve(n_stream)) {
|
2007-05-25 21:41:31 +02:00
|
|
|
case 1: /* resolve worked; now n_stream is attached to circ. */
|
2004-05-06 13:08:04 +02:00
|
|
|
assert_circuit_ok(circ);
|
2006-05-23 05:08:30 +02:00
|
|
|
log_debug(LD_EXIT,"about to call connection_exit_connect().");
|
2003-10-22 09:55:44 +02:00
|
|
|
connection_exit_connect(n_stream);
|
|
|
|
return 0;
|
2003-09-13 00:45:31 +02:00
|
|
|
case -1: /* resolve failed */
|
2006-10-20 16:57:46 +02:00
|
|
|
end_payload[0] = END_STREAM_REASON_RESOLVEFAILED;
|
|
|
|
relay_send_command_from_edge(rh.stream_id, circ, RELAY_COMMAND_END,
|
|
|
|
end_payload, 1, NULL);
|
2007-05-25 21:41:31 +02:00
|
|
|
/* n_stream got freed. don't touch it. */
|
2004-03-02 08:24:11 +01:00
|
|
|
break;
|
|
|
|
case 0: /* resolve added to pending list */
|
2004-05-06 13:08:04 +02:00
|
|
|
assert_circuit_ok(circ);
|
2007-05-25 21:41:31 +02:00
|
|
|
break;
|
2003-09-13 00:45:31 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-06-17 20:13:09 +02:00
|
|
|
/**
|
|
|
|
* Called when we receive a RELAY_RESOLVE cell 'cell' along the circuit 'circ';
|
|
|
|
* begin resolving the hostname, and (eventually) reply with a RESOLVED cell.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
2006-07-23 09:37:35 +02:00
|
|
|
connection_exit_begin_resolve(cell_t *cell, or_circuit_t *circ)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2006-07-26 21:07:26 +02:00
|
|
|
edge_connection_t *dummy_conn;
|
2004-06-17 20:13:09 +02:00
|
|
|
relay_header_t rh;
|
|
|
|
|
2006-07-23 09:37:35 +02:00
|
|
|
assert_circuit_ok(TO_CIRCUIT(circ));
|
2004-06-17 20:13:09 +02:00
|
|
|
relay_header_unpack(&rh, cell->payload);
|
|
|
|
|
|
|
|
/* This 'dummy_conn' only exists to remember the stream ID
|
|
|
|
* associated with the resolve request; and to make the
|
|
|
|
* implementation of dns.c more uniform. (We really only need to
|
|
|
|
* remember the circuit, the stream ID, and the hostname to be
|
|
|
|
* resolved; but if we didn't store them in a connection like this,
|
|
|
|
* the housekeeping in dns.c would get way more complicated.)
|
|
|
|
*/
|
2007-06-05 22:54:49 +02:00
|
|
|
dummy_conn = TO_EDGE_CONN(connection_new(CONN_TYPE_EXIT, AF_INET));
|
2004-06-17 20:13:09 +02:00
|
|
|
dummy_conn->stream_id = rh.stream_id;
|
2006-07-26 21:07:26 +02:00
|
|
|
dummy_conn->_base.address = tor_strndup(cell->payload+RELAY_HEADER_SIZE,
|
|
|
|
rh.length);
|
|
|
|
dummy_conn->_base.port = 0;
|
|
|
|
dummy_conn->_base.state = EXIT_CONN_STATE_RESOLVEFAILED;
|
|
|
|
dummy_conn->_base.purpose = EXIT_PURPOSE_RESOLVE;
|
2004-06-17 20:13:09 +02:00
|
|
|
|
2007-03-24 16:58:11 +01:00
|
|
|
dummy_conn->on_circuit = TO_CIRCUIT(circ);
|
|
|
|
|
2004-06-17 20:13:09 +02:00
|
|
|
/* send it off to the gethostbyname farm */
|
2007-03-24 16:58:11 +01:00
|
|
|
switch (dns_resolve(dummy_conn)) {
|
2005-02-05 22:03:24 +01:00
|
|
|
case -1: /* Impossible to resolve; a resolved cell was sent. */
|
2005-02-06 00:55:21 +01:00
|
|
|
/* Connection freed; don't touch it. */
|
|
|
|
return 0;
|
|
|
|
case 1: /* The result was cached; a resolved cell was sent. */
|
2006-07-26 21:07:26 +02:00
|
|
|
if (!dummy_conn->_base.marked_for_close)
|
|
|
|
connection_free(TO_CONN(dummy_conn));
|
2004-06-17 20:13:09 +02:00
|
|
|
return 0;
|
|
|
|
case 0: /* resolve added to pending list */
|
2006-07-23 09:37:35 +02:00
|
|
|
assert_circuit_ok(TO_CIRCUIT(circ));
|
2005-02-05 22:03:24 +01:00
|
|
|
break;
|
2004-06-17 20:13:09 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:42:22 +02:00
|
|
|
/** Connect to conn's specified addr and port. If it worked, conn
|
|
|
|
* has now been added to the connection_array.
|
|
|
|
*
|
|
|
|
* Send back a connected cell. Include the resolved IP of the destination
|
|
|
|
* address, but <em>only</em> if it's a general exit stream. (Rendezvous
|
|
|
|
* streams must not reveal what IP they connected to.)
|
|
|
|
*/
|
2004-11-09 19:22:17 +01:00
|
|
|
void
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_exit_connect(edge_connection_t *edge_conn)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2004-10-17 03:57:34 +02:00
|
|
|
uint32_t addr;
|
|
|
|
uint16_t port;
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_t *conn = TO_CONN(edge_conn);
|
2003-09-13 00:45:31 +02:00
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
if (!connection_edge_is_rendezvous_stream(edge_conn) &&
|
|
|
|
router_compare_to_my_exit_policy(edge_conn)) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_EXIT,"%s:%d failed exit policy. Closing.",
|
2006-03-19 04:55:48 +01:00
|
|
|
escaped_safe_str(conn->address), conn->port);
|
2007-03-24 16:57:51 +01:00
|
|
|
connection_edge_end(edge_conn, END_STREAM_REASON_EXITPOLICY);
|
2006-07-26 21:07:26 +02:00
|
|
|
circuit_detach_stream(circuit_get_by_edge_conn(edge_conn), edge_conn);
|
2004-05-06 13:08:04 +02:00
|
|
|
connection_free(conn);
|
2003-10-22 09:55:44 +02:00
|
|
|
return;
|
2003-09-13 00:45:31 +02:00
|
|
|
}
|
|
|
|
|
2004-10-17 03:57:34 +02:00
|
|
|
addr = conn->addr;
|
|
|
|
port = conn->port;
|
2004-11-09 19:22:17 +01:00
|
|
|
if (redirect_exit_list) {
|
|
|
|
SMARTLIST_FOREACH(redirect_exit_list, exit_redirect_t *, r,
|
2004-10-17 03:57:34 +02:00
|
|
|
{
|
|
|
|
if ((addr&r->mask)==(r->addr&r->mask) &&
|
|
|
|
(r->port_min <= port) && (port <= r->port_max)) {
|
|
|
|
struct in_addr in;
|
2004-10-19 19:46:06 +02:00
|
|
|
if (r->is_redirect) {
|
2005-02-22 09:18:36 +01:00
|
|
|
char tmpbuf[INET_NTOA_BUF_LEN];
|
2004-10-19 19:46:06 +02:00
|
|
|
addr = r->addr_dest;
|
|
|
|
port = r->port_dest;
|
|
|
|
in.s_addr = htonl(addr);
|
2005-02-22 09:18:36 +01:00
|
|
|
tor_inet_ntoa(&in, tmpbuf, sizeof(tmpbuf));
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_EXIT, "Redirecting connection from %s:%d to %s:%d",
|
2006-03-19 04:55:48 +01:00
|
|
|
escaped_safe_str(conn->address), conn->port,
|
2006-02-13 10:02:35 +01:00
|
|
|
safe_str(tmpbuf), port);
|
2004-10-19 19:46:06 +02:00
|
|
|
}
|
2004-10-17 03:57:34 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
});
|
2004-11-09 19:22:17 +01:00
|
|
|
}
|
2004-10-17 03:57:34 +02:00
|
|
|
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_EXIT,"about to try connecting");
|
2004-11-28 10:05:49 +01:00
|
|
|
switch (connection_connect(conn, conn->address, addr, port)) {
|
2003-09-16 03:58:46 +02:00
|
|
|
case -1:
|
2007-03-24 16:57:51 +01:00
|
|
|
connection_edge_end_errno(edge_conn);
|
2006-07-26 21:07:26 +02:00
|
|
|
circuit_detach_stream(circuit_get_by_edge_conn(edge_conn), edge_conn);
|
2004-05-05 03:26:57 +02:00
|
|
|
connection_free(conn);
|
2003-10-22 09:55:44 +02:00
|
|
|
return;
|
2003-09-16 03:58:46 +02:00
|
|
|
case 0:
|
2003-09-13 00:45:31 +02:00
|
|
|
conn->state = EXIT_CONN_STATE_CONNECTING;
|
|
|
|
|
2005-01-12 07:42:32 +01:00
|
|
|
connection_watch_events(conn, EV_WRITE | EV_READ);
|
2005-02-23 21:35:26 +01:00
|
|
|
/* writable indicates finish;
|
|
|
|
* readable/error indicates broken link in windowsland. */
|
2003-10-22 09:55:44 +02:00
|
|
|
return;
|
2003-09-16 03:58:46 +02:00
|
|
|
/* case 1: fall through */
|
2003-09-13 00:45:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
conn->state = EXIT_CONN_STATE_OPEN;
|
2005-12-14 21:40:40 +01:00
|
|
|
if (connection_wants_to_flush(conn)) {
|
|
|
|
/* in case there are any queued data cells */
|
2007-03-04 21:11:46 +01:00
|
|
|
log_warn(LD_BUG,"newly connected conn had data waiting!");
|
2003-09-13 00:45:31 +02:00
|
|
|
// connection_start_writing(conn);
|
|
|
|
}
|
2005-01-12 07:42:32 +01:00
|
|
|
connection_watch_events(conn, EV_READ);
|
2003-09-13 00:45:31 +02:00
|
|
|
|
|
|
|
/* also, deliver a 'connected' cell back through the circuit. */
|
2006-07-26 21:07:37 +02:00
|
|
|
if (connection_edge_is_rendezvous_stream(edge_conn)) {
|
|
|
|
/* rendezvous stream */
|
2004-04-06 22:25:18 +02:00
|
|
|
/* don't send an address back! */
|
2006-07-26 21:07:37 +02:00
|
|
|
connection_edge_send_command(edge_conn,
|
2005-05-03 12:04:08 +02:00
|
|
|
RELAY_COMMAND_CONNECTED,
|
2007-03-24 16:57:51 +01:00
|
|
|
NULL, 0);
|
2004-04-06 22:25:18 +02:00
|
|
|
} else { /* normal stream */
|
2004-10-17 03:57:34 +02:00
|
|
|
/* This must be the original address, not the redirected address. */
|
2005-09-02 20:53:31 +02:00
|
|
|
char connected_payload[8];
|
2005-09-03 03:47:39 +02:00
|
|
|
set_uint32(connected_payload, htonl(conn->addr));
|
2005-09-02 20:53:31 +02:00
|
|
|
set_uint32(connected_payload+4,
|
2006-07-26 21:07:26 +02:00
|
|
|
htonl(dns_clip_ttl(edge_conn->address_ttl)));
|
2006-07-26 21:07:37 +02:00
|
|
|
connection_edge_send_command(edge_conn,
|
2005-05-03 12:04:08 +02:00
|
|
|
RELAY_COMMAND_CONNECTED,
|
2007-03-24 16:57:51 +01:00
|
|
|
connected_payload, 8);
|
2004-04-06 22:25:18 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-09-29 05:50:11 +02:00
|
|
|
/** Given an exit conn that should attach to us as a directory server, open a
|
2007-05-29 19:31:13 +02:00
|
|
|
* bridge connection with a linked connection pir, create a new directory
|
|
|
|
* conn, and join them together. Return 0 on success (or if there was an
|
|
|
|
* error we could send back an end cell for). Return -(some circuit end
|
|
|
|
* reason) if the circuit needs to be torn down. Either connects
|
|
|
|
* <b>exitconn<b/>, frees it, or marks it, as appropriate.
|
2006-09-29 05:50:11 +02:00
|
|
|
*/
|
|
|
|
static int
|
2007-05-13 11:25:06 +02:00
|
|
|
connection_exit_connect_dir(edge_connection_t *exitconn)
|
2006-09-29 05:50:11 +02:00
|
|
|
{
|
2007-05-13 11:25:06 +02:00
|
|
|
dir_connection_t *dirconn = NULL;
|
|
|
|
or_circuit_t *circ = TO_OR_CIRCUIT(exitconn->on_circuit);
|
2006-09-29 05:50:11 +02:00
|
|
|
|
2007-04-21 19:26:12 +02:00
|
|
|
log_info(LD_EXIT, "Opening local connection for anonymized directory exit");
|
2006-09-29 05:50:11 +02:00
|
|
|
|
2007-05-13 11:25:06 +02:00
|
|
|
exitconn->_base.state = EXIT_CONN_STATE_OPEN;
|
2006-09-29 05:50:11 +02:00
|
|
|
|
2007-06-05 22:54:49 +02:00
|
|
|
dirconn = TO_DIR_CONN(connection_new(CONN_TYPE_DIR, AF_INET));
|
2006-09-29 05:50:11 +02:00
|
|
|
|
2007-05-13 11:25:06 +02:00
|
|
|
dirconn->_base.addr = 0x7f000001;
|
|
|
|
dirconn->_base.port = 0;
|
|
|
|
dirconn->_base.address = tor_strdup("Tor network");
|
|
|
|
dirconn->_base.type = CONN_TYPE_DIR;
|
|
|
|
dirconn->_base.purpose = DIR_PURPOSE_SERVER;
|
|
|
|
dirconn->_base.state = DIR_CONN_STATE_SERVER_COMMAND_WAIT;
|
2006-09-29 05:50:11 +02:00
|
|
|
|
2007-05-13 22:24:43 +02:00
|
|
|
connection_link_connections(TO_CONN(dirconn), TO_CONN(exitconn));
|
2007-04-21 19:26:12 +02:00
|
|
|
|
2007-05-13 11:25:06 +02:00
|
|
|
if (connection_add(TO_CONN(exitconn))<0) {
|
|
|
|
connection_edge_end(exitconn, END_STREAM_REASON_RESOURCELIMIT);
|
|
|
|
connection_free(TO_CONN(exitconn));
|
|
|
|
connection_free(TO_CONN(dirconn));
|
2006-09-29 05:50:11 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-05-25 21:41:31 +02:00
|
|
|
/* link exitconn to circ, now that we know we can use it. */
|
2007-05-13 11:25:06 +02:00
|
|
|
exitconn->next_stream = circ->n_streams;
|
|
|
|
circ->n_streams = exitconn;
|
2007-05-10 10:53:05 +02:00
|
|
|
|
2007-05-13 11:25:06 +02:00
|
|
|
if (connection_add(TO_CONN(dirconn))<0) {
|
|
|
|
connection_edge_end(exitconn, END_STREAM_REASON_RESOURCELIMIT);
|
|
|
|
connection_close_immediate(TO_CONN(exitconn));
|
|
|
|
connection_mark_for_close(TO_CONN(exitconn));
|
|
|
|
connection_free(TO_CONN(dirconn));
|
2006-09-29 05:50:11 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-05-13 11:25:06 +02:00
|
|
|
connection_start_reading(TO_CONN(dirconn));
|
|
|
|
connection_start_reading(TO_CONN(exitconn));
|
2006-09-29 05:50:11 +02:00
|
|
|
|
2007-05-13 11:25:06 +02:00
|
|
|
if (connection_edge_send_command(exitconn,
|
2007-03-24 16:57:51 +01:00
|
|
|
RELAY_COMMAND_CONNECTED, NULL, 0) < 0) {
|
2007-05-13 11:25:06 +02:00
|
|
|
connection_mark_for_close(TO_CONN(exitconn));
|
|
|
|
connection_mark_for_close(TO_CONN(dirconn));
|
2006-09-29 05:50:11 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:42:22 +02:00
|
|
|
/** Return 1 if <b>conn</b> is a rendezvous stream, or 0 if
|
|
|
|
* it is a general stream.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_edge_is_rendezvous_stream(edge_connection_t *conn)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(conn);
|
2007-05-24 20:12:52 +02:00
|
|
|
if (*conn->rend_query) /* XXX */ /* XXXX Why is this XXX? -NM */
|
2004-04-06 23:52:01 +02:00
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-03-19 07:57:16 +01:00
|
|
|
/** Return 1 if router <b>exit</b> is likely to allow stream <b>conn</b>
|
|
|
|
* to exit from it, or 0 if it probably will not allow it.
|
2004-05-10 06:42:22 +02:00
|
|
|
* (We might be uncertain if conn's destination address has not yet been
|
|
|
|
* resolved.)
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_ap_can_use_exit(edge_connection_t *conn, routerinfo_t *exit)
|
2003-11-16 06:33:45 +01:00
|
|
|
{
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(conn);
|
2006-07-26 21:07:26 +02:00
|
|
|
tor_assert(conn->_base.type == CONN_TYPE_AP);
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(conn->socks_request);
|
2004-11-29 09:34:54 +01:00
|
|
|
tor_assert(exit);
|
2003-11-17 02:20:35 +01:00
|
|
|
|
2004-11-29 09:34:54 +01:00
|
|
|
/* If a particular exit node has been requested for the new connection,
|
|
|
|
* make sure the exit node of the existing circuit matches exactly.
|
|
|
|
*/
|
|
|
|
if (conn->chosen_exit_name) {
|
2005-10-05 00:23:31 +02:00
|
|
|
if (router_get_by_nickname(conn->chosen_exit_name, 1) != exit) {
|
2004-11-29 09:34:54 +01:00
|
|
|
/* doesn't match */
|
2006-09-22 02:24:27 +02:00
|
|
|
// log_debug(LD_APP,"Requested node '%s', considering node '%s'. No.",
|
|
|
|
// conn->chosen_exit_name, exit->nickname);
|
2004-11-29 09:34:54 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-09-22 02:43:55 +02:00
|
|
|
if (conn->socks_request->command == SOCKS_COMMAND_CONNECT) {
|
2005-02-22 01:53:08 +01:00
|
|
|
struct in_addr in;
|
|
|
|
uint32_t addr = 0;
|
2005-03-19 07:57:16 +01:00
|
|
|
addr_policy_result_t r;
|
2005-02-22 01:53:08 +01:00
|
|
|
if (tor_inet_aton(conn->socks_request->address, &in))
|
|
|
|
addr = ntohl(in.s_addr);
|
2006-03-27 04:25:34 +02:00
|
|
|
r = compare_addr_to_addr_policy(addr, conn->socks_request->port,
|
|
|
|
exit->exit_policy);
|
2005-03-19 07:57:16 +01:00
|
|
|
if (r == ADDR_POLICY_REJECTED || r == ADDR_POLICY_PROBABLY_REJECTED)
|
2004-11-29 09:34:54 +01:00
|
|
|
return 0;
|
2006-12-13 01:28:56 +01:00
|
|
|
} else if (SOCKS_COMMAND_IS_RESOLVE(conn->socks_request->command)) {
|
2006-09-22 02:43:55 +02:00
|
|
|
/* Can't support reverse lookups without eventdns. */
|
|
|
|
if (conn->socks_request->command == SOCKS_COMMAND_RESOLVE_PTR &&
|
|
|
|
exit->has_old_dnsworkers)
|
|
|
|
return 0;
|
|
|
|
|
2006-09-21 23:48:42 +02:00
|
|
|
/* Don't send DNS requests to non-exit servers by default. */
|
2006-12-12 22:09:30 +01:00
|
|
|
if (!conn->chosen_exit_name && policy_is_reject_star(exit->exit_policy))
|
2006-09-21 23:48:42 +02:00
|
|
|
return 0;
|
2004-06-17 20:13:09 +02:00
|
|
|
}
|
2004-07-21 05:16:24 +02:00
|
|
|
return 1;
|
2003-11-16 06:33:45 +01:00
|
|
|
}
|
|
|
|
|
2004-11-09 19:22:17 +01:00
|
|
|
/** Make connection redirection follow the provided list of
|
|
|
|
* exit_redirect_t */
|
|
|
|
void
|
|
|
|
set_exit_redirects(smartlist_t *lst)
|
|
|
|
{
|
|
|
|
if (redirect_exit_list) {
|
|
|
|
SMARTLIST_FOREACH(redirect_exit_list, exit_redirect_t *, p, tor_free(p));
|
|
|
|
smartlist_free(redirect_exit_list);
|
|
|
|
}
|
2007-06-07 19:26:19 +02:00
|
|
|
if (lst && smartlist_len(lst)) {
|
|
|
|
log_warn(LD_GENERAL,
|
|
|
|
"The RedirectExit option is deprecated; it will go away in a "
|
|
|
|
"future version of Tor.");
|
|
|
|
}
|
2004-11-09 19:22:17 +01:00
|
|
|
redirect_exit_list = lst;
|
|
|
|
}
|
|
|
|
|
2004-11-29 09:34:54 +01:00
|
|
|
/** If address is of the form "y.onion" with a well-formed handle y:
|
2005-10-06 06:33:40 +02:00
|
|
|
* Put a NUL after y, lower-case it, and return ONION_HOSTNAME.
|
2004-11-29 09:34:54 +01:00
|
|
|
*
|
|
|
|
* If address is of the form "y.exit":
|
2005-10-06 06:33:40 +02:00
|
|
|
* Put a NUL after y and return EXIT_HOSTNAME.
|
2004-11-29 09:34:54 +01:00
|
|
|
*
|
|
|
|
* Otherwise:
|
2004-11-30 04:44:10 +01:00
|
|
|
* Return NORMAL_HOSTNAME and change nothing.
|
2004-11-29 09:34:54 +01:00
|
|
|
*/
|
2004-11-30 04:44:10 +01:00
|
|
|
hostname_type_t
|
2005-06-11 20:52:12 +02:00
|
|
|
parse_extended_hostname(char *address)
|
|
|
|
{
|
2004-11-29 09:34:54 +01:00
|
|
|
char *s;
|
|
|
|
char query[REND_SERVICE_ID_LEN+1];
|
|
|
|
|
|
|
|
s = strrchr(address,'.');
|
2006-10-09 04:35:51 +02:00
|
|
|
if (!s)
|
|
|
|
return NORMAL_HOSTNAME; /* no dot, thus normal */
|
2005-02-22 01:53:08 +01:00
|
|
|
if (!strcmp(s+1,"exit")) {
|
2006-07-15 21:21:30 +02:00
|
|
|
*s = 0; /* nul-terminate it */
|
2004-11-30 04:44:10 +01:00
|
|
|
return EXIT_HOSTNAME; /* .exit */
|
2004-11-29 09:34:54 +01:00
|
|
|
}
|
2005-02-22 01:53:08 +01:00
|
|
|
if (strcmp(s+1,"onion"))
|
2004-11-30 04:44:10 +01:00
|
|
|
return NORMAL_HOSTNAME; /* neither .exit nor .onion, thus normal */
|
2004-11-29 09:34:54 +01:00
|
|
|
|
|
|
|
/* so it is .onion */
|
2006-07-15 21:21:30 +02:00
|
|
|
*s = 0; /* nul-terminate it */
|
2005-12-14 21:40:40 +01:00
|
|
|
if (strlcpy(query, address, REND_SERVICE_ID_LEN+1) >=
|
|
|
|
REND_SERVICE_ID_LEN+1)
|
2004-11-29 09:34:54 +01:00
|
|
|
goto failed;
|
|
|
|
if (rend_valid_service_id(query)) {
|
2004-11-30 04:44:10 +01:00
|
|
|
return ONION_HOSTNAME; /* success */
|
2004-11-29 09:34:54 +01:00
|
|
|
}
|
|
|
|
failed:
|
|
|
|
/* otherwise, return to previous state and return 0 */
|
|
|
|
*s = '.';
|
2005-06-07 20:01:46 +02:00
|
|
|
return BAD_HOSTNAME;
|
2004-11-29 09:34:54 +01:00
|
|
|
}
|
2005-06-09 21:03:31 +02:00
|
|
|
|
2006-11-17 04:34:58 +01:00
|
|
|
/** Check if the address is of the form "y.noconnect"
|
2006-11-17 04:34:44 +01:00
|
|
|
*/
|
2007-05-24 22:31:30 +02:00
|
|
|
int
|
2006-11-17 04:34:58 +01:00
|
|
|
hostname_is_noconnect_address(const char *address)
|
2006-11-17 04:34:44 +01:00
|
|
|
{
|
2006-11-17 04:34:58 +01:00
|
|
|
return ! strcasecmpend(address, ".noconnect");
|
2006-11-17 04:34:44 +01:00
|
|
|
}
|
2006-11-17 04:34:58 +01:00
|
|
|
|