GUACAMOLE-52: Merge change to allow for history records when connections are users are no longer present.

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java

@@ -246,13 +246,12 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS
         
         // Get associated models
         AuthenticatedUser user = record.getUser();
-        UserModel userModel = user.getUser().getModel();
         ConnectionRecordModel recordModel = new ConnectionRecordModel();
 
         // Copy user information and timestamps into new record
-        recordModel.setUserID(userModel.getObjectID());
+        recordModel.setUsername(user.getIdentifier());
-        recordModel.setUsername(userModel.getIdentifier());
         recordModel.setConnectionIdentifier(connection.getIdentifier());
+        recordModel.setConnectionName(connection.getName());
         recordModel.setStartDate(record.getStartDate());
         recordModel.setEndDate(new Date());
 

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql

@@ -230,11 +230,13 @@ CREATE TABLE `guacamole_user_permission` (
 
 CREATE TABLE `guacamole_connection_history` (
 
-  `history_id`    int(11)  NOT NULL AUTO_INCREMENT,
+  `history_id`      int(11)  NOT NULL AUTO_INCREMENT,
-  `user_id`       int(11)  NOT NULL,
+  `user_id`         int(11)  DEFAULT NULL,
-  `connection_id` int(11)  NOT NULL,
+  `username`        varchar(128) NOT NULL,
-  `start_date`    datetime NOT NULL,
+  `connection_id`   int(11)  DEFAULT NULL,
-  `end_date`      datetime DEFAULT NULL,
+  `connection_name` varchar(128) NOT NULL,
+  `start_date`      datetime NOT NULL,
+  `end_date`        datetime DEFAULT NULL,
 
   PRIMARY KEY (`history_id`),
   KEY `user_id` (`user_id`),

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.9.10.sql

@@ -0,0 +1,89 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--   http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied.  See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
+--
+-- User and connection IDs within history table can now be null
+--
+
+ALTER TABLE guacamole_connection_history
+    MODIFY COLUMN user_id INT(11) DEFAULT NULL;
+
+ALTER TABLE guacamole_connection_history
+    MODIFY COLUMN connection_id INT(11) DEFAULT NULL;
+
+--
+-- Add new username and connection_name columns to history table
+--
+
+ALTER TABLE guacamole_connection_history
+    ADD COLUMN username VARCHAR(128);
+
+ALTER TABLE guacamole_connection_history
+    ADD COLUMN connection_name VARCHAR(128);
+
+--
+-- Populate new name columns by joining corresponding tables
+--
+
+UPDATE guacamole_connection_history
+JOIN guacamole_user
+    ON guacamole_user.user_id = guacamole_connection_history.user_id
+SET guacamole_connection_history.username = guacamole_user.username;
+
+UPDATE guacamole_connection_history
+JOIN guacamole_connection
+    ON guacamole_connection.connection_id =
+        guacamole_connection_history.connection_id
+SET guacamole_connection_history.connection_name =
+    guacamole_connection.connection_name;
+
+--
+-- Set NOT NULL now that the column is fully populated
+--
+
+ALTER TABLE guacamole_connection_history
+    MODIFY username VARCHAR(128) NOT NULL;
+
+ALTER TABLE guacamole_connection_history
+    MODIFY connection_name VARCHAR(128) NOT NULL;
+
+--
+-- Remove old foreign key constraints with ON DELETE CASCADE
+--
+
+ALTER TABLE guacamole_connection_history
+    DROP FOREIGN KEY guacamole_connection_history_ibfk_1;
+
+ALTER TABLE guacamole_connection_history
+    DROP FOREIGN KEY guacamole_connection_history_ibfk_2;
+
+--
+-- Recreate foreign key constraints with ON DELETE SET NULL
+--
+
+ALTER TABLE guacamole_connection_history
+    ADD CONSTRAINT guacamole_connection_history_ibfk_1
+    FOREIGN KEY (user_id)
+    REFERENCES guacamole_user (user_id) ON DELETE SET NULL;
+
+ALTER TABLE guacamole_connection_history
+    ADD CONSTRAINT guacamole_connection_history_ibfk_2
+    FOREIGN KEY (connection_id)
+    REFERENCES guacamole_connection (connection_id) ON DELETE SET NULL;
+

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml

@@ -37,17 +37,15 @@
     <select id="select" resultMap="ConnectionRecordResultMap">
 
         SELECT
-            guacamole_connection.connection_id,
+            guacamole_connection_history.connection_id,
-            guacamole_connection.connection_name,
+            guacamole_connection_history.connection_name,
-            guacamole_user.user_id,
+            guacamole_connection_history.user_id,
-            guacamole_user.username,
+            guacamole_connection_history.username,
             guacamole_connection_history.start_date,
             guacamole_connection_history.end_date
         FROM guacamole_connection_history
-        JOIN guacamole_connection ON guacamole_connection_history.connection_id = guacamole_connection.connection_id
-        JOIN guacamole_user ON guacamole_connection_history.user_id = guacamole_user.user_id
         WHERE
-            guacamole_connection.connection_id = #{identifier,jdbcType=VARCHAR}
+            guacamole_connection_history.connection_id = #{identifier,jdbcType=VARCHAR}
         ORDER BY
             guacamole_connection_history.start_date DESC,
             guacamole_connection_history.end_date DESC
@@ -59,13 +57,18 @@
 
         INSERT INTO guacamole_connection_history (
             connection_id,
+            connection_name,
             user_id,
+            username,
             start_date,
             end_date
         )
         VALUES (
             #{record.connectionIdentifier,jdbcType=VARCHAR},
-            #{record.userID,jdbcType=INTEGER},
+            #{record.connectionName,jdbcType=VARCHAR},
+            (SELECT user_id FROM guacamole_user
+             WHERE username = #{record.username,jdbcType=VARCHAR}),
+            #{record.username,jdbcType=VARCHAR},
             #{record.startDate,jdbcType=TIMESTAMP},
             #{record.endDate,jdbcType=TIMESTAMP}
         )
@@ -77,9 +80,9 @@
 
         SELECT
             guacamole_connection_history.connection_id,
-            guacamole_connection.connection_name,
+            guacamole_connection_history.connection_name,
             guacamole_connection_history.user_id,
-            guacamole_user.username,
+            guacamole_connection_history.username,
             guacamole_connection_history.start_date,
             guacamole_connection_history.end_date
         FROM guacamole_connection_history
@@ -132,9 +135,9 @@
 
         SELECT
             guacamole_connection_history.connection_id,
-            guacamole_connection.connection_name,
+            guacamole_connection_history.connection_name,
             guacamole_connection_history.user_id,
-            guacamole_user.username,
+            guacamole_connection_history.username,
             guacamole_connection_history.start_date,
             guacamole_connection_history.end_date
         FROM guacamole_connection_history

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql

@@ -274,11 +274,13 @@ CREATE INDEX ON guacamole_user_permission(user_id);
 
 CREATE TABLE guacamole_connection_history (
 
-  history_id    serial      NOT NULL,
+  history_id      serial       NOT NULL,
-  user_id       integer     NOT NULL,
+  user_id         integer      DEFAULT NULL,
-  connection_id integer     NOT NULL,
+  username        varchar(128) NOT NULL,
-  start_date    timestamptz NOT NULL,
+  connection_id   integer      DEFAULT NULL,
-  end_date      timestamptz DEFAULT NULL,
+  connection_name varchar(128) NOT NULL,
+  start_date      timestamptz  NOT NULL,
+  end_date        timestamptz  DEFAULT NULL,
 
   PRIMARY KEY (history_id),
 

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.10.sql

@@ -0,0 +1,90 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--   http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied.  See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
+--
+-- User and connection IDs within history table can now be null
+--
+
+ALTER TABLE guacamole_connection_history
+    ALTER COLUMN user_id SET DEFAULT NULL,
+    ALTER COLUMN user_id DROP NOT NULL;
+
+ALTER TABLE guacamole_connection_history
+    ALTER COLUMN connection_id SET DEFAULT NULL,
+    ALTER COLUMN connection_id DROP NOT NULL;
+
+--
+-- Add new username and connection_name columns to history table
+--
+
+ALTER TABLE guacamole_connection_history
+    ADD COLUMN username varchar(128);
+
+ALTER TABLE guacamole_connection_history
+    ADD COLUMN connection_name varchar(128);
+
+--
+-- Populate new name columns by joining corresponding tables
+--
+
+UPDATE guacamole_connection_history
+    SET username = guacamole_user.username
+    FROM guacamole_user
+    WHERE guacamole_user.user_id = guacamole_connection_history.user_id;
+
+UPDATE guacamole_connection_history
+    SET connection_name = guacamole_connection.connection_name
+    FROM guacamole_connection
+    WHERE guacamole_connection.connection_id =
+        guacamole_connection_history.connection_id;
+
+--
+-- Set NOT NULL now that the column is fully populated
+--
+
+ALTER TABLE guacamole_connection_history
+    ALTER COLUMN username SET NOT NULL;
+
+ALTER TABLE guacamole_connection_history
+    ALTER COLUMN connection_name SET NOT NULL;
+
+--
+-- Remove old foreign key constraints with ON DELETE CASCADE
+--
+
+ALTER TABLE guacamole_connection_history
+    DROP CONSTRAINT guacamole_connection_history_ibfk_1;
+
+ALTER TABLE guacamole_connection_history
+    DROP CONSTRAINT guacamole_connection_history_ibfk_2;
+
+--
+-- Recreate foreign key constraints with ON DELETE SET NULL
+--
+
+ALTER TABLE guacamole_connection_history
+    ADD CONSTRAINT guacamole_connection_history_ibfk_1
+    FOREIGN KEY (user_id)
+    REFERENCES guacamole_user (user_id) ON DELETE SET NULL;
+
+ALTER TABLE guacamole_connection_history
+    ADD CONSTRAINT guacamole_connection_history_ibfk_2
+    FOREIGN KEY (connection_id)
+    REFERENCES guacamole_connection (connection_id) ON DELETE SET NULL;
+

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml

@@ -37,17 +37,15 @@
     <select id="select" resultMap="ConnectionRecordResultMap">
 
         SELECT
-            guacamole_connection.connection_id,
+            guacamole_connection_history.connection_id,
-            guacamole_connection.connection_name,
+            guacamole_connection_history.connection_name,
-            guacamole_user.user_id,
+            guacamole_connection_history.user_id,
-            guacamole_user.username,
+            guacamole_connection_history.username,
             guacamole_connection_history.start_date,
             guacamole_connection_history.end_date
         FROM guacamole_connection_history
-        JOIN guacamole_connection ON guacamole_connection_history.connection_id = guacamole_connection.connection_id
-        JOIN guacamole_user ON guacamole_connection_history.user_id = guacamole_user.user_id
         WHERE
-            guacamole_connection.connection_id = #{identifier,jdbcType=INTEGER}::integer
+            guacamole_connection_history.connection_id = #{identifier,jdbcType=INTEGER}::integer
         ORDER BY
             guacamole_connection_history.start_date DESC,
             guacamole_connection_history.end_date DESC
@@ -59,13 +57,18 @@
 
         INSERT INTO guacamole_connection_history (
             connection_id,
+            connection_name,
             user_id,
+            username,
             start_date,
             end_date
         )
         VALUES (
             #{record.connectionIdentifier,jdbcType=INTEGER}::integer,
-            #{record.userID,jdbcType=INTEGER},
+            #{record.connectionName,jdbcType=VARCHAR},
+            (SELECT user_id FROM guacamole_user
+             WHERE username = #{record.username,jdbcType=VARCHAR}),
+            #{record.username,jdbcType=VARCHAR},
             #{record.startDate,jdbcType=TIMESTAMP},
             #{record.endDate,jdbcType=TIMESTAMP}
         )
@@ -77,14 +80,12 @@
 
         SELECT
             guacamole_connection_history.connection_id,
-            guacamole_connection.connection_name,
+            guacamole_connection_history.connection_name,
             guacamole_connection_history.user_id,
-            guacamole_user.username,
+            guacamole_connection_history.username,
             guacamole_connection_history.start_date,
             guacamole_connection_history.end_date
         FROM guacamole_connection_history
-        LEFT JOIN guacamole_connection ON guacamole_connection_history.connection_id = guacamole_connection.connection_id
-        LEFT JOIN guacamole_user       ON guacamole_connection_history.user_id       = guacamole_user.user_id
 
         <!-- Search terms -->
         <foreach collection="terms" item="term"
@@ -132,9 +133,9 @@
 
         SELECT
             guacamole_connection_history.connection_id,
-            guacamole_connection.connection_name,
+            guacamole_connection_history.connection_name,
             guacamole_connection_history.user_id,
-            guacamole_user.username,
+            guacamole_connection_history.username,
             guacamole_connection_history.start_date,
             guacamole_connection_history.end_date
         FROM guacamole_connection_history

guacamole-docker/Dockerfile

@@ -22,7 +22,7 @@
 #
 
 # Start from Tomcat image
-FROM tomcat:8.0.20-jre7
+FROM tomcat:8.0.20-jre8
 MAINTAINER Michael Jumper <mike.jumper@guac-dev.org>
 
 # Version info

guacamole/src/main/webapp/app/client/controllers/clientController.js

@@ -755,7 +755,7 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
         if (!$scope.client)
             return false;
 
-        return !!($scope.client.uploads.length || $scope.client.downloads.length);
+        return !!$scope.client.uploads.length;
 
     };
 

guacamole/src/main/webapp/app/client/directives/guacFileTransferManager.js

@@ -83,11 +83,6 @@ angular.module('client').directive('guacFileTransferManager', [function guacFile
                     return isInProgress(upload.transferState);
                 });
 
-                // Remove completed downloads
-                $scope.client.downloads = $scope.client.downloads.filter(function isDownloadInProgress(download) {
-                    return isInProgress(download.transferState);
-                });
-
             };
 
         }]

guacamole/src/main/webapp/app/client/types/ManagedClient.js

@@ -28,7 +28,6 @@ angular.module('client').factory('ManagedClient', ['$rootScope', '$injector',
     var ClientIdentifier     = $injector.get('ClientIdentifier');
     var ManagedClientState   = $injector.get('ManagedClientState');
     var ManagedDisplay       = $injector.get('ManagedDisplay');
-    var ManagedFileDownload  = $injector.get('ManagedFileDownload');
     var ManagedFilesystem    = $injector.get('ManagedFilesystem');
     var ManagedFileUpload    = $injector.get('ManagedFileUpload');
 
@@ -41,6 +40,7 @@ angular.module('client').factory('ManagedClient', ['$rootScope', '$injector',
     var clipboardService       = $injector.get('clipboardService');
     var connectionGroupService = $injector.get('connectionGroupService');
     var connectionService      = $injector.get('connectionService');
+    var tunnelService          = $injector.get('tunnelService');
     var guacAudio              = $injector.get('guacAudio');
     var guacHistory            = $injector.get('guacHistory');
     var guacImage              = $injector.get('guacImage');
@@ -104,15 +104,6 @@ angular.module('client').factory('ManagedClient', ['$rootScope', '$injector',
          */
         this.clipboardData = template.clipboardData || '';
 
-        /**
-         * All downloaded files. As files are downloaded, their progress can be
-         * observed through the elements of this array. It is intended that
-         * this array be manipulated externally as needed.
-         *
-         * @type ManagedFileDownload[]
-         */
-        this.downloads = template.downloads || [];
-
         /**
          * All uploaded files. As files are uploaded, their progress can be
          * observed through the elements of this array. It is intended that
@@ -453,9 +444,7 @@ angular.module('client').factory('ManagedClient', ['$rootScope', '$injector',
 
         // Handle any received files
         client.onfile = function clientFileReceived(stream, mimetype, filename) {
-            $rootScope.$apply(function startDownload() {
+            tunnelService.downloadStream(tunnel.uuid, stream, mimetype, filename);
-                managedClient.downloads.push(ManagedFileDownload.getInstance(stream, mimetype, filename));
-            });
         };
 
         // Handle any received filesystem objects
@@ -530,7 +519,7 @@ angular.module('client').factory('ManagedClient', ['$rootScope', '$injector',
         }
 
         // Start and manage file upload
-        managedClient.uploads.push(ManagedFileUpload.getInstance(managedClient.client, file, object, streamName));
+        managedClient.uploads.push(ManagedFileUpload.getInstance(managedClient, file, object, streamName));
 
     };
 

guacamole/src/main/webapp/app/client/types/ManagedFileDownload.js

@@ -1,153 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Provides the ManagedFileDownload class used by the guacClientManager service.
- */
-angular.module('client').factory('ManagedFileDownload', ['$rootScope', '$injector',
-    function defineManagedFileDownload($rootScope, $injector) {
-
-    // Required types
-    var ManagedFileTransferState = $injector.get('ManagedFileTransferState');
-
-    /**
-     * Object which serves as a surrogate interface, encapsulating a Guacamole
-     * file download while it is active, allowing it to be detached and
-     * reattached from different client views.
-     * 
-     * @constructor
-     * @param {ManagedFileDownload|Object} [template={}]
-     *     The object whose properties should be copied within the new
-     *     ManagedFileDownload.
-     */
-    var ManagedFileDownload = function ManagedFileDownload(template) {
-
-        // Use empty object by default
-        template = template || {};
-
-        /**
-         * The current state of the file transfer stream.
-         *
-         * @type ManagedFileTransferState
-         */
-        this.transferState = template.transferState || new ManagedFileTransferState();
-
-        /**
-         * The mimetype of the file being transferred.
-         *
-         * @type String
-         */
-        this.mimetype = template.mimetype;
-
-        /**
-         * The filename of the file being transferred.
-         *
-         * @type String
-         */
-        this.filename = template.filename;
-
-        /**
-         * The number of bytes transferred so far.
-         *
-         * @type Number
-         */
-        this.progress = template.progress;
-
-        /**
-         * A blob containing the complete downloaded file. This is available
-         * only after the download has finished.
-         *
-         * @type Blob
-         */
-        this.blob = template.blob;
-
-    };
-
-    /**
-     * Creates a new ManagedFileDownload which downloads the contents of the
-     * given stream as a file having the given mimetype and filename.
-     *
-     * @param {Guacamole.InputStream} stream
-     *     The stream whose contents should be downloaded as a file.
-     *
-     * @param {String} mimetype
-     *     The mimetype of the stream contents.
-     *
-     * @param {String} filename
-     *     The filename of the file being received over the steram.
-     *
-     * @return {ManagedFileDownload}
-     *     A new ManagedFileDownload object which can be used to track the
-     *     progress of the download.
-     */
-    ManagedFileDownload.getInstance = function getInstance(stream, mimetype, filename) {
-
-        // Init new file download object
-        var managedFileDownload = new ManagedFileDownload({
-            mimetype : mimetype,
-            filename : filename,
-            progress : 0,
-            transferState : new ManagedFileTransferState({
-                streamState : ManagedFileTransferState.StreamState.OPEN
-            })
-        });
-
-        // Begin file download
-        var blob_reader = new Guacamole.BlobReader(stream, mimetype);
-
-        // Update progress as data is received
-        blob_reader.onprogress = function onprogress() {
-
-            // Update progress
-            $rootScope.$apply(function downloadStreamProgress() {
-                managedFileDownload.progress = blob_reader.getLength();
-            });
-
-            // Signal server that data was received
-            stream.sendAck("Received", Guacamole.Status.Code.SUCCESS);
-
-        };
-
-        // Save blob and close stream when complete
-        blob_reader.onend = function onend() {
-            $rootScope.$apply(function downloadStreamEnd() {
-
-                // Save blob
-                managedFileDownload.blob = blob_reader.getBlob();
-
-                // Mark stream as closed
-                ManagedFileTransferState.setStreamState(managedFileDownload.transferState,
-                    ManagedFileTransferState.StreamState.CLOSED);
-
-                // Notify of upload completion
-                $rootScope.$broadcast('guacDownloadComplete', filename);
-
-            });
-        };
-
-        // Signal server that data is ready to be received
-        stream.sendAck("Ready", Guacamole.Status.Code.SUCCESS);
-        
-        return managedFileDownload;
-
-    };
-
-    return ManagedFileDownload;
-
-}]);

guacamole/src/main/webapp/app/client/types/ManagedFileUpload.js

@@ -24,10 +24,11 @@ angular.module('client').factory('ManagedFileUpload', ['$rootScope', '$injector'
     function defineManagedFileUpload($rootScope, $injector) {
 
     // Required types
+    var Error                    = $injector.get('Error');
     var ManagedFileTransferState = $injector.get('ManagedFileTransferState');
 
     // Required services
-    var $window = $injector.get('$window');
+    var tunnelService = $injector.get('tunnelService');
 
     /**
      * Object which serves as a surrogate interface, encapsulating a Guacamole
@@ -81,32 +82,12 @@ angular.module('client').factory('ManagedFileUpload', ['$rootScope', '$injector'
 
     };
 
-    /**
-     * Converts the given bytes to a base64-encoded string.
-     * 
-     * @param {Uint8Array} bytes A Uint8Array which contains the data to be
-     *                           encoded as base64.
-     * @return {String} The base64-encoded string.
-     */
-    var getBase64 = function getBase64(bytes) {
-
-        var data = "";
-
-        // Produce binary string from bytes in buffer
-        for (var i=0; i<bytes.byteLength; i++)
-            data += String.fromCharCode(bytes[i]);
-
-        // Convert to base64
-        return $window.btoa(data);
-
-    };
-
     /**
      * Creates a new ManagedFileUpload which uploads the given file to the
      * server through the given Guacamole client.
      * 
-     * @param {Guacamole.Client} client
+     * @param {ManagedClient} managedClient
-     *     The Guacamole client through which the file is to be uploaded.
+     *     The ManagedClient through which the file is to be uploaded.
      * 
      * @param {File} file
      *     The file to upload.
@@ -123,10 +104,13 @@ angular.module('client').factory('ManagedFileUpload', ['$rootScope', '$injector'
      *     A new ManagedFileUpload object which can be used to track the
      *     progress of the upload.
      */
-    ManagedFileUpload.getInstance = function getInstance(client, file, object, streamName) {
+    ManagedFileUpload.getInstance = function getInstance(managedClient, file, object, streamName) {
 
         var managedFileUpload = new ManagedFileUpload();
-        var streamAcknowledged = false;
+
+        // Pull Guacamole.Tunnel and Guacamole.Client from given ManagedClient
+        var client = managedClient.client;
+        var tunnel = managedClient.tunnel;
 
         // Open file for writing
         var stream;
@@ -153,10 +137,8 @@ angular.module('client').factory('ManagedFileUpload', ['$rootScope', '$injector'
 
         });
 
-        var writer = new Guacamole.FileWriter(stream);
+        // Upload file once stream is acknowledged
-
+        stream.onack = function beginUpload(status) {
-        // Begin upload when stream is acknowledged, notify of any errors
-        writer.onack = function ackReceived(status) {
 
             // Notify of any errors from the Guacamole server
             if (status.isError()) {
@@ -165,50 +147,48 @@ angular.module('client').factory('ManagedFileUpload', ['$rootScope', '$injector'
                         ManagedFileTransferState.StreamState.ERROR,
                         status.code);
                 });
+                return;
             }
 
-            // Begin sending the requested file once stream is acknowledged
+            // Begin upload
-            else if (!streamAcknowledged) {
+            tunnelService.uploadToStream(tunnel.uuid, stream, file, function uploadContinuing(length) {
-                writer.sendFile(file);
+                $rootScope.$apply(function uploadStreamProgress() {
-                streamAcknowledged = true;
+                    managedFileUpload.progress = length;
-            }
+                });
+            })
 
-        };
+            // Notify if upload succeeds
+            .then(function uploadSuccessful() {
 
-        // Abort and notify if the file cannot be read
+                // Upload complete
-        writer.onerror = function fileReadError(file, offset, error) {
+                managedFileUpload.progress = file.size;
+                ManagedFileTransferState.setStreamState(managedFileUpload.transferState,
+                    ManagedFileTransferState.StreamState.CLOSED);
 
-            // Abort transfer
+                // Notify of upload completion
-            writer.sendEnd();
+                $rootScope.$broadcast('guacUploadComplete', file.name);
 
-            // Upload failed
+            },
-            ManagedFileTransferState.setStreamState(managedFileUpload.transferState,
-                ManagedFileTransferState.StreamState.ERROR);
 
-        };
+            // Notify if upload fails
+            function uploadFailed(error) {
 
-        // Notify of upload progress
+                // Use provide status code if the error is coming from the stream
-        writer.onprogress = function uploadProgressing(file, length) {
+                if (error.type === Error.Type.STREAM_ERROR)
+                    ManagedFileTransferState.setStreamState(managedFileUpload.transferState,
+                        ManagedFileTransferState.StreamState.ERROR,
+                        error.statusCode);
+
+                // Fail with internal error for all other causes
+                else
+                    ManagedFileTransferState.setStreamState(managedFileUpload.transferState,
+                        ManagedFileTransferState.StreamState.ERROR,
+                        Guacamole.Status.Code.INTERNAL_ERROR);
 
-            $rootScope.$apply(function uploadStreamProgress() {
-                managedFileUpload.progress = length;
             });
 
-        };
+            // Ignore all further acks
-
+            stream.onack = null;
-        // Clean up and notify when upload completes
-        writer.oncomplete = function uploadComplete(file) {
-
-            // If at end, stop upload
-            writer.sendEnd();
-            managedFileUpload.progress = file.size;
-
-            // Upload complete
-            ManagedFileTransferState.setStreamState(managedFileUpload.transferState,
-                ManagedFileTransferState.StreamState.CLOSED);
-
-            // Notify of upload completion
-            $rootScope.$broadcast('guacUploadComplete', file.name);
 
         };
 

guacamole/src/main/webapp/app/client/types/ManagedFilesystem.js

@@ -25,8 +25,7 @@ angular.module('client').factory('ManagedFilesystem', ['$rootScope', '$injector'
     function defineManagedFilesystem($rootScope, $injector) {
 
     // Required types
-    var ManagedFileDownload = $injector.get('ManagedFileDownload');
+    var tunnelService = $injector.get('tunnelService');
-    var ManagedFileUpload   = $injector.get('ManagedFileUpload');
 
     /**
      * Object which serves as a surrogate interface, encapsulating a Guacamole
@@ -194,8 +193,8 @@ angular.module('client').factory('ManagedFilesystem', ['$rootScope', '$injector'
 
     /**
      * Downloads the given file from the server using the given Guacamole
-     * client and filesystem. The file transfer can be monitored through the
+     * client and filesystem. The browser will automatically start the
-     * corresponding entry in the downloads array of the given ManagedClient.
+     * download upon completion of this function.
      *
      * @param {ManagedClient} managedClient
      *     The ManagedClient from which the file is to be downloaded.
@@ -215,8 +214,8 @@ angular.module('client').factory('ManagedFilesystem', ['$rootScope', '$injector'
             // Parse filename from string
             var filename = path.match(/(.*[\\/])?(.*)/)[2];
 
-            // Start and track download
+            // Start download
-            managedClient.downloads.push(ManagedFileDownload.getInstance(stream, mimetype, filename));
+            tunnelService.downloadStream(managedClient.tunnel.uuid, stream, mimetype, filename);
 
         });