From 8a57b2037ec2006f6d5c43690729d33bd6f47a7c Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 20 Jul 2021 20:28:29 -0700 Subject: [PATCH] GUACAMOLE-1384: Ensure all $http error objects are wrapped in Guacamole error objects, even if the relevant request could not be sent. --- .../main/frontend/src/app/rest/services/requestService.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/guacamole/src/main/frontend/src/app/rest/services/requestService.js b/guacamole/src/main/frontend/src/app/rest/services/requestService.js index 0b135e708..ead13320c 100644 --- a/guacamole/src/main/frontend/src/app/rest/services/requestService.js +++ b/guacamole/src/main/frontend/src/app/rest/services/requestService.js @@ -56,6 +56,11 @@ angular.module('rest').factory('requestService', ['$injector', if (response.data) throw new Error(response.data); + // Fall back to a generic internal error if the request couldn't + // even be issued (webapp is down, etc.) + else if ('data' in response) + throw new Error({ message : 'Unknown failure sending HTTP request' }); + // The value provided is not actually a response object from // the $http service throw response;