Use MIDIMessageQueue/IsValidWebMIDIData for MIDI byte stream validation

content/browser/renderer_host/media/midi_host.cc

 // Copyright (c) 2013 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 "content/browser/renderer_host/media/midi_host.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/process/process.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/media/media_internals.h"
 #include "content/common/media/midi_messages.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/media_observer.h"
 #include "content/public/browser/user_metrics.h"
 #include "media/midi/midi_manager.h"
+#include "media/midi/midi_message_util.h"
 
 using media::MIDIManager;
 using media::MIDIPortInfoList;
 
 // The total number of bytes which we're allowed to send to the OS
 // before knowing that they have been successfully sent.
 static const size_t kMaxInFlightBytes = 10 * 1024 * 1024;  // 10 MB.
 
 // We keep track of the number of bytes successfully sent to
 // the hardware.  Every once in a while we report back to the renderer
 // the number of bytes sent since the last report. This threshold determines
 // how many bytes will be sent before reporting back to the renderer.
 static const size_t kAcknowledgementThresholdBytes = 1024 * 1024;  // 1 MB.
 
 static const uint8 kSysExMessage = 0xf0;
 
 namespace content {
 
 MIDIHost::MIDIHost(int renderer_process_id, media::MIDIManager* midi_manager)
     : renderer_process_id_(renderer_process_id),
+      sysex_allowed_(false),

[Takashi Toyoshima, 2013/11/20 10:04:58]

I like this new approach.

[yukawa, 2013/11/20 11:06:08]

Thanks. And I renamed |sysex_allowed_| with |has_sys_ex_permission_| so that we
can share similar terminology between MIDIDispatcherHost and MIDIHost.

       midi_manager_(midi_manager),
       sent_bytes_in_flight_(0),
       bytes_sent_since_last_acknowledgement_(0) {
 }
 
 MIDIHost::~MIDIHost() {
   if (midi_manager_)
     midi_manager_->EndSession(this);
 }
 
@@ skipping 19 matching lines @@
   MIDIPortInfoList input_ports;
   MIDIPortInfoList output_ports;
 
   // Initialize devices and register to receive MIDI data.
   bool success = false;
   if (midi_manager_) {
     success = midi_manager_->StartSession(this);
     if (success) {
       input_ports = midi_manager_->input_ports();
       output_ports = midi_manager_->output_ports();
+      received_messages_queues_.clear();
+      received_messages_queues_.resize(input_ports.size());
+      // ChildSecurityPolicy is set just before OnStartSession. So we can safely
+      // cache the policy.
+      sysex_allowed_ = ChildProcessSecurityPolicyImpl::GetInstance()->

[Takashi Toyoshima, 2013/11/20 10:04:58]

FYI, midi_dispatcher_host.cc is the exact place to store the permission.

[yukawa, 2013/11/20 11:06:08]

Thank you for the info!  Slightly revised the comment.

+          CanSendMIDISysExMessage(renderer_process_id_);
     }
   }
 
   Send(new MIDIMsg_SessionStarted(
        client_id,
        success,
        input_ports,
        output_ports));
 }
 
 void MIDIHost::OnSendData(uint32 port,
                           const std::vector<uint8>& data,
                           double timestamp) {
   if (!midi_manager_)
     return;
 
   if (data.empty())
     return;
 
-  base::AutoLock auto_lock(in_flight_lock_);
+  // Blink running in a renderer checks permission to raise a SecurityError
+  // in JavaScript. The actual permission check for security purposes
+  // happens here in the browser process.
+  if (!sysex_allowed_ &&
+      (std::find(data.begin(), data.end(), kSysExMessage) != data.end())) {
+    RecordAction(UserMetricsAction("BadMessageTerminate_MIDI"));
+    BadMessageReceived();
+    return;
+  }
 
-  // Sanity check that we won't send too much.
-  if (sent_bytes_in_flight_ > kMaxInFlightBytes ||
-      data.size() > kMaxInFlightBytes ||
-      data.size() + sent_bytes_in_flight_ > kMaxInFlightBytes)
+  if (!media::IsValidMIDIMessagesForWebMIDI(data))
     return;
 
-  if (data[0] >= kSysExMessage) {
-    // Blink running in a renderer checks permission to raise a SecurityError in
-    // JavaScript. The actual permission check for security perposes happens
-    // here in the browser process.
-    if (!ChildProcessSecurityPolicyImpl::GetInstance()->CanSendMIDISysExMessage(
-        renderer_process_id_)) {
-      RecordAction(UserMetricsAction("BadMessageTerminate_MIDI"));
-      BadMessageReceived();
-      return;
-    }
-  }
-
-  midi_manager_->DispatchSendMIDIData(
-      this,
-      port,
-      data,
-      timestamp);
-
+  base::AutoLock auto_lock(in_flight_lock_);
+  // Sanity check that we won't send too much data.
+  if (data.size() + sent_bytes_in_flight_ > kMaxInFlightBytes)

[Takashi Toyoshima, 2013/11/20 10:04:58]

Can you add TODO here?
We should handle internal buffer overflow later, and may want to throw some
error in JavaScript. We'll discuss it in W3C.

[yukawa, 2013/11/20 11:06:08]

Done.

+    return;
+  midi_manager_->DispatchSendMIDIData(this, port, data, timestamp);
   sent_bytes_in_flight_ += data.size();
 }
 
 void MIDIHost::ReceiveMIDIData(
     uint32 port,
     const uint8* data,
     size_t length,
     double timestamp) {
   TRACE_EVENT0("midi", "MIDIHost::ReceiveMIDIData");
 
-  // Check a process security policy to receive a system exclusive message.
-  if (length > 0 && data[0] >= kSysExMessage) {
-    if (!ChildProcessSecurityPolicyImpl::GetInstance()->CanSendMIDISysExMessage(
-        renderer_process_id_)) {
-      // MIDI devices may send a system exclusive messages even if the renderer
-      // doesn't have a permission to receive it. Don't kill the renderer as
-      // OnSendData() does.
-      return;
-    }
+  if (received_messages_queues_.size() <= port)
+    return;
+
+  // Lazy initialization
+  if (received_messages_queues_[port] == NULL)
+    received_messages_queues_[port] = new media::MIDIMessageQueue(true);
+
+  received_messages_queues_[port]->Add(data, length);
+  std::vector<uint8> message;
+  while (true) {
+    received_messages_queues_[port]->Get(&message);
+    if (message.empty())
+      break;
+
+    // MIDI devices may send a system exclusive messages even if the renderer
+    // doesn't have a permission to receive it. Don't kill the renderer as
+    // OnSendData() does.
+    if (message[0] == kSysExMessage && !sysex_allowed_)
+      continue;
+
+    // Send to the renderer.
+    Send(new MIDIMsg_DataReceived(port, message, timestamp));
   }
-
-  // Send to the renderer.
-  std::vector<uint8> v(data, data + length);
-  Send(new MIDIMsg_DataReceived(port, v, timestamp));
 }
 
 void MIDIHost::AccumulateMIDIBytesSent(size_t n) {
   {
     base::AutoLock auto_lock(in_flight_lock_);
     if (n <= sent_bytes_in_flight_)
       sent_bytes_in_flight_ -= n;
   }
 
   if (bytes_sent_since_last_acknowledgement_ + n >=
       bytes_sent_since_last_acknowledgement_)
     bytes_sent_since_last_acknowledgement_ += n;
 
   if (bytes_sent_since_last_acknowledgement_ >=
       kAcknowledgementThresholdBytes) {
     Send(new MIDIMsg_AcknowledgeSentData(
         bytes_sent_since_last_acknowledgement_));
     bytes_sent_since_last_acknowledgement_ = 0;
   }
 }
 
 }  // namespace content