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 2018/01/30 23:44:51 UTC
[39/50] guacamole-client git commit: GUACAMOLE-197: Move variable
declarations for TLS into correct context.
GUACAMOLE-197: Move variable declarations for TLS into correct context.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/60ddc82a
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/60ddc82a
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/60ddc82a
Branch: refs/heads/master
Commit: 60ddc82aff7d6447dc4708d76dd83860aa1951f0
Parents: 249ea07
Author: Nick Couchman <vn...@apache.org>
Authored: Sun Jul 16 15:32:11 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Mon Jan 29 17:08:11 2018 -0500
----------------------------------------------------------------------
.../auth/radius/RadiusConnectionService.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/60ddc82a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusConnectionService.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusConnectionService.java b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusConnectionService.java
index 9dd39a3..fa9a0b6 100644
--- a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusConnectionService.java
+++ b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusConnectionService.java
@@ -117,15 +117,6 @@ public class RadiusConnectionService {
return null;
}
- // Pull configuration parameters from guacamole.properties
- LocalEnvironment guacEnv = new LocalEnvironment();
- String guacHome = guacEnv.getGuacamoleHome().getAbsolutePath();
- String caFile = confService.getRadiusCAFile();
- String caPassword = confService.getRadiusCAPassword();
- String keyFile = confService.getRadiusKeyFile();
- String keyPassword = confService.getRadiusKeyPassword();
- String innerProtocol = confService.getRadiusEAPTTLSInnerProtocol();
-
RadiusAuthenticator radAuth = radiusClient.getAuthProtocol(confService.getRadiusAuthProtocol());
if (radAuth == null)
throw new GuacamoleException("Could not get a valid RadiusAuthenticator for specified protocol: " + confService.getRadiusAuthProtocol());
@@ -135,6 +126,15 @@ public class RadiusConnectionService {
radAuth instanceof EAPTLSAuthenticator ||
radAuth instanceof EAPTTLSAuthenticator) {
+ // Pull TLS configuration parameters from guacamole.properties
+ LocalEnvironment guacEnv = new LocalEnvironment();
+ String guacHome = guacEnv.getGuacamoleHome();
+ String caFile = confService.getRadiusCAFile();
+ String caPassword = confService.getRadiusCAPassword();
+ String keyFile = confService.getRadiusKeyFile();
+ String keyPassword = confService.getRadiusKeyPassword();
+ String innerProtocol = confService.getRadiusEAPTTLSInnerProtocol();
+
if (caFile != null) {
((EAPTLSAuthenticator)radAuth).setCaFile((new File(guacHome, caFile)).toString());
((EAPTLSAuthenticator)radAuth).setCaFileType(confService.getRadiusCAType());