From 125ae48abf3c7c8cb471e60dd785d3d7fad59e7a Mon Sep 17 00:00:00 2001 From: Albert Choi Date: Tue, 6 Jul 2021 14:57:02 -0400 Subject: [PATCH 1/2] Fix incorrect second parameter This was causing "java.lang.IllegalArgumentException: There is no configured chain under the name/key" --- .../shiro/web/filter/mgt/PathMatchingFilterChainResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/main/java/org/apache/shiro/web/filter/mgt/PathMatchingFilterChainResolver.java b/web/src/main/java/org/apache/shiro/web/filter/mgt/PathMatchingFilterChainResolver.java index 6d81e0231e..e216108650 100644 --- a/web/src/main/java/org/apache/shiro/web/filter/mgt/PathMatchingFilterChainResolver.java +++ b/web/src/main/java/org/apache/shiro/web/filter/mgt/PathMatchingFilterChainResolver.java @@ -125,7 +125,7 @@ public FilterChain getChain(ServletRequest request, ServletResponse response, Fi log.trace("Matched path pattern [{}] for requestURI [{}]. " + "Utilizing corresponding filter chain...", pathPattern, Encode.forHtml(requestURINoTrailingSlash)); } - return filterChainManager.proxy(originalChain, requestURINoTrailingSlash); + return filterChainManager.proxy(originalChain, pathPattern); } } } From 367c3d5cc0bc18eefcc4358930b82978c877f06b Mon Sep 17 00:00:00 2001 From: Brian Demers Date: Tue, 6 Jul 2021 16:34:03 -0400 Subject: [PATCH 2/2] Add test for SHIRO-825 --- .../PathMatchingFilterChainResolverTest.java | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/web/src/test/java/org/apache/shiro/web/filter/mgt/PathMatchingFilterChainResolverTest.java b/web/src/test/java/org/apache/shiro/web/filter/mgt/PathMatchingFilterChainResolverTest.java index db4de61e2d..76bff556ce 100644 --- a/web/src/test/java/org/apache/shiro/web/filter/mgt/PathMatchingFilterChainResolverTest.java +++ b/web/src/test/java/org/apache/shiro/web/filter/mgt/PathMatchingFilterChainResolverTest.java @@ -255,4 +255,44 @@ public void testMultipleChainsPathEndsWithSlash() { FilterChain resolved = resolver.getChain(request, response, chain); assertThat(resolved, notNullValue()); } + + /** + * Test asserting SHIRO-825. + */ + @Test + public void testGetChainWhenPathEndsWithSlash() { + HttpServletRequest request = mock(HttpServletRequest.class); + HttpServletResponse response = mock(HttpServletResponse.class); + FilterChain chain = mock(FilterChain.class); + + //ensure at least one chain is defined: + resolver.getFilterChainManager().addToChain("/resource/*/book", "authcBasic"); + + when(request.getServletPath()).thenReturn(""); + when(request.getPathInfo()).thenReturn("/resource/123/book/"); + + FilterChain resolved = resolver.getChain(request, response, chain); + assertNotNull(resolved); + verify(request).getServletPath(); + } + + /** + * Test asserting SHIRO-825. + */ + @Test + public void testGetChainWhenPathDoesNotEndWithSlash() { + HttpServletRequest request = mock(HttpServletRequest.class); + HttpServletResponse response = mock(HttpServletResponse.class); + FilterChain chain = mock(FilterChain.class); + + //ensure at least one chain is defined: + resolver.getFilterChainManager().addToChain("/resource/*/book", "authcBasic"); + + when(request.getServletPath()).thenReturn(""); + when(request.getPathInfo()).thenReturn("/resource/123/book"); + + FilterChain resolved = resolver.getChain(request, response, chain); + assertNotNull(resolved); + verify(request).getServletPath(); + } }