mirror of
https://github.com/gyurix1968/guacamole-client.git
synced 2025-09-06 13:17:41 +00:00
GUACAMOLE-462: Do not attempt to retrieve recordings for records with null UUIDs.
This commit is contained in:
@@ -71,6 +71,35 @@ public class HistoryConnectionRecord extends DelegatingConnectionRecord {
|
|||||||
*/
|
*/
|
||||||
private final File recording;
|
private final File recording;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the file or directory providing recording storage for the given
|
||||||
|
* history record. If no such file or directory exists, or the file cannot
|
||||||
|
* be read, null is returned.
|
||||||
|
*
|
||||||
|
* @param record
|
||||||
|
* The ConnectionRecord whose associated recording storage file
|
||||||
|
* or directory should be returned.
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
* A File pointing to the file or directory providing recording storage
|
||||||
|
* for the given history record, or null if no such file exists.
|
||||||
|
*
|
||||||
|
* @throws GuacamoleException
|
||||||
|
* If the configured path for stored recordings cannot be read.
|
||||||
|
*/
|
||||||
|
private static File getRecordingFile(ConnectionRecord record) throws GuacamoleException {
|
||||||
|
|
||||||
|
UUID uuid = record.getUUID();
|
||||||
|
if (uuid != null) {
|
||||||
|
File recordingFile = new File(HistoryAuthenticationProvider.getRecordingSearchPath(), uuid.toString());
|
||||||
|
if (recordingFile.canRead())
|
||||||
|
return recordingFile;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new HistoryConnectionRecord that wraps the given
|
* Creates a new HistoryConnectionRecord that wraps the given
|
||||||
* ConnectionRecord, automatically associating ActivityLogs based on
|
* ConnectionRecord, automatically associating ActivityLogs based on
|
||||||
@@ -84,11 +113,7 @@ public class HistoryConnectionRecord extends DelegatingConnectionRecord {
|
|||||||
*/
|
*/
|
||||||
public HistoryConnectionRecord(ConnectionRecord record) throws GuacamoleException {
|
public HistoryConnectionRecord(ConnectionRecord record) throws GuacamoleException {
|
||||||
super(record);
|
super(record);
|
||||||
|
this.recording = getRecordingFile(record);
|
||||||
String uuid = record.getUUID().toString();
|
|
||||||
File recordingFile = new File(HistoryAuthenticationProvider.getRecordingSearchPath(), uuid);
|
|
||||||
this.recording = recordingFile.canRead() ? recordingFile : null;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user