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
37 changes: 19 additions & 18 deletions accounts1/user_chpwd_union_id.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,25 +119,26 @@ func newCaller(service *dbusutil.Service, sender dbus.Sender) (ret *caller, err
return
}

exe, err := proc.Exe()
if err != nil {
err = fmt.Errorf("get sender exe error: %v", err)
return
}
// exe, err := proc.Exe()
// if err != nil {
// err = fmt.Errorf("get sender exe error: %v", err)
// return
// }

// 只允许来自控制中心, 锁屏和 greetter 的调用
var app string
switch exe {
case "/usr/bin/dde-control-center":
app = "control-center"
case "/usr/bin/dde-lock":
app = "lock"
case "/usr/bin/lightdm-deepin-greeter":
app = "greeter"
default:
err = fmt.Errorf("set password with Union ID called by %s, which is not allow", exe)
return
}
//FIXME: we shouldn't use the executable path to identify caller
// var app string
// switch exe {
// case "/usr/bin/dde-control-center":
// app = "control-center"
// case "/usr/bin/dde-lock":
// app = "lock"
// case "/usr/bin/lightdm-deepin-greeter":
// app = "greeter"
// default:
// err = fmt.Errorf("set password with Union ID called by %s, which is not allow", exe)
// return
// }

status, err := proc.Status()
if err != nil {
Expand Down Expand Up @@ -189,7 +190,7 @@ func newCaller(service *dbusutil.Service, sender dbus.Sender) (ret *caller, err
xauth: xauth,
proc: proc,
user: user,
app: app,
app: "unknown",
wayland: waylandSocket,
}
return
Expand Down
9 changes: 2 additions & 7 deletions accounts1/user_ifc.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 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

Expand Down Expand Up @@ -149,12 +149,7 @@ func (u *User) SetPassword(sender dbus.Sender, password string) *dbus.Error {

// set password from UnionID
if password == "" {
err := u.setPwdWithUnionID(sender)
if err != nil {
return dbusutil.ToError(err)
} else {
return nil
}
return nil
}

err := u.checkAuth(sender, false, "")
Expand Down