Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0.x' 

Closes gh-13150
This commit is contained in:
Josh Cummings 2023-05-10 16:15:13 -06:00
parent eea3b7734f e033e347b4
commit a4e13c520b
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/src/main/java/org/springframework/security/web/ObservationFilterChainDecorator.java
View File

@ -377,7 +377,6 @@ public final class ObservationFilterChainDecorator implements FilterChainProxy.F
private void error(Throwable error) {
if (this.state.get() == 1) {
this.scope.close();
this.scope.getCurrentObservation().error(error);
}
}

19
web/src/test/java/org/springframework/security/web/ObservationFilterChainDecoratorTests.java
View File

@ -34,8 +34,10 @@ import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.willThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@ -109,6 +111,23 @@ public class ObservationFilterChainDecoratorTests {
assertThat(events.get(1).getName()).isEqualTo("authentication.basic.after");
}
// gh-12787
@Test
void decorateFiltersWhenErrorsThenClosesObservationOnlyOnce() throws Exception {
ObservationHandler<?> handler = mock(ObservationHandler.class);
given(handler.supportsContext(any())).willReturn(true);
ObservationRegistry registry = ObservationRegistry.create();
registry.observationConfig().observationHandler(handler);
ObservationFilterChainDecorator decorator = new ObservationFilterChainDecorator(registry);
FilterChain chain = mock(FilterChain.class);
Filter filter = mock(Filter.class);
willThrow(IllegalArgumentException.class).given(filter).doFilter(any(), any(), any());
FilterChain decorated = decorator.decorate(chain, List.of(filter));
assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(
() -> decorated.doFilter(new MockHttpServletRequest("GET", "/"), new MockHttpServletResponse()));
verify(handler).onScopeClosed(any());
}
private static class BasicAuthenticationFilter implements Filter {
@Override