Merge pull request #753 from imobachgs/unify-users-and-manager

Unify users and manager services
agama-project · Sep 14, 2023 · 5b3172e · 5b3172e
2 parents 5dc90d5 + 6fc7564
commit 5b3172e
Show file tree

Hide file tree

Showing 16 changed files with 57 additions and 338 deletions.
diff --git a/rust/agama-lib/src/users/proxies.rs b/rust/agama-lib/src/users/proxies.rs
@@ -5,7 +5,7 @@ use zbus::dbus_proxy;
 
 #[dbus_proxy(
     interface = "org.opensuse.Agama.Users1",
-    default_service = "org.opensuse.Agama.Users1",
+    default_service = "org.opensuse.Agama.Manager1",
     default_path = "/org/opensuse/Agama/Users1"
 )]
 trait Users1 {

diff --git a/rust/package/agama-cli.changes b/rust/package/agama-cli.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 14 10:10:37 UTC 2023 - Imobach Gonzalez Sosa <[email protected]>
+
+- Use a single D-Bus service to connect to the manager and the
+  users API (gh#openSUSE/agama#753, follow-up of
+  gh#openSUSE/agama#729).
+
 -------------------------------------------------------------------
 Wed Sep 13 09:27:22 UTC 2023 - Knut Anderssen <[email protected]>
 

diff --git a/rust/share/dbus-test.conf b/rust/share/dbus-test.conf
@@ -37,14 +37,12 @@
     <allow own="org.opensuse.Agama.Manager1" />
     <allow own="org.opensuse.Agama.Software1" />
     <allow own="org.opensuse.Agama.Storage1" />
-    <allow own="org.opensuse.Agama.Users1" />
 
     <!-- only root can send anything to the services -->
     <allow send_destination="org.opensuse.Agama1" />
     <allow send_destination="org.opensuse.Agama.Manager1" />
     <allow send_destination="org.opensuse.Agama.Software1" />
     <allow send_destination="org.opensuse.Agama.Storage1" />
-    <allow send_destination="org.opensuse.Agama.Users1" />
   </policy>
 
   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>

diff --git a/service/lib/agama/dbus/clients/users.rb b/service/lib/agama/dbus/clients/users.rb
diff --git a/service/lib/agama/dbus/manager_service.rb b/service/lib/agama/dbus/manager_service.rb
@@ -37,16 +37,9 @@ module DBus
     # It connects to the system D-Bus and answers requests on objects below
     # `/org/opensuse/Agama1`.
     class ManagerService
-      # List of D-Bus services exposed by this class
-      #
-      # This basically allows to define "aliases" - all exposed services holds the same objects
-      # but under different names
-      #
-      # @return [Array<String>]
-      MANAGER_SERVICE = "org.opensuse.Agama.Manager1"
-      USERS_SERVICE = "org.opensuse.Agama.Users1"
-      private_constant :MANAGER_SERVICE
-      private_constant :USERS_SERVICE
+      # D-Bus service (org.opensuse.Agama.Manager1)
+      SERVICE_NAME = "org.opensuse.Agama.Manager1"
+      private_constant :SERVICE_NAME
 
       # Agama D-Bus
       #
@@ -94,9 +87,6 @@ def export
 
         paths = dbus_objects.map(&:path).join(", ")
         logger.info "Exported #{paths} objects"
-
-        # Request our service names only when we're ready to serve the objects
-        service_aliases.each { |s| bus.request_name(s) }
       end
 
       # Call this from some main loop to dispatch the D-Bus messages
@@ -117,16 +107,9 @@ def setup_cockpit
         cockpit.setup(config.data["web"])
       end
 
-      def service_aliases
-        @service_aliases ||= [
-          MANAGER_SERVICE,
-          USERS_SERVICE
-        ]
-      end
-
       # @return [::DBus::ObjectServer]
       def service
-        @service ||= bus.object_server
+        @service ||= bus.request_service(SERVICE_NAME)
       end
 
       # @return [Array<::DBus::Object>]

diff --git a/service/lib/agama/manager.rb b/service/lib/agama/manager.rb
@@ -30,7 +30,6 @@
 require "agama/dbus/clients/locale"
 require "agama/dbus/clients/software"
 require "agama/dbus/clients/storage"
-require "agama/dbus/clients/users"
 require "agama/helpers"
 
 Yast.import "Stage"
@@ -160,11 +159,7 @@ def language
     #
     # @return [DBus::Clients::Users]
     def users
-      @users ||= DBus::Clients::Users.new.tap do |client|
-        client.on_service_status_change do |status|
-          service_status_recorder.save(client.service.name, status)
-        end
-      end
+      @users ||= Users.new(logger)
     end
 
     # Network manager

diff --git a/service/lib/agama/users.rb b/service/lib/agama/users.rb
@@ -30,7 +30,6 @@ module Agama
   # Backend class using YaST code.
   #
   # {Agama::DBus::Users} wraps it with a D-Bus interface and
-  # {Agama::DBus::Clients::Users} is a D-Bus client for that.
   class Users
     include Helpers
 
@@ -141,6 +140,13 @@ def validate
       ]
     end
 
+    # Determines whether the users configuration is valid
+    #
+    # @return [Boolean]
+    def valid?
+      validate.empty?
+    end
+
   private
 
     attr_reader :logger

diff --git a/service/package/rubygem-agama.changes b/service/package/rubygem-agama.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 14 09:04:29 UTC 2023 - Imobach Gonzalez Sosa <[email protected]>
+
+- Use a single D-Bus service to expose the manager and the users
+  settings (gh#openSUSE/agama#753, follow-up of
+  gh#openSUSE/agama#729).
+
 -------------------------------------------------------------------
 Tue Sep 12 12:27:33 UTC 2023 - Imobach Gonzalez Sosa <[email protected]>
 

diff --git a/service/share/dbus.conf b/service/share/dbus.conf
@@ -39,14 +39,12 @@
     <allow own="org.opensuse.Agama.Manager1" />
     <allow own="org.opensuse.Agama.Software1" />
     <allow own="org.opensuse.Agama.Storage1" />
-    <allow own="org.opensuse.Agama.Users1" />
 
     <!-- only root can send anything to the services -->
     <allow send_destination="org.opensuse.Agama1" />
     <allow send_destination="org.opensuse.Agama.Manager1" />
     <allow send_destination="org.opensuse.Agama.Software1" />
     <allow send_destination="org.opensuse.Agama.Storage1" />
-    <allow send_destination="org.opensuse.Agama.Users1" />
   </policy>
 
   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>

diff --git a/service/share/org.opensuse.Agama.Users1.service b/service/share/org.opensuse.Agama.Users1.service