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

GUACAMOLE-204: Remove extension-specific URL parameter relocation.

Browse Source
This commit is contained in:
Nick Couchman
2017-05-15 09:05:11 -04:00
parent 2ba52e908b
commit ac5ed01d53
3 changed files with 6 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProvider.java
View File

@@ -63,6 +63,11 @@ public class CASAuthenticationProvider implements AuthenticationProvider {
return "cas";
}
@Override
public Object getResource() throws GuacamoleException {
return null;
}
@Override
public AuthenticatedUser authenticateUser(Credentials credentials)
throws GuacamoleException {

42
extensions/guacamole-auth-cas/src/main/resources/casIndexTicket.js
View File

@@ -1,42 +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.
*/
/**
* Index module run block that looks for the ticket parameter
* on the current location and moves it to the correct
* place to get processed by the Angular app.
*/
angular.module('index').run(['$injector',
function casIndexTicket($injector) {
console.log('Running casIndexTicket...');
var $window = $injector.get('$window');
var curPath = $window.location.href;
var ticketPos = curPath.indexOf('?ticket=');
if (ticketPos < 0)
return null;
ticketPos += 8;
var hashPos = curPath.indexOf('#/');
if (ticketPos < hashPos) {
var ticket = curPath.substring(ticketPos, hashPos);
var newPath = curPath.substring(0,ticketPos - 8) + '#/?ticket=' + ticket;
$window.location.href = newPath;
}
}]);

3
extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
View File

@@ -12,8 +12,7 @@
"js" : [
"casModule.js",
"casController.js",
"casConfig.js",
"casIndexTicket.js"
"casConfig.js"
]
}