Mojo: Report bindings validation errors via MojoNotifyBadMessage

mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl

 {%- import "interface_macros.tmpl" as interface_macros %}
 {%- import "struct_macros.tmpl" as struct_macros %}
 
 {%- set class_name = interface.name %}
 {%- set proxy_name = interface.name ~ "Proxy" %}
 {%- set namespace_as_string = "%s"|format(namespace|replace(".","::")) %}
 
-{%- macro alloc_params(struct, params, message, serialization_context) %}
+{%- macro alloc_params(struct, params, message, serialization_context,
+                       description) %}
   ({{params}})->DecodePointers();
   ({{serialization_context}})->handles.Swap(({{message}})->mutable_handles());
   bool success = true;
 {%-   for param in struct.packed.packed_fields_in_ordinal_order %}
   {{param.field.kind|cpp_wrapper_type}} p_{{param.field.name}}{};
 {%-   endfor %}
   {{struct.name}}DataView input_data_view({{params}},
                                           {{serialization_context}});
   {{struct_macros.deserialize(struct, "input_data_view", "p_%s", "success")}}
-  if (!success)
+  mojo::internal::ValidationContext validation_context(

[yzshen1, 2016/06/15 22:20:09]

Please create this context inside the "if (!success)" block.

[Ken Rockot(use gerrit already), 2016/06/15 22:38:23]

Done

+      {{message}}->data(), {{message}}->data_num_bytes(),
+      {{message}}->handles()->size(), {{message}},
+      "{{description}} deserializer");
+  if (!success) {
+    ReportValidationError(
+        &validation_context,
+        mojo::internal::VALIDATION_ERROR_DESERIALIZATION_FAILED);
     return false;
+  }
 {%- endmacro %}
 
 {%- macro pass_params(parameters) %}
 {%-   for param in parameters %}
 {%-     if param.kind|is_move_only_kind -%}
 std::move(p_{{param.name}})
 {%-     else -%}
 p_{{param.name}}
 {%-     endif -%}
 {%-     if not loop.last %}, {% endif %}
@@ skipping 61 matching lines @@
 {%-       endfor -%}
   DISALLOW_COPY_AND_ASSIGN({{class_name}}_{{method.name}}_HandleSyncResponse);
 };
 bool {{class_name}}_{{method.name}}_HandleSyncResponse::Accept(
     mojo::Message* message) {
   internal::{{class_name}}_{{method.name}}_ResponseParams_Data* params =
       reinterpret_cast<internal::{{class_name}}_{{method.name}}_ResponseParams_Data*>(
           message->mutable_payload());
 
   {{alloc_params(method.response_param_struct, "params", "message",
-                 "&serialization_context_")}}
+                 "&serialization_context_",
+                 "{{class_name}}::{{method.name}} response")}}
 
 {%-       for param in method.response_parameters %}
 {%-         if param.kind|is_move_only_kind %}
   *out_{{param.name}}_ = std::move(p_{{param.name}});
 {%-         else %}
   *out_{{param.name}}_ = p_{{param.name}};
 {%-         endif %}
 {%-       endfor %}
   *result_ = true;
   return true;
@@ skipping 14 matching lines @@
   mojo::internal::SerializationContext serialization_context_;
   DISALLOW_COPY_AND_ASSIGN({{class_name}}_{{method.name}}_ForwardToCallback);
 };
 bool {{class_name}}_{{method.name}}_ForwardToCallback::Accept(
     mojo::Message* message) {
   internal::{{class_name}}_{{method.name}}_ResponseParams_Data* params =
       reinterpret_cast<internal::{{class_name}}_{{method.name}}_ResponseParams_Data*>(
           message->mutable_payload());
 
   {{alloc_params(method.response_param_struct, "params", "message",
-                 "&serialization_context_")}}
+                 "&serialization_context_",
+                 "{{class_name}}_{{method.name}} response")}}
   callback_.Run({{pass_params(method.response_parameters)}});
   return true;
 }
 {%-   endif %}
 {%- endfor %}
 
 {{proxy_name}}::{{proxy_name}}(mojo::MessageReceiverWithResponder* receiver)
     : ControlMessageProxy(receiver) {
 }
 
