fix: pick the Fix for Security Issues#1175
Closed
52cyb wants to merge 3 commits into
Closed
Conversation
1. Removed unused imports (filepath, utils) and cleaned up import references 2. Changed temporary file creation from hardcoded path to using os.CreateTemp with a safe filename pattern 3. Simplified the if-else logic by removing unnecessary else block and using early return 4. Used path.Ext for extension extraction instead of filepath.Ext This refactoring ensures that temporary background files are created using Go's standard safe method, which provides random naming to avoid collisions and potential race conditions. The previous approach used a hardcoded filename which could cause conflicts if multiple instances run simultaneously. Influence: 1. Verify that setting a background source file works correctly via DBus 2. Test getting the background returns a valid temporary file path 3. Verify the temporary file has the correct extension matching the source 4. Check that temporary files are properly cleaned up 5. Test concurrent operations to ensure no file name collisions 6. Verify that the temporary file is readable and contains valid image data refactor: 改进主题中的临时背景文件创建 1. 移除未使用的导入(filepath, utils)并清理导入引用 2. 将临时文件创建从硬编码路径改为使用 os.CreateTemp 并使用安全的文件名 模式 3. 通过移除不必要的 else 块和使用提前返回来简化 if-else 逻辑 4. 使用 path.Ext 替代 filepath.Ext 进行扩展名提取 这次重构确保使用 Go 标准的安全方法创建临时背景文件，通过随机命名避免冲突 和潜在的竞争条件。之前的方法使用硬编码文件名，如果多个实例同时运行可能导 致冲突。 Influence: 1. 验证通过 DBus 设置背景源文件功能正常 2. 测试获取背景返回有效的临时文件路径 3. 验证临时文件具有与源文件匹配的正确扩展名 4. 检查临时文件是否被正确清理 5. 测试并发操作以确保文件名无冲突 6. 验证临时文件可读且包含有效的图像数据 PMS: BUG-367561 (cherry picked from commit 72bacd9)
1. Add polkit rules file allowing lightdm active sessions to call the uadp action without password 2. Implement checkAuthorization function using polkit authority to verify caller authorization 3. Add authorization checks to all sensitive uadp methods: ListName, Set, Get, Delete, Release 4. Return empty results with authorization error when caller is not authorized Log: Added polkit authorization protection for uadp manager operations Influence: 1. Test all uadp methods (ListName, Set, Get, Delete, Release) with unauthorized caller 2. Verify lightdm active sessions can call methods without password prompt 3. Test lightdm inactive sessions are denied access 4. Verify polkit rules file is installed correctly 5. Test normal user calls with proper authorization prompt 6. Verify error handling when authorization is denied feat: 为 uadp 管理器方法添加 polkit 授权 1. 添加 polkit 规则文件，允许 lightdm 活跃会话无需密码调用 uadp 操作 2. 实现 checkAuthorization 函数，使用 polkit 权限验证调用者授权 3. 为所有敏感 uadp 方法添加授权检查：ListName、Set、Get、Delete、Release 4. 当调用者未授权时返回空结果和授权错误 Log: 为 uadp 管理操作添加 polkit 授权保护 Influence: 1. 使用未授权调用者测试所有 uadp 方法（ListName、Set、Get、Delete、 Release） 2. 验证 lightdm 活跃会话可无需密码调用方法 3. 测试 lightdm 非活跃会话被拒绝访问 4. 验证 polkit 规则文件正确安装 5. 测试普通用户调用时弹出授权提示 6. 验证授权被拒绝时的错误处理 PMS: BUG-367555 BUG-367575 Change-Id: I5a77779ab915aaae8fca23c25fda3173752aa5e4 (cherry picked from commit fdfc101)
1. Move gfxmode signal file from /tmp to /run (tmpfs, wiped each boot) to fix stale-file issue that could prevent detection completion 2. Introduce CreateGfxmodeDetectReady function to centralize mkdir + write logic with consistent error wrapping 3. Remove direct os.WriteFile calls in favor of the new function 4. Update systemd service with RuntimeDirectory to manage /run/deepin-gfxmode-detect and preserve across restarts Log: Relocate gfxmode detection signal file to /run and unify creation entry for better lifecycle management PMS: BUG-367565 Influence: 1. Test gfxmode detection process with normal device conditions 2. Verify signal file creation in /run directory after detection 3. Verify signal file preservation across service restart 4. Verify postinst grub2 -prepare-gfxmode-detect creates signal file without systemd RuntimeDirectory refactor: 提升 gfxmode 信号文件创建安全性 1. 将 gfxmode 信号文件从 /tmp 迁移至 /run（tmpfs，每次开机清空）， 修正残留旧文件导致探测完成判断失效的问题 2. 引入 CreateGfxmodeDetectReady 函数，统一 mkdir + 写文件逻辑并 规范错误包装 3. 移除直接的 os.WriteFile 调用，统一使用新函数 4. 更新 systemd 服务，通过 RuntimeDirectory 托管 /run/deepin-gfxmode-detect 父目录并跨重启保留 Log: 将 gfxmode 探测完成信号文件迁移至 /run 并统一创建入口，改善生命周期管理 PMS: BUG-367565 Influence: 1. 测试正常设备条件下的 gfxmode 检测流程 2. 验证检测完成后 /run 目录中信号文件的创建与生命周期 3. 验证服务重启后信号文件按 RuntimeDirectoryPreserve 行为保留 4. 验证 postinst 的 grub2 -prepare-gfxmode-detect 在无 systemd 托管时能正常创建信号文件 (cherry picked from commit a50e3aa)
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: 52cyb 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 |
|
Hi @52cyb. Thanks for your PR. I'm waiting for a linuxdeepin member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
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
3 participants
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.
pick BUG-367555, BUG-367575, BUG-367561, BUG-367565等安全漏洞的修复
Log: pick安全漏洞的修复
PMS: BUG-367555 BUG-367575 BUG-367561 BUG-367565