2002-09-26 15:17:14 +02:00
|
|
|
/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */
|
2002-09-26 14:09:10 +02:00
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
/* $Id$ */
|
|
|
|
|
|
|
|
#include "or.h"
|
|
|
|
|
2003-09-17 22:09:06 +02:00
|
|
|
static int directory_send_command(connection_t *conn, int command);
|
2003-09-16 07:41:49 +02:00
|
|
|
static int directory_handle_command(connection_t *conn);
|
|
|
|
|
2002-09-26 14:09:10 +02:00
|
|
|
/********* START VARIABLES **********/
|
|
|
|
|
|
|
|
extern or_options_t options; /* command-line and config-file options */
|
|
|
|
|
2003-09-21 08:15:43 +02:00
|
|
|
static char fetchstring[] = "GET / HTTP/1.0\r\n\r\n";
|
2002-09-28 07:53:00 +02:00
|
|
|
static char answerstring[] = "HTTP/1.0 200 OK\r\n\r\n";
|
2003-09-27 23:30:10 +02:00
|
|
|
static char the_directory[MAX_DIR_SIZE+1];
|
|
|
|
static int directorylen=0;
|
2002-09-26 14:09:10 +02:00
|
|
|
|
|
|
|
/********* END VARIABLES ************/
|
|
|
|
|
2003-09-17 22:09:06 +02:00
|
|
|
void directory_initiate_command(routerinfo_t *router, int command) {
|
2002-09-26 14:09:10 +02:00
|
|
|
connection_t *conn;
|
|
|
|
|
|
|
|
if(!router) /* i guess they didn't have one in mind for me to use */
|
|
|
|
return;
|
|
|
|
|
2003-09-22 08:22:00 +02:00
|
|
|
#if 0 /* there's no problem with parallel get/posts now. whichever 'get' ends
|
|
|
|
last is the directory. */
|
2003-09-17 22:09:06 +02:00
|
|
|
if(connection_get_by_type(CONN_TYPE_DIR)) { /* there's already a dir conn running */
|
|
|
|
log_fn(LOG_DEBUG,"Canceling connect, dir conn already active.");
|
2002-09-28 07:53:00 +02:00
|
|
|
return;
|
2003-09-16 03:58:46 +02:00
|
|
|
}
|
2003-09-22 08:22:00 +02:00
|
|
|
#endif
|
2002-09-28 07:53:00 +02:00
|
|
|
|
2003-09-21 08:15:43 +02:00
|
|
|
if(command == DIR_CONN_STATE_CONNECTING_FETCH)
|
|
|
|
log_fn(LOG_DEBUG,"initiating directory fetch");
|
2003-09-17 22:09:06 +02:00
|
|
|
else
|
2003-09-21 08:15:43 +02:00
|
|
|
log_fn(LOG_DEBUG,"initiating directory upload");
|
2002-09-28 07:53:00 +02:00
|
|
|
|
2002-09-26 14:09:10 +02:00
|
|
|
conn = connection_new(CONN_TYPE_DIR);
|
|
|
|
|
|
|
|
/* set up conn so it's got all the data we need to remember */
|
2002-10-14 08:44:48 +02:00
|
|
|
conn->addr = router->addr;
|
|
|
|
conn->port = router->dir_port;
|
2002-09-26 14:09:10 +02:00
|
|
|
conn->address = strdup(router->address);
|
2003-09-25 07:17:11 +02:00
|
|
|
if (router->identity_pkey)
|
|
|
|
conn->identity_pkey = crypto_pk_dup_key(router->identity_pkey);
|
Get directories working.
Or at least, directories get generated, signed, download, and checked, with
nobody seeming to crash.
In config/*, added 'signing-key' blocks to dirservers and routers.or, so
that everyone will know about the directories' signing keys.
In or/directory.c, refrained from using a dirserver's signing key when
no such key is known; added more debugging output.
In or/main.c, added debugging output and fixed a few logic errors.
In or/routers.c, added debugging output and prevented a segfault on
routers_resolve_directory. The interleaving of arrays and lists on
routerinfo_t is still messy, but at least it seems to work again.
svn:r278
2003-05-08 23:35:11 +02:00
|
|
|
else {
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_WARNING, "No signing key known for dirserver %s; signature won't be checked", conn->address);
|
2003-09-25 07:17:11 +02:00
|
|
|
conn->identity_pkey = NULL;
|
2003-09-26 12:03:50 +02:00
|
|
|
/* XXX is there really any situation where router doesn't have an identity_pkey? */
|
Get directories working.
Or at least, directories get generated, signed, download, and checked, with
nobody seeming to crash.
In config/*, added 'signing-key' blocks to dirservers and routers.or, so
that everyone will know about the directories' signing keys.
In or/directory.c, refrained from using a dirserver's signing key when
no such key is known; added more debugging output.
In or/main.c, added debugging output and fixed a few logic errors.
In or/routers.c, added debugging output and prevented a segfault on
routers_resolve_directory. The interleaving of arrays and lists on
routerinfo_t is still messy, but at least it seems to work again.
svn:r278
2003-05-08 23:35:11 +02:00
|
|
|
}
|
2002-09-26 14:09:10 +02:00
|
|
|
|
2003-09-16 03:58:46 +02:00
|
|
|
if(connection_add(conn) < 0) { /* no space, forget it */
|
2002-09-26 14:09:10 +02:00
|
|
|
connection_free(conn);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2003-09-16 03:58:46 +02:00
|
|
|
switch(connection_connect(conn, router->address, router->addr, router->dir_port)) {
|
|
|
|
case -1:
|
2003-09-17 22:09:06 +02:00
|
|
|
router_forget_router(conn->addr, conn->port); /* XXX don't try him again */
|
2002-09-26 14:09:10 +02:00
|
|
|
connection_free(conn);
|
|
|
|
return;
|
2003-09-16 03:58:46 +02:00
|
|
|
case 0:
|
|
|
|
connection_set_poll_socket(conn);
|
2003-08-14 19:13:52 +02:00
|
|
|
connection_watch_events(conn, POLLIN | POLLOUT | POLLERR);
|
|
|
|
/* writable indicates finish, readable indicates broken link,
|
|
|
|
error indicates broken link in windowsland. */
|
2003-09-17 22:09:06 +02:00
|
|
|
conn->state = command;
|
2002-09-26 14:09:10 +02:00
|
|
|
return;
|
2003-09-16 03:58:46 +02:00
|
|
|
/* case 1: fall through */
|
2002-09-26 14:09:10 +02:00
|
|
|
}
|
|
|
|
|
2003-09-16 03:58:46 +02:00
|
|
|
connection_set_poll_socket(conn);
|
2003-09-17 22:09:06 +02:00
|
|
|
if(directory_send_command(conn, command) < 0) {
|
2002-09-26 14:09:10 +02:00
|
|
|
connection_remove(conn);
|
|
|
|
connection_free(conn);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-09-17 22:09:06 +02:00
|
|
|
static int directory_send_command(connection_t *conn, int command) {
|
2003-09-25 12:42:07 +02:00
|
|
|
const char *s;
|
|
|
|
char tmp[8192];
|
2002-09-26 14:09:10 +02:00
|
|
|
|
|
|
|
assert(conn && conn->type == CONN_TYPE_DIR);
|
|
|
|
|
2003-09-17 22:09:06 +02:00
|
|
|
switch(command) {
|
2003-09-21 08:15:43 +02:00
|
|
|
case DIR_CONN_STATE_CONNECTING_FETCH:
|
|
|
|
if(connection_write_to_buf(fetchstring, strlen(fetchstring), conn) < 0) {
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_WARNING,"Couldn't write fetch to buffer.");
|
2003-09-17 22:09:06 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2003-09-21 08:15:43 +02:00
|
|
|
conn->state = DIR_CONN_STATE_CLIENT_SENDING_FETCH;
|
2003-09-17 22:09:06 +02:00
|
|
|
break;
|
2003-09-21 08:15:43 +02:00
|
|
|
case DIR_CONN_STATE_CONNECTING_UPLOAD:
|
2003-09-17 22:09:06 +02:00
|
|
|
s = router_get_my_descriptor();
|
|
|
|
if(!s) {
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_WARNING,"Failed to get my descriptor.");
|
2003-09-17 22:09:06 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2003-09-25 12:42:07 +02:00
|
|
|
snprintf(tmp, sizeof(tmp), "POST / HTTP/1.0\r\nContent-Length: %d\r\n\r\n%s",
|
|
|
|
strlen(s), s);
|
|
|
|
if(connection_write_to_buf(tmp, strlen(tmp), conn) < 0) {
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_WARNING,"Couldn't write post/descriptor to buffer.");
|
2003-09-17 22:09:06 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2003-09-21 08:15:43 +02:00
|
|
|
conn->state = DIR_CONN_STATE_CLIENT_SENDING_UPLOAD;
|
2003-09-17 22:09:06 +02:00
|
|
|
break;
|
2002-09-26 14:09:10 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int connection_dir_process_inbuf(connection_t *conn) {
|
|
|
|
|
|
|
|
assert(conn && conn->type == CONN_TYPE_DIR);
|
|
|
|
|
|
|
|
if(conn->inbuf_reached_eof) {
|
2003-09-17 22:09:06 +02:00
|
|
|
switch(conn->state) {
|
2003-09-21 08:15:43 +02:00
|
|
|
case DIR_CONN_STATE_CLIENT_READING_FETCH:
|
2003-09-17 22:09:06 +02:00
|
|
|
/* kill it, but first process the_directory and learn about new routers. */
|
2003-09-25 07:17:11 +02:00
|
|
|
switch(fetch_from_buf_http(conn->inbuf,
|
2003-09-18 10:11:31 +02:00
|
|
|
NULL, 0, the_directory, MAX_DIR_SIZE)) {
|
2003-09-17 22:09:06 +02:00
|
|
|
case -1: /* overflow */
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_WARNING,"'fetch' response too large. Failing.");
|
2003-09-17 22:09:06 +02:00
|
|
|
return -1;
|
|
|
|
case 0:
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_INFO,"'fetch' response not all here, but we're at eof. Closing.");
|
2003-09-17 22:09:06 +02:00
|
|
|
return -1;
|
|
|
|
/* case 1, fall through */
|
|
|
|
}
|
2003-09-21 08:15:43 +02:00
|
|
|
/* XXX check headers, at least make sure returned 2xx */
|
2003-09-17 22:09:06 +02:00
|
|
|
directorylen = strlen(the_directory);
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_INFO,"Received directory (size %d):\n%s", directorylen, the_directory);
|
2003-09-17 22:09:06 +02:00
|
|
|
if(directorylen == 0) {
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_INFO,"Empty directory. Ignoring.");
|
2003-09-17 22:09:06 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2003-09-25 07:17:11 +02:00
|
|
|
if(router_get_dir_from_string(the_directory, conn->identity_pkey) < 0){
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_INFO,"...but parsing failed. Ignoring.");
|
2003-09-17 22:09:06 +02:00
|
|
|
} else {
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_INFO,"and got an %s directory; updated routers.",
|
2003-09-25 07:17:11 +02:00
|
|
|
conn->identity_pkey ? "authenticated" : "unauthenticated");
|
2003-09-17 22:09:06 +02:00
|
|
|
}
|
|
|
|
if(options.OnionRouter) { /* connect to them all */
|
|
|
|
router_retry_connections();
|
|
|
|
}
|
|
|
|
return -1;
|
2003-09-21 08:15:43 +02:00
|
|
|
case DIR_CONN_STATE_CLIENT_READING_UPLOAD:
|
2003-09-17 22:09:06 +02:00
|
|
|
/* XXX make sure there's a 200 OK on the buffer */
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_INFO,"eof while reading upload response. Finished.");
|
2003-09-17 22:09:06 +02:00
|
|
|
return -1;
|
|
|
|
default:
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_INFO,"conn reached eof, not reading. Closing.");
|
2003-09-17 22:09:06 +02:00
|
|
|
return -1;
|
2002-09-28 02:52:59 +02:00
|
|
|
}
|
2002-09-26 14:09:10 +02:00
|
|
|
}
|
|
|
|
|
2003-09-17 22:09:06 +02:00
|
|
|
if(conn->state == DIR_CONN_STATE_SERVER_COMMAND_WAIT)
|
|
|
|
return directory_handle_command(conn);
|
|
|
|
|
|
|
|
/* XXX for READ states, might want to make sure inbuf isn't too big */
|
2002-09-26 14:09:10 +02:00
|
|
|
|
2003-09-17 22:09:06 +02:00
|
|
|
log_fn(LOG_DEBUG,"Got data, not eof. Leaving on inbuf.");
|
2002-09-26 14:09:10 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-09-16 07:41:49 +02:00
|
|
|
static int directory_handle_command(connection_t *conn) {
|
2003-09-17 22:09:06 +02:00
|
|
|
char headers[1024];
|
2003-09-25 12:42:07 +02:00
|
|
|
char body[50000]; /* XXX */
|
2003-09-28 10:06:18 +02:00
|
|
|
size_t dlen;
|
2003-09-27 23:30:10 +02:00
|
|
|
const char *cp;
|
2002-09-26 14:09:10 +02:00
|
|
|
|
|
|
|
assert(conn && conn->type == CONN_TYPE_DIR);
|
|
|
|
|
2003-09-25 07:17:11 +02:00
|
|
|
switch(fetch_from_buf_http(conn->inbuf,
|
2003-09-18 10:11:31 +02:00
|
|
|
headers, sizeof(headers), body, sizeof(body))) {
|
2003-09-17 22:09:06 +02:00
|
|
|
case -1: /* overflow */
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_WARNING,"input too large. Failing.");
|
2003-09-17 22:09:06 +02:00
|
|
|
return -1;
|
|
|
|
case 0:
|
|
|
|
log_fn(LOG_DEBUG,"command not all here yet.");
|
|
|
|
return 0;
|
|
|
|
/* case 1, fall through */
|
2002-09-26 14:09:10 +02:00
|
|
|
}
|
|
|
|
|
2003-09-17 22:09:06 +02:00
|
|
|
log_fn(LOG_DEBUG,"headers '%s', body '%s'.",headers,body);
|
|
|
|
if(!strncasecmp(headers,"GET",3)) {
|
2003-09-21 08:15:43 +02:00
|
|
|
/* XXX should check url and http version */
|
2002-09-26 14:09:10 +02:00
|
|
|
|
2003-09-28 10:06:18 +02:00
|
|
|
dlen = dirserv_get_directory(&cp);
|
2002-09-26 14:09:10 +02:00
|
|
|
|
2003-09-28 10:06:18 +02:00
|
|
|
if(dlen == 0) {
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_WARNING,"My directory is empty. Closing.");
|
2003-09-29 09:50:08 +02:00
|
|
|
return -1; /* XXX send some helpful http error code */
|
2003-09-17 22:09:06 +02:00
|
|
|
}
|
2002-09-26 14:09:10 +02:00
|
|
|
|
2003-09-17 22:09:06 +02:00
|
|
|
log_fn(LOG_DEBUG,"Dumping directory to client.");
|
|
|
|
if((connection_write_to_buf(answerstring, strlen(answerstring), conn) < 0) ||
|
2003-09-28 10:06:18 +02:00
|
|
|
(connection_write_to_buf(cp, dlen, conn) < 0)) {
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_WARNING,"Failed to write answerstring+directory to outbuf.");
|
2003-09-17 22:09:06 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
conn->state = DIR_CONN_STATE_SERVER_WRITING;
|
|
|
|
return 0;
|
2002-09-28 07:53:00 +02:00
|
|
|
}
|
|
|
|
|
2003-09-17 22:09:06 +02:00
|
|
|
if(!strncasecmp(headers,"POST",4)) {
|
2003-09-21 08:15:43 +02:00
|
|
|
/* XXX should check url and http version */
|
2003-09-17 22:09:06 +02:00
|
|
|
log_fn(LOG_DEBUG,"Received POST command, body '%s'", body);
|
2003-09-29 09:50:08 +02:00
|
|
|
cp = body;
|
|
|
|
if(dirserv_add_descriptor(&cp) < 0) {
|
|
|
|
log_fn(LOG_WARNING,"dirserv_add_descriptor() failed. Dropping.");
|
|
|
|
return -1; /* XXX should write an http failed code */
|
|
|
|
}
|
2003-09-17 22:09:06 +02:00
|
|
|
if(connection_write_to_buf(answerstring, strlen(answerstring), conn) < 0) {
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_WARNING,"Failed to write answerstring to outbuf.");
|
2003-09-17 22:09:06 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
conn->state = DIR_CONN_STATE_SERVER_WRITING;
|
|
|
|
return 0;
|
2002-09-26 14:09:10 +02:00
|
|
|
}
|
|
|
|
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_WARNING,"Got headers with unknown command. Closing.");
|
2003-09-17 22:09:06 +02:00
|
|
|
return -1;
|
2002-09-26 14:09:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int connection_dir_finished_flushing(connection_t *conn) {
|
|
|
|
int e, len=sizeof(e);
|
|
|
|
|
|
|
|
assert(conn && conn->type == CONN_TYPE_DIR);
|
|
|
|
|
|
|
|
switch(conn->state) {
|
2003-09-21 08:15:43 +02:00
|
|
|
case DIR_CONN_STATE_CONNECTING_FETCH:
|
|
|
|
case DIR_CONN_STATE_CONNECTING_UPLOAD:
|
2003-08-12 05:08:41 +02:00
|
|
|
if (getsockopt(conn->s, SOL_SOCKET, SO_ERROR, (void*)&e, &len) < 0) { /* not yet */
|
2003-08-14 19:13:52 +02:00
|
|
|
if(!ERRNO_CONN_EINPROGRESS(errno)) {
|
2003-06-18 00:18:26 +02:00
|
|
|
log_fn(LOG_DEBUG,"in-progress connect failed. Removing.");
|
2002-09-26 15:17:14 +02:00
|
|
|
router_forget_router(conn->addr, conn->port); /* don't try him again */
|
2002-09-26 14:09:10 +02:00
|
|
|
return -1;
|
|
|
|
} else {
|
|
|
|
return 0; /* no change, see if next time is better */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* the connect has finished. */
|
|
|
|
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_INFO,"Dir connection to router %s:%u established.",
|
2002-09-26 14:09:10 +02:00
|
|
|
conn->address,conn->port);
|
|
|
|
|
2003-09-17 22:09:06 +02:00
|
|
|
return directory_send_command(conn, conn->state);
|
2003-09-21 08:15:43 +02:00
|
|
|
case DIR_CONN_STATE_CLIENT_SENDING_FETCH:
|
|
|
|
log_fn(LOG_DEBUG,"client finished sending fetch command.");
|
|
|
|
conn->state = DIR_CONN_STATE_CLIENT_READING_FETCH;
|
2003-09-17 22:09:06 +02:00
|
|
|
connection_watch_events(conn, POLLIN);
|
|
|
|
return 0;
|
2003-09-21 08:15:43 +02:00
|
|
|
case DIR_CONN_STATE_CLIENT_SENDING_UPLOAD:
|
|
|
|
log_fn(LOG_DEBUG,"client finished sending upload command.");
|
|
|
|
conn->state = DIR_CONN_STATE_CLIENT_READING_UPLOAD;
|
2002-09-26 14:09:10 +02:00
|
|
|
connection_watch_events(conn, POLLIN);
|
|
|
|
return 0;
|
2003-09-17 22:09:06 +02:00
|
|
|
case DIR_CONN_STATE_SERVER_WRITING:
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_INFO,"Finished writing server response. Closing.");
|
2002-09-26 14:09:10 +02:00
|
|
|
return -1; /* kill it */
|
|
|
|
default:
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_WARNING,"BUG: called in unexpected state.");
|
|
|
|
return -1;
|
2002-09-26 14:09:10 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-04-07 04:12:02 +02:00
|
|
|
/*
|
|
|
|
Local Variables:
|
|
|
|
mode:c
|
|
|
|
indent-tabs-mode:nil
|
|
|
|
c-basic-offset:2
|
|
|
|
End:
|
|
|
|
*/
|