Skip to content

fix: fix path-variable off-by-one and guard placeholder substitution in rewrite plugin (#6882) #6951

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
juicewcode wants to merge 14 commits into
base: master
Choose a base branch
from
+27 −1
Open

fix: fix path-variable off-by-one and guard placeholder substitution in rewrite plugin (#6882) #6951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f4a3193
fix: fix path-variable off-by-one and guard placeholder substitution…
juicewcode Aug 19, 2026
fa24f15
Merge branch 'master' into fix/6882-rewrite-path-variable-substitution
juicewcode Sep 5, 2026
1833072
Merge branch 'master' into fix/6882-rewrite-path-variable-substitution
juicewcode Sep 5, 2026
4ef8f0c
Merge branch 'master' into fix/6882-rewrite-path-variable-substitution
Aias00 Sep 5, 2026
22ca548
Merge branch 'master' into fix/6882-rewrite-path-variable-substitution
Aias00 Sep 5, 2026
a830bdd
Merge branch 'master' into fix/6882-rewrite-path-variable-substitution
Aias00 Sep 5, 2026
6e16529
Merge branch 'master' into fix/6882-rewrite-path-variable-substitution
Aias00 Sep 5, 2026
808e1d2
Merge branch 'master' into fix/6882-rewrite-path-variable-substitution
Aias00 Sep 6, 2026
74bd3ae
Merge branch 'master' into fix/6882-rewrite-path-variable-substitution
Aias00 Sep 6, 2026
ae851a2
Merge branch 'master' into fix/6882-rewrite-path-variable-substitution
Aias00 Sep 6, 2026
33fc84d
Merge branch 'master' into fix/6882-rewrite-path-variable-substitution
Aias00 Sep 15, 2026
47b31e8
Merge branch 'master' into fix/6882-rewrite-path-variable-substitution
yu199195 Sep 15, 2026
b19e895
Merge branch 'master' into fix/6882-rewrite-path-variable-substitution
juicewcode Sep 15, 2026
a3e97e9
Merge branch 'master' into fix/6882-rewrite-path-variable-substitution
juicewcode Sep 20, 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
2 changes: 1 addition & 1 deletion ...n/shenyu-plugin-rewrite/src/main/java/org/apache/shenyu/plugin/rewrite/RewritePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ protected Mono<Void> doExecute(final ServerWebExchange exchange, final ShenyuPlu
&& ThreadLocalRandom.current().nextInt(100) < percentage) {
rewriteUri = rewriteHandle.getReplace().contains("{") && rewriteHandle.getRegex().contains("{")
? PathMatchUtils.replaceAll(rewriteHandle.getReplace(), rewriteHandle.getRegex().substring(rewriteHandle.getRegex().indexOf("{")),
rewriteUri.substring(rewriteHandle.getRegex().indexOf("{")))
rewriteUri.substring(rewriteHandle.getRegex().indexOf("{")))

@yu199195 yu199195 Sep 15, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the code is same？

@juicewcode juicewcode Sep 15, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, the tab change here is just from resolving a merge conflict between my branch and master. My actual code changes are in the first commit (f4a3193) of this PR.It is likely that the same changes were already merged into master, so they no longer appear in the diff.

: rewriteUri.replaceAll(rewriteHandle.getRegex(), rewriteHandle.getReplace());
Map<String, Object> attributes = exchange.getAttributes();
if (Optional.ofNullable(rewriteHandle.getRewriteMetaData()).orElse(false)) {
Expand Down
26 changes: 26 additions & 0 deletions ...enyu-plugin-rewrite/src/test/java/org/apache/shenyu/plugin/rewrite/RewritePluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,32 @@ public void shouldReturnNewURIForRewritePlugin() {
assertEquals("/shenyu/rewrite", exchange.getAttributes().get(Constants.REWRITE_URI));
}

@Test
public void shouldRewritePathVariableWithCompleteValue() {
RuleData data = new RuleData();
data.setHandle("{\"regex\":\"/shenyu/{id}\",\"replace\":\"/shenyu/{id}\"}");
RewriteHandle rewriteHandle = GsonUtils.getGson().fromJson(data.getHandle(), RewriteHandle.class);
RewritePluginDataHandler.CACHED_HANDLE.get().cachedHandle(CacheKeyUtils.INST.getKey(data), rewriteHandle);
ServerWebExchange rewriteExchange = MockServerWebExchange.from(MockServerHttpRequest.get("/shenyu/123").build());
rewriteExchange.getAttributes().put(Constants.CONTEXT, new ShenyuContext());
when(chain.execute(rewriteExchange)).thenReturn(Mono.empty());
SelectorData selectorData = mock(SelectorData.class);
StepVerifier.create(rewritePlugin.doExecute(rewriteExchange, chain, selectorData, data)).expectSubscription().verifyComplete();
assertEquals("/shenyu/123", rewriteExchange.getAttributes().get(Constants.REWRITE_URI));
}

@Test
public void shouldNotThrowWhenOnlyReplaceContainsPlaceholder() {
RuleData data = new RuleData();
data.setHandle("{\"regex\":\"/shenyu/.*\",\"replace\":\"/new/{id}\"}");
RewriteHandle rewriteHandle = GsonUtils.getGson().fromJson(data.getHandle(), RewriteHandle.class);
RewritePluginDataHandler.CACHED_HANDLE.get().cachedHandle(CacheKeyUtils.INST.getKey(data), rewriteHandle);
when(chain.execute(exchange)).thenReturn(Mono.empty());
SelectorData selectorData = mock(SelectorData.class);
StepVerifier.create(rewritePlugin.doExecute(exchange, chain, selectorData, data)).expectSubscription().verifyComplete();
assertEquals("/new/{id}", exchange.getAttributes().get(Constants.REWRITE_URI));
}

@Test
public void testSkip() {
final boolean result = rewritePlugin.skip(exchange);
Expand Down
Loading