kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Server redirect password should be interpreted as a binary blob

Browse Source 
and not a unicode string, which is passed though as a password
during the redirection.



git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/rdesktop/trunk@1765 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Henrik Andersson 2013-11-28 11:59:05 +00:00
parent a1db8d906c
commit 820a2f7bb8
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rdesktop.c
View File

@ -117,10 +117,11 @@ RD_BOOL g_redirect = False;
char *g_redirect_server;
uint32 g_redirect_server_len;
char g_redirect_domain[16];
char g_redirect_password[64];
char *g_redirect_username;
uint8 *g_redirect_lb_info;
uint32 g_redirect_lb_info_len;
uint8 *g_redirect_cookie;
uint32 g_redirect_cookie_len;
uint32 g_redirect_flags = 0;
uint32 g_redirect_session_id = 0;
@ -1117,7 +1118,6 @@ main(int argc, char *argv[])
xfree(g_username);
g_username = (char *) xmalloc(strlen(g_redirect_username) + 1);
STRNCPY(g_username, g_redirect_username, strlen(g_redirect_username) + 1);
STRNCPY(password, g_redirect_password, sizeof(password));
STRNCPY(server, g_redirect_server, sizeof(server));
flags |= RDP_LOGON_AUTO;
}

19
rdp.c
View File

@ -71,6 +71,8 @@ extern char g_redirect_password[64];
extern char *g_redirect_username;
extern uint8 *g_redirect_lb_info;
extern uint32 g_redirect_lb_info_len;
extern uint8 *g_redirect_cookie;
extern uint32 g_redirect_cookie_len;
extern uint32 g_redirect_flags;
extern uint32 g_redirect_session_id;
@ -1564,11 +1566,20 @@ process_redirect_pdu(STREAM s, RD_BOOL enhanced_redirect /*, uint32 * ext_disc_r
if (g_redirect_flags & PDU_REDIRECT_HAS_PASSWORD)
{
/* read length of password string */
in_uint32_le(s, len);
/* the information in this blob is either a password or a cookie that
should be passed though as blob and not parsed as a unicode string */
/* read blob length */
in_uint32_le(s, g_redirect_cookie_len);
/* read password string */
rdp_in_unistr(s, g_redirect_password, sizeof(g_redirect_password), len);
/* reallocate cookie blob */
if (g_redirect_cookie != NULL)
free(g_redirect_cookie);
g_redirect_cookie = xmalloc(g_redirect_cookie_len);
/* read cookie as is */
in_uint8p(s, g_redirect_cookie, g_redirect_cookie_len);
}
if (g_redirect_flags & PDU_REDIRECT_DONT_STORE_USERNAME)