Skip to content

Commit 90670dc

Browse files
committed
feat: root进程需要判断调用者时,使用TrustedExe替换Exe
root进程需要判断调用者时,使用TrustedExe替换Exe Log: root进程需要判断调用者时,使用TrustedExe替换Exe pms: TASK-369021
1 parent 9965a80 commit 90670dc

8 files changed

Lines changed: 10 additions & 10 deletions

File tree

accounts1/user.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ func (u *User) getSenderDBus(sender dbus.Sender) string {
283283
return ""
284284
}
285285
proc := procfs.Process(pid)
286-
exe, err := proc.Exe()
286+
exe, err := proc.TrustedExe()
287287
if err != nil {
288288
logger.Warning(err)
289289
return ""
@@ -530,7 +530,7 @@ func (u *User) checkIsControlCenter(sender dbus.Sender) bool {
530530
}
531531

532532
p := procfs.Process(pid)
533-
exe, err := p.Exe()
533+
exe, err := p.TrustedExe()
534534
if err != nil {
535535
logger.Warning(err)
536536
return false
@@ -551,7 +551,7 @@ func (u *User) checkIsDeepinDaemon(sender dbus.Sender) bool {
551551
}
552552

553553
p := procfs.Process(pid)
554-
exe, err := p.Exe()
554+
exe, err := p.TrustedExe()
555555
if err != nil {
556556
logger.Warning(err)
557557
return false

accounts1/user_chpwd_union_id.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func newCaller(service *dbusutil.Service, sender dbus.Sender) (ret *caller, err
116116
return
117117
}
118118

119-
exe, err := proc.Exe()
119+
exe, err := proc.TrustedExe()
120120
if err != nil {
121121
err = fmt.Errorf("get sender exe error: %v", err)
122122
return

bin/dde-system-daemon/tty.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func (d *Daemon) SetLogindTTY(sender dbus.Sender, NAutoVTs int, resetCustom bool
111111
return dbusutil.ToError(err)
112112
}
113113
p := procfs.Process(pid)
114-
cmd, err = p.Exe()
114+
cmd, err = p.TrustedExe()
115115
if err != nil {
116116
// 当调用者在使用过程中发生了更新,则在获取该进程的exe时,会出现lstat xxx (deleted)此类的error,如果发生的是覆盖,则该路径依旧存在,因此增加以下判断
117117
pErr, ok := err.(*os.PathError)

bin/dde-system-daemon/virtual.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func getValidSupData(supApps []string) []string {
8282
// 获取App二进制名称,将exe和cmdline拼接成一个string
8383
func getActivePidInfo(pid uint32) (execPath string, err error) {
8484
value := procfs.Process(pid)
85-
execPath, err = value.Exe()
85+
execPath, err = value.TrustedExe()
8686
if err != nil {
8787
logger.Warning(err)
8888
return "", err

grub2/grub2.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ func checkInvokePermission(service *dbusutil.Service, sender dbus.Sender) error
623623
return err
624624
}
625625
p := procfs.Process(pid)
626-
cmd, err := p.Exe()
626+
cmd, err := p.TrustedExe()
627627
if err != nil {
628628
// 当调用者在使用过程中发生了更新,则在获取该进程的exe时,会出现lstat xxx (deleted)此类的error,如果发生的是覆盖,则该路径依旧存在,因此增加以下判断
629629
pErr, ok := err.(*os.PathError)

system/display1/displaycfg.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ func (d *Display) doDetectSupportWayland(sender dbus.Sender) (bool, error) {
276276
logger.Warning(err)
277277
return false, err
278278
}
279-
execPath, err := p.Exe()
279+
execPath, err := p.TrustedExe()
280280
if err != nil {
281281
logger.Warning(err)
282282
return false, err

system/scheduler/scheduler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func setProcessPriority(cfg *config, pid int) {
5454

5555
// 获取进程可执行文件路径
5656
func getProcessExe(pid int) (string, error) {
57-
exe, err := procfs.Process(pid).Exe()
57+
exe, err := procfs.Process(pid).TrustedExe()
5858
return exe, err
5959
}
6060

system/uadp1/manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func (m *Manager) getExecPath(sender dbus.Sender) (string, error) {
162162
return "", err
163163
}
164164

165-
execPath, err := procfs.Process(pid).Exe()
165+
execPath, err := procfs.Process(pid).TrustedExe()
166166
if err != nil {
167167
return "", err
168168
}

0 commit comments

Comments
 (0)