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

GUACAMOLE-197: Allow setupRadiusAuthenticator to throw GuacamoleException rather than hiding it.

Browse Source
This commit is contained in:
Nick Couchman
2017-04-11 09:41:18 -04:00
committed by Nick Couchman
parent 3976af7b11
commit a49dfeeeeb
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,7 +110,7 @@ public class RadiusConnectionService {
* configuration fails. * configuration fails.
* *
*/ */
private RadiusAuthenticator setupRadiusAuthenticator() { private RadiusAuthenticator setupRadiusAuthenticator() throws GuacamoleException {
// If we don't have a radiusClient object, yet, don't go any further. // If we don't have a radiusClient object, yet, don't go any further.
if (radiusClient == null) { if (radiusClient == null) {
@@ -132,26 +132,18 @@ public class RadiusConnectionService {
String basePath; String basePath;
// Pull configuration parameters from guacamole.properties // Pull configuration parameters from guacamole.properties
try { guacEnv = new LocalEnvironment();
guacEnv = new LocalEnvironment(); basePath = guacEnv.getGuacamoleHome().getAbsolutePath() + '/';
basePath = guacEnv.getGuacamoleHome().getAbsolutePath() + '/'; radAuthName = confService.getRadiusAuthProtocol();
radAuthName = confService.getRadiusAuthProtocol(); caFile = confService.getRadiusCAFile();
caFile = confService.getRadiusCAFile(); caPassword = confService.getRadiusCAPassword();
caPassword = confService.getRadiusCAPassword(); caType = confService.getRadiusCAType();
caType = confService.getRadiusCAType(); keyFile = confService.getRadiusKeyFile();
keyFile = confService.getRadiusKeyFile(); keyPassword = confService.getRadiusKeyPassword();
keyPassword = confService.getRadiusKeyPassword(); keyType = confService.getRadiusKeyType();
keyType = confService.getRadiusKeyType(); trustAll = confService.getRadiusTrustAll();
trustAll = confService.getRadiusTrustAll(); innerProtocol = confService.getRadiusEAPTTLSInnerProtocol();
innerProtocol = confService.getRadiusEAPTTLSInnerProtocol();
}
catch (GuacamoleException e) {
logger.error("Error retrieving configuration.");
logger.debug("Error getting config parameters from file.");
return null;
}
RadiusAuthenticator radAuth = radiusClient.getAuthProtocol(radAuthName); RadiusAuthenticator radAuth = radiusClient.getAuthProtocol(radAuthName);
if (radAuth == null) if (radAuth == null)
return null; return null;