Merge pull request #52 from factomatic/fix-did-updater

Fix DID updater

.travis.yml

@@ -9,6 +9,6 @@ install:
 - pip install pipenv
 - pipenv install -d --pre
 script:
-- pytest --cov=./client/ --cov=./resolver
+- pytest --cov=./factom_did/client/ --cov=./factom_did/resolver
 after_success:
 - coveralls

factom_did/client/updater.py

@@ -186,6 +186,13 @@ def export_entry_data(self):
         )
         new_management_keys, new_did_keys, new_services = self._get_new()
 
+        if not self.exists_management_key_with_priority_zero(
+            self.orig_management_keys, new_management_keys, revoked_management_keys
+        ):
+            raise ValueError(
+                "DIDUpdate entry would leave no management keys of priority zero"
+            )
+
         # Entries in the "revoke" section of a DIDUpdate entry
         revoke_dict = defaultdict(list)
 
@@ -311,6 +318,32 @@ def record_on_chain(self, factomd, walletd, ec_address, verbose=False):
             verbose,
         )
 
+    @staticmethod
+    def exists_management_key_with_priority_zero(
+        active_management_keys, new_management_keys, management_keys_to_revoke
+    ):
+        """
+        Checks if a management key of priority zero would be present if the management keys will be updated according
+        to the given parameters.
+
+        Parameters
+        ----------
+        active_management_keys: set
+            The currently active management keys
+        new_management_keys: set
+            The management keys to be added
+        management_keys_to_revoke: set
+            The management keys to be revoked
+
+        Returns
+        -------
+        bool
+        """
+        active_management_keys = active_management_keys.copy()
+        active_management_keys.update(new_management_keys)
+        remaining_keys = active_management_keys.difference(management_keys_to_revoke)
+        return min(map(lambda key: key.priority, remaining_keys)) == 0
+
     def _get_revoked(self):
         revoked_management_keys = self.orig_management_keys.difference(
             set(self.did.management_keys)

tests/test_updater.py

@@ -301,3 +301,7 @@ def test_addition_and_revocation(self, full_did):
         assert added["service"][0]["id"] == "{}#encrypted-chat".format(full_did.id)
         assert added["service"][0]["type"] == "chat-service"
         assert added["service"][0]["serviceEndpoint"] == "https://my-chat-service.com"
+
+    def test_revocation_of_all_mngt_keys_with_priority_zero(self, full_did):
+        with pytest.raises(ValueError):
+            full_did.update().revoke_management_key("man-key1").export_entry_data()