Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions application/main.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-only

Expand Down Expand Up @@ -128,7 +128,10 @@ int main(int argc, char *argv[])
proc.startDetached("/usr/bin/dbus-send --system --type=method_call --dest=com.deepin.diskmanager /com/deepin/diskmanager com.deepin.diskmanager.Quit");
}

proc.startDetached("/usr/bin/deepin-diskmanager-authenticateProxy");
QStringList argList;
argList << QDBusConnection::systemBus().baseService();
qDebug() << "Starting deepin-diskmanager-authenticateProxy with args:" << argList;
proc.startDetached("deepin-diskmanager-authenticateProxy", argList);

//正常启动程序后,循环查询后台服务是否已经启动,如果后台服务启动说明鉴权成功,启动前端界面
while (1) {
Expand Down
13 changes: 7 additions & 6 deletions service/PolicyKitHelper.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-only

Expand All @@ -7,18 +7,19 @@
//

#include "PolicyKitHelper.h"
#include <QDebug>

Check warning on line 10 in service/PolicyKitHelper.cpp

View workflow job for this annotation

GitHub Actions / cppcheck

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

Check warning on line 10 in service/PolicyKitHelper.cpp

View workflow job for this annotation

GitHub Actions / static-check / static-check

Include file: <QDebug> not found. Please note: Cppcheck does not need standard library headers to get proper results.
bool PolicyKitHelper::checkAuthorization(const QString& actionId, qint64 applicationPid)

bool PolicyKitHelper::checkAuthorization(const QString& actionId, const QString& appBusName)

Check warning on line 12 in service/PolicyKitHelper.cpp

View workflow job for this annotation

GitHub Actions / cppcheck

The function 'checkAuthorization' is never used.

Check warning on line 12 in service/PolicyKitHelper.cpp

View workflow job for this annotation

GitHub Actions / static-check / static-check

The function 'checkAuthorization' is never used.
{
if (appBusName.isEmpty())
return false;

Authority::Result result;
// 第一个参数是需要验证的action,和规则文件写的保持一致
result = Authority::instance()->checkAuthorizationSync(actionId, UnixProcessSubject(applicationPid),
result = Authority::instance()->checkAuthorizationSync(actionId, SystemBusNameSubject(appBusName),
Authority::AllowUserInteraction);
if (result == Authority::Yes) {
// qDebug() << 111111111;
return true;
}else {
// qDebug() << 22222222;
return false;
}
}
Expand Down
4 changes: 2 additions & 2 deletions service/PolicyKitHelper.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-only

Expand All @@ -14,7 +14,7 @@ class PolicyKitHelper
return &instance;
}

bool checkAuthorization(const QString& actionId, qint64 applicationPid);
bool checkAuthorization(const QString& actionId, const QString& appBusName);

private:
PolicyKitHelper();
Expand Down
Loading
Loading