Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions misc/polkit-rules/org.deepin.dde.uadp.rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
polkit.addRule(function(action, subject) {
if (action.id === "org.deepin.dde.uadp.doAction") {
// lightdm 活跃会话放行(greeter 免密码调用)
if (subject.user === "lightdm") {
if (subject.active) {
return polkit.Result.YES;
} else {
return polkit.Result.NO;
}
}

// deepin-daemon 用户及组放行
if (subject.user === "deepin-daemon" || subject.isInGroup("deepin-daemon")) {
return polkit.Result.YES;
}
}
});
59 changes: 57 additions & 2 deletions system/uadp1/manager.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

package uadp

import (
"github.com/godbus/dbus/v5"
"errors"

dbus "github.com/godbus/dbus/v5"
polkit "github.com/linuxdeepin/go-dbus-factory/system/org.freedesktop.policykit1"
"github.com/linuxdeepin/go-lib/dbusutil"
"github.com/linuxdeepin/go-lib/procfs"
)
Expand All @@ -16,6 +19,28 @@ import (
const uadpEncryptMaxSize = 256 - 11
const uadpDecryptMaxSize = 256

const uadpActionId = "org.deepin.dde.uadp.doAction"

func checkAuthorization(actionId string, sysBusName string) error {
systemBus, err := dbus.SystemBus()
if err != nil {
return err
}
authority := polkit.NewAuthority(systemBus)
subject := polkit.MakeSubject(polkit.SubjectKindSystemBusName)
subject.SetDetail("name", sysBusName)

ret, err := authority.CheckAuthorization(0, subject, actionId,
nil, polkit.CheckAuthorizationFlagsAllowUserInteraction, "")
if err != nil {
return err
}
if !ret.IsAuthorized {
return errors.New("not authorized")
}
return nil
}

type Manager struct {
service *dbusutil.Service

Expand Down Expand Up @@ -60,6 +85,12 @@ func (m *Manager) Available() (bool, *dbus.Error) {
}

func (m *Manager) ListName(sender dbus.Sender) ([]string, *dbus.Error) {
err := checkAuthorization(uadpActionId, string(sender))
if err != nil {
logger.Warning(err)
return []string{}, dbusutil.ToError(err)
}

exec, err := m.getExecPath(sender)
if err != nil {
logger.Warning(err)
Expand All @@ -70,6 +101,12 @@ func (m *Manager) ListName(sender dbus.Sender) ([]string, *dbus.Error) {
}

func (m *Manager) Set(sender dbus.Sender, name string, data []byte) *dbus.Error {
err := checkAuthorization(uadpActionId, string(sender))
if err != nil {
logger.Warning(err)
return dbusutil.ToError(err)
}

exec, err := m.getExecPath(sender)
if err != nil {
logger.Warning(err)
Expand Down Expand Up @@ -102,6 +139,12 @@ func (m *Manager) Set(sender dbus.Sender, name string, data []byte) *dbus.Error
}

func (m *Manager) Get(sender dbus.Sender, name string) ([]byte, *dbus.Error) {
err := checkAuthorization(uadpActionId, string(sender))
if err != nil {
logger.Warning(err)
return []byte{}, dbusutil.ToError(err)
}

exec, err := m.getExecPath(sender)
if err != nil {
logger.Warning(err)
Expand All @@ -123,6 +166,12 @@ func (m *Manager) Get(sender dbus.Sender, name string) ([]byte, *dbus.Error) {
}

func (m *Manager) Delete(sender dbus.Sender, name string) *dbus.Error {
err := checkAuthorization(uadpActionId, string(sender))
if err != nil {
logger.Warning(err)
return dbusutil.ToError(err)
}

exec, err := m.getExecPath(sender)
if err != nil {
logger.Warning(err)
Expand All @@ -140,6 +189,12 @@ func (m *Manager) Delete(sender dbus.Sender, name string) *dbus.Error {
}

func (m *Manager) Release(sender dbus.Sender) *dbus.Error {
err := checkAuthorization(uadpActionId, string(sender))
if err != nil {
logger.Warning(err)
return dbusutil.ToError(err)
}

exec, err := m.getExecPath(sender)
if err != nil {
logger.Warning(err)
Expand Down
Loading