feat: lastore模块逻辑修改

lastore/agent.go

@@ -0,0 +1,89 @@
+// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package lastore
+
+import (
+	"sync"
+
+	"github.com/godbus/dbus"
+	lastore "github.com/linuxdeepin/go-dbus-factory/com.deepin.lastore"
+	"github.com/linuxdeepin/go-lib/dbusutil"
+)
+
+const (
+	// lastore agent的interface name
+	sessionAgentInterface = "com.deepin.lastore.Agent"
+	sessionAgentPath      = "/com/deepin/lastore/agent"
+)
+
+// 对应com.deepin.daemon.Network.GetProxy方法的key值
+const (
+	proxyTypeHttp  = "http"
+	proxyTypeHttps = "https"
+	proxyTypeFtp   = "ftp"
+	proxyTypeSocks = "socks"
+)
+
+// 对应系统代理环境变量
+const (
+	envHttpProxy  = "http_proxy"
+	envHttpsProxy = "https_proxy"
+	envFtpProxy   = "ftp_proxy"
+	envAllProxy   = "all_proxy"
+)
+
+// Agent 需要实现GetManualProxy和SendNotify两个接口
+type Agent struct {
+	sysService *dbusutil.Service
+	lastoreObj *Lastore
+	sysLastore lastore.Lastore
+	mu         sync.Mutex
+}
+
+func newAgent(l *Lastore) (*Agent, error) {
+	sysBus, err := dbusutil.NewSystemService()
+	if err != nil {
+		logger.Warning(err)
+		return nil, err
+	}
+	a := &Agent{
+		sysService: sysBus,
+	}
+	a.lastoreObj = l
+	a.sysLastore = lastore.NewLastore(a.sysService.Conn())
+	return a, nil
+}
+
+func (a *Agent) init() {
+	err := a.sysService.Export(sessionAgentPath, a)
+	if err != nil {
+		logger.Warning(err)
+		return
+	}
+	err = a.sysLastore.Manager().RegisterAgent(0, sessionAgentPath)
+	if err != nil {
+		logger.Warning(err)
+	}
+}
+
+func (a *Agent) destroy() {
+	err := a.sysLastore.Manager().UnRegisterAgent(0, sessionAgentPath)
+	if err != nil {
+		logger.Warning(err)
+	}
+}
+
+func (a *Agent) checkCallerAuth(sender dbus.Sender) bool {
+	const rootUid = 0
+	uid, err := a.sysService.GetConnUID(string(sender))
+	if err != nil {
+		return false
+	}
+	if uid != rootUid {
+		logger.Warningf("not allow %v call this method", sender)
+		return false
+	}
+	return true
+}

lastore/agent_ifc.go

