hyprwm/hyprlock
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprlock.git synced 2024-11-16 23:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

core: Allow and fix empty passwords (#140)

Browse source 
* Revert "core: don't auth on empty password (#126)"

This reverts commit 6a085d7f8e.

* core: properly handle pam_conv
This commit is contained in:
Maximilian Seidler 2024-03-07 14:22:11 +01:00 committed by GitHub
parent 3d6162e06e
commit 90e94dee86
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/core/Password.cpp
View file

@ -11,11 +11,20 @@
#include <cstring> #include <cstring>
#include <thread> #include <thread>
struct pam_response* reply;
// //
int conv(int num_msg, const struct pam_message** msg, struct pam_response** resp, void* appdata_ptr) { int conv(int num_msg, const struct pam_message** msg, struct pam_response** resp, void* appdata_ptr) {
*resp = reply; const char* pass = static_cast<const char*>(appdata_ptr);
struct pam_response* pam_reply = static_cast<struct pam_response*>(calloc(num_msg, sizeof(struct pam_response)));
for (int i = 0; i < num_msg; ++i) {
switch (msg[i]->msg_style) {
case PAM_PROMPT_ECHO_OFF:
case PAM_PROMPT_ECHO_ON: pam_reply[i].resp = strdup(pass); break;
case PAM_ERROR_MSG: Debug::log(ERR, "PAM: {}", msg[i]->msg); break;
case PAM_TEXT_INFO: Debug::log(LOG, "PAM: {}", msg[i]->msg); break;
}
}
*resp = pam_reply;
return PAM_SUCCESS; return PAM_SUCCESS;
} }
@ -29,7 +38,7 @@ std::shared_ptr<CPassword::SVerificationResult> CPassword::verify(const std::str
std::thread([this, result, pass]() { std::thread([this, result, pass]() {
auto auth = [&](std::string auth) -> bool { auto auth = [&](std::string auth) -> bool {
const pam_conv localConv = {conv, NULL}; const pam_conv localConv = {conv, (void*)pass.c_str()};
pam_handle_t* handle = NULL; pam_handle_t* handle = NULL;
int ret = pam_start(auth.c_str(), getlogin(), &localConv, &handle); int ret = pam_start(auth.c_str(), getlogin(), &localConv, &handle);
@ -41,11 +50,7 @@ std::shared_ptr<CPassword::SVerificationResult> CPassword::verify(const std::str
return false; return false;
} }
reply = (struct pam_response*)malloc(sizeof(struct pam_response)); ret = pam_authenticate(handle, 0);
reply->resp = strdup(pass.c_str());
reply->resp_retcode = 0;
ret = pam_authenticate(handle, 0);
if (ret != PAM_SUCCESS) { if (ret != PAM_SUCCESS) {
result->success = false; result->success = false;

6
src/core/hyprlock.cpp
View file

@ -714,11 +714,9 @@ void CHyprlock::onKey(uint32_t key, bool down) {
if (m_sPasswordState.passBuffer.length() > 0) if (m_sPasswordState.passBuffer.length() > 0)
m_sPasswordState.passBuffer = m_sPasswordState.passBuffer.substr(0, m_sPasswordState.passBuffer.length() - 1); m_sPasswordState.passBuffer = m_sPasswordState.passBuffer.substr(0, m_sPasswordState.passBuffer.length() - 1);
} else if (SYM == XKB_KEY_Return || SYM == XKB_KEY_KP_Enter) { } else if (SYM == XKB_KEY_Return || SYM == XKB_KEY_KP_Enter) {
if (m_sPasswordState.passBuffer.length() > 0) { Debug::log(LOG, "Authenticating");
Debug::log(LOG, "Authenticating");
m_sPasswordState.result = g_pPassword->verify(m_sPasswordState.passBuffer); m_sPasswordState.result = g_pPassword->verify(m_sPasswordState.passBuffer);
}
} else if (SYM == XKB_KEY_Escape) { } else if (SYM == XKB_KEY_Escape) {
Debug::log(LOG, "Clearing password buffer"); Debug::log(LOG, "Clearing password buffer");