Skip to content

fix: login stuck for passwordless users in nopasswdlogin group #331

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

Closed
openarun wants to merge 1 commit into from
Closed

fix: login stuck for passwordless users in nopasswdlogin group #331

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
15 changes: 7 additions & 8 deletions src/lightdm-deepin-greeter/greeterworker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,14 +513,6 @@ void GreeterWorker::checkAccount(const QString &account)
const QString userPath = m_accountsInter->FindUserByName(account);
if (userPath.startsWith("/")) {
user_ptr = std::make_shared<NativeUser>(userPath);

// 对于没有设置密码的账户,直接认定为错误账户
if (!user_ptr->isPasswordValid()) {
qWarning() << userPath;
emit m_model->authFailedTipsMessage(tr("Wrong account"));
m_model->setAuthType(AT_None);
return;
}
Comment on lines -518 to -523
Copy link
Contributor

@asterwyx asterwyx Jul 12, 2023

Choose a reason for hiding this comment

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

Moving these all to the end of the function might lead to creating authentication even when the user is not in the nopasswdlogin group and his or her password is not set. I think you should judge if a user is in the nopasswdlogin group right here.

Copy link
Contributor

@asterwyx asterwyx Aug 2, 2023

Choose a reason for hiding this comment

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

Hi, how do you think about my comment here?

} else if (!user_ptr) {
// 判断账户第一次登录时的有效性
std::string str = account.toStdString();
Expand Down Expand Up @@ -553,6 +545,13 @@ void GreeterWorker::checkAccount(const QString &account)
destroyAuthentication(m_account);
createAuthentication(user_ptr->name());
}
// 对于没有设置密码的账户,直接认定为错误账户
if (!user_ptr->isPasswordValid()) {
qWarning() << userPath;
emit m_model->authFailedTipsMessage(tr("Wrong account"));
m_model->setAuthType(AT_None);
return;
}
}

void GreeterWorker::checkDBusServer(bool isValid)
Expand Down