Repository navigation
fix: validate DBus reply in SMB mount path - #413
Closed
Johnson-zs wants to merge 1 commit into
Closed
Johnson-zs wants to merge 1 commit into
Johnson-zs wants to merge 1 commit into
Conversation
1. Root cause: mountWithUserInput() and mountWithSavedInfos() did not check QDBusReply validity, DBus timeout produced contradictory state ok=false with err=kNoError, triggering false error dialog 2. Fix: add ret.isValid() guard before accessing reply value, on NoReply timeout use isMounted() to verify actual mount status, increase DBus timeout from 25s to 60s for slow SMB networks 3. Impact: eliminates false mount-failure dialog when SMB mount succeeds but DBus call times out, normal path unchanged Log: fix false mount error dialog on SMB DBus timeout Influence: 1. Test SMB mount with correct credentials, verify no false error 2. Test SMB mount under slow network to trigger DBus timeout 3. Verify mount-failure dialog still shows on genuine mount failures fix: 修复SMB挂载DBus超时误报错误对话框 1. 根因：mountWithUserInput()和mountWithSavedInfos()未校验DBus回复 有效性，DBus超时产生矛盾状态ok=false且err=kNoError，误弹错误对话框 2. 方案：访问回复值前增加ret.isValid()检查，NoReply超时时通过 isMounted()查询实际挂载状态，DBus超时从25秒增至60秒 3. 影响：消除SMB挂载成功但DBus超时时的误报错误对话框，正常路径无变化 Log: 修复SMB挂载DBus超时时的误报错误对话框 Influence: 1. 测试使用正确凭据SMB挂载，验证无误报错误对话框 2. 测试慢网络下SMB挂载触发DBus超时场景 3. 验证真实挂载失败仍正确显示错误对话框 PMS: BUG-295741
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: Johnson-zs The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Reviewer's GuideThe SMB mount paths now validate QDBusReply results before accessing returned data, treat NoReply timeouts as recoverable by verifying the actual mount state, and allow up to 60 seconds for slow DBus-backed SMB mounts, preventing false failure dialogs when the mount succeeds. Sequence diagram for resilient SMB mount DBus handlingsequenceDiagram
participant Caller
participant Mounter
participant DBus as MountControlDBus
participant System as MountState
Caller->>Mounter: mountWithUserInput()
Mounter->>DBus: call(kMountControlMount, address, param)
Note over DBus: Timeout set to 60000 ms
DBus-->>Mounter: QDBusReply<QVariantMap>
alt ret.isValid()
Mounter->>Mounter: ret.value()
Mounter-->>Caller: MountRet from DBus reply
else NoReply timeout
Mounter->>System: isMounted(address, checkMpt)
alt Mount is present
System-->>Mounter: true, checkMpt
Mounter-->>Caller: success with mount point
else Mount is absent
System-->>Mounter: false
Mounter-->>Caller: kGDBusErrorNoReply
end
else Other invalid reply
Mounter-->>Caller: kGDBusErrorNoReply
end
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
deepin pr auto review🤖 AI 代码审查报告总体评分： 📊 总体评价
🔍 详细分析1. 语法逻辑 ✅评价： 边界处理完善 ✅ 通过 潜在问题： 建议： ['对于非 NoReply 的 DBus 错误，建议映射到更精确的 DeviceError 枚举值（如 kGDBusErrorFailed），而非统一使用 kGDBusErrorNoReply', '在 mountWithSavedInfos 中，非 NoReply 错误建议直接返回错误而非 break，避免误导性地提示用户输入登录凭据'] 2. 代码质量 ✅评价： 代码结构清晰，注释完整 ✅ 通过 潜在问题： 建议： ['建议将 NoReply 错误处理逻辑（判断错误类型、调用 isMounted、返回结果）提取为公共辅助函数，减少重复代码'] 3. 代码性能 ✅评价： 性能良好，资源使用合理 ✅ 通过 潜在问题： 建议： [] 4. 代码安全 🔒评价： 存在0个安全漏洞 ✅ 通过
安全漏洞详情： 建议： [] 💡 改进建议代码示例// 建议改进：非 NoReply 错误使用更精确的错误码，并提取公共处理逻辑
// 提取公共的 NoReply 错误处理函数
std::optional<DNetworkMounter::MountRet> handleDBusNoReply(const QString &address,
DNetworkMounter *mounter)
{
QString checkMpt;
if (mounter->isMounted(address, checkMpt))
return DNetworkMounter::MountRet{true, DeviceError::kNoError, checkMpt};
return DNetworkMounter::MountRet{false, DeviceError::kGDBusErrorNoReply, ""};
}
// 在 mountWithUserInput 中：
if (!ret.isValid()) {
const auto &e = ret.error();
if (e.type() == QDBusError::NoReply
|| e.name() == QStringLiteral("org.freedesktop.DBus.Error.NoReply")) {
auto result = handleDBusNoReply(address, this);
if (result)
return *result;
return {false, DeviceError::kGDBusErrorNoReply, ""};
}
// 非 NoReply 错误使用通用错误码
return {false, DeviceError::kGDBusErrorFailed, ""};
}本报告由 AI 代码审查工具自动生成 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fix: validate DBus reply in SMB mount path
check QDBusReply validity, DBus timeout produced contradictory state
ok=false with err=kNoError, triggering false error dialog
NoReply timeout use isMounted() to verify actual mount status,
increase DBus timeout from 25s to 60s for slow SMB networks
but DBus call times out, normal path unchanged
Log: fix false mount error dialog on SMB DBus timeout
Influence:
fix: 修复SMB挂载DBus超时误报错误对话框
有效性，DBus超时产生矛盾状态ok=false且err=kNoError，误弹错误对话框
isMounted()查询实际挂载状态，DBus超时从25秒增至60秒
Log: 修复SMB挂载DBus超时时的误报错误对话框
Influence:
PMS: BUG-295741
Summary by Sourcery
Make SMB mount handling resilient to DBus timeouts by validating replies and confirming the actual mount state before reporting failure.
Bug Fixes:
Enhancements: