Skip to content

fix(security): use SystemBusNameSubject for polkit authentication #609

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
deepin-bot merged 1 commit into from
Mar 3, 2026
Merged

fix(security): use SystemBusNameSubject for polkit authentication #609

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
54 changes: 4 additions & 50 deletions deepin-devicemanager-server/deepin-devicecontrol/src/controlinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,55 +19,14 @@
#include <QFile>
#include <QDBusConnectionInterface>

#include <polkit-qt5-1/PolkitQt1/Authority>

Check warning on line 22 in deepin-devicemanager-server/deepin-devicecontrol/src/controlinterface.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <polkit-qt5-1/PolkitQt1/Authority> not found. Please note: Cppcheck does not need standard library headers to get proper results.

// 系统库文件
#include <dirent.h>
#include <cups.h>

Check warning on line 25 in deepin-devicemanager-server/deepin-devicecontrol/src/controlinterface.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <cups.h> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <string>

Check warning on line 26 in deepin-devicemanager-server/deepin-devicecontrol/src/controlinterface.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <string> not found. Please note: Cppcheck does not need standard library headers to get proper results.

using namespace PolkitQt1;
using namespace DDLog;
static int getPidByName(const QString &taskName)
{
DIR *dir = opendir("/proc");
int pid = -1;
if (nullptr == dir)
return pid;

struct dirent *ptr = nullptr;
while ((ptr = readdir(dir)) != nullptr) {
if ((strcmp(ptr->d_name, ".") == 0) || (strcmp(ptr->d_name, "..") == 0) || DT_DIR != ptr->d_type)
continue;
char filepath[1024] = { 0 };
sprintf(filepath, "/proc/%s/cmdline", ptr->d_name);
FILE *fp = fopen(filepath, "r");
if (nullptr == fp)
continue;

char buf[1024] = { 0 };
if (fgets(buf, 1023, fp) == nullptr) {
fclose(fp);
continue;
}
char cur_task_name[1024] = { 0 };
sscanf(buf, "%s", cur_task_name);
fclose(fp);
if (QString(cur_task_name).endsWith(taskName)) {
bool ok = false;
int curPid = QString(ptr->d_name).toInt(&ok);
if (ok) {
pid = curPid;
break;
}
}
}
closedir(dir);

return pid;
}


bool ControlInterface::getUserAuthorPasswd()
{
#ifdef DISABLE_POLKIT
Expand All @@ -77,15 +36,10 @@
return true;
}

int pid = getPidByName("deepin-devicemanager");
if (pid >= 0) {
Authority::Result result = Authority::instance()->checkAuthorizationSync("com.deepin.deepin-devicemanager.checkAuthentication",
UnixProcessSubject(pid),
Authority::AllowUserInteraction);
return result == Authority::Yes;
}

return false;
Authority::Result result = Authority::instance()->checkAuthorizationSync("com.deepin.deepin-devicemanager.checkAuthentication",
SystemBusNameSubject(message().service()),
Authority::AllowUserInteraction);
return result == Authority::Yes;
}
ControlInterface::ControlInterface(QObject *parent)
: QDBusService(parent)
Expand Down