Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-19 08:59:27 +01:00
Code Issues Projects Releases Wiki Activity

SaslTestCase: Change config instead of messing with irc.sasl_next_mechanisms

Browse Source 
Changing the internal state will break in the next commit, which
reorganizes SASL state initialization
This commit is contained in:
Valentin Lorentz 2023-09-05 08:29:56 +02:00 committed by Val Lorentz
parent 81a5133c14
commit c66b973db0
1 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
test/test_irclib.py
View File

@ -1494,9 +1494,10 @@ class BatchTestCase(SupyTestCase):
class SaslTestCase(SupyTestCase, CapNegMixin): class SaslTestCase(SupyTestCase, CapNegMixin):
def setUp(self): def setUp(self):
pass self._default_mechanisms = conf.supybot.networks.test.sasl.mechanisms()
def tearDown(self): def tearDown(self):
conf.supybot.networks.test.sasl.mechanisms.setValue(self._default_mechanisms)
conf.supybot.networks.test.sasl.username.setValue('') conf.supybot.networks.test.sasl.username.setValue('')
conf.supybot.networks.test.sasl.password.setValue('') conf.supybot.networks.test.sasl.password.setValue('')
conf.supybot.networks.test.certfile.setValue('') conf.supybot.networks.test.certfile.setValue('')
@ -1504,19 +1505,30 @@ class SaslTestCase(SupyTestCase, CapNegMixin):
def testPlain(self): def testPlain(self):
conf.supybot.networks.test.sasl.username.setValue('jilles') conf.supybot.networks.test.sasl.username.setValue('jilles')
conf.supybot.networks.test.sasl.password.setValue('sesame') conf.supybot.networks.test.sasl.password.setValue('sesame')
conf.supybot.networks.test.sasl.mechanisms.setValue(
['scram-sha-256', 'plain'])
self.irc = irclib.Irc('test') self.irc = irclib.Irc('test')
self.assertEqual(self.irc.sasl_current_mechanism, None) self.assertEqual(self.irc.sasl_current_mechanism, None)
self.irc.sasl_next_mechanisms = ['scram-sha-256', 'plain']
self.startCapNegociation() if irclib.scram:
self.assertEqual(self.irc.sasl_next_mechanisms,
['scram-sha-256', 'plain'])
self.startCapNegociation()
m = self.irc.takeMsg()
self.assertEqual(m, ircmsgs.IrcMsg(command='AUTHENTICATE',
args=('SCRAM-SHA-256',)))
self.irc.feedMsg(ircmsgs.IrcMsg(command='904',
args=('mechanism not available',)))
else:
self.assertEqual(self.irc.sasl_next_mechanisms,
['plain'])
self.startCapNegociation()
m = self.irc.takeMsg()
self.assertEqual(m, ircmsgs.IrcMsg(command='AUTHENTICATE',
args=('SCRAM-SHA-256',)))
self.irc.feedMsg(ircmsgs.IrcMsg(command='904',
args=('mechanism not available',)))
m = self.irc.takeMsg() m = self.irc.takeMsg()
self.assertEqual(m, ircmsgs.IrcMsg(command='AUTHENTICATE', self.assertEqual(m, ircmsgs.IrcMsg(command='AUTHENTICATE',
@ -1537,11 +1549,14 @@ class SaslTestCase(SupyTestCase, CapNegMixin):
conf.supybot.networks.test.sasl.username.setValue('jilles') conf.supybot.networks.test.sasl.username.setValue('jilles')
conf.supybot.networks.test.sasl.password.setValue('sesame') conf.supybot.networks.test.sasl.password.setValue('sesame')
conf.supybot.networks.test.certfile.setValue('foo') conf.supybot.networks.test.certfile.setValue('foo')
conf.supybot.networks.test.sasl.mechanisms.setValue(
['external', 'plain'])
self.irc = irclib.Irc('test') self.irc = irclib.Irc('test')
self.assertEqual(self.irc.sasl_current_mechanism, None) self.assertEqual(self.irc.sasl_current_mechanism, None)
self.irc.sasl_next_mechanisms = ['external', 'plain'] self.assertEqual(self.irc.sasl_next_mechanisms,
['external', 'plain'])
self.startCapNegociation() self.startCapNegociation()
@ -1570,11 +1585,14 @@ class SaslTestCase(SupyTestCase, CapNegMixin):
conf.supybot.networks.test.sasl.username.setValue('jilles') conf.supybot.networks.test.sasl.username.setValue('jilles')
conf.supybot.networks.test.sasl.password.setValue('sesame') conf.supybot.networks.test.sasl.password.setValue('sesame')
conf.supybot.networks.test.certfile.setValue('foo') conf.supybot.networks.test.certfile.setValue('foo')
conf.supybot.networks.test.sasl.mechanisms.setValue(
['external', 'plain'])
self.irc = irclib.Irc('test') self.irc = irclib.Irc('test')
self.assertEqual(self.irc.sasl_current_mechanism, None) self.assertEqual(self.irc.sasl_current_mechanism, None)
self.irc.sasl_next_mechanisms = ['external', 'plain'] self.assertEqual(self.irc.sasl_next_mechanisms,
['external', 'plain'])
self.startCapNegociation(caps='sasl=foo,plain,bar') self.startCapNegociation(caps='sasl=foo,plain,bar')
@ -1596,11 +1614,14 @@ class SaslTestCase(SupyTestCase, CapNegMixin):
def testReauthenticate(self): def testReauthenticate(self):
conf.supybot.networks.test.sasl.username.setValue('jilles') conf.supybot.networks.test.sasl.username.setValue('jilles')
conf.supybot.networks.test.sasl.password.setValue('sesame') conf.supybot.networks.test.sasl.password.setValue('sesame')
conf.supybot.networks.test.sasl.mechanisms.setValue(
['external', 'plain'])
self.irc = irclib.Irc('test') self.irc = irclib.Irc('test')
self.assertEqual(self.irc.sasl_current_mechanism, None) self.assertEqual(self.irc.sasl_current_mechanism, None)
self.irc.sasl_next_mechanisms = ['plain'] self.assertEqual(self.irc.sasl_next_mechanisms,
['plain'])
self.startCapNegociation(caps='') self.startCapNegociation(caps='')