wyl/hertzbeat
1
0
Fork 0
mirror of https://github.com/dromara/hertzbeat.git synced 2026-09-17 09:40:58 +00:00
Code Issues Projects Releases Wiki Activity

[fix] correct inverted RegistryProtocol param validation (#4366)

Browse Source
This commit is contained in:
Duansg
2026-09-08 19:18:54 +08:00
committed by GitHub
parent 74c79d1ea3
commit 5022ec4dcc
2 changed files with 157 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RegistryProtocol.java
+2 -2
View File
@@ -49,7 +49,7 @@ public class RegistryProtocol implements CommonRequestProtocol, Protocol {
@Override
public boolean isInvalid() {
return validateIpDomain(host) && validPort(port)
&& StringUtils.isAnyBlank(host, String.valueOf(port), discoveryClientTypeName);
return !validateIpDomain(host) || !validPort(port)
|| StringUtils.isBlank(discoveryClientTypeName);
}
}
hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/entity/job/protocol/RegistryProtocolTest.java
+155 -32
View File
@@ -1,23 +1,20 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hertzbeat.common.entity.job.protocol;
import org.junit.jupiter.api.Test;
@@ -28,26 +25,152 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
class RegistryProtocolTest {
@Test
void isInvalid() {
void isInvalidValidProtocol() {
RegistryProtocol protocol = RegistryProtocol.builder()
.host("192.168.1.1")
.port("8848")
.discoveryClientTypeName("Nacos")
.build();
assertFalse(protocol.isInvalid());
}
RegistryProtocol protocol1 = new RegistryProtocol();
protocol1.setPort("8080");
protocol1.setHost("127.0.0.1");
assertTrue(protocol1.isInvalid());
@Test
void isInvalidValidProtocolWithDomain() {
RegistryProtocol protocol = RegistryProtocol.builder()
.host("nacos.example.com")
.port("8848")
.discoveryClientTypeName("Nacos")
.build();
assertFalse(protocol.isInvalid());
}
RegistryProtocol protocol2 = new RegistryProtocol();
protocol2.setPort("8080");
protocol2.setHost("www.baidu.com");
assertTrue(protocol2.isInvalid());
@Test
void isInvalidValidProtocolWithLocalhost() {
RegistryProtocol protocol = RegistryProtocol.builder()
.host("localhost")
.port("8848")
.discoveryClientTypeName("Consul")
.build();
assertFalse(protocol.isInvalid());
}
RegistryProtocol protocol3 = new RegistryProtocol();
protocol3.setPort("8080");
protocol3.setHost("www.baidu.com.");
assertFalse(protocol3.isInvalid());
@Test
void isInvalidValidProtocolWithIpv6() {
RegistryProtocol protocol = RegistryProtocol.builder()
.host("::1")
.port("8848")
.discoveryClientTypeName("Consul")
.build();
assertFalse(protocol.isInvalid());
}
RegistryProtocol protocol4 = new RegistryProtocol();
protocol3.setPort("80800");
protocol3.setHost("10.45.56.344");
assertFalse(protocol4.isInvalid());
@Test
void isInvalidNullHost() {
RegistryProtocol protocol = RegistryProtocol.builder()
.host(null)
.port("8848")
.discoveryClientTypeName("Nacos")
.build();
assertTrue(protocol.isInvalid());
}
@Test
void isInvalidBlankHost() {
RegistryProtocol protocol = RegistryProtocol.builder()
.host(" ")
.port("8848")
.discoveryClientTypeName("Nacos")
.build();
assertTrue(protocol.isInvalid());
}
@Test
void isInvalidMalformedHost() {
RegistryProtocol protocol = RegistryProtocol.builder()
.host("???")
.port("8848")
.discoveryClientTypeName("Nacos")
.build();
assertTrue(protocol.isInvalid());
}
@Test
void isInvalidHostWithTrailingDot() {
RegistryProtocol protocol = RegistryProtocol.builder()
.host("www.baidu.com.")
.port("8080")
.discoveryClientTypeName("Nacos")
.build();
assertTrue(protocol.isInvalid());
}
@Test
void isInvalidNullPort() {
RegistryProtocol protocol = RegistryProtocol.builder()
.host("192.168.1.1")
.port(null)
.discoveryClientTypeName("Nacos")
.build();
assertTrue(protocol.isInvalid());
}
@Test
void isInvalidBlankPort() {
RegistryProtocol protocol = RegistryProtocol.builder()
.host("192.168.1.1")
.port("")
.discoveryClientTypeName("Nacos")
.build();
assertTrue(protocol.isInvalid());
}
@Test
void isInvalidOutOfRangePort() {
RegistryProtocol protocol = RegistryProtocol.builder()
.host("192.168.1.1")
.port("99999")
.discoveryClientTypeName("Nacos")
.build();
assertTrue(protocol.isInvalid());
}
@Test
void isInvalidNonNumericPort() {
RegistryProtocol protocol = RegistryProtocol.builder()
.host("192.168.1.1")
.port("abc")
.discoveryClientTypeName("Nacos")
.build();
assertTrue(protocol.isInvalid());
}
@Test
void isInvalidOutOfRangePortWithDomainLikeHost() {
RegistryProtocol protocol = RegistryProtocol.builder()
.host("10.45.56.344")
.port("80800")
.discoveryClientTypeName("Nacos")
.build();
assertTrue(protocol.isInvalid());
}
@Test
void isInvalidNullDiscoveryClientTypeName() {
RegistryProtocol protocol = RegistryProtocol.builder()
.host("192.168.1.1")
.port("8848")
.discoveryClientTypeName(null)
.build();
assertTrue(protocol.isInvalid());
}
@Test
void isInvalidBlankDiscoveryClientTypeName() {
RegistryProtocol protocol = RegistryProtocol.builder()
.host("192.168.1.1")
.port("8848")
.discoveryClientTypeName(" ")
.build();
assertTrue(protocol.isInvalid());
}
}