Do minimal processing of gnubby data. Add request timeouts and send error

remoting/webapp/gnubby_auth_handler.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.
 
 /**
  * @fileoverview
  * Class that routes gnubby-auth extension messages to and from the gnubbyd
  * extension.
  */
 
@@ skipping 13 matching lines @@
 
 /**
  * Processes gnubby-auth messages.
  * @param {string} data The gnubby-auth message data.
  */
 remoting.GnubbyAuthHandler.prototype.onMessage = function(data) {
   var message = getJsonObjectFromString(data);
   var messageType = getStringAttr(message, 'type');
   if (messageType == 'data') {
     this.sendMessageToGnubbyd_(
-        getJsonObjectFromString(getStringAttr(message, 'jsonMessage')),
+        {'type': 'auth-agent@openssh.com',

[Sergey Ulanov, 2014/03/22 00:45:57]

nit: space before 'type'

[psj, 2014/03/22 01:30:19]

Hmm, I mis-remembered the style guide here - the brace always goes on the
previous line for a multiline initialization.

+          'data': getArrayAttr(message, 'data')},
         this.callback_.bind(this, getNumberAttr(message, 'connectionId')));
   } else {
     console.error('Invalid gnubby-auth message: ' + messageType);
   }
 };
 
 /**
  * Callback invoked with data to be returned to the host.
  * @param {number} connectionId The connection id.
- * @param {Object} data The JSON object to send to the host.
+ * @param {Object} response The JSON response with the data to send to the host.
  * @private
  */
 remoting.GnubbyAuthHandler.prototype.callback_ =
-    function(connectionId, data) {
-  var json_data = JSON.stringify(data);
-  this.clientSession_.sendGnubbyAuthMessage({'type': 'data',
-    'connectionId': connectionId,
-    'jsonMessage': json_data});
+    function(connectionId, response) {
+  try {
+    this.clientSession_.sendGnubbyAuthMessage({
+      'type': 'data',
+      'connectionId': connectionId,
+      'data': getArrayAttr(response, 'data')});

[Sergey Ulanov, 2014/03/22 00:45:57]

nit: space before }

[psj, 2014/03/22 01:30:19]

Similar to the opening brace, the multiline initializer closing brace goes on
the following line

+  } catch (err) {
+    console.error('gnubby callback failed: ', /** @type {*} */ (err));
+    this.clientSession_.sendGnubbyAuthMessage({'type': 'error',
+      'connectionId': connectionId});

[Sergey Ulanov, 2014/03/22 00:45:57]

nit: move type field to match the formatting in line 52. Also add space before }

[psj, 2014/03/22 01:30:19]

Done.

+    return;
+  }
 };
 
 /**
  * Send data to the gnubbyd extension.
  * @param {Object} jsonObject The JSON object to send to the gnubbyd extension.
  * @param {function(Object)} callback The callback to invoke with reply data.
  * @private
  */
 remoting.GnubbyAuthHandler.prototype.sendMessageToGnubbyd_ =
     function(jsonObject, callback) {
@@ skipping 16 matching lines @@
  * @private
  */
 function onGnubbydDevReply_(jsonObject, callback, reply) {
   var kGnubbydStableExtensionId = 'beknehfpfkghjoafdifaflglpjkojoco';
 
   if (reply) {
     callback(reply);
   } else {
     chrome.runtime.sendMessage(kGnubbydStableExtensionId, jsonObject, callback);
   }
-};
+}