Do minimal processing of gnubby data. Add request timeouts and send error

remoting/host/gnubby_socket.h

+// Copyright 2014 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.
+
+#ifndef REMOTING_HOST_GNUBBY_SOCKET_H_
+#define REMOTING_HOST_GNUBBY_SOCKET_H_
+
+#include <string>
+#include <vector>
+
+#include "base/memory/scoped_ptr.h"
+#include "base/threading/non_thread_safe.h"
+#include "base/timer/timer.h"
+#include "net/socket/stream_listen_socket.h"

[Sergey Ulanov, 2014/03/21 02:09:37]

nit: Forward-declare base::Timer and net::StreamListenSocket and move these
includes to the .cc file.

[psj, 2014/03/21 21:30:45]

They are both used in scoped_ptr, so the full class definition is needed

[Sergey Ulanov, 2014/03/21 22:53:16]

It still a pointer so you shouldn't need include. If it doesn't compile without
this include then it's probably because you don't have explicit destructor (see
my next comment). In that case the compiled tries to create an implicit
destructor when compiling this header.

[psj, 2014/03/21 23:24:17]

Ah, OK. It seemed weird that a forward reference wouldn't work but I didn't
realize it was due to the lack of a destructor

+
+namespace remoting {
+
+// Class that manages a socket used for gnubby requests.
+class GnubbySocket : public base::NonThreadSafe {
+ public:
+  GnubbySocket(scoped_ptr<net::StreamListenSocket> socket,
+               const base::Closure& timeout_callback);
+

[Sergey Ulanov, 2014/03/21 22:53:16]

declare destructor here and define in .cc file

[psj, 2014/03/21 23:24:17]

Done.

+  // Adds data to the current request.
+  void AddRequestData(const char* data, int data_len);
+
+  // Gets the current request data and clears it.
+  void GetAndClearRequestData(std::string* data_out);
+
+  // Returns true if the current request is complete.
+  bool IsRequestComplete() const;
+
+  // Returns true if the stated request size is larger than the allowed maximum.
+  bool IsRequestTooLarge() const;
+
+  // Sends response data to the socket.
+  void SendResponse(const std::string& data);
+
+  // Sends an SSH error code to the socket.
+  void SendSshError();
+
+  // Returns true if |socket| is the same one owned by this object.
+  bool IsSocket(net::StreamListenSocket* socket) const;
+
+  // Sets a timer for testing.
+  void SetTimerForTesting(base::Timer*);

[Sergey Ulanov, 2014/03/21 02:09:37]

use scoped_ptr<> to pass ownership here. Also the parameter must be named. 

[psj, 2014/03/21 21:30:45]

Done and done.

+
+ private:
+  // Returns the stated request length.
+  size_t GetRequestLength() const;
+
+  // Returns the response length bytes.
+  std::string GetResponseLengthAsBytes(const std::string& response) const;
+
+  // Resets the socket activity timer.
+  void ResetTimer();
+
+  // The socket.
+  scoped_ptr<net::StreamListenSocket> socket_;
+
+  // Request data.
+  std::vector<char> request_data_;
+
+  // The activity timer.
+  scoped_ptr<base::Timer> timer_;
+
+  DISALLOW_COPY_AND_ASSIGN(GnubbySocket);
+};
+
+}  // namespace remoting
+
+#endif  // REMOTING_HOST_GNUBBY_SOCKET_H_