Skip to content

fix : UpstreamCheckUtils.checkUrl param add protocol. #6252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BraveheartStone wants to merge 12 commits into
base: master
Choose a base branch
from
Open

fix : UpstreamCheckUtils.checkUrl param add protocol. #6252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b02befc
fix : UpstreamCheckUtils.checkUrl param add protocol.
Dec 5, 2025
c80dab4
fix : check style
Dec 5, 2025
ff03dd0
Merge branch 'master' into fix_upstream_check_utils
Aias00 Dec 8, 2025
1492e92
Merge branch 'master' into fix_upstream_check_utils
yu199195 Dec 8, 2025
6358b22
Merge branch 'master' into fix_upstream_check_utils
Aias00 Dec 8, 2025
a5447f0
Merge branch 'master' into fix_upstream_check_utils
Aias00 Dec 9, 2025
43f7339
Merge branch 'master' into fix_upstream_check_utils
Aias00 Dec 11, 2025
5f86193
Merge branch 'master' into fix_upstream_check_utils
loongs-zhang Dec 13, 2025
7a18dd4
Merge branch 'master' into fix_upstream_check_utils
Aias00 Dec 15, 2025
15febe2
Merge branch 'master' into fix_upstream_check_utils
Aias00 Dec 28, 2025
946359c
Merge branch 'master' into fix_upstream_check_utils
Aias00 Jan 5, 2026
33d02b3
Merge branch 'master' into fix_upstream_check_utils
Aias00 Jan 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/UpstreamCheckService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ public boolean checkAndSubmit(final String selectorId, final CommonUpstream comm
if (!REGISTER_TYPE_HTTP.equalsIgnoreCase(registerType) || !checked) {
return false;
}
final boolean pass = UpstreamCheckUtils.checkUrl(commonUpstream.getUpstreamUrl());
final boolean pass = UpstreamCheckUtils.checkUrl(commonUpstream.getProtocol(), commonUpstream.getUpstreamUrl());
if (pass) {
this.submit(selectorId, commonUpstream);
return false;
Expand Down Expand Up @@ -310,7 +310,7 @@ private void checkZombie0(final ZombieUpstream zombieUpstream) {
ZOMBIE_SET.remove(zombieUpstream);
String selectorId = zombieUpstream.getSelectorId();
CommonUpstream commonUpstream = zombieUpstream.getCommonUpstream();
final boolean pass = UpstreamCheckUtils.checkUrl(commonUpstream.getUpstreamUrl());
final boolean pass = UpstreamCheckUtils.checkUrl(commonUpstream.getProtocol(), commonUpstream.getUpstreamUrl());
if (pass) {
commonUpstream.setTimestamp(System.currentTimeMillis());
commonUpstream.setStatus(true);
Expand All @@ -332,7 +332,7 @@ private void check(final String selectorId, final List<CommonUpstream> upstreamL
final List<CompletableFuture<CommonUpstream>> checkFutures = new ArrayList<>(upstreamList.size());
for (CommonUpstream commonUpstream : upstreamList) {
checkFutures.add(CompletableFuture.supplyAsync(() -> {
final boolean pass = UpstreamCheckUtils.checkUrl(commonUpstream.getUpstreamUrl());
final boolean pass = UpstreamCheckUtils.checkUrl(commonUpstream.getProtocol(), commonUpstream.getUpstreamUrl());
if (pass) {
if (!commonUpstream.isStatus()) {
commonUpstream.setTimestamp(System.currentTimeMillis());
Expand Down
4 changes: 2 additions & 2 deletions shenyu-admin/src/test/java/org/apache/shenyu/admin/service/UpstreamCheckServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,9 @@ public void testScheduled() {
.handle("[{\"upstreamHost\":\"localhost\",\"protocol\":\"http://\",\"localhost\":\"divide-upstream-60\",\"weight\":60}]")
.build();
try (MockedStatic<UpstreamCheckUtils> mocked = mockStatic(UpstreamCheckUtils.class)) {
mocked.when(() -> UpstreamCheckUtils.checkUrl("ReachableUrl"))
mocked.when(() -> UpstreamCheckUtils.checkUrl("https://", "ReachableUrl"))
.thenReturn(true);
mocked.when(() -> UpstreamCheckUtils.checkUrl("ErrorUrl"))
mocked.when(() -> UpstreamCheckUtils.checkUrl("https://", "ErrorUrl"))
.thenReturn(false);

zombieSet.clear();
Expand Down
18 changes: 10 additions & 8 deletions shenyu-common/src/main/java/org/apache/shenyu/common/utils/UpstreamCheckUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,24 @@ public class UpstreamCheckUtils {
/**
* Check url boolean.
*
* @param url the url
* @param protocol the protocol
* @param url the url
* @return the boolean
*/
public static boolean checkUrl(final String url) {
return checkUrl(url, DEFAULT_TIMEOUT);
public static boolean checkUrl(final String protocol, final String url) {
return checkUrl(protocol, url, DEFAULT_TIMEOUT);
}

/**
* Check url boolean.
*
* @param url the url
* @param timeout timeout
* @param protocol the protocol
* @param url the url
* @param timeout timeout
* @return the boolean
*/
public static boolean checkUrl(final String url, final int timeout) {
if (StringUtils.isBlank(url)) {
public static boolean checkUrl(final String protocol, final String url, final int timeout) {
if (StringUtils.isBlank(protocol) || StringUtils.isBlank(url)) {
return false;
}
String[] hostPort;
Expand All @@ -69,7 +71,7 @@ public static boolean checkUrl(final String url, final int timeout) {
} else {
hostPort = StringUtils.split(url, Constants.COLONS);
}
final boolean isHttps = url.startsWith(HTTPS);
final boolean isHttps = protocol.startsWith(HTTPS);
final int port = hostPort.length > 1 ? Integer.parseInt(hostPort[1].trim()) : isHttps ? 443 : 80;
return isHostConnector(hostPort[0].trim(), port, timeout);
}
Expand Down
10 changes: 5 additions & 5 deletions shenyu-common/src/test/java/org/apache/shenyu/common/utils/UpstreamCheckUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public final class UpstreamCheckUtilsTest {

@Test
public void testBlank() {
assertFalse(UpstreamCheckUtils.checkUrl(""));
assertFalse(UpstreamCheckUtils.checkUrl("https://", ""));
}

@Test
Expand All @@ -63,9 +63,9 @@ public void testSocketConnect() {
Thread.yield();
}

assertTrue(UpstreamCheckUtils.checkUrl("127.0.0.1:" + port));
assertFalse(UpstreamCheckUtils.checkUrl("http://127.0.0.1:" + (port == 0 ? port + 1 : port - 1)));
assertTrue(UpstreamCheckUtils.checkUrl("http://127.0.0.1:" + port));
assertTrue(UpstreamCheckUtils.checkUrl("https://shenyu.apache.org"));
assertTrue(UpstreamCheckUtils.checkUrl("https://", "127.0.0.1:" + port));
assertFalse(UpstreamCheckUtils.checkUrl("https://", "127.0.0.1:" + (port == 0 ? port + 1 : port - 1)));
assertTrue(UpstreamCheckUtils.checkUrl("http://", "127.0.0.1:" + port));
assertTrue(UpstreamCheckUtils.checkUrl("https://", "shenyu.apache.org"));
}
}
2 changes: 1 addition & 1 deletion ...yu-loadbalancer/src/main/java/org/apache/shenyu/loadbalancer/cache/UpstreamCheckTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ private void check(final Map<String, List<Upstream>> map) {
}

private UpstreamWithSelectorId check(final String selectorId, final Upstream upstream) {
boolean pass = UpstreamCheckUtils.checkUrl(upstream.getUrl(), checkTimeout);
boolean pass = UpstreamCheckUtils.checkUrl(upstream.getProtocol(), upstream.getUrl(), checkTimeout);
if (pass) {
if (upstream.isHealthy()) {
upstream.setLastHealthTimestamp(System.currentTimeMillis());
Expand Down
2 changes: 1 addition & 1 deletion .../shenyu-plugin-divide/src/test/java/org/apache/shenyu/plugin/divide/DividePluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public void setup() {

// mock static
mockCheckUtils = mockStatic(UpstreamCheckUtils.class);
mockCheckUtils.when(() -> UpstreamCheckUtils.checkUrl(anyString(), anyInt())).thenReturn(true);
mockCheckUtils.when(() -> UpstreamCheckUtils.checkUrl(anyString(), anyString(), anyInt())).thenReturn(true);
initMockInfo();
}

Expand Down
2 changes: 1 addition & 1 deletion ...de/src/test/java/org/apache/shenyu/plugin/divide/handler/DividePluginDataHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public void setUp() {

// mock static
mockCheckUtils = mockStatic(UpstreamCheckUtils.class);
mockCheckUtils.when(() -> UpstreamCheckUtils.checkUrl(anyString(), anyInt())).thenReturn(true);
mockCheckUtils.when(() -> UpstreamCheckUtils.checkUrl(anyString(), anyString(), anyInt())).thenReturn(true);
}

@AfterEach
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/org/apache/shenyu/plugin/divide/handler/DivideUpstreamDataHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public void setUp() {

// mock static
mockCheckUtils = mockStatic(UpstreamCheckUtils.class);
mockCheckUtils.when(() -> UpstreamCheckUtils.checkUrl(anyString(), anyInt())).thenReturn(true);
mockCheckUtils.when(() -> UpstreamCheckUtils.checkUrl(anyString(), anyString(), anyInt())).thenReturn(true);
}

@AfterEach
Expand Down
2 changes: 1 addition & 1 deletion ...lugin-websocket/src/test/java/org/apache/shenyu/plugin/websocket/WebSocketPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public void setup() {

// mock static
mockCheckUtils = mockStatic(UpstreamCheckUtils.class);
mockCheckUtils.when(() -> UpstreamCheckUtils.checkUrl(anyString(), anyInt())).thenReturn(true);
mockCheckUtils.when(() -> UpstreamCheckUtils.checkUrl(anyString(), anyString(), anyInt())).thenReturn(true);
}

@AfterEach
Expand Down
Loading