You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2017/05/22 03:29:17 UTC
[22/23] incubator-guacamole-client git commit: GUACAMOLE-204: Remove
extension-specific URL parameter relocation.
GUACAMOLE-204: Remove extension-specific URL parameter relocation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/ac5ed01d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/ac5ed01d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/ac5ed01d
Branch: refs/heads/master
Commit: ac5ed01d53473f9ea909546765a6384eb6c532d3
Parents: 2ba52e9
Author: Nick Couchman <vn...@apache.org>
Authored: Mon May 15 09:05:11 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Wed May 17 08:57:02 2017 -0400
----------------------------------------------------------------------
.../auth/cas/CASAuthenticationProvider.java | 5 +++
.../src/main/resources/casIndexTicket.js | 42 --------------------
.../src/main/resources/guac-manifest.json | 3 +-
3 files changed, 6 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ac5ed01d/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProvider.java b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProvider.java
index b5c782c..241f17a 100644
--- a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProvider.java
+++ b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProvider.java
@@ -64,6 +64,11 @@ public class CASAuthenticationProvider implements AuthenticationProvider {
}
@Override
+ public Object getResource() throws GuacamoleException {
+ return null;
+ }
+
+ @Override
public AuthenticatedUser authenticateUser(Credentials credentials)
throws GuacamoleException {
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ac5ed01d/extensions/guacamole-auth-cas/src/main/resources/casIndexTicket.js
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-cas/src/main/resources/casIndexTicket.js b/extensions/guacamole-auth-cas/src/main/resources/casIndexTicket.js
deleted file mode 100644
index 282ee65..0000000
--- a/extensions/guacamole-auth-cas/src/main/resources/casIndexTicket.js
+++ /dev/null
@@ -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;
- }
-
-}]);
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ac5ed01d/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
index 03da1f8..f40998e 100644
--- a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
@@ -12,8 +12,7 @@
"js" : [
"casModule.js",
"casController.js",
- "casConfig.js",
- "casIndexTicket.js"
+ "casConfig.js"
]
}