pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

XEP-0300: small fixes

Browse source 
- fix a typo in the default option (crash when hashing a file without
  providing a function)
- Fix the plugin_end method (classical del_feature footgun)
This commit is contained in:
mathieui 2021-03-10 21:26:08 +01:00
parent 7c86c43fc7
commit 1cf6393b61
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
slixmpp/plugins/xep_0300/hash.py
View file

@ -1,4 +1,3 @@
# Slixmpp: The Slick XMPP Library # Slixmpp: The Slick XMPP Library
# Copyright (C) 2017 Emmanuel Gil Peyrot # Copyright (C) 2017 Emmanuel Gil Peyrot
# This file is part of Slixmpp. # This file is part of Slixmpp.
@ -15,6 +14,9 @@ log = logging.getLogger(__name__)
class XEP_0300(BasePlugin): class XEP_0300(BasePlugin):
"""
XEP-0300: Use of Cryptographic Hash Functions in XMPP
"""
name = 'xep_0300' name = 'xep_0300'
description = 'XEP-0300: Use of Cryptographic Hash Functions in XMPP' description = 'XEP-0300: Use of Cryptographic Hash Functions in XMPP'
@ -22,7 +24,7 @@ class XEP_0300(BasePlugin):
stanza = stanza stanza = stanza
default_config = { default_config = {
'block_size': 1024 * 1024, # One MiB 'block_size': 1024 * 1024, # One MiB
'preferded': 'sha-256', 'preferred': 'sha-256',
'enable_sha-1': False, 'enable_sha-1': False,
'enable_sha-256': True, 'enable_sha-256': True,
'enable_sha-512': True, 'enable_sha-512': True,
@ -61,7 +63,7 @@ class XEP_0300(BasePlugin):
def plugin_end(self): def plugin_end(self):
for namespace in self.enabled_hashes: for namespace in self.enabled_hashes:
self.xmpp['xep_0030'].del_feature(namespace) self.xmpp['xep_0030'].del_feature(feature=namespace)
self.enabled_hashes.clear() self.enabled_hashes.clear()
self.xmpp['xep_0030'].del_feature(feature=Hash.namespace) self.xmpp['xep_0030'].del_feature(feature=Hash.namespace)