59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
|
From a85afbd3022fb63f8356d0260a2a1d976898ff3f Mon Sep 17 00:00:00 2001
|
|||
|
|
From: peijiankang <peijiankang@kylinos.cn>
|
|||
|
|
Date: Fri, 19 May 2023 15:56:07 +0800
|
|||
|
|
Subject: [PATCH] fix critical vulnerabilities
|
|||
|
|
|
|||
|
|
---
|
|||
|
|
registeredQDbus/sysdbusregister.cpp | 5 +++++
|
|||
|
|
registeredQDbus/sysdbusregister.h | 4 +++-
|
|||
|
|
2 files changed, 8 insertions(+), 1 deletion(-)
|
|||
|
|
|
|||
|
|
diff --git a/registeredQDbus/sysdbusregister.cpp b/registeredQDbus/sysdbusregister.cpp
|
|||
|
|
index 1aaefbe..077c8d6 100644
|
|||
|
|
--- a/registeredQDbus/sysdbusregister.cpp
|
|||
|
|
+++ b/registeredQDbus/sysdbusregister.cpp
|
|||
|
|
@@ -30,6 +30,7 @@
|
|||
|
|
#include <QDBusReply>
|
|||
|
|
#include<QCryptographicHash>
|
|||
|
|
#include <polkit-qt5-1/polkitqt1-authority.h>
|
|||
|
|
+#include <QDBusMessage>
|
|||
|
|
|
|||
|
|
/* qt会将glib里的signals成员识别为宏，所以取消该宏
|
|||
|
|
* 后面如果用到signals时，使用Q_SIGNALS代替即可
|
|||
|
|
@@ -180,6 +181,10 @@ int SysdbusRegister::_changeOtherUserPasswd(QString username, QString pwd){
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
int SysdbusRegister::changeOtherUserPasswd(QString username, QString pwd){
|
|||
|
|
+ //密码校验
|
|||
|
|
+ QDBusConnection conn = connection();
|
|||
|
|
+ QDBusMessage msg = message();
|
|||
|
|
+ _id = conn.interface()->servicePid(msg.service()).value();
|
|||
|
|
|
|||
|
|
if (_id == 0){
|
|||
|
|
return -1;
|
|||
|
|
diff --git a/registeredQDbus/sysdbusregister.h b/registeredQDbus/sysdbusregister.h
|
|||
|
|
index a513ada..bffc80b 100644
|
|||
|
|
--- a/registeredQDbus/sysdbusregister.h
|
|||
|
|
+++ b/registeredQDbus/sysdbusregister.h
|
|||
|
|
@@ -28,6 +28,8 @@
|
|||
|
|
#include <QVector>
|
|||
|
|
#include <ddcutil_c_api.h>
|
|||
|
|
#include <ddcutil_types.h>
|
|||
|
|
+#include <QDBusContext>
|
|||
|
|
+#include <QDBusConnectionInterface>
|
|||
|
|
|
|||
|
|
struct brightInfo {
|
|||
|
|
QString serialNum;
|
|||
|
|
@@ -40,7 +42,7 @@ struct displayInfo {
|
|||
|
|
QString edidHash; //edid信息的hash值(md5)
|
|||
|
|
};
|
|||
|
|
|
|||
|
|
-class SysdbusRegister : public QObject
|
|||
|
|
+class SysdbusRegister : public QObject,QDBusContext
|
|||
|
|
{
|
|||
|
|
Q_OBJECT
|
|||
|
|
|
|||
|
|
--
|
|||
|
|
2.39.1
|
|||
|
|
|