GUAC-1132: Allow batch retrieval/deletion of tunnels.

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserContext.java

@@ -28,6 +28,7 @@ import org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupDirector
 import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionDirectory;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
+import java.util.ArrayList;
 import java.util.Collection;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.auth.jdbc.base.RestrictedObject;
@@ -130,9 +131,22 @@ public class UserContext extends RestrictedObject
     }
 
     @Override
-    public ConnectionRecord getActiveConnection(String tunnelUUID)
+    public Collection<ConnectionRecord> getActiveConnections(Collection<String> tunnelUUIDs)
             throws GuacamoleException {
-        return tunnelService.getActiveConnection(getCurrentUser(), tunnelUUID);
+
+        // Look up active connections for each given tunnel UUID
+        Collection<ConnectionRecord> records = new ArrayList<ConnectionRecord>(tunnelUUIDs.size());
+        for (String tunnelUUID : tunnelUUIDs) {
+
+            // Add corresponding record only if it exists
+            ConnectionRecord record = tunnelService.getActiveConnection(getCurrentUser(), tunnelUUID);
+            if (record != null)
+                records.add(record);
+
+        }
+
+        return records;
+        
     }
 
 }

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/UserContext.java

@@ -113,24 +113,24 @@ public interface UserContext {
             throws GuacamoleException;
 
     /**
-     * Returns the connection record associated with the active connection
+     * Returns the connection records associated with the active connections
-     * having the tunnel with the given UUID. The active connection will only
+     * having the tunnels with the given UUIDs. An active connection will only
      * be returned if the current user has access.
      *
-     * @param tunnelUUID
+     * @param tunnelUUIDs
-     *     The UUID of the tunnel whose associated connection record should be
+     *     The UUIDs of the tunnels whose associated connection records should
-     *     returned.
+     *     be returned.
      *
      * @return
-     *     The connection record associated with the active connection having
+     *     A collection of all connection records associated with the active
-     *     the tunnel with the given UUID, if any, or null if no such
+     *     connections having the tunnels with the given UUIDs, if any, or an
-     *     connection exists.
+     *     empty collection if no such connections exist.
      *
      * @throws GuacamoleException
      *     If an error occurs while reading active connection records, or if
      *     permission is denied.
      */
-    ConnectionRecord getActiveConnection(String tunnelUUID)
+    Collection<ConnectionRecord> getActiveConnections(Collection<String> tunnelUUIDs)
             throws GuacamoleException;
 
 }

guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUserContext.java

@@ -175,9 +175,9 @@ public class SimpleUserContext implements UserContext {
     }
 
     @Override
-    public ConnectionRecord getActiveConnection(String tunnelUUID)
+    public Collection<ConnectionRecord> getActiveConnections(Collection<String> tunnelUUID)
             throws GuacamoleException {
-        return null;
+        return Collections.EMPTY_LIST;
     }
 
 }

guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/tunnel/TunnelRESTService.java

@@ -24,6 +24,7 @@ package org.glyptodon.guacamole.net.basic.rest.tunnel;
 
 import com.google.inject.Inject;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -34,8 +35,6 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleResourceNotFoundException;
-import org.glyptodon.guacamole.GuacamoleUnsupportedException;
 import org.glyptodon.guacamole.net.GuacamoleTunnel;
 import org.glyptodon.guacamole.net.auth.ConnectionRecord;
 import org.glyptodon.guacamole.net.auth.UserContext;
@@ -103,37 +102,38 @@ public class TunnelRESTService {
     }
 
     /**
-     * Deletes the tunnel having the given UUID, effectively closing the
+     * Deletes the tunnels having the given UUIDs, effectively closing the
-     * tunnel and killing the associated connection.
+     * tunnels and killing the associated connections.
      * 
      * @param authToken
      *     The authentication token that is used to authenticate the user
      *     performing the operation.
      *
-     * @param tunnelUUID
+     * @param tunnelUUIDs
-     *     The UUID associated with the tunnel being deleted.
+     *     The UUIDs associated with the tunnels being deleted.
      *
      * @throws GuacamoleException
-     *     If an error occurs while deleting the tunnel.
+     *     If an error occurs while deleting the tunnels.
      */
     @DELETE
-    @Path("/{tunnelUUID}")
+    @Path("/")
     @AuthProviderRESTExposure
-    public void deleteTunnel(@QueryParam("token") String authToken,
+    public void deleteTunnels(@QueryParam("token") String authToken,
-            @PathParam("tunnelUUID") String tunnelUUID) 
+            @QueryParam("tunnelUUID") Collection<String> tunnelUUIDs) 
             throws GuacamoleException {
 
+        // Attempt to get all requested tunnels
         UserContext userContext = authenticationService.getUserContext(authToken);
+        Collection<ConnectionRecord> records = userContext.getActiveConnections(tunnelUUIDs);
 
-        // Retrieve specified tunnel
+        // Close each tunnel, if not already closed
-        ConnectionRecord record = userContext.getActiveConnection(tunnelUUID);
+        for (ConnectionRecord record : records) {
-        if (record == null)
-            throw new GuacamoleResourceNotFoundException("No such tunnel: \"" + tunnelUUID + "\"");
 
-        // Close tunnel, if not already closed
+            GuacamoleTunnel tunnel = record.getTunnel();
-        GuacamoleTunnel tunnel = record.getTunnel();
+            if (tunnel != null && tunnel.isOpen())
-        if (tunnel != null && tunnel.isOpen())
+                tunnel.close();
-            tunnel.close();
+
+        }
 
     }