Fix #874 - Support !s-* as no-op for irrtoolset compatibility (#977)

Re irrtoolset/irrtoolset#65
irrdnet · Dec 2, 2024 · ad4e91b · ad4e91b
1 parent e0fa95b
commit ad4e91b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/irrd/server/whois/query_parser.py b/irrd/server/whois/query_parser.py
@@ -362,9 +362,13 @@ def handle_irrd_route_search(self, parameter: str):
     def handle_irrd_sources_list(self, parameter: str) -> Optional[str]:
         """
         !s query - set used sources
+           !s-* no-op, backwards compatibility https://github.com/irrtoolset/irrtoolset/issues/65
            !s-lc returns all active sources, comma separated
            !sripe,nttcom limits sources to ripe and nttcom
         """
+        if parameter == "-*":
+            return None
+
         if parameter == "-lc":
             return ",".join(self.query_resolver.source_manager.sources)
 

diff --git a/irrd/server/whois/tests/test_query_parser.py b/irrd/server/whois/tests/test_query_parser.py
@@ -902,6 +902,12 @@ def test_sources_list(self, prepare_parser, config_override):
         )
         mock_query_resolver.set_query_sources = Mock()
 
+        response = parser.handle_query("!s-*")
+        assert response.response_type == WhoisQueryResponseType.SUCCESS
+        assert response.mode == WhoisQueryResponseMode.IRRD
+        assert not response.result
+        mock_query_resolver.set_query_sources.assert_not_called()
+
         response = parser.handle_query("!stest1")
         assert response.response_type == WhoisQueryResponseType.SUCCESS
         assert response.mode == WhoisQueryResponseMode.IRRD