-
Notifications
You must be signed in to change notification settings - Fork 6.1k
Support multiple RequestRejectedHandler beans. #10603
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.
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
Closed
Drezir
wants to merge
7
commits into
spring-projects:main
from
Drezir:feature/requestrejectedhandlers
Closed
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
1d98961
Support multiple RequestRejectedHandler beans.
de5bfa1
Support multiple RequestRejectedHandler beans by using CompositeReque…
f9ff7e9
Set RequestRejectedHandler via WebSecurity
91fbe09
fix formatting
61ca3bd
Code review
d0e8d29
RequestRejectedHandler tests
2cacde4
Update CompositeRequestRejectedHandlerTests.java
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
.../main/java/org/springframework/security/web/firewall/CompositeRequestRejectedHandler.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
/* | ||
* Copyright 2002-2021 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.security.web.firewall; | ||
|
||
import jakarta.servlet.ServletException; | ||
import jakarta.servlet.http.HttpServletRequest; | ||
import jakarta.servlet.http.HttpServletResponse; | ||
import org.springframework.util.Assert; | ||
|
||
import java.io.IOException; | ||
import java.util.Arrays; | ||
import java.util.List; | ||
|
||
/** | ||
* A {@link RequestRejectedHandler} that delegates to several other | ||
* {@link RequestRejectedHandler}s. | ||
* | ||
* @author Adam Ostrožlík | ||
* @since 5.7 | ||
*/ | ||
public final class CompositeRequestRejectedHandler implements RequestRejectedHandler { | ||
|
||
private final List<RequestRejectedHandler> requestRejectedhandlers; | ||
|
||
Drezir marked this conversation as resolved.
Show resolved
Hide resolved
|
||
/** | ||
* Creates a new instance. | ||
* @param requestRejectedhandlers the {@link RequestRejectedHandler} instances to | ||
* handle {@link org.springframework.security.web.firewall.RequestRejectedException} | ||
*/ | ||
public CompositeRequestRejectedHandler(RequestRejectedHandler... requestRejectedhandlers) { | ||
Assert.notEmpty(requestRejectedhandlers, "requestRejectedhandlers cannot be empty"); | ||
this.requestRejectedhandlers = Arrays.asList(requestRejectedhandlers); | ||
} | ||
|
||
@Override | ||
public void handle(HttpServletRequest request, HttpServletResponse response, | ||
RequestRejectedException requestRejectedException) throws IOException, ServletException { | ||
for (RequestRejectedHandler requestRejectedhandler : requestRejectedhandlers) { | ||
requestRejectedhandler.handle(request, response, requestRejectedException); | ||
} | ||
} | ||
|
||
} |
43 changes: 43 additions & 0 deletions
43
.../java/org/springframework/security/web/firewall/CompositeRequestRejectedHandlerTests.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
* Copyright 2002-2021 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.security.web.firewall; | ||
|
||
import jakarta.servlet.http.HttpServletRequest; | ||
import jakarta.servlet.http.HttpServletResponse; | ||
import org.junit.jupiter.api.Test; | ||
|
||
import static org.assertj.core.api.Assertions.assertThatExceptionOfType; | ||
import static org.mockito.Mockito.mock; | ||
|
||
public class CompositeRequestRejectedHandlerTests { | ||
|
||
@Test | ||
void compositeRequestRejectedHandlerRethrowsTheException() { | ||
RequestRejectedException requestRejectedException = new RequestRejectedException("rejected"); | ||
DefaultRequestRejectedHandler sut = new DefaultRequestRejectedHandler(); | ||
CompositeRequestRejectedHandler crrh = new CompositeRequestRejectedHandler(sut); | ||
assertThatExceptionOfType(RequestRejectedException.class).isThrownBy(() -> crrh | ||
.handle(mock(HttpServletRequest.class), mock(HttpServletResponse.class), requestRejectedException)) | ||
.withMessage("rejected"); | ||
} | ||
|
||
@Test | ||
void compositeRequestRejectedHandlerForbidsEmptyHandlers() { | ||
assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(CompositeRequestRejectedHandler::new); | ||
} | ||
|
||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.