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

whitelist unvendored mode names

Browse Source
This commit is contained in:
Valentin Lorentz
2021-12-18 23:33:44 +01:00
parent 2a62040b4f
commit 50b9358ed0
1 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
irctest/server_tests/named_modes.py
View File

@ -15,6 +15,40 @@ from irctest.numerics import (
from irctest.patma import ANYLIST, ANYSTR, ListRemainder, StrRe from irctest.patma import ANYLIST, ANYSTR, ListRemainder, StrRe
from irctest.runner import NotImplementedByController from irctest.runner import NotImplementedByController
CHMODES = {
"op",
"voice",
"ban",
"inviteonly",
"limit",
"moderated",
"noextmsg",
"key",
"private",
"topiclock",
"secret",
"banex",
"invex",
"admin",
"halfop",
"noctcp",
"owner",
"permanent",
"regonly",
"secureonly",
"mute",
}
UMODES = {
"invisible",
"oper",
"snomask",
"wallops",
"bot",
"hidechans",
"cloak",
}
class _NamedModeTestMixin: class _NamedModeTestMixin:
ALLOW_MODE_REPLY: bool ALLOW_MODE_REPLY: bool
@ -403,8 +437,8 @@ class NamedModesTestCase(_NamedModeTestMixin, cases.BaseServerTestCase):
got_last_umode = False got_last_umode = False
capturing_re = r"[12345]:(?P<name>(\S+/)?[a-zA-Z0-9-]+)(=[a-zA-Z]+)?" capturing_re = r"[12345]:(?P<name>(\S+/)?[a-zA-Z0-9-]+)(=[a-zA-Z]+)?"
# fmt: off # fmt: off
chmode_re = r"[12345]:(\S+/)?[a-zA-Z0-9-]+(=[a-zA-Z]+)?" chmode_re = r"^[12345]:(\S+/)?[a-zA-Z0-9-]+(=[a-zA-Z]+)?$"
umode_re = r"[34]:(\S+/)?[a-zA-Z0-9-]+(=[a-zA-Z]+)?" # noqa umode_re = r"^[34]:(\S+/)?[a-zA-Z0-9-]+(=[a-zA-Z]+)?$" # noqa
# fmt: on # fmt: on
chmode_pat = [ListRemainder(StrRe(chmode_re), min_length=1)] chmode_pat = [ListRemainder(StrRe(chmode_re), min_length=1)]
umode_pat = [ListRemainder(StrRe(umode_re), min_length=1)] umode_pat = [ListRemainder(StrRe(umode_re), min_length=1)]
@ -454,6 +488,15 @@ class NamedModesTestCase(_NamedModeTestMixin, cases.BaseServerTestCase):
"invisible", seen_umodes, "'invisible' umode not supported/advertised" "invisible", seen_umodes, "'invisible' umode not supported/advertised"
) )
unknown_chmodes = {m for m in seen_chmodes if "/" not in m} - CHMODES
unknown_umodes = {m for m in seen_umodes if "/" not in m} - UMODES
self.assertFalse(
unknown_chmodes, fail_msg="Got unknown unvendored chmodes: {got}"
)
self.assertFalse(
unknown_umodes, fail_msg="Got unknown unvendored umodes: {got}"
)
class OverlyStrictNamedModesTestCase(_NamedModeTestMixin, cases.BaseServerTestCase): class OverlyStrictNamedModesTestCase(_NamedModeTestMixin, cases.BaseServerTestCase):
"""Stronger tests, that assert the server only sends PROP and never MODE. """Stronger tests, that assert the server only sends PROP and never MODE.