diff --git a/CHANGES.rst b/CHANGES.rst index 7b2140dd3..4a031d0f8 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -30,6 +30,9 @@ Bug fixes in 23.1 Breaking changes in 23.1 ~~~~~~~~~~~~~~~~~~~~~~~~~ +- Support for the legacy ticket authentication was dropped: If the coordinator + logs ModuleNotFoundError on startup, switch the crossbar config to anonymous + authentication (see ``.crossbar/config-anonymous.yaml`` for an example). - The Debian package (``debian/``) no longer contains crossbar. Use the `coordinator container `_ or install it into a separate local venv as desribed in the diff --git a/labgrid/remote/authenticator.py b/labgrid/remote/authenticator.py deleted file mode 100644 index a31321947..000000000 --- a/labgrid/remote/authenticator.py +++ /dev/null @@ -1,20 +0,0 @@ -import logging -from pprint import pprint -from twisted.internet.defer import inlineCallbacks -from autobahn.twisted.wamp import ApplicationSession - - -class AuthenticatorSession(ApplicationSession): - @inlineCallbacks - def onJoin(self, details): - def authenticate(realm, authid, details): # pylint: disable=unused-argument - logging.warning("%s still uses deprecated ticket authentication. Please update.", authid) - pprint(details) - principal = {'role': 'public', 'extra': {}} - return principal - - import warnings - warnings.warn("Ticket authentication is deprecated. Please switch to anonymous authentication once all your exporters/clients support it: .crossbar/config-anonymous.yaml", - DeprecationWarning) - - yield self.register(authenticate, 'org.labgrid.authenticate') diff --git a/labgrid/remote/coordinator.py b/labgrid/remote/coordinator.py index 8fcc5dbe6..f8572ddce 100644 --- a/labgrid/remote/coordinator.py +++ b/labgrid/remote/coordinator.py @@ -133,14 +133,11 @@ async def onConnect(self): enable_tcp_nodelay(self) self.join( self.config.realm, - authmethods=["anonymous", "ticket"], + authmethods=["anonymous"], authid="coordinator", authextra={"authid": "coordinator"}, ) - def onChallenge(self, challenge): - return "dummy-ticket" - @locked async def onJoin(self, details): await self.subscribe(self.on_session_join, 'wamp.session.on_join') diff --git a/pyproject.toml b/pyproject.toml index 577bce655..c97a626f8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -161,9 +161,6 @@ testpaths = [ ] addopts = "-p no:labgrid" -[tool.pylint.MASTER] -ignore-paths = ["labgrid/remote/authenticator.py"] - [tool.pylint.imports] ignored-modules = ["gi"]