MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/372' into stable

Browse Source
This commit is contained in:
Andrew DeMaria
2017-05-06 08:34:41 -06:00
parent d6b954a413 3b3491384a
commit 11ea0c2373
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libresonic-main/src/main/java/org/libresonic/player/service/NetworkService.java
+13
View File
@@ -60,8 +60,21 @@ public class NetworkService {
private static URI calculateProxyUri(HttpServletRequest request) throws URISyntaxException { private static URI calculateProxyUri(HttpServletRequest request) throws URISyntaxException {
String xForardedHost = request.getHeader(X_FORWARDED_HOST); String xForardedHost = request.getHeader(X_FORWARDED_HOST);
// If the request has been through multiple reverse proxies,
// We need to return the original Host that the client used
if (xForardedHost != null) {
xForardedHost = xForardedHost.split(",")[0];
}
if(!isValidXForwardedHost(xForardedHost)) { if(!isValidXForwardedHost(xForardedHost)) {
xForardedHost = request.getHeader(X_FORWARDED_SERVER); xForardedHost = request.getHeader(X_FORWARDED_SERVER);
// If the request has been through multiple reverse proxies,
// We need to return the original Host that the client used
if (xForardedHost != null) {
xForardedHost = xForardedHost.split(",")[0];
}
if(!isValidXForwardedHost(xForardedHost)) { if(!isValidXForwardedHost(xForardedHost)) {
throw new RuntimeException("Cannot calculate proxy uri without HTTP header " + X_FORWARDED_HOST); throw new RuntimeException("Cannot calculate proxy uri without HTTP header " + X_FORWARDED_HOST);
} }