Reformatted code base using black.

This commit is contained in:
Goffi 2024-06-19 18:44:57 +02:00
commit 53fdaa9d09

View file

@ -140,9 +140,7 @@ class PubsubEncryption:
self.gpg_provider = get_gpg_provider(self.host, client)
async def load_secrets(
self,
client: SatXMPPEntity,
node_uri: str
self, client: SatXMPPEntity, node_uri: str
) -> Optional[Dict[str, SharedSecret]]:
"""Load shared secret from databse or cache
@ -174,8 +172,9 @@ class PubsubEncryption:
timestamp=s["timestamp"],
origin=jid.JID(s["origin"]),
revoked=s["revoked"],
shared_with={jid.JID(w) for w in s["shared_with"]}
) for s in secrets_as_dict
shared_with={jid.JID(w) for w in s["shared_with"]},
)
for s in secrets_as_dict
}
client.__cache[node_uri] = shared_secrets
while len(client.__cache) > CACHE_MAX:
@ -196,7 +195,7 @@ class PubsubEncryption:
self,
client: SatXMPPEntity,
node_uri: str,
shared_secrets: Dict[str, SharedSecret]
shared_secrets: Dict[str, SharedSecret],
) -> None:
"""Store shared secrets to database
@ -223,10 +222,10 @@ class PubsubEncryption:
secret_key = secrets.token_urlsafe(64)
secret_id = shortuuid.uuid()
return SharedSecret(
id = secret_id,
key = secret_key,
timestamp = time.time(),
origin = client.jid.userhostJID()
id=secret_id,
key=secret_key,
timestamp=time.time(),
origin=client.jid.userhostJID(),
)
def _ps_secret_revoke(
@ -235,7 +234,7 @@ class PubsubEncryption:
node: str,
secret_id: str,
recipients: List[str],
profile_key: str
profile_key: str,
) -> defer.Deferred:
return defer.ensureDeferred(
self.revoke(
@ -253,7 +252,7 @@ class PubsubEncryption:
service: Optional[jid.JID],
node: str,
secret_id: str,
recipients: Optional[Iterable[jid.JID]] = None
recipients: Optional[Iterable[jid.JID]] = None,
) -> None:
"""Revoke a secret and notify entities
@ -286,9 +285,7 @@ class PubsubEncryption:
)
shared_secret.revoked = True
await self.store_secrets(client, node_uri, shared_secrets)
log.info(
f"shared secret {secret_id!r} for {node_uri} has been revoked."
)
log.info(f"shared secret {secret_id!r} for {node_uri} has been revoked.")
if recipients is None:
recipients = shared_secret.shared_with
if recipients:
@ -312,7 +309,7 @@ class PubsubEncryption:
service: jid.JID,
node: str,
secret_id: str,
recipient: jid.JID
recipient: jid.JID,
) -> None:
revoke_elt = domish.Element((NS_OXPS, "revoke"))
revoke_elt["jid"] = service.full()
@ -336,7 +333,7 @@ class PubsubEncryption:
service: str,
node: str,
secret_ids: List[str],
profile_key: str
profile_key: str,
) -> defer.Deferred:
return defer.ensureDeferred(
self.share_secrets(
@ -354,7 +351,7 @@ class PubsubEncryption:
service: Optional[jid.JID],
node: str,
shared_secret: SharedSecret,
recipient: jid.JID
recipient: jid.JID,
) -> None:
"""Create and send <shared-secret> element"""
if service is None:
@ -413,9 +410,7 @@ class PubsubEncryption:
try:
to_share = [shared_secrets[s_id] for s_id in secret_ids]
except KeyError as e:
raise exceptions.NotFound(
f"no shared secret found with given ID: {e}"
)
raise exceptions.NotFound(f"no shared secret found with given ID: {e}")
for shared_secret in to_share:
await self.share_secret(client, service, node, shared_secret, recipient)
await self.store_secrets(client, node_uri, shared_secrets)
@ -432,7 +427,7 @@ class PubsubEncryption:
self.host.get_client(profile_key),
jid.JID(service) if service else None,
node,
[jid.JID(r) for r in recipients] or None
[jid.JID(r) for r in recipients] or None,
)
)
@ -441,7 +436,7 @@ class PubsubEncryption:
client: SatXMPPEntity,
service: Optional[jid.JID],
node: str,
recipients: Optional[List[jid.JID]] = None
recipients: Optional[List[jid.JID]] = None,
) -> None:
"""Revoke all current known secrets, create and share a new one
@ -466,11 +461,11 @@ class PubsubEncryption:
if shared_secrets:
# we get recipients from latests shared secret's shared_with list,
# regarless of deprecation (cause all keys may be deprecated)
recipients = list(sorted(
shared_secrets.values(),
key=lambda s: s.timestamp,
reverse=True
)[0].shared_with)
recipients = list(
sorted(
shared_secrets.values(), key=lambda s: s.timestamp, reverse=True
)[0].shared_with
)
else:
recipients = []
@ -482,10 +477,7 @@ class PubsubEncryption:
await self.store_secrets(client, node_uri, shared_secrets)
def _ps_secrets_list(
self,
service: str,
node: str,
profile_key: str
self, service: str, node: str, profile_key: str
) -> defer.Deferred:
d = defer.ensureDeferred(
self.list_shared_secrets(
@ -522,10 +514,7 @@ class PubsubEncryption:
]
async def handle_revoke_elt(
self,
client: SatXMPPEntity,
sender: jid.JID,
revoke_elt: domish.Element
self, client: SatXMPPEntity, sender: jid.JID, revoke_elt: domish.Element
) -> None:
"""Parse a <revoke> element and update local secrets
@ -537,9 +526,7 @@ class PubsubEncryption:
node = revoke_elt["node"]
secret_id = revoke_elt["id"]
except (KeyError, RuntimeError) as e:
log.warning(
f"ignoring invalid <revoke> element: {e}\n{revoke_elt.toXml()}"
)
log.warning(f"ignoring invalid <revoke> element: {e}\n{revoke_elt.toXml()}")
return
node_uri = uri.build_xmpp_uri("pubsub", path=service.full(), node=node)
shared_secrets = await self.load_secrets(client, node_uri)
@ -571,10 +558,7 @@ class PubsubEncryption:
log.info(f"Shared secret {secret_id} has been revoked for {node_uri}")
async def handle_shared_secret_elt(
self,
client: SatXMPPEntity,
sender: jid.JID,
shared_secret_elt: domish.Element
self, client: SatXMPPEntity, sender: jid.JID, shared_secret_elt: domish.Element
) -> None:
"""Parse a <shared-secret> element and update local secrets
@ -632,7 +616,7 @@ class PubsubEncryption:
items: Optional[List[domish.Element]],
options: Optional[dict],
sender: jid.JID,
extra: Dict[str, Any]
extra: Dict[str, Any],
) -> bool:
if not items or not extra.get("encrypted"):
return True
@ -702,9 +686,11 @@ class PubsubEncryption:
shared_secrets = None
for item in items:
payload = item.firstChildElement()
if (payload is not None
if (
payload is not None
and payload.name == "encrypted"
and payload.uri == NS_OXPS):
and payload.uri == NS_OXPS
):
encrypted_elt = payload
secret_id = encrypted_elt.getAttribute("key")
if not secret_id:
@ -713,7 +699,9 @@ class PubsubEncryption:
)
continue
if shared_secrets is None:
node_uri = uri.build_xmpp_uri("pubsub", path=service.full(), node=node)
node_uri = uri.build_xmpp_uri(
"pubsub", path=service.full(), node=node
)
shared_secrets = await self.load_secrets(client, node_uri)
if shared_secrets is None:
log.warning(
@ -730,8 +718,7 @@ class PubsubEncryption:
continue
log.debug(f"decrypting item {item.getAttribute('id', '')}")
decrypted = self.gpg_provider.decrypt_symmetrically(
base64.b64decode(str(encrypted_elt)),
shared_secret.key
base64.b64decode(str(encrypted_elt)), shared_secret.key
)
decrypted_elt = xml_tools.parse(decrypted)
item.children.clear()
@ -743,7 +730,7 @@ class PubsubEncryption:
self,
client: SatXMPPEntity,
message_elt: domish.Element,
post_treat: defer.Deferred
post_treat: defer.Deferred,
) -> bool:
sender = jid.JID(message_elt["from"]).userhostJID()
# there may be an openpgp element if OXIM is not activate, in this case we have to
@ -752,10 +739,7 @@ class PubsubEncryption:
if openpgp_elt is not None:
try:
payload_elt, __ = await self._ox.unpack_openpgp_element(
client,
openpgp_elt,
"signcrypt",
sender
client, openpgp_elt, "signcrypt", sender
)
except Exception as e:
log.warning(f"Can't decrypt element: {e}\n{message_elt.toXml()}")