Skip to content

[ISSUE #6292] Avoid mutating divide upstream for specify-domain #6392

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

Draft
Federicorao wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −3
Draft

[ISSUE #6292] Avoid mutating divide upstream for specify-domain #6392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions ...roxy/shenyu-plugin-divide/src/main/java/org/apache/shenyu/plugin/divide/DividePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,12 @@ protected Mono<Void> doExecute(final ServerWebExchange exchange, final ShenyuPlu
Object error = ShenyuResultWrap.error(exchange, ShenyuResultEnum.CANNOT_FIND_HEALTHY_UPSTREAM_URL);
return WebFluxResultUtils.result(exchange, error);
}
// set the http url
String domain = upstream.buildDomain();
List<String> specifyDomains = exchange.getRequest().getHeaders().get(Constants.SPECIFY_DOMAIN);
if (CollectionUtils.isNotEmpty(specifyDomains)) {
upstream.setUrl(specifyDomains.get(0));
domain = buildDomain(upstream, specifyDomains.get(0));
}
// set domain
String domain = upstream.buildDomain();
exchange.getAttributes().put(Constants.HTTP_DOMAIN, domain);
// set the http timeout
exchange.getAttributes().put(Constants.HTTP_TIME_OUT, ruleHandle.getTimeout());
Expand Down Expand Up @@ -158,6 +157,14 @@ private DivideRuleHandle buildRuleHandle(final RuleData rule) {
return DividePluginDataHandler.CACHED_HANDLE.get().obtainHandle(CacheKeyUtils.INST.getKey(rule));
}

private String buildDomain(final Upstream upstream, final String url) {
String protocol = upstream.getProtocol();
if (StringUtils.isBlank(protocol)) {
protocol = "http://";
}
return protocol + StringUtils.trim(url);
}

private void responseTrigger(final Upstream upstream) {
long now = System.currentTimeMillis();
upstream.getInflight().decrementAndGet();
Expand Down
18 changes: 18 additions & 0 deletions .../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 @@ -178,6 +178,24 @@ public void doPostExecuteTest() {
StepVerifier.create(result).expectSubscription().verifyComplete();
}

@Test
public void doExecuteWithSpecifyDomainShouldNotMutateCachedUpstream() {
ServerWebExchange specifyDomainExchange = MockServerWebExchange.from(MockServerHttpRequest.get("localhost")
.remoteAddress(new InetSocketAddress(8090))
.header(Constants.SPECIFY_DOMAIN, "mock-specified")
.build());
ShenyuContext context = mock(ShenyuContext.class);
specifyDomainExchange.getAttributes().put(Constants.CONTEXT, context);
when(chain.execute(specifyDomainExchange)).thenReturn(Mono.empty());

Mono<Void> result = dividePlugin.doExecute(specifyDomainExchange, chain, selectorData, ruleData);
StepVerifier.create(result).expectSubscription().verifyComplete();

List<Upstream> upstreams = UpstreamCacheManager.getInstance().findUpstreamListBySelectorId(selectorData.getId());
assertEquals("http://mock-specified", specifyDomainExchange.getAttribute(Constants.HTTP_DOMAIN));
assertEquals("mock-3", upstreams.get(0).getUrl());
}

/**
* Skip.
*/
Expand Down