@@ -0,0 +1,86 @@
+// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package lastore
+
+import (
+	"errors"
+	"fmt"
+	"github.com/godbus/dbus"
+	"github.com/linuxdeepin/go-lib/dbusutil"
+)
+
+func (*Agent) GetInterfaceName() string {
+	return sessionAgentInterface
+}
+
+func (a *Agent) GetManualProxy(sender dbus.Sender) (map[string]string, *dbus.Error) {
+	if !a.checkCallerAuth(sender) {
+		return nil, dbusutil.ToError(fmt.Errorf("not allow %v call this method", sender))
+	}
+	method, err := a.lastoreObj.network.GetProxyMethod(0)
+	if err != nil {
+		logger.Warning(err)
+		return nil, dbusutil.ToError(err)
+	}
+	if method != "manual" {
+		return nil, dbusutil.ToError(errors.New("only support manual proxy"))
+	}
+	proxyTypeList := []string{
+		proxyTypeHttp, proxyTypeHttps, proxyTypeFtp,
+	}
+	proxyEnvMap := make(map[string]string)
+	for _, typ := range proxyTypeList {
+		host, port, err := a.lastoreObj.network.GetProxy(0, typ)
+		if err != nil {
+			logger.Warning(err)
+			continue
+		}
+		user, passwd, enable, err := a.lastoreObj.network.GetProxyAuthentication(0, typ)
+		if err != nil {
+			logger.Warning(err)
+			continue
+		}
+		if enable {
+			proxyEnvMap[fmt.Sprintf("%s_proxy", typ)] = fmt.Sprintf("%s://%s:%s@%s:%s", proxyTypeHttp, user, passwd, host, port)
+		} else {
+			proxyEnvMap[fmt.Sprintf("%s_proxy", typ)] = fmt.Sprintf("%s://%s:%s", proxyTypeHttp, host, port)
+		}
+
+	}
+	host, port, err := a.lastoreObj.network.GetProxy(0, proxyTypeSocks)
+	if err != nil {
+		logger.Warning(err)
+		return proxyEnvMap, nil
+	}
+	user, passwd, enable, err := a.lastoreObj.network.GetProxyAuthentication(0, proxyTypeSocks)
+	if err != nil {
+		logger.Warning(err)
+		return proxyEnvMap, nil
+	}
+	if enable {
+		proxyEnvMap[envAllProxy] = fmt.Sprintf("%s://%s:%s@%s:%s", proxyTypeSocks, user, passwd, host, port)
+	} else {
+		proxyEnvMap[envAllProxy] = fmt.Sprintf("%s://%s:%s", proxyTypeSocks, host, port)
+	}
+
+	return proxyEnvMap, nil
+}
+
+func (a *Agent) SendNotify(sender dbus.Sender, appName string, replacesId uint32, appIcon string, summary string, body string, actions []string, hints map[string]dbus.Variant, expireTimeout int32) (uint32, *dbus.Error) {
+	if !a.checkCallerAuth(sender) {
+		return 0, dbusutil.ToError(fmt.Errorf("not allow %v call this method", sender))
+	}
+	logger.Info("receive notify from lastore daemon")
+	id, err := a.lastoreObj.notifications.Notify(0, appName, replacesId, appIcon, summary, body, actions, hints, expireTimeout)
+	return id, dbusutil.ToError(err)
+}
+
+func (a *Agent) CloseNotification(sender dbus.Sender, id uint32) *dbus.Error {
+	if !a.checkCallerAuth(sender) {
+		return dbusutil.ToError(fmt.Errorf("not allow %v call this method", sender))
+	}
+	logger.Info("receive close notify from lastore daemon")
+	return dbusutil.ToError(a.lastoreObj.notifications.CloseNotification(0, id))
+}

lastore/daemon.go

@@ -5,8 +5,8 @@
 package lastore
 
 import (
-	"github.com/linuxdeepin/go-lib/log"
 	"github.com/linuxdeepin/dde-daemon/loader"
+	"github.com/linuxdeepin/go-lib/log"
 )
 
 const (
@@ -22,6 +22,7 @@ func init() {
 
 type Daemon struct {
 	lastore *Lastore
+	agent   *Agent
 	*loader.ModuleBase
 }
 
@@ -38,13 +39,12 @@ func (*Daemon) GetDependencies() []string {
 func (d *Daemon) Start() error {
 	service := loader.GetService()
 
-	lastore, err := newLastore(service)
+	lastoreObj, err := newLastore(service)
 	if err != nil {
 		return err
 	}
-	d.lastore = lastore
-
-	err = service.Export(dbusPath, lastore, lastore.syncConfig)
+	d.lastore = lastoreObj
+	err = service.Export(dbusPath, lastoreObj, lastoreObj.syncConfig)
 	if err != nil {
 		return err
 	}
@@ -53,32 +53,44 @@ func (d *Daemon) Start() error {
 	if err != nil {
 		return err
 	}
-
-	err = lastore.syncConfig.Register()
+	err = lastoreObj.syncConfig.Register()
 	if err != nil {
 		logger.Warning("Failed to register sync service:", err)
 	}
+	agent, err := newAgent(lastoreObj)
+	if err != nil {
+		logger.Warning(err)
+		return err
+	}
+	d.agent = agent
+	agent.init()
 	return nil
 }
 
 func (d *Daemon) Stop() error {
-	if d.lastore == nil {
-		return nil
+	if d.lastore != nil {
+		service := loader.GetService()
+		err := service.ReleaseName(dbusServiceName)
+		if err != nil {
+			logger.Warning(err)
+		}
+		d.lastore.destroy()
+		err = service.StopExport(d.lastore)
+		if err != nil {
+			logger.Warning(err)
+		}
+
+		d.lastore = nil
 	}
 
-	service := loader.GetService()
-	err := service.ReleaseName(dbusServiceName)
-	if err != nil {
-		logger.Warning(err)
-	}
-
-	d.lastore.destroy()
-
-	err = service.StopExport(d.lastore)
-	if err != nil {
-		logger.Warning(err)
+	if d.agent != nil {
+		service := loader.GetService()
+		d.agent.destroy()
+		err := service.StopExport(d.agent)
+		if err != nil {
+			logger.Warning(err)
+		}
+		d.agent = nil
 	}
-
-	d.lastore = nil
 	return nil
 }