feat: 添加D-Bus调用者白名单鉴权机制，org.deepin.dde.LocaleHelper1设置语言

locale-helper/ifc.go

@@ -5,6 +5,7 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/godbus/dbus/v5"
@@ -25,9 +26,12 @@ var errAuthFailed = fmt.Errorf("authentication failed")
 func (h *Helper) SetLocale(sender dbus.Sender, locale string) *dbus.Error {
 	h.service.DelayAutoQuit()
 
-	ok, err := h.checkAuth(sender)
-	logger.Debug("---Auth ret:", ok, err)
-	if !ok || err != nil {
+	authorized, err := h.authorizeOrPolkit(sender)
+	if err != nil {
+		logger.Warning("SetLocale access denied:", err)
+		return dbusutil.ToError(err)
+	}
+	if !authorized {
 		return dbusutil.ToError(errAuthFailed)
 	}
 
@@ -54,9 +58,12 @@ func (h *Helper) emitRealSuccess() {
 }
 
 func (h *Helper) generateLocale(sender dbus.Sender, locale string) error {
-	ok, err := h.checkAuth(sender)
-	logger.Debug("---Auth ret:", ok, err)
-	if !ok || err != nil {
+	authorized, err := h.authorizeOrPolkit(sender)
+	if err != nil {
+		logger.Warning("GenerateLocale access denied:", err)
+		return err
+	}
+	if !authorized {
 		return errAuthFailed
 	}
 
@@ -86,6 +93,15 @@ func (h *Helper) generateLocale(sender dbus.Sender, locale string) error {
 	return nil
 }
 
+func (h *Helper) SetAllowCaller(sender dbus.Sender, uniqueName string) *dbus.Error {
+	h.service.DelayAutoQuit()
+	err := h.allowCallers.addCaller(sender, uniqueName)
+	if err != nil {
+		logger.Warningf("SetAllowCaller rejected sender %s for target %s: %v", sender, uniqueName, err)
+	}
+	return dbusutil.ToError(err)
+}
+
 func (h *Helper) GenerateLocale(sender dbus.Sender, locale string) *dbus.Error {
 	h.service.DelayAutoQuit()
 
@@ -128,6 +144,21 @@ func enableLocaleInFile(locale, file string) error {
 	return nil
 }
 
+// authorizeOrPolkit checks the allow-caller registry first. If the registry is
+// not enabled (the service was not launched through deepin-security-loader),
+// fall back to the Polkit authorization dialog.
+func (h *Helper) authorizeOrPolkit(sender dbus.Sender) (bool, error) {
+	err := h.allowCallers.authorize(sender)
+	if err == nil {
+		return true, nil
+	}
+	if errors.Is(err, errAllowCallerNotEnabled) {
+		// Not launched via deepin-security-loader: fall back to Polkit.
+		return h.checkAuth(sender)
+	}
+	return false, err
+}
+
 func (h *Helper) checkAuth(sender dbus.Sender) (bool, error) {
 	systemBus := h.service.Conn()
 	authority := polkit.NewAuthority(systemBus)

locale-helper/main.go

@@ -25,9 +25,10 @@ const (
 )
 
 type Helper struct {
-	service *dbusutil.Service
-	mu      sync.Mutex
-	running bool
+	service      *dbusutil.Service
+	allowCallers *allowCallerRegistry
+	mu           sync.Mutex
+	running      bool
 
 	//nolint
 	signals *struct {
@@ -62,9 +63,16 @@ func main() {
 		logger.Fatalf("name %q already has the owner", dbusServiceName)
 	}
 
+	allowCallers, err := newAllowCallerRegistry(service)
+	if err != nil {
+		logger.Fatal("failed to initialize allow-caller registry:", err)
+	}
+	defer allowCallers.close()
+
 	var h = &Helper{
-		running: false,
-		service: service,
+		running:      false,
+		service:      service,
+		allowCallers: allowCallers,
 	}
 	err = service.Export(dbusPath, h)
 	if err != nil {

misc/conf/org.deepin.dde.LocaleHelper1.conf

@@ -8,6 +8,15 @@
   <!-- Only root can own the service -->
   <policy user="root">
     <allow own="org.deepin.dde.LocaleHelper1"/>
+    <allow send_destination="org.deepin.dde.LocaleHelper1"
+           send_interface="org.deepin.dde.LocaleHelper1"
+           send_member="SetAllowCaller"/>
+  </policy>
+
+  <policy group="deepin-daemon">
+    <allow send_destination="org.deepin.dde.LocaleHelper1"
+           send_interface="org.deepin.dde.LocaleHelper1"
+           send_member="SetAllowCaller"/>
   </policy>
 
   <!-- Allow anyone to invoke methods on the interfaces -->
@@ -20,6 +29,10 @@
            send_interface="org.freedesktop.DBus.Properties"/>
     <allow send_destination="org.deepin.dde.LocaleHelper1"
            send_interface="org.freedesktop.DBus.Introspectable"/>
+
+    <deny send_destination="org.deepin.dde.LocaleHelper1"
+          send_interface="org.deepin.dde.LocaleHelper1"
+          send_member="SetAllowCaller"/>
   </policy>
 
-</busconfig>
+</busconfig>

misc/polkit-action/org.deepin.dde.locale-helper.policy.in

@@ -12,7 +12,7 @@
     <defaults>
       <allow_any>no</allow_any>
       <allow_inactive>no</allow_inactive>
-      <allow_active>yes</allow_active>
+      <allow_active>auth_admin_keep</allow_active>
     </defaults>
   </action>
 </policyconfig>

misc/systemd/system/deepin-locale-helper.service

@@ -10,6 +10,11 @@ Type=dbus
 BusName=org.deepin.dde.LocaleHelper1
 ExecStart=/usr/lib/deepin-api/locale-helper
 
+RuntimeDirectory=dde-api
+RuntimeDirectoryMode=0700
+RuntimeDirectoryPreserve=yes
+
+ReadWritePaths=/run/dde-api
 ReadWritePaths=/etc/default/locale
 ReadWritePaths=/etc/locale.gen