safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #158 from glyptodon/home-page-redirect

Browse Source 
GUAC-1161: Reject attempts to visit '/' unless '/' is actually the home.
This commit is contained in:
James Muehlner
2015-04-23 12:06:28 -07:00
parent 35c5d846ce 7c542e8de8
commit e917f8d376
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
guacamole/src/main/webapp/app/index/config/indexRouteConfig.js
View File

@@ -74,8 +74,8 @@ angular.module('index').config(['$routeProvider', '$locationProvider',
var $q = $injector.get('$q');
var userPageService = $injector.get('userPageService');
// Promise for redirection attempt
var redirect = $q.defer();
// Promise for routing attempt
var route = $q.defer();
// Re-authenticate including any parameters in URL
$injector.invoke(updateCurrentToken)
@@ -84,23 +84,29 @@ angular.module('index').config(['$routeProvider', '$locationProvider',
// Redirect to home page
userPageService.getHomePage()
.then(function homePageRetrieved(homePage) {
$location.url(homePage.url);
// If home page is the requested location, allow through
if ($location.path() === homePage.url)
route.resolve();
// Otherwise, reject and reroute
else {
$location.url(homePage.url);
route.reject();
}
})
// If retrieval of home page fails, assume '/'
// If retrieval of home page fails, assume requested page is OK
['catch'](function homePageFailed() {
$location.url('/');
})
// Resolve promise in either case
['finally'](function retrievalAttemptComplete() {
redirect.resolve();
route.resolve();
});
});
// Return promise that will resolve regardless of success/failure
return redirect.promise;
// Return promise that will resolve only if the requested page is the
// home page
return route.promise;
}];