fix: prevent multiple gateways in manual network configuration #439
Conversation
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
Reviewer's GuideThis PR transforms the gateway field into an address-indexed array, updates serialization and UI bindings to work with multiple address slots, and enforces a single-gateway constraint through enhanced counting and error messaging for both IPv4 and IPv6 in manual mode. Class diagram for updated IPv6 and IPv4 configuration modelsclassDiagram
class SectionIPv6 {
+var addressData
+bool isEdit
+string method
+var gateway // changed from string to array
+string errorKey
+string errorMsg
+getConfig()
+validate()
}
class SectionIPv4 {
+var addressData
+bool isEdit
+string method
+string gateway
+string errorKey
+string errorMsg
+getConfig()
+validate()
}
SectionIPv6 --> "addressData[]" AddressData
SectionIPv6 --> "gateway[]" Gateway
SectionIPv4 --> "addressData[]" AddressData
SectionIPv4 --> "gateway" Gateway
class AddressData {
+string address
+string netmask
}
class Gateway {
+string value
}
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}
There was a problem hiding this comment.
Hey there - I've reviewed your changes - here's some feedback:
- Consider extracting the gateway‐counting and validation logic in both SectionIPv4 and SectionIPv6 into a shared helper to reduce duplication and keep behavior consistent.
- Instead of managing a sparse array for gateways, track a single gateway value or explicit index to simplify getConfig and binding logic and avoid edge cases.
- Remove the console.log in the IPv6 validation block to prevent spurious debug output in production.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- Consider extracting the gateway‐counting and validation logic in both SectionIPv4 and SectionIPv6 into a shared helper to reduce duplication and keep behavior consistent.
- Instead of managing a sparse array for gateways, track a single gateway value or explicit index to simplify getConfig and binding logic and avoid edge cases.
- Remove the console.log in the IPv6 validation block to prevent spurious debug output in production.
## Individual Comments
### Comment 1
<location> `dcc-network/qml/SectionIPv6.qml:93` </location>
<code_context>
}
// 检查网关
- if (k === "0" && gateway.length !== 0 && !NetUtils.ipv6RegExp.test(gateway)) {
+ console.log("gateway =====", k, gateway[k])
+ if (gateway[k].length !== 0) {
+ gatewayCount++
</code_context>
<issue_to_address>
**issue:** Debug logging should be removed or gated before merging.
Console.log statements in production may clutter logs or expose sensitive data. Please remove or conditionally enable this debug output.
</issue_to_address>
### Comment 2
<location> `dcc-network/qml/SectionIPv4.qml:71` </location>
<code_context>
errorKey = ""
errorMsg = ""
if (method === "manual") {
+ let gatewayCount = 0
for (let k in addressData) {
if (!NetUtils.ipRegExp.test(addressData[k][0])) {
</code_context>
<issue_to_address>
**suggestion:** Gateway count logic for IPv4 may not handle malformed addressData entries.
Add validation to ensure addressData[k][2] exists and is a string before accessing it to prevent runtime errors.
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
Contributor
|
TAG Bot New tag: 2.0.75 |
caixr23
force-pushed
the
BUG-312351
branch
2 times, most recently
from
19c9d90 to
e8c27a5
Compare
1. Added validation to ensure only one gateway can be configured in manual mode for both IPv4 and IPv6 2. Fixed gateway property type in IPv6 from string to array to support per-address gateway tracking 3. Enhanced error handling to display specific error messages when multiple gateways are detected 4. Improved gateway counting logic to prevent configuration errors Log: Fixed network configuration to prevent setting multiple gateways Influence: 1. Test manual network configuration with multiple IP addresses 2. Verify that only one gateway can be set across all addresses 3. Test error message display when attempting to set multiple gateways 4. Validate both IPv4 and IPv6 manual configuration scenarios 5. Check that automatic and disabled modes don't retain gateway settings fix: 修复手动网络配置中多个网关设置问题 1. 添加验证逻辑确保手动模式下IPv4和IPv6只能配置一个网关 2. 修复IPv6网关属性类型从字符串改为数组以支持按地址跟踪网关 3. 增强错误处理，在检测到多个网关时显示具体错误信息 4. 改进网关计数逻辑以防止配置错误 Log: 修复网络配置中设置多个网关的问题 Influence: 1. 测试包含多个IP地址的手动网络配置 2. 验证所有地址中只能设置一个网关 3. 测试尝试设置多个网关时的错误消息显示 4. 验证IPv4和IPv6手动配置场景 5. 检查自动和禁用模式不会保留网关设置 PMS: BUG-312351
deepin pr auto review我来帮你审查这段代码的变更。主要涉及 IPv4 和 IPv6 配置的网络设置部分。让我从多个维度进行分析：
具体改进建议：
// 可以将网关检查逻辑抽取为单独函数
function validateGateway(addressData) {
let gatewayCount = 0
for (let k in addressData) {
if (addressData[k][2].length !== 0) {
gatewayCount++
if (gatewayCount >= 2) {
return {
valid: false,
key: k + "gateway",
message: qsTr("Only one gateway is allowed")
}
}
}
}
return { valid: true }
}
// 初始化时设置数组长度
gateway: new Array(maxGatewayCount)
// 增加边界检查
function setGateway(index, value) {
if (index < 0 || index >= gateway.length) {
return false
}
gateway[index] = value
return true
}
// 添加输入验证函数
function validateInput(value, pattern, fieldName) {
if (value.length !== 0 && !pattern.test(value)) {
return {
valid: false,
key: fieldName,
message: qsTr("Invalid " + fieldName)
}
}
return { valid: true }
}
// 统一错误处理机制
function handleError(errorKey, errorMsg) {
root.errorKey = errorKey
root.errorMsg = errorMsg
return false
}这些改进建议主要围绕：
总体来说，这次变更是积极的，提高了代码的健壮性和可维护性。建议采纳上述改进建议以进一步提升代码质量。 |
robertkill
approved these changes
Dec 10, 2025
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: caixr23, robertkill 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 |
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.
Log: Fixed network configuration to prevent setting multiple gateways
Influence:
fix: 修复手动网络配置中多个网关设置问题
Log: 修复网络配置中设置多个网关的问题
Influence:
PMS: BUG-312351
Summary by Sourcery
Prevent configuring multiple gateways in manual network settings by converting the IPv6 gateway property to an array, adding validation to enforce a single gateway for both IPv4 and IPv6, and surfacing specific error messages when duplicates are detected.
Bug Fixes:
Enhancements: