entd: move opencryptoki initialization out of entd

base_policy/policy-utils.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.
 
 /**
  * Check the validity of the policy extension manifest.
  *
  * This function is invoked by entd before the policy is loaded in order to
  * check the validity of the extension manifest.  If this function returns
  * false, entd exits and does not restart until the next user logs in.
@@ skipping 1223 matching lines @@
 /**
  * Return information about the current policy.
  *
  * This policy callback returns the policy description, according to the
  * extension manifest,and the current username.
  *
  * @return {Object} An object with 'description' and 'username' properties.
  */
 Policy.Callbacks.prototype['cb:info'] =
 function cb_info() {
-  return Policy.CallbackSuccess({
+  var callback_data = {
    description: this.policy.manifest.description,
    version: this.policy.manifest.version,
    username: entd.username,
    browserPolicyChanged: this.policy.browserPolicyChanged,
    isLibcrosLoaded: entd.isLibcrosLoaded,
    tpm: {
      isReady: (entd.isLibcrosLoaded ? entd.tpm.isReady : true),
      isEnabled: (entd.isLibcrosLoaded ? entd.tpm.isEnabled : true),
      isOwned: (entd.isLibcrosLoaded ? entd.tpm.isOwned : true),
      isBeingOwned: (entd.isLibcrosLoaded ? entd.tpm.isBeingOwned : false),
      statusString: (entd.isLibcrosLoaded ? entd.tpm.statusString :
-                    "libcros not loaded"),
+                    "libcros not loaded")
    },
    pkcs11: {
      state: this.policy.pkcs11.state,
      log: this.policy.getLog(this.policy.pkcs11)
    }
-  });
+  }
+  if ('isTokenReady' in entd.tpm) {
+    callback_data.pkcs11.isTokenReady =
+      (entd.isLibcrosLoaded ? entd.tpm.isTokenReady : false);
+  }
+
+  return Policy.CallbackSuccess(callback_data);
 };
 
 /**
  * Set the user PIN on a given token.
  *
  * This is a no-op if the oldPin and newPin are the same value.
  *
  * @param {Object} arg An object with the following properties:
  *  - 'slotId' An integer representing the slot that contains the target token.
  *  - 'oldPin' An optional string representing the current PIN.  Defaults to
  *      Token.DEFAULT_USER_PIN or Policy.PKCS11_USER_PIN, depending on the
  *      state of the token.
  *  - 'oldPin' An optional string representing the new PIN.  Defaults to
  *      Policy.PKCS11_USER_PIN.
  *
  * Setting the user pin is an asynchronous operation.  While the set is in
  * progress the token state will be 'start:user-pin'.  If the operation
  * completes successfully, the token state should become 'stop:ready', although
  * if the operation completes successfully but the token is not ready due to
  * some unexpected condition, it will become 'stop:user-pin'.  On error it will
  * become 'stop:error'.
+ * TODO(crosbug.com/14277): Remove SetPIN functions.
  */
 Policy.Callbacks.prototype['cb:setUserPin'] =
 function cb_setUserPin(arg) {
   var pkcs11 = this.policy.pkcs11.api;
   if (!pkcs11)
     return Policy.CallbackError('Pkcs11 not initialized');
 
   if (!('slotId' in arg))
     return Policy.CallbackError('Missing required parameter: slotId');
 
@@ skipping 112 matching lines @@
 /**
  * Initialize a PKCS11 token.
  *
  * @param {Object} arg An object with the following properties:
  *  - 'slotId' An integer representing the slot that contains the target token.
  *
  * Initializing a PKCS11 token is an asynchronous operation.  While the
  * initialization is in progress the token state will be 'start:init'.  If the
  * operation completes successfully the token state will become 'stop:init'.
  * On error it will become 'stop:error'.
+ * TODO(crosbug.com/14277): Remove initToken function.
  */
 Policy.Callbacks.prototype['cb:initToken'] =
 function cb_initToken(arg) {
   var pkcs11 = this.policy.pkcs11.api;
   if (!pkcs11)
     return Policy.CallbackError('Pkcs11 not initialized');
 
   if (!('slotId' in arg))
     return Policy.CallbackError('Mising parameter: slotId');
 
@@ skipping 235 matching lines @@
 Policy.CallbackSuccess =
 function CallbackSuccess(data) {
   return { status: 'success', data: data };
 };
 
 /**
  * Return an object indicating that a callback encountered an error.
  */
 Policy.CallbackError =
 function CallbackError(data) {
+  // Log the error to syslogs for further diagnosis.
+  entd.syslog.error(data);
   return { status: 'error', data: data };
 };
 
 /**
  * Namespace for utility functions...
  */
 
 var util = new Object();
 
 /**
@@ skipping 292 matching lines @@
   var result = [];
   for (i = 0; i < str.length; i++) {
     var d = str.charCodeAt(i);
     var h = d.toString(16);
     if (h.length == 1)
       result.push('0');
     result.push(h);
   }
   return result.join('');
 }