Commit 422a67ba authored by Matija Obreza's avatar Matija Obreza

Merge branch '407-requestrejectedexception-logging' into 'master'

Resolve "RequestRejectedException logging"

Closes #407

See merge request genesys-pgr/genesys-server!338
parents 29564f43 f1d9dff1
/*
* Copyright 2019 Global Crop Diversity Trust
*
* 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
*
* http://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.genesys2.server.servlet.filter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.web.firewall.RequestRejectedException;
import org.springframework.web.filter.GenericFilterBean;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
* https://stackoverflow.com/questions/51788764/how-to-intercept-a-requestrejectedexception-in-spring/52635656#52635656
*/
public class SuppressRequestRejectedExceptionFilter extends GenericFilterBean {
private static final Logger LOG = LoggerFactory.getLogger(SuppressRequestRejectedExceptionFilter.class);
@Override
public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
try {
chain.doFilter(req, res);
} catch (RequestRejectedException e) {
HttpServletRequest request = (HttpServletRequest) req;
HttpServletResponse response = (HttpServletResponse) res;
LOG.warn("Bad request {} {}: {}", request.getMethod(), request.getRequestURL(), e.getMessage());
response.sendError(HttpServletResponse.SC_NOT_FOUND);
}
}
}
......@@ -27,6 +27,7 @@ import javax.servlet.ServletRegistration;
import javax.servlet.SessionTrackingMode;
import org.genesys2.server.servlet.filter.LocaleURLFilter;
import org.genesys2.server.servlet.filter.SuppressRequestRejectedExceptionFilter;
import org.sitemesh.builder.SiteMeshFilterBuilder;
import org.sitemesh.config.ConfigurableSiteMeshFilter;
import org.sitemesh.webapp.contentfilter.BasicSelector;
......@@ -90,6 +91,9 @@ public class WebInitializer extends AbstractAnnotationConfigDispatcherServletIni
}
private void registerFilters(final ServletContext servletContext) {
final FilterRegistration.Dynamic customLogFilter = servletContext.addFilter("suppressRequestRejectedExceptionFilter", SuppressRequestRejectedExceptionFilter.class);
customLogFilter.addMappingForUrlPatterns(null, false, "/*");
// UrlRewrite filter configuration
final FilterRegistration.Dynamic urlRewriteFilter = servletContext.addFilter("urlRewriteFilter", UrlRewriteFilter.class);
urlRewriteFilter.setInitParameter("confReloadCheckInterval", "10");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment