honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#138 - rewrote to always use super's address base, then fixup the host name and protocol

This commit is contained in:
b.debeaubien 2015-03-31 12:53:40 -04:00
parent d111d19071
commit 243b9a71a4
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/ApacheProxyAddressStrategy.java
View File

@ -58,24 +58,40 @@ public class ApacheProxyAddressStrategy extends IncomingRequestAddressStrategy {
@Override @Override
public String determineServerBase(ServletContext theServletContext, HttpServletRequest theRequest) { public String determineServerBase(ServletContext theServletContext, HttpServletRequest theRequest) {
String forwardedHost = getForwardedHost(theRequest);
if (forwardedHost != null) {
return forwardedServerBase(theServletContext, theRequest, forwardedHost);
}
return super.determineServerBase(theServletContext, theRequest);
}
private String getForwardedHost(HttpServletRequest theRequest) {
String forwardedHost = theRequest.getHeader("x-forwarded-host"); String forwardedHost = theRequest.getHeader("x-forwarded-host");
if (forwardedHost != null) { if (forwardedHost != null) {
int commaPos = forwardedHost.indexOf(','); int commaPos = forwardedHost.indexOf(',');
if (commaPos >= 0) { if (commaPos >= 0) {
forwardedHost = forwardedHost.substring(0, commaPos - 1); forwardedHost = forwardedHost.substring(0, commaPos - 1);
} }
String requestFullPath = StringUtils.defaultString(theRequest.getRequestURI());
String serverBase = protocol(theRequest) + forwardedHost + requestFullPath;
return serverBase;
} }
return super.determineServerBase(theServletContext, theRequest); return forwardedHost;
}
public String forwardedServerBase(ServletContext theServletContext, HttpServletRequest theRequest, String theForwardedHost) {
String serverBase = super.determineServerBase(theServletContext, theRequest);
String host = theRequest.getHeader("host");
if (host != null) {
serverBase = serverBase.replace(host, theForwardedHost);
serverBase = serverBase.substring(serverBase.indexOf("://"));
return protocol(theRequest) + serverBase;
}
return serverBase;
} }
protected String protocol(HttpServletRequest theRequest) { protected String protocol(HttpServletRequest theRequest) {
String protocol = theRequest.getHeader("x-forwarded-proto"); String protocol = theRequest.getHeader("x-forwarded-proto");
if (protocol != null) { if (protocol != null) {
return protocol + "://"; return protocol;
} }
return myUseHttps ? "https://" : "http://"; return myUseHttps ? "https" : "http";
} }
} }