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-362: Deal correctly with return value when reading the key.

Browse Source
This commit is contained in:
Nick Couchman
2017-10-01 07:15:19 -04:00
committed by Nick Couchman
parent ab41f44100
commit 3d091411f3
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
guacamole-ext/src/main/java/org/apache/guacamole/properties/PrivateKeyGuacamoleProperty.java
View File

@@ -53,8 +53,22 @@ public abstract class PrivateKeyGuacamoleProperty implements GuacamoleProperty<P
// Open and read the file specified in the configuration. // Open and read the file specified in the configuration.
File keyFile = new File(value); File keyFile = new File(value);
InputStream keyInput = new BufferedInputStream(new FileInputStream(keyFile)); InputStream keyInput = new BufferedInputStream(new FileInputStream(keyFile));
final byte[] keyBytes = new byte[(int) keyFile.length()]; int keyLength = (int) keyFile.length();
keyInput.read(keyBytes); final byte[] keyBytes = new byte[keyLength];
int keyRead = keyInput.read(keyBytes);
// Error reading any bytes out of the key.
if (keyRead == -1)
throw new GuacamoleServerException("Failed to get any bytes while reading key.");
// Zero-sized key
else if(keyRead == 0)
throw new GuacamoleServerException("Failed to ready key because key is empty.");
// Fewer bytes read than contained in the key
else if (keyRead < keyLength)
throw new GuacamoleServerException("Unable to read the full length of the key.");
keyInput.close(); keyInput.close();
// Set up decryption infrastructure // Set up decryption infrastructure