Fix GnubbyAuthHandlerPosix to handle requests correctly.

remoting/host/gnubby_socket.cc

 // 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.
 
 #include "remoting/host/gnubby_socket.h"
 
 #include "base/macros.h"
 #include "base/timer/timer.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
@@ skipping 54 matching lines @@
 
 void GnubbySocket::SendSshError() {
   DCHECK(CalledOnValidThread());
 
   SendResponse(std::string(kSshError, arraysize(kSshError)));
 }
 
 void GnubbySocket::StartReadingRequest(
     const base::Closure& request_received_callback) {
   DCHECK(CalledOnValidThread());
 

[Sergey Ulanov, 2015/07/16 23:20:54]

DCHECK(!request_received_callback_);

[Wez, 2015/07/17 20:51:20]

Done.

   request_received_callback_ = request_received_callback;
   DoRead();
 }
 
 void GnubbySocket::OnDataWritten(int result) {
   DCHECK(CalledOnValidThread());
   DCHECK(write_buffer_);
 
   if (result < 0) {
     LOG(ERROR) << "Error in sending response.";
@@ skipping 15 matching lines @@
   int result = socket_->Write(
       write_buffer_.get(), write_buffer_->BytesRemaining(),
       base::Bind(&GnubbySocket::OnDataWritten, base::Unretained(this)));
   if (result != net::ERR_IO_PENDING)
     OnDataWritten(result);
 }
 
 void GnubbySocket::OnDataRead(int bytes_read) {
   DCHECK(CalledOnValidThread());
 
-  if (bytes_read < 0) {
-    LOG(ERROR) << "Error in reading request.";
+  if (bytes_read <= 0) {
+    if (bytes_read < 0)
+      LOG(ERROR) << "Error in reading request.";

[Sergey Ulanov, 2015/07/16 23:20:54]

log the error code?

[Wez, 2015/07/17 20:51:19]

Done.

     read_completed_ = true;
     request_received_callback_.Run();

[Sergey Ulanov, 2015/07/16 23:20:54]

This should be base::ResetAndReturn(request_received_callback_).Run();
Otherwise request_received_callback_ can be modified while being called, which
is not safe (particularly it breaks when there are curried parameters passed by
reference).
Same in line 123

[Wez, 2015/07/17 20:51:20]

Done. Thanks for catching that!

     return;
   }
   ResetTimer();
   request_data_.insert(request_data_.end(), read_buffer_->data(),
                        read_buffer_->data() + bytes_read);
   if (IsRequestComplete()) {
     read_completed_ = true;
     request_received_callback_.Run();
     return;
   }
@@ skipping 47 matching lines @@
 
   return response_len;
 }
 
 void GnubbySocket::ResetTimer() {
   if (timer_->IsRunning())
     timer_->Reset();
 }
 
 }  // namespace remoting