Skip to content
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

Jump to bottom

Fixes exit context when request is blocked in springwebmvc adaptor #1353

Merged
merged 6 commits into from
Mar 24, 2020
Merged

Fixes exit context when request is blocked in springwebmvc adaptor #1353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e8b2978
Add "web-context-unify" configuration to support "chain" relation flo…
cdfive Mar 9, 2020
43ecd46
Merge remote-tracking branch 'Sentinel/master'
cdfive Mar 14, 2020
f2286e0
Merge remote-tracking branch 'Sentinel/master'
cdfive Mar 18, 2020
1fbb107
Merge remote-tracking branch 'Sentinel/master'
cdfive Mar 22, 2020
65ff676
Exit context if request is blocked and improve test case.
cdfive Mar 22, 2020
84dfe5e
Using try finally block, since user may need the context in the block…
cdfive Mar 23, 2020
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: 5 additions & 1 deletion ...main/java/com/alibaba/csp/sentinel/adapter/spring/webmvc/AbstractSentinelInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,11 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
}
return true;
} catch (BlockException e) {
handleBlockException(request, response, e);
try {
handleBlockException(request, response, e);
} finally {
ContextUtil.exit();
}
return false;
}
}
Expand Down
9 changes: 6 additions & 3 deletions ...java/com/alibaba/csp/sentinel/adapter/spring/webmvc/SentinelSpringMvcIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,21 @@ public void testOriginParser() throws Exception {
final String headerName = "S-User";
configureRulesFor(springMvcPathVariableUrl, 0, limitOrigin);

// This will be passed since the caller is different: userB
this.mvc.perform(get("/foo/1").accept(MediaType.TEXT_PLAIN).header(headerName, "userB"))
.andExpect(status().isOk())
.andExpect(content().string("foo 1"));

// This will be blocked and reponse json.
// This will be blocked since the caller is same: userA
this.mvc.perform(
get("/foo/2").accept(MediaType.APPLICATION_JSON).header(headerName, limitOrigin))
.andExpect(status().isOk())
.andExpect(content().json(ResultWrapper.blocked().toJsonString()));

// This will be passed since the caller is different: ""
this.mvc.perform(get("/foo/3").accept(MediaType.APPLICATION_JSON))
.andExpect(status().isOk())
.andExpect(content().string(ResultWrapper.blocked().toJsonString()));
.andExpect(content().string("foo 3"));

FlowRuleManager.loadRules(null);
}
Expand Down Expand Up @@ -115,7 +118,7 @@ public void testRuntimeException() throws Exception {
assertEquals(i + 1, cn.passQps(), 0.01);
}

// This will be blocked and reponse json.
// This will be blocked and response json.
this.mvc.perform(get(url))
.andExpect(status().isOk())
.andExpect(content().string(ResultWrapper.blocked().toJsonString()));
Expand Down