val/irctest
1
0
Fork 0
mirror of https://github.com/progval/irctest.git synced 2025-04-07 07:49:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ecdsa tests to use the same protocol as Atheme.

Browse Source 
Which requires not hashing the challenge.
This commit is contained in:
Valentin Lorentz
2019-12-26 12:10:45 +01:00
parent 442c57e6c6
commit 8a81224ba8
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
irctest/client_tests/test_sasl.py
View File

@ -1,4 +1,7 @@
import hashlib
import ecdsa import ecdsa
from ecdsa.util import sigencode_der, sigdecode_der
import base64 import base64
import pyxmpp2_scram as scram import pyxmpp2_scram as scram
@ -17,6 +20,16 @@ IRX9cyi2wdYg9mUUYyh9GKdBCYHGUJAiCA==
-----END EC PRIVATE KEY----- -----END EC PRIVATE KEY-----
""" """
CHALLENGE = bytes(range(32))
assert len(CHALLENGE) == 32
class IdentityHash:
def __init__(self, data):
self._data = data
def digest(self):
return self._data
class SaslTestCase(cases.BaseClientTestCase, cases.ClientNegociationHelper, class SaslTestCase(cases.BaseClientTestCase, cases.ClientNegociationHelper,
cases.OptionalityHelper): cases.OptionalityHelper):
@cases.OptionalityHelper.skipUnlessHasMechanism('PLAIN') @cases.OptionalityHelper.skipUnlessHasMechanism('PLAIN')
@ -140,14 +153,14 @@ class SaslTestCase(cases.BaseClientTestCase, cases.ClientNegociationHelper,
m = self.getMessage() m = self.getMessage()
self.assertEqual(m, Message([], None, 'AUTHENTICATE', self.assertEqual(m, Message([], None, 'AUTHENTICATE',
['amlsbGVz'])) # jilles ['amlsbGVz'])) # jilles
self.sendLine('AUTHENTICATE Zm9vYmFy') # foobar self.sendLine('AUTHENTICATE {}'.format(base64.b64encode(CHALLENGE).decode('ascii')))
m = self.getMessage() m = self.getMessage()
self.assertMessageEqual(m, command='AUTHENTICATE') self.assertMessageEqual(m, command='AUTHENTICATE')
sk = ecdsa.SigningKey.from_pem(ECDSA_KEY) sk = ecdsa.SigningKey.from_pem(ECDSA_KEY)
vk = sk.get_verifying_key() vk = sk.get_verifying_key()
signature = base64.b64decode(m.params[0]) signature = base64.b64decode(m.params[0])
try: try:
vk.verify(signature, b'foobar') vk.verify(signature, CHALLENGE, hashfunc=IdentityHash, sigdecode=sigdecode_der)
except ecdsa.BadSignatureError: except ecdsa.BadSignatureError:
raise AssertionError('Bad signature') raise AssertionError('Bad signature')
self.sendLine('900 * * foo :You are now logged in.') self.sendLine('900 * * foo :You are now logged in.')