Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: subpath bad matching #202

Merged
merged 7 commits into from
Aug 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/dbus_fast/message_bus.py
Original file line number Diff line number Diff line change
Expand Up @@ -693,11 +693,10 @@ def _introspect_export_path(self, path: str) -> intr.Node:
children = set()

for export_path in self._path_exports:
try:
child_path = export_path.split(path, maxsplit=1)[1]
except IndexError:
if not export_path.startswith(path):
continue

child_path = export_path.split(path, maxsplit=1)[1]
child_path = child_path.lstrip("/")
child_name = child_path.split("/", maxsplit=1)[0]

Expand Down
34 changes: 34 additions & 0 deletions tests/service/test_standard_interfaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,40 @@ async def test_introspectable_interface():
bus2.disconnect()


@pytest.mark.asyncio
async def test_introspect_matching_sub_paths():
bus1 = await MessageBus().connect()
bus2 = await MessageBus().connect()

interface = ExampleInterface("test.interface1")

bus1.export("/a/test/path1", interface)
bus1.export("/a/subpath/a/test/path2", interface)

async def introspect_subpath(path, expected_subnodes):
reply = await bus2.call(
Message(
destination=bus1.unique_name,
path=path,
interface="org.freedesktop.DBus.Introspectable",
member="Introspect",
)
)
assert reply.signature == "s"
node = intr.Node.parse(reply.body[0])
assert {n.name for n in node.nodes} == expected_subnodes

await introspect_subpath("/", {"a"})
await introspect_subpath("/a", {"test", "subpath"})
await introspect_subpath("/a/test", {"path1"})
await introspect_subpath("/a/test/path1", set())
await introspect_subpath("/a/subpath/a/test", {"path2"})
await introspect_subpath("/a/subpath/a/test/path2", set())

bus1.disconnect()
bus2.disconnect()


@pytest.mark.asyncio
async def test_peer_interface():
bus1 = await MessageBus().connect()
Expand Down
Loading