Message validation in message dispatchers.

remoting/protocol/host_message_dispatcher.cc

 // Copyright (c) 2011 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 "base/memory/ref_counted.h"
 #include "net/base/io_buffer.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/proto/internal.pb.h"
 #include "remoting/protocol/connection_to_client.h"
@@ skipping 34 matching lines @@
   event_message_reader_->Init(
       connection->session()->event_channel(),
       NewCallback(this, &HostMessageDispatcher::OnEventMessageReceived));
   control_message_reader_->Init(
       connection->session()->control_channel(),
       NewCallback(this, &HostMessageDispatcher::OnControlMessageReceived));
 }
 
 void HostMessageDispatcher::OnControlMessageReceived(
     ControlMessage* message, Task* done_task) {
-  // TODO(sergeyu): Add message validation.
   if (message->has_begin_session_request()) {
-    host_stub_->BeginSessionRequest(
-        &message->begin_session_request().credentials(), done_task);
-    return;
+    const BeginSessionRequest& request = message->begin_session_request();
+    if (request.has_credentials() && request.credentials().has_type()) {
+      host_stub_->BeginSessionRequest(&request.credentials(), done_task);
+      return;
+    }
+  } else if (message->has_suggest_resolution()) {
+    const SuggestResolutionRequest& resolution = message->suggest_resolution();
+    if (resolution.has_width() && resolution.width() > 0 &&
+        resolution.has_height() && resolution.height() > 0) {
+      host_stub_->SuggestResolution(&resolution, done_task);

[Wez, 2011/07/20 21:45:14]

We don't ever send or handle SuggestResolution messages, so perhaps we should
strip it out for now; we can re-introduce a mechanism once we have something
designed.

[Sergey Ulanov, 2011/07/20 22:04:20]

Done.

+      return;
+    }
   }
-  if (message->has_suggest_resolution()) {
-    host_stub_->SuggestResolution(&message->suggest_resolution(), done_task);
-    return;
-  }
+
   LOG(WARNING) << "Invalid control message received.";
   done_task->Run();
   delete done_task;
 }
 
 void HostMessageDispatcher::OnEventMessageReceived(
     EventMessage* message, Task* done_task) {
-  // TODO(sergeyu): Add message validation.
   connection_->UpdateSequenceNumber(message->sequence_number());
+
   if (message->has_key_event()) {
-    input_stub_->InjectKeyEvent(&message->key_event(), done_task);
-    return;
-  }
-  if (message->has_mouse_event()) {
+    const KeyEvent& event = message->key_event();
+    if (event.has_keycode() && event.has_pressed()) {
+      input_stub_->InjectKeyEvent(&event, done_task);
+      return;
+    }
+  } else if (message->has_mouse_event()) {
     input_stub_->InjectMouseEvent(&message->mouse_event(), done_task);
     return;
   }
+
   LOG(WARNING) << "Invalid event message received.";
   done_task->Run();
   delete done_task;
 }
 
 }  // namespace protocol
 }  // namespace remoting