safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-784: Merge changes which tolerate the presence of a port number within X-Forwarded-For headers.

Browse Source
This commit is contained in:
Mike Jumper
2020-01-25 22:34:05 -08:00
committed by GitHub
parent 9fdcccf79d 25ac5f06c1
commit ff6dc5f330
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
guacamole/src/main/java/org/apache/guacamole/rest/auth/AuthenticationService.java
View File

@@ -106,11 +106,16 @@ public class AuthenticationService {
*/ */
private static final String IP_ADDRESS_REGEX = "(" + IPV4_ADDRESS_REGEX + "|" + IPV6_ADDRESS_REGEX + ")"; private static final String IP_ADDRESS_REGEX = "(" + IPV4_ADDRESS_REGEX + "|" + IPV6_ADDRESS_REGEX + ")";
/**
* Regular expression which matches any Port Number.
*/
private static final String PORT_NUMBER_REGEX = "(:[0-9]{1,5})?";
/** /**
* Pattern which matches valid values of the de-facto standard * Pattern which matches valid values of the de-facto standard
* "X-Forwarded-For" header. * "X-Forwarded-For" header.
*/ */
private static final Pattern X_FORWARDED_FOR = Pattern.compile("^" + IP_ADDRESS_REGEX + "(, " + IP_ADDRESS_REGEX + ")*$"); private static final Pattern X_FORWARDED_FOR = Pattern.compile("^" + IP_ADDRESS_REGEX + PORT_NUMBER_REGEX + "(, " + IP_ADDRESS_REGEX + PORT_NUMBER_REGEX + ")*$");
/** /**
* Returns a formatted string containing an IP address, or list of IP * Returns a formatted string containing an IP address, or list of IP