From 50150ef3e9a3fc8fff8c87ff719efa54bda4cb99 Mon Sep 17 00:00:00 2001
From: Rodolfo Olivieri <rolivier@redhat.com>
Date: Tue, 17 Dec 2024 10:26:40 -0300
Subject: [PATCH] Switch to system bus instead of session bus

---
 Makefile                                    |  1 +
 command_line_assistant/dbus/constants.py    |  6 +++---
 command_line_assistant/dbus/server.py       | 14 ++++++--------
 data/development/systemd/clad-devel.service |  1 +
 data/release/com.redhat.lightspeed.conf     | 12 +++++++++---
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index eba937b..61464d6 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,7 @@ link-systemd-units: ## Link the systemd units to /etc/systemd/user
 	@echo "Linking the systemd units from $(CLAD_SYSTEMD_DEVEL_PATH) to $(SYSTEMD_USER_UNITS)/clad.service"
 	@sed -e 's/{{ EXEC_START }}/$(CLAD_VENV_BIN)/'			   \
 		 -e 's/{{ CONFIG_FILE_PATH }}/$(XDG_CONFIG_DIRS)/' \
+		 -e 's/{{ DBUS_SESSION_ADDRESS }}/$(subst /,\/,$(DBUS_SESSION_BUS_ADDRESS))/' \
 	     $(CLAD_SYSTEMD_DEVEL_PATH) > $(CLAD_SYSTEMD_USER_PATH)
 	@ln -s $(CLAD_SYSTEMD_USER_PATH) $(SYSTEMD_USER_UNITS)/clad.service
 
diff --git a/command_line_assistant/dbus/constants.py b/command_line_assistant/dbus/constants.py
index b1fe6ee..757b00d 100644
--- a/command_line_assistant/dbus/constants.py
+++ b/command_line_assistant/dbus/constants.py
@@ -4,7 +4,7 @@
 
 ERROR_MAPPER = ErrorMapper()
 
-SESSION_BUS = SystemMessageBus(error_mapper=ERROR_MAPPER)
+SYSTEM_BUS = SystemMessageBus(error_mapper=ERROR_MAPPER)
 
 SERVICE_NAMESPACE = ("com", "redhat", "lightspeed")
 
@@ -13,9 +13,9 @@
 
 # Define the service identifier for a query
 QUERY_IDENTIFIER = DBusServiceIdentifier(
-    namespace=QUERY_NAMESAPCE, message_bus=SESSION_BUS
+    namespace=QUERY_NAMESAPCE, message_bus=SYSTEM_BUS
 )
 # Define the service identifier for a history
 HISTORY_IDENTIFIER = DBusServiceIdentifier(
-    namespace=HISTORY_NAMESPACE, message_bus=SESSION_BUS
+    namespace=HISTORY_NAMESPACE, message_bus=SYSTEM_BUS
 )
diff --git a/command_line_assistant/dbus/server.py b/command_line_assistant/dbus/server.py
index 7a6ead8..8dc0926 100644
--- a/command_line_assistant/dbus/server.py
+++ b/command_line_assistant/dbus/server.py
@@ -7,7 +7,7 @@
 from command_line_assistant.dbus.constants import (
     HISTORY_IDENTIFIER,
     QUERY_IDENTIFIER,
-    SESSION_BUS,
+    SYSTEM_BUS,
 )
 from command_line_assistant.dbus.context import HistoryContext, QueryContext
 from command_line_assistant.dbus.interfaces import HistoryInterface, QueryInterface
@@ -19,24 +19,22 @@ def serve(config: Config):
     """Start the daemon."""
     logger.info("Starting clad!")
     try:
-        SESSION_BUS.publish_object(
+        SYSTEM_BUS.publish_object(
             QUERY_IDENTIFIER.object_path, QueryInterface(QueryContext(config))
         )
-        SESSION_BUS.publish_object(
+        SYSTEM_BUS.publish_object(
             HISTORY_IDENTIFIER.object_path, HistoryInterface(HistoryContext(config))
         )
 
         # The flag DBUS_NAME_FLAG_REPLACE_EXISTING is needed during development
         # so ew can replace the existing bus.
         # TODO(r0x0d): See what to do with it later.
-        SESSION_BUS.register_service(
-            QUERY_IDENTIFIER.service_name, flags=DBUS_NAME_FLAG_REPLACE_EXISTING
-        )
-        SESSION_BUS.register_service(
+        SYSTEM_BUS.register_service(QUERY_IDENTIFIER.service_name)
+        SYSTEM_BUS.register_service(
             HISTORY_IDENTIFIER.service_name, flags=DBUS_NAME_FLAG_REPLACE_EXISTING
         )
         loop = EventLoop()
         loop.run()
     finally:
         # Unregister the DBus service and objects.
-        SESSION_BUS.disconnect()
+        SYSTEM_BUS.disconnect()
diff --git a/data/development/systemd/clad-devel.service b/data/development/systemd/clad-devel.service
index 0c9d153..6b14737 100644
--- a/data/development/systemd/clad-devel.service
+++ b/data/development/systemd/clad-devel.service
@@ -8,6 +8,7 @@ PrivateTmp=yes
 RemainAfterExit=no
 ExecStart={{ EXEC_START }}
 Environment="XDG_CONFIG_DIRS={{ CONFIG_FILE_PATH }}"
+Environment="DBUS_SYSTEM_BUS_ADDRESS={{ DBUS_SESSION_ADDRESS }}"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/data/release/com.redhat.lightspeed.conf b/data/release/com.redhat.lightspeed.conf
index 9de351f..f2bac57 100644
--- a/data/release/com.redhat.lightspeed.conf
+++ b/data/release/com.redhat.lightspeed.conf
@@ -4,12 +4,18 @@
 <busconfig>
   <!-- Allow the command line assistant service to own the name -->
   <policy context="default">
-    <allow own="com.redhat.lightspeed"/>
+    <allow own="com.redhat.lightspeed.query"/>
+    <allow own="com.redhat.lightspeed.history"/>
   </policy>
 
   <!-- Allow any user to invoke methods -->
   <policy context="default">
-    <allow send_destination="com.redhat.lightspeed"/>
-    <allow receive_sender="com.redhat.lightspeed"/>
+    <allow send_destination="com.redhat.lightspeed.query"/>
+    <allow receive_sender="com.redhat.lightspeed.query"/>
+  </policy>
+
+  <policy context="default">
+    <allow send_destination="com.redhat.lightspeed.history"/>
+    <allow receive_sender="com.redhat.lightspeed.history"/>
   </policy>
 </busconfig>