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

GUACAMOLE-197: Move variable declarations for TLS into correct context.

Browse Source
This commit is contained in:
Nick Couchman
2017-07-16 15:32:11 -04:00
parent 249ea0776b
commit 60ddc82aff
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusConnectionService.java
View File

@@ -117,15 +117,6 @@ public class RadiusConnectionService {
return null; 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()); RadiusAuthenticator radAuth = radiusClient.getAuthProtocol(confService.getRadiusAuthProtocol());
if (radAuth == null) if (radAuth == null)
throw new GuacamoleException("Could not get a valid RadiusAuthenticator for specified protocol: " + confService.getRadiusAuthProtocol()); 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 EAPTLSAuthenticator ||
radAuth instanceof EAPTTLSAuthenticator) { 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) { if (caFile != null) {
((EAPTLSAuthenticator)radAuth).setCaFile((new File(guacHome, caFile)).toString()); ((EAPTLSAuthenticator)radAuth).setCaFile((new File(guacHome, caFile)).toString());
((EAPTLSAuthenticator)radAuth).setCaFileType(confService.getRadiusCAType()); ((EAPTLSAuthenticator)radAuth).setCaFileType(confService.getRadiusCAType());