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

GUACAMOLE-197: Use java.io.File for filename operations, rather than relying on platform-specific assumptions.

Browse Source
This commit is contained in:
Nick Couchman
2017-04-11 13:29:49 -04:00
committed by Nick Couchman
parent 60b5802cc7
commit cf884f33f9
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@
package org.apache.guacamole.auth.radius; package org.apache.guacamole.auth.radius;
import com.google.inject.Inject; import com.google.inject.Inject;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.InetAddress; import java.net.InetAddress;
@@ -119,23 +120,14 @@ public class RadiusConnectionService {
return null; return null;
} }
String caFile;
String caPassword;
String caType;
String keyFile;
String keyPassword;
String innerProtocol;
LocalEnvironment guacEnv;
String basePath;
// Pull configuration parameters from guacamole.properties // Pull configuration parameters from guacamole.properties
guacEnv = new LocalEnvironment(); LocalEnvironment guacEnv = new LocalEnvironment();
basePath = guacEnv.getGuacamoleHome().getAbsolutePath() + '/'; String guacHome = guacEnv.getGuacamoleHome().getAbsolutePath();
caFile = confService.getRadiusCAFile(); String caFile = confService.getRadiusCAFile();
caPassword = confService.getRadiusCAPassword(); String caPassword = confService.getRadiusCAPassword();
keyFile = confService.getRadiusKeyFile(); String keyFile = confService.getRadiusKeyFile();
keyPassword = confService.getRadiusKeyPassword(); String keyPassword = confService.getRadiusKeyPassword();
innerProtocol = confService.getRadiusEAPTTLSInnerProtocol(); String innerProtocol = confService.getRadiusEAPTTLSInnerProtocol();
RadiusAuthenticator radAuth = radiusClient.getAuthProtocol(confService.getRadiusAuthProtocol()); RadiusAuthenticator radAuth = radiusClient.getAuthProtocol(confService.getRadiusAuthProtocol());
if (radAuth == null) if (radAuth == null)
@@ -147,7 +139,7 @@ public class RadiusConnectionService {
radAuth instanceof EAPTTLSAuthenticator) { radAuth instanceof EAPTTLSAuthenticator) {
if (caFile != null) { if (caFile != null) {
((EAPTLSAuthenticator)radAuth).setCaFile(basePath + caFile); ((EAPTLSAuthenticator)radAuth).setCaFile((new File(guacHome, caFile)).toString());
((EAPTLSAuthenticator)radAuth).setCaFileType(confService.getRadiusCAType()); ((EAPTLSAuthenticator)radAuth).setCaFileType(confService.getRadiusCAType());
if (caPassword != null) if (caPassword != null)
((EAPTLSAuthenticator)radAuth).setCaPassword(caPassword); ((EAPTLSAuthenticator)radAuth).setCaPassword(caPassword);
@@ -156,7 +148,7 @@ public class RadiusConnectionService {
if (keyPassword != null) if (keyPassword != null)
((EAPTLSAuthenticator)radAuth).setKeyPassword(keyPassword); ((EAPTLSAuthenticator)radAuth).setKeyPassword(keyPassword);
((EAPTLSAuthenticator)radAuth).setKeyFile(basePath + keyFile); ((EAPTLSAuthenticator)radAuth).setKeyFile((new File(guacHome, keyFile)).toString());
((EAPTLSAuthenticator)radAuth).setKeyFileType(confService.getRadiusKeyType()); ((EAPTLSAuthenticator)radAuth).setKeyFileType(confService.getRadiusKeyType());
((EAPTLSAuthenticator)radAuth).setTrustAll(confService.getRadiusTrustAll()); ((EAPTLSAuthenticator)radAuth).setTrustAll(confService.getRadiusTrustAll());