From 419e936c820140c825a83f65c81b94d722c7d152 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 21 Apr 2015 14:11:29 -0700 Subject: [PATCH] GUAC-1161: Ignore key events while user is logged out. --- .../main/webapp/app/index/controllers/indexController.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/guacamole/src/main/webapp/app/index/controllers/indexController.js b/guacamole/src/main/webapp/app/index/controllers/indexController.js index f8d45bed7..f395fa995 100644 --- a/guacamole/src/main/webapp/app/index/controllers/indexController.js +++ b/guacamole/src/main/webapp/app/index/controllers/indexController.js @@ -71,6 +71,10 @@ angular.module('index').controller('indexController', ['$scope', '$injector', // Broadcast keydown events keyboard.onkeydown = function onkeydown(keysym) { + // Do not handle key events if not logged in + if ($scope.expectedCredentials) + return true; + // Warn of pending keydown var guacBeforeKeydownEvent = $scope.$broadcast('guacBeforeKeydown', keysym, keyboard); if (guacBeforeKeydownEvent.defaultPrevented) @@ -85,6 +89,10 @@ angular.module('index').controller('indexController', ['$scope', '$injector', // Broadcast keyup events keyboard.onkeyup = function onkeyup(keysym) { + // Do not handle key events if not logged in + if ($scope.expectedCredentials) + return; + // Warn of pending keyup var guacBeforeKeydownEvent = $scope.$broadcast('guacBeforeKeyup', keysym, keyboard); if (guacBeforeKeydownEvent.defaultPrevented)