Skip to content

If enabled, only take the first comma separated ip #892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 8, 2024
Merged

If enabled, only take the first comma separated ip #892

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01539ce
If enabled, only take the first comma separated ip
tomas-sexenian Aug 20, 2024
98e634c
Undo changes in getServerPort
tomas-sexenian Aug 20, 2024
f02735d
Merge branch 'master' into RemoteAddrFix
tomas-sexenian Aug 20, 2024
953cc91
Merge branch 'master' into RemoteAddrFix
tomas-sexenian Aug 23, 2024
602e80f
Merge branch 'master' into RemoteAddrFix
tomas-sexenian Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions java/src/main/java/com/genexus/webpanels/HttpContextWeb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public class HttpContextWeb extends HttpContext {
private static final String SAME_SITE_LAX = "Lax";
private static final String SAME_SITE_STRICT = "Strict";
private static final String SET_COOKIE = "Set-Cookie";
private static String httpForwardedHeadersEnabled = System.getenv("HTTP_FORWARDEDHEADERS_ENABLED");

public static final int BROWSER_OTHER = 0;
public static final int BROWSER_IE = 1;
Expand Down Expand Up @@ -630,8 +631,10 @@ public String getUserId(String key, ModelContext context, int handle, com.genexu
}

public String getRemoteAddr() {
boolean isEnabled = "true".equalsIgnoreCase(httpForwardedHeadersEnabled);
String address = getHeader("X-Forwarded-For");
if (address.length() > 0){
if (isEnabled && address != null && address.length() > 0) {
address = address.split(",")[0].trim();
return address;
}
address = request.getRemoteAddr();
Expand Down Expand Up @@ -948,18 +951,16 @@ public byte setCookie(String name, String value, String path, java.util.Date exp
}

public String getServerName() {
boolean isEnabled = "true".equalsIgnoreCase(httpForwardedHeadersEnabled);
String host = getHeader("X-Forwarded-Host");
if (host.length() > 0){
return host;
if (isEnabled && host != null && host.length() > 0) {
return host.split(",")[0].trim();
}
String serverNameProperty = ModelContext.getModelContext().getPreferences().getProperty("SERVER_NAME", "");
if (!StringUtils.isBlank(serverNameProperty)) {
return serverNameProperty;
}
if (request != null)
return request.getServerName();

return "";
return request != null ? request.getServerName() : "";
}

public int getServerPort() {
Expand Down
Loading