Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactored addition of proxy headers into two methods, 

to allow subclasses to override this behavior more easily.
This commit is contained in:
Simone Bordet 2013-10-31 10:08:52 +01:00
parent c64dad6066
commit b1e277af21
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
View File

@ -137,6 +137,11 @@ public class ProxyServlet extends HttpServlet
} }
} }
public String getViaHost()
{
return _viaHost;
}
public long getTimeout() public long getTimeout()
{ {
return _timeout; return _timeout;
@ -419,11 +424,8 @@ public class ProxyServlet extends HttpServlet
proxyRequest.header(HttpHeader.HOST, _hostHeader); proxyRequest.header(HttpHeader.HOST, _hostHeader);
// Add proxy headers // Add proxy headers
proxyRequest.header(HttpHeader.VIA, "http/1.1 " + _viaHost); addViaHeader(proxyRequest);
proxyRequest.header(HttpHeader.X_FORWARDED_FOR, request.getRemoteAddr()); addXForwardedHeaders(proxyRequest, request);
proxyRequest.header(HttpHeader.X_FORWARDED_PROTO, request.getScheme());
proxyRequest.header(HttpHeader.X_FORWARDED_HOST, request.getHeader(HttpHeader.HOST.asString()));
proxyRequest.header(HttpHeader.X_FORWARDED_SERVER, request.getLocalName());
if (hasContent) if (hasContent)
{ {
@ -488,6 +490,19 @@ public class ProxyServlet extends HttpServlet
proxyRequest.send(new ProxyResponseListener(request, response)); proxyRequest.send(new ProxyResponseListener(request, response));
} }
protected Request addViaHeader(Request proxyRequest)
{
return proxyRequest.header(HttpHeader.VIA, "http/1.1 " + getViaHost());
}
protected void addXForwardedHeaders(Request proxyRequest, HttpServletRequest request)
{
proxyRequest.header(HttpHeader.X_FORWARDED_FOR, request.getRemoteAddr());
proxyRequest.header(HttpHeader.X_FORWARDED_PROTO, request.getScheme());
proxyRequest.header(HttpHeader.X_FORWARDED_HOST, request.getHeader(HttpHeader.HOST.asString()));
proxyRequest.header(HttpHeader.X_FORWARDED_SERVER, request.getLocalName());
}
protected void onResponseHeaders(HttpServletRequest request, HttpServletResponse response, Response proxyResponse) protected void onResponseHeaders(HttpServletRequest request, HttpServletResponse response, Response proxyResponse)
{ {
for (HttpField field : proxyResponse.getHeaders()) for (HttpField field : proxyResponse.getHeaders())