poz/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

service/pam: move pam execution to subprocess to allow killing it

Browse source 
Many pam modules can't be aborted well without this.
This commit is contained in:
outfoxxed 2024-06-18 03:29:25 -07:00
parent b5c8774a79
commit e89035b18c
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
10 changed files with 480 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/services/pam/qml.cpp
View file

@ -13,12 +13,6 @@
#include "conversation.hpp"
PamContext::~PamContext() {
if (this->conversation != nullptr && this->conversation->isRunning()) {
this->conversation->abort();
}
}
void PamContext::componentComplete() {
this->postInit = true;
@ -91,12 +85,12 @@ void PamContext::startConversation() {
}
}
this->conversation = new PamConversation(this->mConfig, this->mConfigDirectory, user);
this->conversation = new PamConversation(this);
QObject::connect(this->conversation, &PamConversation::completed, this, &PamContext::onCompleted);
QObject::connect(this->conversation, &PamConversation::error, this, &PamContext::onError);
QObject::connect(this->conversation, &PamConversation::message, this, &PamContext::onMessage);
emit this->activeChanged();
this->conversation->start();
this->conversation->start(this->mConfigDirectory, this->mConfig, user);
}
void PamContext::abortConversation() {
@ -104,7 +98,7 @@ void PamContext::abortConversation() {
this->mTargetActive = false;
QObject::disconnect(this->conversation, nullptr, this, nullptr);
if (this->conversation->isRunning()) this->conversation->abort();
this->conversation->deleteLater();
this->conversation = nullptr;
emit this->activeChanged();
@ -124,9 +118,9 @@ void PamContext::abortConversation() {
}
}
void PamContext::respond(QString response) {
void PamContext::respond(const QString& response) {
if (this->isActive() && this->mIsResponseRequired) {
this->conversation->respond(std::move(response));
this->conversation->respond(response);
} else {
qWarning() << "PamContext response was ignored as this context does not require one.";
}