entd: Restart on token init failure

reference_extension/client.js

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * Namespace object for the client side code.
  */
 var client = new Object();
 
 /**
@@ skipping 31 matching lines @@
 function getLastLogLine(log) {
   var ary = log.split(/\r?\n/);
   for (var i = 1; i < ary.length; ++i) {
     if (ary[ary.length - i])
       return ary[ary.length - i];
   }
 
   return '';
 }
 
+client.reload =
+function reload() {
+  document.location.href = document.location.pathname + "?reload";
+}
+
 /**
  * Get a url to a resource inside the extension.
  *
  * @param {string} url The path portion of the URL you are interested in.
  */
 client.getURL =
 function getURL(url) {
   if (typeof 'chrome' != undefined && chrome.extension)
     return chrome.extension.getURL(url);
 
@@ skipping 94 matching lines @@
         }
       }
 
     } else {
       $("#entd-status").
           text('Waiting...').
           attr('status', 'red');
 
       if (!daemonError) {
         daemonError = true;
-        client.showError(
-            'The Enterprise Daemon has not started.  You must log out or ' +
-            'reboot after installing the policy.  If the problem persists, ' +
-            'try clearing your TPM in the BIOS.', 'Error',
-            { details: JSON.stringify(retval)} );
+        var msg;
+
+        if (document.location.search.match(/reload/)) {
+          msg = 'Please wait while the Enterprise Daemon restarts.';
+        } else {
+          msg = 'The Enterprise Daemon has not started.  You must log out or ' +
+              'reboot after installing the policy.  If the problem persists, ' +
+              'try clearing your TPM in the BIOS.';
+        }
+
+        client.showError(msg, 'Error', { details: JSON.stringify(retval) } );
       }
     }
 
     if (ready) {
       if (retval.data.browserPolicyChanged) {
         $('#entd-message').
             text('Your browser settings have been changed, you ' +
                  'must log out before they take effect.').
             attr('status', 'red');
       } else {
@@ skipping 181 matching lines @@
       client.invokePolicyCallback('setUserPin', { slotId: token.slotId },
                                   onerror);
     } else if (token.state == 'stop:ready') {
       // User pin is set, all done.
       $('.status.token-user').attr('status', 'green');
       client.showSuccess('The PKCS#11 token has been successfully ' +
                          'initialized. You may now install certificates.',
                          'Token Initialized');
       return;
     } else if (token.state == 'stop:error') {
-      client.showTokenDetails(token);
+      // If the token failed to initialize, it might be left in a broken
+      // state.  This can happen if the hardware times out.  We ask entd
+      // to restart, because it should be able to detect the broken token
+      // and delete it.
+      client.invokePolicyCallback("restart");
+      client.showTokenDetails(token, { okCallback: client.reload() });
       return;
     }
 
     setTimeout(function () {
         client.invokePolicyCallback('listTokens', null,
                                     oncomplete_list);
       }, 1000);
   };
 
   if (!force && token.state == 'stop:ready') {
@@ skipping 299 matching lines @@
     attr('status', 'error');
 }
 
 /**
  * Show the details for a given token in a modal dialog box.
  *
  * Shows the token details in a modal Error, Success, or Alert box, depending
  * on the state of the token.
  */
 client.showTokenDetails =
-function showTokenDetails(token) {
-  var options = { details: '' };
+function showTokenDetails(token, options) {
+  var options = options || {};
+
+  options.details = '';
   if (token.log)
     options.details += token.log + '\n';
 
   options.details += 'current state: ' + token.state +
     '\nslotId: ' + token.slotId + '\nflags: ';
 
   for (var key in token.flags) {
     if (token.flags[key])
       options.details += '\n* ' + key;
   }
 
   if (token.state == 'stop:error') {
     var msg = client.getLastLogLine(token.log);
     if (!msg)
-      msg = 'There was an error initializing your token';
+      msg = 'There was an error initializing your token.';
+
     client.showError(msg, 'Error', options);
     return;
   }
 
   if (token.state == 'stop:ready') {
     client.showSuccess('Token is initialized', 'Token Information', options);
     return;
   }
 
   client.showAlert('Token is not initialized: ' + token.state,
@@ skipping 363 matching lines @@
              JSON.stringify(retval));
       }
     } else {
       param = new client.CallbackError(
           name, arg,
           { msg: 'Error invoking callback: ' + name + ': http status: ' +
             this.status } );
     }
 
     param.xhrStatus = xhr.status;
-    oncomplete(param);
+    if (typeof oncomplete == "function")
+      oncomplete(param);
   };
 
   xhr.open('POST', 'http://127.0.0.1:' + client.policyCallbackPort +
            '/dispatch');
   xhr.setRequestHeader('X-Entd-Request',
                        client.manifest.requestHeaderValue || 'magic');
   xhr.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
   xhr.send(JSON.stringify({'function': name, 'argument': arg}));
 };
 
@@ skipping 36 matching lines @@
  * @param {string} name The name of the callback that returned this data.
  * @param {Object} arg The argument object originally passed to the callback.
  * @param {Object} data The data returned by the callback.
  */
 client.CallbackError =
 function CallbackError(name, arg, data) {
   this.init_(name, arg, data);
 };
 
 client.CallbackError.prototype.init_ = client.CallbackSuccess.prototype.init_;