/*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file http_send.c paraslash's http sender */
+#include <sys/types.h>
+#include <dirent.h>
#include "para.h"
+#include "error.h"
+#include "string.h"
#include "server.cmdline.h"
#include "afh.h"
+#include "afs.h"
#include "server.h"
#include "http.h"
#include "vss.h"
#include "send.h"
#include "list.h"
#include "close_on_fork.h"
-#include "error.h"
#include "net.h"
-#include "string.h"
#include "fd.h"
#include "chunk_queue.h"
-/** \cond convert sock_addr_in to ascii */
-#define CLIENT_ADDR(hc) inet_ntoa((hc)->addr.sin_addr)
-/* get the port number of a struct http_client */
-#define CLIENT_PORT(hc) (hc)->addr.sin_port
+/** Message sent to clients that do not send a valid get request. */
#define HTTP_ERR_MSG "HTTP/1.0 400 Bad Request\n"
-/** \endcond */
+
/** The possible states of a client from the server's POV. */
enum http_status {
/** The list of connected clients. */
static struct list_head clients;
/** The whitelist/blacklist. */
-static struct list_head access_perm_list;
+static struct list_head http_acl;
/** Describes one client that connected the tcp port of the http sender. */
struct http_client {
/** The file descriptor of the client. */
int fd;
- /** Address information about the client. */
- struct sockaddr_in addr;
+ /** The socket `name' of the client. */
+ char *name;
/** The client's current status. */
enum http_status status;
/** Non-zero if we included \a fd in the read set.*/
struct in_addr addr;
/** The netmask for this entry. */
unsigned netmask;
- /** The position of this entry in the access_perm_list. */
+ /** The position of this entry in the acl. */
struct list_head node;
};
static void http_shutdown_client(struct http_client *hc, const char *msg)
{
- PARA_INFO_LOG("shutting down %s on fd %d (%s)\n", CLIENT_ADDR(hc),
- hc->fd, msg);
+ PARA_INFO_LOG("shutting down %s on fd %d (%s)\n", hc->name, hc->fd,
+ msg);
numclients--;
+ free(hc->name);
close(hc->fd);
del_close_on_fork_list(hc->fd);
cq_destroy(hc->cq);
queue_chunk_or_shutdown(hc, current_chunk, 0);
continue;
}
-// PARA_DEBUG_LOG("sending %d -> %s\n", len, CLIENT_ADDR(hc));
+// PARA_DEBUG_LOG("sending %d -> %s\n", len, remote_name(hc->fd));
ret = write(hc->fd, buf, len);
// PARA_DEBUG_LOG("ret: %d\n", ret);
if (ret < 0) {
}
}
+/**
+ * Return true if addr_1 matches addr_2 in the first `netmask' bits.
+ */
+static int v4_addr_match(uint32_t addr_1, uint32_t addr_2, uint8_t netmask)
+{
+ uint32_t mask = ~0U;
+
+ if (netmask < 32)
+ mask <<= (32 - netmask);
+ return (htonl(addr_1) & mask) == (htonl(addr_2) & mask);
+}
+
static int host_in_access_perm_list(struct http_client *hc)
{
struct access_info *ai, *tmp;
- list_for_each_entry_safe(ai, tmp, &access_perm_list, node) {
- unsigned mask = ((~0U) >> ai->netmask);
- if ((hc->addr.sin_addr.s_addr & mask) == (ai->addr.s_addr & mask))
- return 1;
+ struct sockaddr_storage ss;
+ socklen_t sslen = sizeof(ss);
+ struct in_addr v4_addr;
+
+ if (getpeername(hc->fd, (struct sockaddr *)&ss, &sslen) < 0) {
+ PARA_ERROR_LOG("Can not determine peer address: %s\n", strerror(errno));
+ goto no_match;
}
+ v4_addr = extract_v4_addr(&ss);
+ if (!v4_addr.s_addr)
+ goto no_match;
+
+ list_for_each_entry_safe(ai, tmp, &http_acl, node)
+ if (v4_addr_match(v4_addr.s_addr, ai->addr.s_addr, ai->netmask))
+ return 1;
+no_match:
return 0;
}
list_for_each_entry_safe(hc, tmp, &clients, node) {
i++;
-// PARA_DEBUG_LOG("handling client %d: %s\n", i, CLIENT_ADDR(hc));
+// PARA_DEBUG_LOG("handling client %d: %s\n", i, remote_name(hc->fd));
switch (hc->status) {
case HTTP_STREAMING: /* nothing to do */
case HTTP_READY_TO_STREAM:
return;
hc = para_calloc(sizeof(struct http_client));
err_msg = "accept error";
- hc->fd = para_accept(server_fd, &hc->addr, sizeof(struct sockaddr_in));
+ hc->fd = para_accept(server_fd, NULL, 0);
if (hc->fd <= 0)
goto err_out;
- PARA_NOTICE_LOG("connection from %s (fd %d)\n", CLIENT_ADDR(hc), hc->fd);
+ hc->name = make_message("%s", remote_name(hc->fd));
+ PARA_NOTICE_LOG("connection from %s (fd %d)\n", hc->name, hc->fd);
if (conf.http_max_clients_arg > 0 && numclients >=
conf.http_max_clients_arg) {
err_msg = "server full";
}
hc->status = HTTP_CONNECTED;
hc->cq = cq_new(MAX_BACKLOG);
- PARA_INFO_LOG("accepted client #%d: %s (fd %d)\n", numclients,
- CLIENT_ADDR(hc), hc->fd);
numclients++;
+ PARA_INFO_LOG("accepted client #%d: %s (fd %d)\n", numclients,
+ hc->name, hc->fd);
para_list_add(&hc->node, &clients);
add_close_on_fork_list(hc->fd);
- mark_fd_nonblock(hc->fd);
+ mark_fd_nonblocking(hc->fd);
return;
err_out:
PARA_WARNING_LOG("ignoring connect request from %s (%s)\n",
- CLIENT_ADDR(hc), err_msg);
+ hc->name, err_msg);
if (hc->fd > 0)
close(hc->fd);
free(hc);
{
int ret;
- server_fd = init_tcp_socket(port);
+ server_fd = para_listen(AF_UNSPEC, IPPROTO_TCP, port);
if (server_fd < 0) {
http_shutdown_clients();
self->status = SENDER_OFF;
return server_fd;
}
- ret = mark_fd_nonblock(server_fd);
+ ret = mark_fd_nonblocking(server_fd);
if (ret < 0) {
- PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+ PARA_EMERG_LOG("%s\n", para_strerror(-ret));
exit(EXIT_FAILURE);
}
self->status = SENDER_ON;
{
struct access_info *ai, *tmp;
- list_for_each_entry_safe(ai, tmp, &access_perm_list, node) {
+ list_for_each_entry_safe(ai, tmp, &http_acl, node) {
char *nad = para_strdup(inet_ntoa(ai->addr));
if (!strcmp(nad, inet_ntoa(scd->addr)) &&
ai->netmask == scd->netmask) {
ai->netmask = scd->netmask;
PARA_INFO_LOG("adding %s/%i to access list\n", inet_ntoa(ai->addr),
ai->netmask);
- para_list_add(&ai->node, &access_perm_list);
+ para_list_add(&ai->node, &http_acl);
}
static int http_com_deny(struct sender_command_data *scd)
struct access_info *ai, *tmp_ai;
struct http_client *hc, *tmp_hc;
- list_for_each_entry_safe(ai, tmp_ai, &access_perm_list, node) {
+ list_for_each_entry_safe(ai, tmp_ai, &http_acl, node) {
char *tmp = make_message("%s%s/%d ", ap? ap : "",
inet_ntoa(ai->addr), ai->netmask);
free(ap);
ap = tmp;
}
list_for_each_entry_safe(hc, tmp_hc, &clients, node) {
- char *tmp = make_message("%s%s:%d ", clnts? clnts : "",
- CLIENT_ADDR(hc), CLIENT_PORT(hc));
+ char *tmp = make_message("%s%s ", clnts? clnts : "", hc->name);
free(clnts);
clnts = tmp;
}
return ret;
}
-static void init_access_control_list(void)
+static void init_acl(struct list_head *acl, char * const *acl_info, int num)
{
int i;
struct sender_command_data scd;
- INIT_LIST_HEAD(&access_perm_list);
- for (i = 0; i < conf.http_access_given; i++) {
- char *arg = para_strdup(conf.http_access_arg[i]);
+ INIT_LIST_HEAD(acl);
+ for (i = 0; i < num; i++) {
+ char *arg = para_strdup(acl_info[i]);
char *p = strchr(arg, '/');
if (!p)
goto err;
*p = '\0';
- if (!inet_aton(arg, &scd.addr))
+ if (!inet_pton(AF_INET, arg, &scd.addr))
goto err;
scd.netmask = atoi(++p);
if (scd.netmask < 0 || scd.netmask > 32)
s->client_cmds[SENDER_ADD] = NULL;
s->client_cmds[SENDER_DELETE] = NULL;
self = s;
- init_access_control_list();
+ init_acl(&http_acl, conf.http_access_arg, conf.http_access_given);
if (!conf.http_no_autostart_given)
open_tcp_port(conf.http_port_arg); /* ignore errors */
PARA_DEBUG_LOG("%s", "http sender init complete\n");
projects / paraslash.git / blobdiff