Correctly update 'regcount' and 'active' when a device is registered

Signed-off-by: Jean Snyman <[email protected]>

keylime/models/registrar/registrar_agent.py

@@ -76,9 +76,16 @@ def _prepare_iak_idevid(self):
     def _prepare_status_flags(self):
         self.virtual = self.ekcert == "virtual"
 
-        if ("ek_tpm", "ekcert", "aik_tpm", "iak_tpm", "idevid_tpm") in self.changes:
+        if any(field in ("ek_tpm", "ekcert", "aik_tpm", "iak_tpm", "idevid_tpm") for field in self.changes):
             self.active = False
 
+    def _prepare_regcount(self):
+        if self.regcount == None:
+            self.regcount = 0
+
+        if any(field in ("ek_tpm", "ekcert", "aik_tpm", "iak_tpm", "idevid_tpm") for field in self.changes):
+            self.regcount += 1
+
     def update(self, data):
         # Bind key-value pairs ('data') to those fields which are meant to be externally changeable
         self.cast_changes(
@@ -91,6 +98,8 @@ def update(self, data):
         self._prepare_iak_idevid()
         # Determine and set 'virtual' and 'active' flags
         self._prepare_status_flags()
+        # Increment number of registrations
+        self._prepare_regcount()
 
         # Validate values
         self.validate_required(["ek_tpm", "aik_tpm"])

keylime/web/registrar/agents_controller.py

@@ -54,7 +54,7 @@ def delete(self, agent_id, **params):
         agent.delete()
         self.respond(200, "Success")
 
-    # POST /v2[.:minor]/agents/:agent_id/activate/
+    # POST /v2[.:minor]/agents/:agent_id/[activate]
     def activate(self, agent_id, auth_tag, **params):
         agent = RegistrarAgent.get(agent_id)