Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-03 05:09:10 +01:00
Code Issues Packages Projects Releases Activity

Preserve request method on force base url (#1778)

Browse Source 
The redirect which is used to force base url uses now 307 instead of 302 in order to preserve the request method.

Closes #1771
This commit is contained in:
Sebastian Sdorra
2021-08-23 20:02:12 +02:00
committed by GitHub
parent 7f9f4e566c
commit da2b34e528
3 changed files with 146 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
scm-webapp/src/main/java/sonia/scm/filter/BaseUrlFilter.java
View File

@@ -21,10 +21,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.filter;
//~--- non-JDK imports --------------------------------------------------------
package sonia.scm.filter;
import com.google.common.annotations.VisibleForTesting;
import com.google.inject.Inject;
@@ -34,8 +32,6 @@ import sonia.scm.util.HttpUtil;
import sonia.scm.util.Util;
import sonia.scm.web.filter.HttpFilter;
//~--- JDK imports ------------------------------------------------------------
import java.io.IOException;
import javax.servlet.FilterChain;
@@ -50,110 +46,49 @@ import sonia.scm.Priority;
*/
@Priority(Filters.PRIORITY_BASEURL)
@WebElement(Filters.PATTERN_ALL)
public class BaseUrlFilter extends HttpFilter
{
public class BaseUrlFilter extends HttpFilter {
/** scm configuration */
private final ScmConfiguration configuration;
/**
* Constructs ...
*
*
* @param configuration
*/
@Inject
public BaseUrlFilter(ScmConfiguration configuration)
{
public BaseUrlFilter(ScmConfiguration configuration) {
this.configuration = configuration;
}
//~--- methods --------------------------------------------------------------
/**
* Method description
*
*
* @param requestUrl
* @param baseUrl
*
* @return
*/
@VisibleForTesting
boolean startsWith(String requestUrl, String baseUrl)
{
return HttpUtil.normalizeUrl(requestUrl).startsWith(
HttpUtil.normalizeUrl(baseUrl));
boolean startsWith(String requestUrl, String baseUrl) {
return HttpUtil.normalizeUrl(requestUrl).startsWith(HttpUtil.normalizeUrl(baseUrl));
}
/**
* Method description
*
*
* @param request
* @param response
* @param chain
*
* @throws IOException
* @throws ServletException
*/
@Override
protected void doFilter(HttpServletRequest request,
HttpServletResponse response, FilterChain chain)
throws IOException, ServletException
{
if (Util.isEmpty(configuration.getBaseUrl()))
{
protected void doFilter(
HttpServletRequest request, HttpServletResponse response, FilterChain chain
) throws IOException, ServletException {
if (Util.isEmpty(configuration.getBaseUrl())) {
configuration.setBaseUrl(createDefaultBaseUrl(request));
}
if (!configuration.isForceBaseUrl() || isBaseUrl(request))
{
if (!configuration.isForceBaseUrl() || isBaseUrl(request)) {
chain.doFilter(request, response);
}
else
{
String url = HttpUtil.getCompleteUrl(configuration,
HttpUtil.getStrippedURI(request));
response.sendRedirect(url);
} else {
String url = HttpUtil.getCompleteUrl(configuration, HttpUtil.getStrippedURI(request));
response.setStatus(HttpServletResponse.SC_TEMPORARY_REDIRECT);
response.setHeader(HttpUtil.HEADER_LOCATION, url);
}
}
/**
* Method description
*
*
* @param request
*
* @return
*/
private String createDefaultBaseUrl(HttpServletRequest request)
{
private String createDefaultBaseUrl(HttpServletRequest request) {
StringBuilder sb = new StringBuilder(request.getScheme());
sb.append("://").append(request.getServerName()).append(":");
sb.append(String.valueOf(request.getServerPort()));
sb.append(request.getServerPort());
sb.append(request.getContextPath());
return sb.toString();
}
//~--- get methods ----------------------------------------------------------
/**
* Method description
*
*
* @param request
*
* @return
*/
private boolean isBaseUrl(HttpServletRequest request)
{
return startsWith(request.getRequestURL().toString(),
configuration.getBaseUrl());
private boolean isBaseUrl(HttpServletRequest request) {
return startsWith(request.getRequestURL().toString(), configuration.getBaseUrl());
}
//~--- fields ---------------------------------------------------------------
/** scm configuration */
private final ScmConfiguration configuration;
}