mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2001 from metalefty/clipfile-fail 

clipboard file: Implement MS-RDPECLIP 3.1.5.4.7 compliance (#2001)
This commit is contained in:
matt335672 2021-09-21 10:37:35 +01:00 committed by GitHub
parent 85518a8157 eb848747d2
commit 32d5d7cc27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
sesman/chansrv/clipboard_file.c
View File

@ -82,6 +82,37 @@ timeval2wintime(struct timeval *tv)
}
#endif
/***
* See MS-RDPECLIP 3.1.5.4.7
*
* Sends a failure response to a CLIPRDR_FILECONTENTS_REQUEST
* @param streamId Stream ID from CLIPRDR_FILECONTENTS_REQUEST
* @return 0 for success
*/
static int
clipboard_send_filecontents_response_fail(int streamId)
{
LOG_DEVEL(LOG_LEVEL_TRACE, "clipboardn_send_filecontents_response_fail:");
struct stream *s;
int size;
int rv;
make_stream(s);
init_stream(s, 64);
out_uint16_le(s, CB_FILECONTENTS_RESPONSE);
out_uint16_le(s, CB_RESPONSE_FAIL);
out_uint32_le(s, 4);
out_uint32_le(s, streamId);
s_mark_end(s);
size = (int)(s->end - s->data);
rv = send_channel_data(g_cliprdr_chan_id, s->data, size);
free_stream(s);
return rv;
}
/*****************************************************************************/
/* this will replace %20 or any hex with the space or correct char
* returns error */
@ -318,12 +349,21 @@ clipboard_send_file_size(int streamId, int lindex)
if (g_files_list == 0)
{
LOG_DEVEL(LOG_LEVEL_ERROR, "clipboard_send_file_size: error g_files_list is nil");
clipboard_send_filecontents_response_fail(streamId);
return 1;
}
cfi = (struct cb_file_info *)list_get_item(g_files_list, lindex);
if (cfi == 0)
{
LOG_DEVEL(LOG_LEVEL_ERROR, "clipboard_send_file_size: error cfi is nil");
clipboard_send_filecontents_response_fail(streamId);
return 1;
}
if (cfi->size < 0)
{
LOG(LOG_LEVEL_ERROR, "clipboard_send_file_size: error cfi->size is negative"
"value [%d]", cfi->size);
clipboard_send_filecontents_response_fail(streamId);
return 1;
}
file_size = cfi->size;
@ -397,12 +437,14 @@ clipboard_send_file_data(int streamId, int lindex,
if (g_files_list == 0)
{
LOG_DEVEL(LOG_LEVEL_ERROR, "clipboard_send_file_data: error g_files_list is nil");
clipboard_send_filecontents_response_fail(streamId);
return 1;
}
cfi = (struct cb_file_info *)list_get_item(g_files_list, lindex);
if (cfi == 0)
{
LOG_DEVEL(LOG_LEVEL_ERROR, "clipboard_send_file_data: error cfi is nil");
clipboard_send_filecontents_response_fail(streamId);
return 1;
}
LOG_DEVEL(LOG_LEVEL_DEBUG, "clipboard_send_file_data: streamId %d lindex %d "
@ -412,15 +454,17 @@ clipboard_send_file_data(int streamId, int lindex,
fd = g_file_open_ex(full_fn, 1, 0, 0, 0);
if (fd == -1)
{
LOG_DEVEL(LOG_LEVEL_ERROR, "clipboard_send_file_data: file open [%s] failed",
full_fn);
LOG(LOG_LEVEL_ERROR, "clipboard_send_file_data: file open [%s] failed: %s",
full_fn, g_get_strerror());
clipboard_send_filecontents_response_fail(streamId);
return 1;
}
if (g_file_seek(fd, nPositionLow) < 0)
{
LOG_DEVEL(LOG_LEVEL_ERROR, "clipboard_send_file_data: seek error "
"in file: %s", full_fn);
LOG(LOG_LEVEL_ERROR, "clipboard_send_file_data: seek error in file [%s]: %s",
full_fn, g_get_strerror());
g_file_close(fd);
clipboard_send_filecontents_response_fail(streamId);
return 1;
}
make_stream(s);
@ -432,6 +476,7 @@ clipboard_send_file_data(int streamId, int lindex,
cbRequested, size);
free_stream(s);
g_file_close(fd);
clipboard_send_filecontents_response_fail(streamId);
return 1;
}
out_uint16_le(s, CB_FILECONTENTS_RESPONSE); /* 9 */

1
sesman/chansrv/clipboard_file.h
View File

@ -53,6 +53,7 @@ clipboard_c2s_in_files(struct stream *s, char *file_list, int file_list_size,
int
clipboard_request_file_size(int stream_id, int lindex);
int
clipboard_request_file_data(int stream_id, int lindex, int offset,
int request_bytes);