@@ skipping 140 matching lines @@
 {%- if interface.methods %}
   switch (message->header()->name) {
 {%-   for method in interface.methods %}
     case internal::k{{class_name}}_{{method.name}}_Name: {
 {%-     if method.response_parameters == None %}
       internal::{{class_name}}_{{method.name}}_Params_Data* params =
           reinterpret_cast<internal::{{class_name}}_{{method.name}}_Params_Data*>(
               message->mutable_payload());
 
       {{alloc_params(method.param_struct, "params", "message",
-          "&serialization_context_")|indent(4)}}
+          "&serialization_context_", "{{class_name}}::{{method.name}}")
+              |indent(4)}}
       // A null |sink_| means no implementation was bound.
       assert(sink_);
       TRACE_EVENT0("mojom", "{{class_name}}::{{method.name}}");
       sink_->{{method.name}}({{pass_params(method.parameters)}});
       return true;
 {%-     else %}
       break;
 {%-     endif %}
     }
 {%-   endfor %}
   }
 {%- endif %}
   return false;
 }
 
 bool {{class_name}}Stub::AcceptWithResponder(
     mojo::Message* message, mojo::MessageReceiverWithStatus* responder) {
   if (mojo::internal::ControlMessageHandler::IsControlMessage(message))
     return control_message_handler_.AcceptWithResponder(message, responder);
 {%- if interface.methods %}
   switch (message->header()->name) {
 {%-   for method in interface.methods %}
     case internal::k{{class_name}}_{{method.name}}_Name: {
 {%-     if method.response_parameters != None %}
       internal::{{class_name}}_{{method.name}}_Params_Data* params =
           reinterpret_cast<internal::{{class_name}}_{{method.name}}_Params_Data*>(
               message->mutable_payload());
 
       {{alloc_params(method.param_struct, "params", "message",
-          "&serialization_context_")|indent(4)}}
+          "&serialization_context_", "{{class_name}}::{{method.name}}")|
+              indent(4)}}
       {{class_name}}::{{method.name}}Callback::Runnable* runnable =
           new {{class_name}}_{{method.name}}_ProxyToResponder(
               message->request_id(),
               message->has_flag(mojo::internal::kMessageIsSync),
               responder,
               serialization_context_.router);
       {{class_name}}::{{method.name}}Callback callback(runnable);
       // A null |sink_| means no implementation was bound.
       assert(sink_);
       TRACE_EVENT0("mojom", "{{class_name}}::{{method.name}}");
@@ skipping 12 matching lines @@
 
 {#--- Request validator definitions #}
 
 {{class_name}}RequestValidator::{{class_name}}RequestValidator(
     mojo::MessageReceiver* sink) : MessageFilter(sink) {
 }
 
 bool {{class_name}}RequestValidator::Accept(mojo::Message* message) {
   assert(sink_);
 
+  mojo::internal::ValidationContext validation_context(
+    message->data(), message->data_num_bytes(), message->handles()->size(),
+    message, "{{class_name}} RequestValidator");
+
   if (mojo::internal::ControlMessageHandler::IsControlMessage(message)) {
-    if (!mojo::internal::ValidateControlRequest(message))
+    if (!mojo::internal::ValidateControlRequest(message, &validation_context))
       return false;
     return sink_->Accept(message);
   }
 
   switch (message->header()->name) {
 {%- for method in interface.methods %}
     case internal::k{{class_name}}_{{method.name}}_Name: {
 {%-   if method.response_parameters != None %}
-      if (!mojo::internal::ValidateMessageIsRequestExpectingResponse(message))
+      if (!mojo::internal::ValidateMessageIsRequestExpectingResponse(
+              message, &validation_context)) {
         return false;
+      }
 {%-   else %}
-      if (!mojo::internal::ValidateMessageIsRequestWithoutResponse(message))
+      if (!mojo::internal::ValidateMessageIsRequestWithoutResponse(
+              message, &validation_context)) {
         return false;
+      }
 {%-   endif %}
       if (!mojo::internal::ValidateMessagePayload<
-               internal::{{class_name}}_{{method.name}}_Params_Data>(message)) {
+               internal::{{class_name}}_{{method.name}}_Params_Data>(
+                  message, &validation_context)) {
         return false;
       }
       return sink_->Accept(message);
     }
 {%- endfor %}
     default:
       break;
   }
 
   // Unrecognized message.
   ReportValidationError(
+      &validation_context,
       mojo::internal::VALIDATION_ERROR_MESSAGE_HEADER_UNKNOWN_METHOD);
   return false;
 }
 
 {#--- Response validator definitions #}
 {% if interface|has_callbacks %}
 {{class_name}}ResponseValidator::{{class_name}}ResponseValidator(
     mojo::MessageReceiver* sink) : MessageFilter(sink) {
 }
 
 bool {{class_name}}ResponseValidator::Accept(mojo::Message* message) {
   assert(sink_);
 
+  mojo::internal::ValidationContext validation_context(
+    message->data(), message->data_num_bytes(), message->handles()->size(),
+    message, "{{class_name}} ResponseValidator");
+
   if (mojo::internal::ControlMessageHandler::IsControlMessage(message)) {
-    if (!mojo::internal::ValidateControlResponse(message))
+    if (!mojo::internal::ValidateControlResponse(message, &validation_context))
       return false;
     return sink_->Accept(message);
   }
 
-  if (!mojo::internal::ValidateMessageIsResponse(message))
+  if (!mojo::internal::ValidateMessageIsResponse(message, &validation_context))
     return false;
   switch (message->header()->name) {
 {%- for method in interface.methods if method.response_parameters != None %}
     case internal::k{{class_name}}_{{method.name}}_Name: {
       if (!mojo::internal::ValidateMessagePayload<
-               internal::{{class_name}}_{{method.name}}_ResponseParams_Data>(message)) {
+               internal::{{class_name}}_{{method.name}}_ResponseParams_Data>(
+                    message, &validation_context)) {
         return false;
       }
       return sink_->Accept(message);
     }
 {%- endfor %}
     default:
       break;
   }
 
   // Unrecognized message.
   ReportValidationError(
+      &validation_context,
       mojo::internal::VALIDATION_ERROR_MESSAGE_HEADER_UNKNOWN_METHOD);
   return false;
 }
 {%- endif -%}