policy-utils.js: reset cert.path in onInstall after a restart

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 84 matching lines @@
     throw new Error('Unable to determine current username');
 
   var ary = entd.username.match(/([^@]+)@(.*)/);
   this.setVariable('userEmail', entd.username);
   this.setVariable('userName', ary[1]);
   this.setVariable('userDomain', ary[2]);
 
   this.callbacks = new Policy.Callbacks(this);
 }
 
-// Store keys and certificates in the TPM
-Policy.USE_TPM = true;
-
 // Well known user PIN for the TPM
 Policy.PKCS11_USER_PIN = '111111';
 
 /**
  * Set a variable for this policy.
  *
  * Variables can be referenced in various parts of the policy and
  * certificate configuration.  This function is used to assign a value to
  * a variable.
  *
@@ skipping 117 matching lines @@
 
   if ('variables' in params) {
     for (var key in params.variables)
       this.setVariable(key, params.variables[key]);
   }
 
   this.userVariables = params.userVariables || null;
 
   this.status = this.isInstalled() ? 'Installed' : 'Not Installed';
 
-  if (this.isInstalled() && typeof this.onInstall == "function") {
-    try {
-      this.onInstall(/* firstInstall: */ false);
-    } catch (ex) {
-      this.error('Exception re-running post-install callback: ' + ex);
-    }
-  }
+  if (this.isInstalled())
+    this.onInstall_(/* firstInstall: */ false);
 };
 
 /**
  * Get a variable for this certificate definition.
  *
  * Variables can be referenced in various parts of the policy and
  * certificate configuration.  This function is used to retrieve the value of
  * a variable.
  *
  * @param {string} name The name of the variable.
@@ skipping 64 matching lines @@
   this.status = type + ': ' + str;
   return this.status;
 };
 
 Policy.Certificate.prototype.findSlotByLabel =
 function findSlotByLabel(label) {
   return entd.pkcs11.slots[label] || null;
 }
 
 /**
+ * Finalize certificate installation and invoke any user specific onInstall
+ * function.
+ *
+ * @param {boolean} firstInstall True if this is the first time the certificate
+ *   has been installed.  False if the certificate was already there when we
+ *   started.
+ */
+Policy.Certificate.prototype.onInstall_ =
+function onInstall(firstInstall) {
+  this.path = 'SETTINGS:key_id=' + this.key_identifier +
+    ',cert_id=' + this.key_identifier +
+    ',pin=' + Policy.PKCS11_USER_PIN;
+
+  this.info('Certificate installed to: ' + this.path);
+
+  if (typeof this.onInstall == 'function') {
+    try {
+      this.onInstall(firstOnstall);
+    } catch (ex) {
+      this.error('Exception running post-install callback: ' + ex);
+    }
+  }
+};
+
+/**
  * Determine if this certificate definition has been successfully installed.
  *
  * @return {boolean} A boolean indicating whether or not this certificate
  *  definition has been successfully installed in the PKCS#11 device.
  */
 Policy.Certificate.prototype.isInstalled =
 function isInstalled() {
   var slot = this.findSlotByLabel(this.label);
   return (slot && ('certificate' in slot));
 };
@@ skipping 145 matching lines @@
 
   // ...and store it in the TPM.
   var slot = this.findSlotByLabel(this.label);
   if (!slot) {
     this.error("Can't add certificate: missing slot object");
     return;
   }
 
   slot.addCertificate(cert);
 
-  if (Policy.USE_TPM) {
-    this.path = "SETTINGS:" 
-      + "key_id=" + this.key_identifier 
-      + ",cert_id=" + this.key_identifier
-      + ",pin=" + Policy.PKCS11_USER_PIN;
-  } else {
-    this.path = "/home/chronos/user/Downloads/" + this.label + ".pem";
-    // Note: This requires entd to be run with --allow-write-to-file
-    writeToFile(cert.toString(), this.path);
-  }
-  this.info('Certificate installed to: ' + this.path);
-
-  if (typeof request.certificate.onInstall == "function") {
-    try {
-      request.certificate.onInstall(/* firstInstall: */ true);
-    } catch (ex) {
-      this.error('Exception running post-install callback: ' + ex);
-    }
-  }
+  this.onInstall_(/* firstInstall: */ true);
 };
 
 
 /**
  * Policy.Callbacks constructor.
  *
  * Policy callbacks contain the functions that can be invoked through the
  * callback server.  Each function can take a single parameter which can
  * be any primitive JavaScript value (Object, Array, number, or string),
  * or any combination of primitive JavaScript values.
@@ skipping 405 matching lines @@
   return str;
 }
 
 /**
  * Detect a raw string.
  */
 util.isRawString =
 function isRawString(str) {
   return str instanceof String && str.isRaw_ == true;
 }