Browse Source

Activation Link(added logic if x-forwarded-proto is set but x-forwarded-port not set, set port to 80 or 443)

pull/2160/head
YevhenBondarenko 7 years ago
committed by Andrew Shvayka
parent
commit
46c7862258
  1. 16
      application/src/main/java/org/thingsboard/server/controller/BaseController.java

16
application/src/main/java/org/thingsboard/server/controller/BaseController.java

@ -516,15 +516,27 @@ public abstract class BaseController {
protected String constructBaseUrl(HttpServletRequest request) {
String scheme = request.getScheme();
if (request.getHeader("x-forwarded-proto") != null) {
scheme = request.getHeader("x-forwarded-proto");
String forwardedProto = request.getHeader("x-forwarded-proto");
if (forwardedProto != null) {
scheme = forwardedProto;
}
int serverPort = request.getServerPort();
if (request.getHeader("x-forwarded-port") != null) {
try {
serverPort = request.getIntHeader("x-forwarded-port");
} catch (NumberFormatException e) {
}
} else if (forwardedProto != null) {
switch (forwardedProto) {
case "http":
serverPort = 80;
break;
case "https":
serverPort = 443;
break;
}
}
String baseUrl = String.format("%s://%s:%d",

Loading…
Cancel
Save