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

GUAC-1101: Migrate to recent API changes on batch-directory branch.

Browse Source
This commit is contained in:
Michael Jumper
2015-02-23 13:23:33 -08:00
parent 9c161c9fc6
commit f78281e3c8
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUserContext.java
View File

@@ -26,6 +26,7 @@ package net.sourceforge.guacamole.net.auth.mysql;
import com.google.inject.Inject; import com.google.inject.Inject;
import java.util.Collections; import java.util.Collections;
import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.net.auth.Connection;
import org.glyptodon.guacamole.net.auth.ConnectionGroup; import org.glyptodon.guacamole.net.auth.ConnectionGroup;
import org.glyptodon.guacamole.net.auth.Directory; import org.glyptodon.guacamole.net.auth.Directory;
import org.glyptodon.guacamole.net.auth.User; import org.glyptodon.guacamole.net.auth.User;
@@ -73,12 +74,26 @@ public class MySQLUserContext implements UserContext {
return userDirectory; return userDirectory;
} }
@Override
public Directory<Connection> getConnectionDirectory() throws GuacamoleException {
/* STUB */
return new SimpleConnectionDirectory(Collections.EMPTY_LIST);
}
@Override
public Directory<ConnectionGroup> getConnectionGroupDirectory() throws GuacamoleException {
/* STUB */
return new SimpleConnectionGroupDirectory(Collections.EMPTY_LIST);
}
@Override @Override
public ConnectionGroup getRootConnectionGroup() throws GuacamoleException { public ConnectionGroup getRootConnectionGroup() throws GuacamoleException {
/* STUB */ /* STUB */
return new SimpleConnectionGroup("ROOT", "ROOT", return new SimpleConnectionGroup(
new SimpleConnectionDirectory(Collections.EMPTY_MAP), MySQLConstants.CONNECTION_GROUP_ROOT_IDENTIFIER,
new SimpleConnectionGroupDirectory(Collections.EMPTY_LIST) MySQLConstants.CONNECTION_GROUP_ROOT_IDENTIFIER,
Collections.EMPTY_LIST,
Collections.EMPTY_LIST
); );
} }

6
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java
View File

@@ -65,12 +65,6 @@ public class UserDirectory implements Directory<User> {
this.currentUser = currentUser; this.currentUser = currentUser;
} }
@Override
public void move(String identifier, Directory<User> groupIdentifier)
throws GuacamoleException {
throw new GuacamoleSecurityException("Permission denied.");
}
@Override @Override
public User get(String identifier) throws GuacamoleException { public User get(String identifier) throws GuacamoleException {
return userService.retrieveObject(currentUser, identifier); return userService.retrieveObject(currentUser, identifier);