safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-10-26 22:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge patch branch changes to main.

Browse Source
This commit is contained in:
Virtually Nick
2025-04-14 22:21:07 -04:00
parent f6d4ed801c 74e597397a
commit 73c1497744
17 changed files with 697 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
guacamole/src/main/java/org/apache/guacamole/event/RemoteAddress.java
View File

@@ -20,7 +20,6 @@
package org.apache.guacamole.event;
import java.util.regex.Pattern;
import javax.servlet.http.HttpServletRequest;
import org.apache.guacamole.net.auth.Credentials;
/**
@@ -78,17 +77,15 @@ public class RemoteAddress implements LoggableDetail {
@Override
public String toString() {
HttpServletRequest request = creds.getRequest();
if (request == null)
return creds.getRemoteAddress();
String remoteAddress = creds.getRemoteAddress();
// Log X-Forwarded-For, if present and valid
String header = request.getHeader("X-Forwarded-For");
String header = creds.getHeader("X-Forwarded-For");
if (header != null && X_FORWARDED_FOR.matcher(header).matches())
return "[" + header + ", " + request.getRemoteAddr() + "]";
return "[" + header + ", " + remoteAddress + "]";
// If header absent or invalid, just use source IP
return request.getRemoteAddr();
return remoteAddress;
}