From 60ddc82aff7d6447dc4708d76dd83860aa1951f0 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Sun, 16 Jul 2017 15:32:11 -0400 Subject: [PATCH] GUACAMOLE-197: Move variable declarations for TLS into correct context. --- .../auth/radius/RadiusConnectionService.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 9dd39a38d..fa9a0b61a 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());