Merge 130346 - Require IPC hello for a verified channel

ipc/ipc_channel_win.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 "ipc/ipc_channel_win.h"
 
 #include <windows.h>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 124 matching lines @@
   //
   // This allows us to potentially process some outgoing messages and
   // interleave other work on this thread when we're getting hammered with
   // input messages. Potentially, this could be tuned to be more efficient
   // with some testing.
   input_state_.is_pending = true;
   return READ_PENDING;
 }
 
 bool Channel::ChannelImpl::WillDispatchInputMessage(Message* msg) {
-  // We don't need to do anything here.
+  // Make sure we get a hello when client validation is required.
+  if (validate_client_)
+    return IsHelloMessage(*msg);
   return true;
 }
 
 void Channel::ChannelImpl::HandleHelloMessage(const Message& msg) {
   // The hello message contains one parameter containing the PID.
   MessageIterator it = MessageIterator(msg);
   int32 claimed_pid =  it.NextInt();
   if (validate_client_ && (it.NextInt() != client_secret_)) {
     NOTREACHED();
     // Something went wrong. Abort connection.
     Close();
     listener()->OnChannelError();
     return;
   }
+  // validation completed.
+  validate_client_ = false;
   listener()->OnChannelConnected(claimed_pid);
 }
 
 bool Channel::ChannelImpl::DidEmptyInputBuffers() {
   // We don't need to do anything here.
   return true;
 }
 
 // static
 const string16 Channel::ChannelImpl::PipeName(
@@ skipping 316 matching lines @@
   int secret;
   do {  // Guarantee we get a non-zero value.
     secret = base::RandInt(0, std::numeric_limits<int>::max());
   } while (secret == 0);
 
   id.append(GenerateUniqueRandomChannelID());
   return id.append(base::StringPrintf("\\%d", secret));
 }
 
 }  // namespace IPC