Query missing cross-signing keys on local sig upload

synapse/federation/transport/client.py

@@ -399,20 +399,24 @@ def query_client_keys(self, destination, query_content, timeout):
             {
               "device_keys": {
                 "<user_id>": ["<device_id>"]
-            } }
+              }
+            }
 
         Response:
             {
               "device_keys": {
                 "<user_id>": {
                   "<device_id>": {...}
-              } }
+                }
+              },
               "master_key": {
                 "<user_id>": {...}
-              } }
+                }
+              },
               "self_signing_key": {
                 "<user_id>": {...}
-            } }
+              }
+            }
 
         Args:
             destination(str): The server to query.
@@ -442,16 +446,17 @@ def query_user_devices(self, destination, user_id, timeout):
                 "keys": {...},
                 "signatures": {
                   "<user_id>": {...}
-                }
-              },
+              }
+            },
               "self_signing_key": {
                 "user_id": "<user_id>",
                 "usage": [...],
                 "keys": {...},
                 "signatures": {
                   "<user_id>": {...}
                 }
-            } }
+              }
+            }
 
         Args:
             destination(str): The server to query.
@@ -475,22 +480,27 @@ def claim_client_keys(self, destination, query_content, timeout):
             {
               "one_time_keys": {
                 "<user_id>": {
-                    "<device_id>": "<algorithm>"
-            } } }
+                  "<device_id>": "<algorithm>"
+                }
+              }
+            }
 
         Response:
             {
               "device_keys": {
                 "<user_id>": {
                   "<device_id>": {
                     "<algorithm>:<key_id>": "<key_base64>"
-            } } } }
+                  }
+                }
+              }
+            }
 
         Args:
             destination(str): The server to query.
             query_content(dict): The user ids to query.
         Returns:
-            A dict containg the one-time keys.
+            A dict containing the one-time keys.
         """
 
         path = _create_v1_path("/user/keys/claim")

synapse/handlers/e2e_keys.py

@@ -1005,7 +1005,7 @@ def _get_e2e_cross_signing_verify_key(
         if self.is_mine(user) or key_type not in ["master", "self_signing"]:
             # Note that master and self_signing keys are the only cross-signing keys we
             # can request over federation
-            return
+            raise NotFoundError("No %s key found for %s" % (key_type, user_id))
 
         (
             key,
@@ -1109,6 +1109,7 @@ def _retrieve_cross_signing_keys_for_remote_user(
 
         # Notify clients that new devices for this user have been discovered
         if retrieved_device_ids:
+            # XXX is this necessary?
             yield self.device_handler.notify_device_update(
                 user.to_string(), retrieved_device_ids
             )