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

Always request the 'sasl' cap before using AUTHENTICATE

Browse Source 
It's required by InspIRCd.

This commit also adds a check so we don't forget it when testing
locally only with Ergo.
This commit is contained in:
Valentin Lorentz
2021-06-27 00:46:00 +02:00
committed by Val Lorentz
parent 829edddeb8
commit cc8b9748a7
5 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
irctest/cases.py
View File

@ -595,6 +595,8 @@ class BaseServerTestCase(
else: else:
raise raise
if password is not None: if password is not None:
if "sasl" not in (capabilities or ()):
raise ValueError("Used 'password' option without sasl capbilitiy")
self.sendLine(client, "AUTHENTICATE PLAIN") self.sendLine(client, "AUTHENTICATE PLAIN")
m = self.getRegistrationMessage(client) m = self.getRegistrationMessage(client)
self.assertMessageMatch(m, command="AUTHENTICATE", params=["+"]) self.assertMessageMatch(m, command="AUTHENTICATE", params=["+"])

4
irctest/server_tests/test_bouncer.py
View File

@ -11,7 +11,9 @@ class Bouncer(cases.BaseServerTestCase):
self.controller.registerUser(self, "observer", "observerpassword") self.controller.registerUser(self, "observer", "observerpassword")
self.controller.registerUser(self, "testuser", "mypassword") self.controller.registerUser(self, "testuser", "mypassword")
self.connectClient("observer", password="observerpassword") self.connectClient(
"observer", password="observerpassword", capabilities=["sasl"]
)
self.joinChannel(1, "#chan") self.joinChannel(1, "#chan")
self.sendLine(1, "CAP REQ :message-tags server-time") self.sendLine(1, "CAP REQ :message-tags server-time")
self.getMessages(1) self.getMessages(1)

17
irctest/server_tests/test_chathistory.py
View File

@ -50,6 +50,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
"labeled-response", "labeled-response",
"message-tags", "message-tags",
"server-time", "server-time",
"sasl",
CHATHISTORY_CAP, CHATHISTORY_CAP,
EVENT_PLAYBACK_CAP, EVENT_PLAYBACK_CAP,
], ],
@ -86,7 +87,13 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
self.connectClient( self.connectClient(
bar, bar,
name=bar, name=bar,
capabilities=["batch", "labeled-response", "message-tags", "server-time"], capabilities=[
"batch",
"labeled-response",
"message-tags",
"sasl",
"server-time",
],
password=pw, password=pw,
) )
self.getMessages(bar) self.getMessages(bar)
@ -153,6 +160,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
"echo-message", "echo-message",
"batch", "batch",
"labeled-response", "labeled-response",
"sasl",
CHATHISTORY_CAP, CHATHISTORY_CAP,
EVENT_PLAYBACK_CAP, EVENT_PLAYBACK_CAP,
], ],
@ -187,6 +195,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
"echo-message", "echo-message",
"batch", "batch",
"labeled-response", "labeled-response",
"sasl",
CHATHISTORY_CAP, CHATHISTORY_CAP,
EVENT_PLAYBACK_CAP, EVENT_PLAYBACK_CAP,
], ],
@ -200,6 +209,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
"echo-message", "echo-message",
"batch", "batch",
"labeled-response", "labeled-response",
"sasl",
CHATHISTORY_CAP, CHATHISTORY_CAP,
EVENT_PLAYBACK_CAP, EVENT_PLAYBACK_CAP,
], ],
@ -292,6 +302,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
"echo-message", "echo-message",
"batch", "batch",
"labeled-response", "labeled-response",
"sasl",
CHATHISTORY_CAP, CHATHISTORY_CAP,
EVENT_PLAYBACK_CAP, EVENT_PLAYBACK_CAP,
], ],
@ -498,6 +509,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
"echo-message", "echo-message",
"batch", "batch",
"labeled-response", "labeled-response",
"sasl",
CHATHISTORY_CAP, CHATHISTORY_CAP,
EVENT_PLAYBACK_CAP, EVENT_PLAYBACK_CAP,
], ],
@ -511,6 +523,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
"echo-message", "echo-message",
"batch", "batch",
"labeled-response", "labeled-response",
"sasl",
CHATHISTORY_CAP, CHATHISTORY_CAP,
], ],
password="sesame2", password="sesame2",
@ -592,6 +605,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
"echo-message", "echo-message",
"batch", "batch",
"labeled-response", "labeled-response",
"sasl",
CHATHISTORY_CAP, CHATHISTORY_CAP,
EVENT_PLAYBACK_CAP, EVENT_PLAYBACK_CAP,
], ],
@ -605,6 +619,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
"echo-message", "echo-message",
"batch", "batch",
"labeled-response", "labeled-response",
"sasl",
CHATHISTORY_CAP, CHATHISTORY_CAP,
], ],
password="sesame2", password="sesame2",

4
irctest/server_tests/test_confusables.py
View File

@ -24,7 +24,9 @@ class ConfusablesTestCase(cases.BaseServerTestCase):
self.assertNotIn(RPL_WELCOME, commands) self.assertNotIn(RPL_WELCOME, commands)
self.assertIn(ERR_NICKNAMEINUSE, commands) self.assertIn(ERR_NICKNAMEINUSE, commands)
self.connectClient("evan", name="evan", password="sesame") self.connectClient(
"evan", name="evan", password="sesame", capabilities=["sasl"]
)
# should be able to switch to the confusable nick # should be able to switch to the confusable nick
self.sendLine("evan", "NICK еvan") self.sendLine("evan", "NICK еvan")
messages = self.getMessages("evan") messages = self.getMessages("evan")

7
irctest/server_tests/test_znc_playback.py
View File

@ -34,6 +34,7 @@ class ZncPlaybackTestCase(cases.BaseServerTestCase):
"message-tags", "message-tags",
"server-time", "server-time",
"echo-message", "echo-message",
"sasl",
], ],
password=pw, password=pw,
) )
@ -49,6 +50,7 @@ class ZncPlaybackTestCase(cases.BaseServerTestCase):
"message-tags", "message-tags",
"server-time", "server-time",
"echo-message", "echo-message",
"sasl",
], ],
) )
self.joinChannel(qux, chname) self.joinChannel(qux, chname)
@ -83,6 +85,7 @@ class ZncPlaybackTestCase(cases.BaseServerTestCase):
"message-tags", "message-tags",
"server-time", "server-time",
"echo-message", "echo-message",
"sasl",
], ],
password=pw, password=pw,
) )
@ -102,6 +105,7 @@ class ZncPlaybackTestCase(cases.BaseServerTestCase):
"message-tags", "message-tags",
"server-time", "server-time",
"echo-message", "echo-message",
"sasl",
], ],
password=pw, password=pw,
) )
@ -125,6 +129,7 @@ class ZncPlaybackTestCase(cases.BaseServerTestCase):
"message-tags", "message-tags",
"server-time", "server-time",
"echo-message", "echo-message",
"sasl",
], ],
password=pw, password=pw,
) )
@ -160,6 +165,7 @@ class ZncPlaybackTestCase(cases.BaseServerTestCase):
"message-tags", "message-tags",
"server-time", "server-time",
"echo-message", "echo-message",
"sasl",
], ],
password=pw, password=pw,
) )
@ -185,6 +191,7 @@ class ZncPlaybackTestCase(cases.BaseServerTestCase):
"message-tags", "message-tags",
"server-time", "server-time",
"echo-message", "echo-message",
"sasl",
], ],
password=pw, password=pw,
) )