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

Ticket #362: Cleaned up a bit.

Browse Source
This commit is contained in:
James Muehlner
2013-12-09 20:35:29 -08:00
parent 756ffa7637
commit d2aec9457f
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/BasicTokenUserContextMap.java
View File

@@ -95,6 +95,11 @@ public class BasicTokenUserContextMap implements TokenUserContextMap {
lastAccessTimeMap.put(authToken, new Date().getTime()); lastAccessTimeMap.put(authToken, new Date().getTime());
} }
/**
* Check if a session has timed out.
* @param authToken The auth token for the session.
* @return True if the session has timed out, false otherwise.
*/
private boolean sessionHasTimedOut(String authToken) { private boolean sessionHasTimedOut(String authToken) {
if(!lastAccessTimeMap.containsKey(authToken)) if(!lastAccessTimeMap.containsKey(authToken))
return true; return true;

14
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/UserRESTService.java
View File

@@ -70,7 +70,7 @@ public class UserRESTService {
private UserService userService; private UserService userService;
/** /**
* Get a list of users in the system. * Gets a list of users in the system.
* @param authToken The authentication token that is used to authenticate * @param authToken The authentication token that is used to authenticate
* the user performing the operation. * the user performing the operation.
* @return The user list. * @return The user list.
@@ -96,7 +96,7 @@ public class UserRESTService {
} }
/** /**
* Get a user. * Gets an individual user.
* @param authToken The authentication token that is used to authenticate * @param authToken The authentication token that is used to authenticate
* the user performing the operation. * the user performing the operation.
* @return user The user. * @return user The user.
@@ -129,13 +129,13 @@ public class UserRESTService {
} }
/** /**
* Create a new user. * Creates a new user and returns the username.
* @param authToken The authentication token that is used to authenticate * @param authToken The authentication token that is used to authenticate
* the user performing the operation. * the user performing the operation.
* @param user The new user to create. * @param user The new user to create.
*/ */
@POST @POST
public void createUser(@QueryParam("token") String authToken, APIUser user) { public String createUser(@QueryParam("token") String authToken, APIUser user) {
UserContext userContext = authenticationService.getUserContextFromAuthToken(authToken); UserContext userContext = authenticationService.getUserContextFromAuthToken(authToken);
try { try {
@@ -144,6 +144,8 @@ public class UserRESTService {
// Create the user // Create the user
userDirectory.add(new APIUserWrapper(user)); userDirectory.add(new APIUserWrapper(user));
return user.getUsername();
} catch(GuacamoleSecurityException e) { } catch(GuacamoleSecurityException e) {
throw new HTTPException(Response.Status.UNAUTHORIZED, e.getMessage() != null ? e.getMessage() : "Permission denied."); throw new HTTPException(Response.Status.UNAUTHORIZED, e.getMessage() != null ? e.getMessage() : "Permission denied.");
} catch(GuacamoleClientException e) { } catch(GuacamoleClientException e) {
@@ -155,7 +157,7 @@ public class UserRESTService {
} }
/** /**
* Update an existing user. * Updates an individual existing user.
* @param authToken The authentication token that is used to authenticate * @param authToken The authentication token that is used to authenticate
* the user performing the operation. * the user performing the operation.
* @param userID The unique identifier of the user to update. * @param userID The unique identifier of the user to update.
@@ -195,7 +197,7 @@ public class UserRESTService {
} }
/** /**
* Delete an existing user. * Deletes an individual existing user.
* @param authToken The authentication token that is used to authenticate * @param authToken The authentication token that is used to authenticate
* the user performing the operation. * the user performing the operation.
* @param userID The unique identifier of the user to delete. * @param userID The unique identifier of the user to delete.