Skip to content

fix: apply configured WAF statusCode to HTTP response instead of hardcoded 403 #6821

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
wy471x wants to merge 3 commits into
base: master
Choose a base branch
from
+16 −3
Open

fix: apply configured WAF statusCode to HTTP response instead of hardcoded 403 #6821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77e9192
fix: apply configured WAF statusCode to HTTP response instead of hard…
wy471x Aug 3, 2026
ddb353c
Merge branch 'master' into fix_WAFPluginConfiguration
wy471x Aug 4, 2026
775ed02
Merge branch 'master' into fix_WAFPluginConfiguration
wy471x Aug 6, 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
5 changes: 3 additions & 2 deletions shenyu-plugin/shenyu-plugin-waf/src/main/java/org/apache/shenyu/plugin/waf/WafPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,9 @@ protected Mono<Void> doExecute(final ServerWebExchange exchange, final ShenyuPlu
return chain.execute(exchange);
}
if (WafEnum.REJECT.getName().equals(wafHandle.getPermission())) {
exchange.getResponse().setStatusCode(HttpStatus.FORBIDDEN);
Object error = ShenyuResultWrap.error(exchange, Integer.parseInt(wafHandle.getStatusCode()), Constants.REJECT_MSG, null);
int statusCode = Integer.parseInt(wafHandle.getStatusCode());
exchange.getResponse().setRawStatusCode(statusCode);
Object error = ShenyuResultWrap.error(exchange, statusCode, Constants.REJECT_MSG, null);
return WebFluxResultUtils.result(exchange, error);
}
return chain.execute(exchange);
Expand Down
14 changes: 13 additions & 1 deletion ...yu-plugin/shenyu-plugin-waf/src/test/java/org/apache/shenyu/plugin/waf/WafPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,22 @@ public void testWafPluginNotConfiguration() {
public void testWafPluginReject() {
ruleData.setId("waf");
ruleData.setSelectorId("waf");
WafHandle handle = GsonUtils.getGson().fromJson("{\"permission\":\"reject\",\"statusCode\":\"0\"}", WafHandle.class);
WafHandle handle = GsonUtils.getGson().fromJson("{\"permission\":\"reject\",\"statusCode\":\"403\"}", WafHandle.class);
WafPluginDataHandler.CACHED_HANDLE.get().cachedHandle(CacheKeyUtils.INST.getKey(ruleData), handle);
Mono<Void> execute = wafPluginUnderTest.doExecute(exchange, chain, selectorData, ruleData);
StepVerifier.create(execute).expectSubscription().verifyComplete();
assertEquals(403, exchange.getResponse().getRawStatusCode());
}

@Test
public void testWafPluginRejectWithCustomStatusCode() {
ruleData.setId("waf");
ruleData.setSelectorId("waf");
WafHandle handle = GsonUtils.getGson().fromJson("{\"permission\":\"reject\",\"statusCode\":\"404\"}", WafHandle.class);
WafPluginDataHandler.CACHED_HANDLE.get().cachedHandle(CacheKeyUtils.INST.getKey(ruleData), handle);
Mono<Void> execute = wafPluginUnderTest.doExecute(exchange, chain, selectorData, ruleData);
StepVerifier.create(execute).expectSubscription().verifyComplete();
assertEquals(404, exchange.getResponse().getRawStatusCode());
}

@Test
Expand Down
Loading