From 4beaeb6c9496e9cbec9ebe45880184399aa6afcf Mon Sep 17 00:00:00 2001 From: gongheng Date: Wed, 17 Jun 2026 16:08:48 +0800 Subject: [PATCH] refactor(driver): move driver repo source init to installer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move driver repo source creation from MainJob to DriverInstaller, creating temp source only when installing and cleaning up after. 将驱动仓库源初始化逻辑从MainJob迁移到DriverInstaller， 仅在安装驱动时按需创建临时源并在安装完成后清理。 Log: 驱动仓库源创建逻辑迁移至安装器按需执行 PMS: BUG-366349 Influence: 驱动仓库源文件不再在服务启动时创建，改为安装驱动时按需创建和清理，避免非社区版系统不必要的源文件残留。 --- .../src/drivercontrol/driverinstaller.cpp | 73 ++++++++++++++++++- .../src/drivercontrol/driverinstaller.h | 18 ++++- .../deepin-deviceinfo/src/mainjob.cpp | 47 +----------- .../deepin-deviceinfo/src/mainjob.h | 7 +- 4 files changed, 91 insertions(+), 54 deletions(-) diff --git a/deepin-devicemanager-server/deepin-devicecontrol/src/drivercontrol/driverinstaller.cpp b/deepin-devicemanager-server/deepin-devicecontrol/src/drivercontrol/driverinstaller.cpp index 6301a8a73..f786a64b4 100644 --- a/deepin-devicemanager-server/deepin-devicecontrol/src/drivercontrol/driverinstaller.cpp +++ b/deepin-devicemanager-server/deepin-devicecontrol/src/drivercontrol/driverinstaller.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2019 ~ 2023 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2019 - 2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: GPL-3.0-or-later @@ -15,6 +15,8 @@ #include #include #include +#include +#include #include #include @@ -22,6 +24,10 @@ #include using namespace DDLog; + +const QString DriverInstaller::DEVICE_REPO_PATH = "/etc/apt/sources.list.d/devicemanager.list"; +const QString DriverInstaller::DRIVER_REPO_PATH = "/etc/apt/sources.list.d/driver.list"; + const int MAX_DPKGRUNING_TEST = 20; const int TEST_TIME_INTERVAL = 2000; @@ -134,9 +140,13 @@ bool DriverInstaller::isNetworkOnline(uint usec) void DriverInstaller::doOperate(const QString &package, const QString &version) { + // 按需创建驱动仓库源文件，仅在 driver.list 中不存在 pro-driver-packages 时创建 + ensureDriverRepoSource(); + if (!initBackend()) { emit errorOccurred(EC_NULL); qCInfo(appLog) << "DRIVER_LOG : ************************** 初始化backend失败"; + cleanupTempSource(); return; } @@ -145,6 +155,7 @@ void DriverInstaller::doOperate(const QString &package, const QString &version) if (nullptr == p) { emit errorOccurred(EC_NOTFOUND); qCInfo(appLog) << "DRIVER_LOG : ************************** 安装包不存在"; + cleanupTempSource(); return; } @@ -154,6 +165,7 @@ void DriverInstaller::doOperate(const QString &package, const QString &version) emit errorOccurred(EC_NOTFOUND); delete p; p = nullptr; + cleanupTempSource(); return; } @@ -164,6 +176,7 @@ void DriverInstaller::doOperate(const QString &package, const QString &version) if (nullptr == mp_Trans) { emit errorOccurred(EC_NULL); qCInfo(appLog) << "DRIVER_LOG : ************************** installPackages"; + cleanupTempSource(); return; } @@ -192,6 +205,9 @@ void DriverInstaller::doOperate(const QString &package, const QString &version) qCInfo(appLog) << "DRIVER_LOG : ************************** 安装结束 结束状态码" << status; qCInfo(appLog) << "DRIVER_LOG : ************************** 安装结束 结束错误码" << code; + // 清理本次创建的临时源文件 + cleanupTempSource(); + mp_Trans->disconnect(); mp_Trans->deleteLater(); mp_Trans = nullptr; @@ -221,4 +237,59 @@ void DriverInstaller::doOperate(const QString &package, const QString &version) mp_Trans->run(); } + +void DriverInstaller::ensureDriverRepoSource() +{ + // 重置临时源标记，避免因前一次安装失败导致残留标记 + m_tempSourceCreated = false; + + // 优先检查系统自带的 driver.list 中是否已包含驱动仓库源 + QFile fileDriver(DRIVER_REPO_PATH); + if (fileDriver.open(QIODevice::ReadOnly)) { + QString info = fileDriver.readAll(); + QStringList lines = info.split("\n"); + foreach (QString line, lines) { + if (line.contains("pro-driver-packages")) { + fileDriver.close(); + return; + } + } + fileDriver.close(); + } + + // 使用 O_EXCL 原子创建文件，避免 TOCTOU 竞争条件（CWE-367） + // NewOnly 保证文件不存在时才创建，若已存在则 open 失败，无需先检查 + QFile file(DEVICE_REPO_PATH); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text | QFile::NewOnly)) { + // 文件已存在属于正常情况（第三方创建），静默返回 + if (!QFile::exists(DEVICE_REPO_PATH)) { + qCInfo(appLog) << "DRIVER_LOG : 创建驱动源文件失败:" << file.errorString(); + } + return; + } + + file.write("deb https://pro-driver-packages.uniontech.com eagle non-free\n"); + file.close(); + m_tempSourceCreated = true; + qCInfo(appLog) << "DRIVER_LOG : 创建临时驱动源文件:" << DEVICE_REPO_PATH; + + // 新源创建后需执行 apt update 更新包索引， + // 否则 QApt::Backend 无法识别该源的软件包 + // 使用列表传参绕过 shell 解析，避免命令注入风险 + QProcess process; + process.start("apt", QStringList() << "update"); + process.waitForFinished(50000); + qCInfo(appLog) << "DRIVER_LOG : 临时源 apt update 完成"; +} + +void DriverInstaller::cleanupTempSource() +{ + if (!m_tempSourceCreated) { + return; + } + + QFile::remove(DEVICE_REPO_PATH); + m_tempSourceCreated = false; + qCWarning(appLog) << "DRIVER_LOG : 清理临时驱动源文件:" << DEVICE_REPO_PATH; +} #endif // DISABLE_DRIVER diff --git a/deepin-devicemanager-server/deepin-devicecontrol/src/drivercontrol/driverinstaller.h b/deepin-devicemanager-server/deepin-devicecontrol/src/drivercontrol/driverinstaller.h index 812b40ca4..92280c85a 100644 --- a/deepin-devicemanager-server/deepin-devicecontrol/src/drivercontrol/driverinstaller.h +++ b/deepin-devicemanager-server/deepin-devicecontrol/src/drivercontrol/driverinstaller.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2019 ~ 2023 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2019 - 2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: GPL-3.0-or-later @@ -27,6 +27,10 @@ class DriverInstaller : public QObject public: explicit DriverInstaller(QObject *parent = nullptr); + // 驱动仓库源文件路径 + static const QString DEVICE_REPO_PATH; + static const QString DRIVER_REPO_PATH; + public slots: /** * @brief installPackage 安装包 @@ -69,11 +73,23 @@ public slots: * @param version */ void doOperate(const QString &package, const QString &version); + + /** + * @brief ensureDriverRepoSource 按需创建驱动仓库源文件 + * 仅在 driver.list 中不存在 pro-driver-packages 时创建 devicemanager.list + */ + void ensureDriverRepoSource(); + + /** + * @brief cleanupTempSource 清理本次创建的临时源文件 + */ + void cleanupTempSource(); private: QApt::Backend *mp_Backend = nullptr; QApt::Transaction *mp_Trans = nullptr; int m_iRuningTestCount = 0; bool m_Cancel; + bool m_tempSourceCreated = false; // 是否在本次安装中创建了临时源 }; #endif // DRIVERINSTALLER_H diff --git a/deepin-devicemanager-server/deepin-deviceinfo/src/mainjob.cpp b/deepin-devicemanager-server/deepin-deviceinfo/src/mainjob.cpp index 902d024cf..93a9f08b7 100644 --- a/deepin-devicemanager-server/deepin-deviceinfo/src/mainjob.cpp +++ b/deepin-devicemanager-server/deepin-deviceinfo/src/mainjob.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2019 ~ 2023 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2019 - 2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: GPL-3.0-or-later @@ -12,20 +12,15 @@ #include #include -#include #include #include #include -#include - using namespace DDLog; static QMutex mainJobMutex; static bool s_ServerIsUpdating = false; static bool s_ClientIsUpdating = false; -const QString DEVICE_REPO_PATH = "/etc/apt/sources.list.d/devicemanager.list"; -const QString DRIVER_REPO_PATH = "/etc/apt/sources.list.d/driver.list"; MainJob::MainJob(const char *name, QObject *parent) : QObject(parent) @@ -43,13 +38,6 @@ MainJob::MainJob(const char *name, QObject *parent) // 在驱动管理延迟加载1000ms QTimer::singleShot(1000, this, [ = ]() { -#ifndef DISABLE_DRIVER - DTK_CORE_NAMESPACE::DSysInfo::UosEdition type = DTK_CORE_NAMESPACE::DSysInfo::uosEditionType(); - if (DTK_CORE_NAMESPACE::DSysInfo::UosCommunity != type ) { - initDriverRepoSource(); - } -#endif - sqlCopytoKernel(); connect(m_deviceInterface, &DeviceInterface::sigUpdate, this, &MainJob::slotUsbChanged); @@ -126,39 +114,6 @@ void MainJob::slotDriverControl(bool success) executeClientInstruction("DETECT"); } -void MainJob::initDriverRepoSource() -{ - QFile fileDriver(DRIVER_REPO_PATH); - if (fileDriver.open(QIODevice::ReadOnly)) { - QString info = fileDriver.readAll(); - QStringList lines = info.split("\n"); - foreach (QString line, lines) { - if (line.contains("pro-driver-packages")) { - fileDriver.close(); - return; - } - } - fileDriver.close(); - } - - QFile file(DEVICE_REPO_PATH); - if (QFile::exists(DEVICE_REPO_PATH)) { - return; - } - if (!file.open(QIODevice::ReadWrite | QIODevice::Text)) { - qCInfo(appLog) << file.errorString(); - return; - } - - file.write("deb https://pro-driver-packages.uniontech.com eagle non-free\n"); - file.close(); - - QString cmd = "apt update"; - QProcess process; - process.start(cmd); - process.waitForFinished(-1); -} - void MainJob::updateAllDevice() { PERF_PRINT_BEGIN("POINT-01", "MainJob::updateAllDevice()"); diff --git a/deepin-devicemanager-server/deepin-deviceinfo/src/mainjob.h b/deepin-devicemanager-server/deepin-deviceinfo/src/mainjob.h index 5770d83c9..a131e916f 100644 --- a/deepin-devicemanager-server/deepin-deviceinfo/src/mainjob.h +++ b/deepin-devicemanager-server/deepin-deviceinfo/src/mainjob.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2019 ~ 2023 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2019 - 2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: GPL-3.0-or-later @@ -53,11 +53,6 @@ private slots: * @brief sqlCopytoKernel */ void sqlCopytoKernel(); - /** - * @brief initDriverRepoSource : 初始化驱动仓库 - * @return : 无 - */ - void initDriverRepoSource(); /** * @brief updateAllDevice */