Gets the peer address (if available) in server requests.

net/server/http_server.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/server/http_server.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_byteorder.h"
 #include "build/build_config.h"
+#include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/server/http_connection.h"
 #include "net/server/http_server_request_info.h"
 #include "net/server/http_server_response_info.h"
 #include "net/server/web_socket.h"
 #include "net/socket/tcp_listen_socket.h"
 
 namespace net {
 
 HttpServer::HttpServer(const StreamListenSocketFactory& factory,
@@ skipping 100 matching lines @@
       }
       delegate_->OnWebSocketMessage(connection->id(), message);
       continue;
     }
 
     HttpServerRequestInfo request;
     size_t pos = 0;
     if (!ParseHeaders(connection, &request, &pos))
       break;
 
+    // Sets peer address if exists.
+    IPEndPoint peer;
+    if (socket->GetPeerAddress(&peer) == OK) {
+      request.peer = peer;

[Ryan Sleevi, 2014/03/11 01:32:43]

Why not socket->GetPeerAddress(&request.peer)?

Seems you're leaving a potentially stale peer here.

[gunsch, 2014/03/17 16:57:15]

Done.

+    }
+
     std::string connection_header = request.GetHeaderValue("connection");
     if (connection_header == "Upgrade") {
       connection->web_socket_.reset(WebSocket::CreateWebSocket(connection,
                                                                request,
                                                                &pos));
 
       if (!connection->web_socket_.get())  // Not enough data was received.
         break;
       delegate_->OnWebSocketRequest(connection->id(), request);
       connection->Shift(pos);
       continue;
     }
 
+    // Rejects non "HTTP/1.1" requests and terminate connection.
+    if (request.proto != "HTTP/1.1") {
+      connection->Send(HttpServerResponseInfo(HTTP_NOT_IMPLEMENTED));
+      Close(connection->id());
+      break;
+    }

[Ryan Sleevi, 2014/03/11 01:32:43]

Unrelated?

[gunsch, 2014/03/17 16:57:15]

This was in our local changes to this class, but I don't think is actually
necessary. Removing.

+
     const char kContentLength[] = "content-length";
     if (request.headers.count(kContentLength)) {
       size_t content_length = 0;
       const size_t kMaxBodySize = 100 << 20;
       if (!base::StringToSizeT(request.GetHeaderValue(kContentLength),
                                &content_length) ||
           content_length > kMaxBodySize) {
         connection->Send(HttpServerResponseInfo::CreateFor500(
             "request content-length too big or unknown: " +
             request.GetHeaderValue(kContentLength)));
@@ skipping 107 matching lines @@
       switch (state) {
         case ST_METHOD:
           info->method = buffer;
           buffer.clear();
           break;
         case ST_URL:
           info->path = buffer;
           buffer.clear();
           break;
         case ST_PROTO:
-          // TODO(mbelshe): Deal better with parsing protocol.
-          DCHECK(buffer == "HTTP/1.1");
+          info->proto = buffer;

[Ryan Sleevi, 2014/03/11 01:32:43]

ditto

[gunsch, 2014/03/17 16:57:15]

Done.

           buffer.clear();
           break;
         case ST_NAME:
           header_name = StringToLowerASCII(buffer);
           buffer.clear();
           break;
         case ST_VALUE:
           TrimWhitespaceASCII(buffer, TRIM_LEADING, &header_value);
           // TODO(mbelshe): Deal better with duplicate headers
           DCHECK(info->headers.find(header_name) == info->headers.end());
@@ skipping 34 matching lines @@
 }
 
 HttpConnection* HttpServer::FindConnection(StreamListenSocket* socket) {
   SocketToConnectionMap::iterator it = socket_to_connection_.find(socket);
   if (it == socket_to_connection_.end())
     return NULL;
   return it->second;
 }
 
 }  // namespace net