Skip to content

fix: revert SetPassword disable, restore with admin auth #1125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caixr23 merged 1 commit into from
May 25, 2026
+49 −1
Merged

fix: revert SetPassword disable, restore with admin auth #1125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 49 additions & 1 deletion accounts1/user_ifc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,55 @@ func (u *User) SetShell(sender dbus.Sender, shell string) *dbus.Error {
}

func (u *User) SetPassword(sender dbus.Sender, password string) *dbus.Error {
return dbusutil.ToError(fmt.Errorf("SetPassword is deprecated and no longer supported"))
logger.Debug("[SetPassword] start ...")

// set password from UnionID
if password == "" {
return nil
}

err := u.checkAuth(sender, false, polkitActionUserAdministration)
Copy link
Copy Markdown
Member

@UTsweetyfish UTsweetyfish May 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

if err != nil {
logger.Debug("[SetPassword] access denied:", err)
return dbusutil.ToError(err)
}

var count = 10
for {
_, err := users.GetShadowInfo(u.UserName)

if err == nil {
break
}
count--
if count == 0 {
return dbusutil.ToError(err)
}
time.Sleep(time.Second)
}

if err := users.ModifyPasswd(password, u.UserName); err != nil {
logger.Warning("DoAction: modify password failed:", err)
return dbusutil.ToError(err)
}

err = removeLoginKeyring(u)
if err != nil {
logger.Warningf("DoAction: remove login keyring failed: %v", err)
}

u.PropsMu.Lock()
defer u.PropsMu.Unlock()

if u.Locked {
if err := users.LockedUser(false, u.UserName); err != nil {
logger.Warning("DoAction: unlock user failed:", err)
return dbusutil.ToError(err)
}
u.Locked = false
_ = u.emitPropChangedLocked(false)
}
return nil
}

func (u *User) SetMaxPasswordAge(sender dbus.Sender, nDays int32) *dbus.Error {
Expand Down
Loading