02_HTTP_access-list.diff

[paraslash.git] / http_send.c

diff --git a/http_send.c b/http_send.c
index f3ae608b4b5ac235894faaeca609eed4694ef50c..28e245eae13ac6b7ce8e0a5f162ab88be52b5a60 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -25,12 +25,9 @@
 #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 {
@@ -59,8 +56,8 @@ static struct list_head access_perm_list;
 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.*/
@@ -91,9 +88,10 @@ static struct sender *self;
 
 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);
@@ -192,7 +190,7 @@ static void http_send( long unsigned current_chunk,
                        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) {
@@ -204,14 +202,37 @@ static void http_send( long unsigned current_chunk,
        }
 }
 
+/**
+ * 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, &access_perm_list, node)
+               if (v4_addr_match(v4_addr.s_addr, ai->addr.s_addr, ai->netmask))
+                       return 1;
+no_match:
        return 0;
 }
 
@@ -223,7 +244,7 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
 
        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:
@@ -263,10 +284,11 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
                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";
@@ -281,16 +303,16 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
        }
        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_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);
@@ -334,7 +356,7 @@ static int open_tcp_port(int port)
 {
        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;
@@ -427,8 +449,7 @@ static char *http_info(void)
                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;
        }