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

Merge 1.0.0 changes back to master.

Browse Source
This commit is contained in:
Michael Jumper
2018-07-01 23:18:04 -07:00
parent 7481c181ed 34faa5d928
commit d53b43ce29
5 changed files with 45 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenRESTService.java
View File

@@ -117,15 +117,7 @@ public class TokenRESTService {
} // end Authorization header fallback
// Build credentials
Credentials credentials = new Credentials();
credentials.setUsername(username);
credentials.setPassword(password);
credentials.setRequest(request);
credentials.setSession(request.getSession(false));
credentials.setRemoteAddress(request.getRemoteAddr());
credentials.setRemoteHostname(request.getRemoteHost());
return credentials;
return new Credentials(username, password, request);
}

9
guacamole/src/main/java/org/apache/guacamole/rest/user/UserResource.java
View File

@@ -155,13 +155,8 @@ public class UserResource
@Context HttpServletRequest request) throws GuacamoleException {
// Build credentials
Credentials credentials = new Credentials();
credentials.setUsername(user.getIdentifier());
credentials.setPassword(userPasswordUpdate.getOldPassword());
credentials.setRequest(request);
credentials.setSession(request.getSession(false));
credentials.setRemoteAddress(request.getRemoteAddr());
credentials.setRemoteHostname(request.getRemoteHost());
Credentials credentials = new Credentials(user.getIdentifier(),
userPasswordUpdate.getOldPassword(), request);
// Verify that the old password was correct
try {