Reject HTTP messages starting with a linefeed

[libs/net.git] / source / http / server.cpp

diff --git a/source/http/server.cpp b/source/http/server.cpp
index 7caa0f5d025b6eb0e55db15f55cbf896aadf40ba..97a42b575477a6f89938d1333ac779db2b03842e 100644 (file)
--- a/source/http/server.cpp
+++ b/source/http/server.cpp
@@ -17,13 +17,16 @@ using namespace std;
 namespace Msp {
 namespace Http {
 
+Server::Server():
+       sock(Net::INET6),
+       event_disp(0)
+{ }
+
 Server::Server(unsigned port):
-       sock(Net::INET),
+       sock(Net::INET6),
        event_disp(0)
 {
-       sock.signal_data_available.connect(sigc::mem_fun(this, &Server::data_available));
-       RefPtr<Net::SockAddr> addr = Net::resolve("*", format("%d", port));
-       sock.listen(*addr, 8);
+       listen(port);
 }
 
 // Avoid emitting sigc::signal destructor in files including server.h
@@ -31,6 +34,13 @@ Server::~Server()
 {
 }
 
+void Server::listen(unsigned port)
+{
+       RefPtr<Net::SockAddr> addr = Net::resolve("*", format("%d", port), Net::INET6);
+       sock.listen(*addr, 8);
+       sock.signal_data_available.connect(sigc::mem_fun(this, &Server::data_available));
+}
+
 unsigned Server::get_port() const
 {
        const Net::SockAddr &addr = sock.get_local_address();
@@ -92,11 +102,19 @@ void Server::client_data_available(Client &cl)
                        break;
                }
 
-       char rbuf[4096];
-       unsigned len = cl.sock->read(rbuf, sizeof(rbuf));
-       if(cl.stale)
+       try
+       {
+               char rbuf[4096];
+               unsigned len = cl.sock->read(rbuf, sizeof(rbuf));
+               if(cl.stale)
+                       return;
+               cl.in_buf.append(rbuf, len);
+       }
+       catch(const exception &)
+       {
+               cl.stale = true;
                return;
-       cl.in_buf.append(rbuf, len);
+       }
 
        RefPtr<Response> response;
        if(!cl.request)
@@ -133,7 +151,7 @@ void Server::client_data_available(Client &cl)
        }
        else
        {
-               len = cl.request->parse_content(cl.in_buf);
+               unsigned len = cl.request->parse_content(cl.in_buf);
                cl.in_buf.erase(0, len);
        }
 
@@ -180,7 +198,17 @@ void Server::send_response(Client &cl, Response &resp)
 {
        if(cl.keepalive)
                resp.set_header("Connection", "keep-alive");
-       cl.sock->write(resp.str());
+
+       try
+       {
+               cl.sock->write(resp.str());
+       }
+       catch(const exception &)
+       {
+               cl.stale = true;
+               return;
+       }
+
        cl.async = false;
        if(cl.keepalive)
        {