safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-10-31 09:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-47: Store remote address and hostname within Credentials.

Browse Source
This commit is contained in:
Michael Jumper
2017-01-28 11:23:31 -08:00
parent 1ed73e6a97
commit b336e26cb2
4 changed files with 78 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Credentials.java
View File

@@ -51,6 +51,19 @@ public class Credentials implements Serializable {
*/
private String password;
/**
* The address of the client end of the connection which provided these
* credentials, if known.
*/
private String remoteAddress;
/**
* The hostname or, if the hostname cannot be determined, the address of
* the client end of the connection which provided these credentials, if
* known.
*/
private String remoteHostname;
/**
* The HttpServletRequest carrying additional credentials, if any.
*/
@@ -133,4 +146,56 @@ public class Credentials implements Serializable {
this.session = session;
}
/**
* Returns the address of the client end of the connection which provided
* these credentials, if known.
*
* @return
* The address of the client end of the connection which provided these
* credentials, or null if the address is not known.
*/
public String getRemoteAddress() {
return remoteAddress;
}
/**
* Sets the address of the client end of the connection which provided
* these credentials.
*
* @param remoteAddress
* The address of the client end of the connection which provided these
* credentials, or null if the address is not known.
*/
public void setRemoteAddress(String remoteAddress) {
this.remoteAddress = remoteAddress;
}
/**
* Returns the hostname of the client end of the connection which provided
* these credentials, if known. If the hostname of the client cannot be
* determined, but the address is known, the address may be returned
* instead.
*
* @return
* The hostname or address of the client end of the connection which
* provided these credentials, or null if the hostname is not known.
*/
public String getRemoteHostname() {
return remoteHostname;
}
/**
* Sets the hostname of the client end of the connection which provided
* these credentials, if known. If the hostname of the client cannot be
* determined, but the address is known, the address may be specified
* instead.
*
* @param remoteHostname
* The hostname or address of the client end of the connection which
* provided these credentials, or null if the hostname is not known.
*/
public void setRemoteHostname(String remoteHostname) {
this.remoteHostname = remoteHostname;
}
}

16
guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java
View File

@@ -21,7 +21,6 @@ package org.apache.guacamole.token;
import java.text.SimpleDateFormat;
import java.util.Date;
import javax.servlet.http.HttpServletRequest;
import org.apache.guacamole.net.auth.Credentials;
/**
@@ -126,12 +125,15 @@ public class StandardTokens {
if (password != null)
filter.setToken(PASSWORD_TOKEN, password);
// Add client hostname and ip tokens
HttpServletRequest request = credentials.getRequest();
if (request != null) {
filter.setToken(CLIENT_HOSTNAME_TOKEN, request.getRemoteHost());
filter.setToken(CLIENT_ADDRESS_TOKEN, request.getRemoteAddr());
}
// Add client hostname token
String hostname = credentials.getRemoteHostname();
if (hostname != null)
filter.setToken(CLIENT_HOSTNAME_TOKEN, hostname);
// Add client address token
String address = credentials.getRemoteAddress();
if (address != null)
filter.setToken(CLIENT_ADDRESS_TOKEN, address);
// Add any tokens which do not require credentials
addStandardTokens(filter);