Validate incoming JS Message Headers

mojo/public/js/bindings/router.js

 // 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.
 
 define("mojo/public/js/bindings/router", [
+  "console",

[abarth-chromium, 2014/07/22 03:51:00]

Production code shouldn't use |console|

[hansmuller, 2014/07/22 15:49:06]

OK, I'll remove that.

   "mojo/public/js/bindings/codec",
   "mojo/public/js/bindings/connector",
-], function(codec, connector) {
+  "mojo/public/js/bindings/validator",
+], function(console, codec, connector, validator) {
 
   function Router(handle) {
     this.connector_ = new connector.Connector(handle);
     this.incomingReceiver_ = null;
     this.nextRequestID_ = 0;
     this.responders_ = {};
 
     this.connector_.setIncomingReceiver({
         accept: this.handleIncomingMessage_.bind(this),
     });
@@ skipping 34 matching lines @@
 
   Router.prototype.setIncomingReceiver = function(receiver) {
     this.incomingReceiver_ = receiver;
   };
 
   Router.prototype.encounteredError = function() {
     return this.connector_.encounteredError();
   };
 
   Router.prototype.handleIncomingMessage_ = function(message) {
-    var flags = message.getFlags();
+    var err = validator.validateMessageHeader(message);
+    if (err != validator.ValidationError.NONE)
+      this.close();
+
+    var flags = message.getHeaderFlags();
     if (flags & codec.kMessageExpectsResponse) {
       if (this.incomingReceiver_) {
         this.incomingReceiver_.acceptWithResponder(message, this);
       } else {
         // If we receive a request expecting a response when the client is not
         // listening, then we have no choice but to tear down the pipe.
         this.close();
       }
     } else if (flags & codec.kMessageIsResponse) {
       var reader = new codec.MessageReader(message);
@@ skipping 10 matching lines @@
   Router.prototype.handleConnectionError_ = function(result) {
     for (var each in this.responders_)
       this.responders_[each].reject(result);
     this.close();
   };
 
   var exports = {};
   exports.Router = Router;
   return exports;
 });