Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for RFB protocol version 3.7 and 3.8 #2549

Open
wants to merge 2 commits into
base: devel
Choose a base branch
from
Open

Add support for RFB protocol version 3.7 and 3.8 #2549

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69cb532
Add support for RFB protocol version 3.7 and 3.8
Jesse-Bakker Feb 13, 2023
5192640
Review fixes
Jesse-Bakker Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 93 additions & 12 deletions vnc/vnc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1643,10 +1643,15 @@ lib_mod_connect(struct vnc *v)
char cursor_mask[32 * (32 / 8)];
char con_port[256];
char text[256];
char *version_str;
char j;
struct stream *s;
struct stream *pixel_format;
int error;
int i;
int sec_lvl = 0;
int version;
int n_sec_lvls;
int check_sec_result;

v->server_msg(v, "VNC started connecting", 0);
Expand Down Expand Up @@ -1710,8 +1715,27 @@ lib_mod_connect(struct vnc *v)
error = trans_force_read_s(v->trans, s, 12);
if (error == 0)
{
s->p = s->data;
out_uint8a(s, "RFB 003.003\n", 12);
in_uint8p(s, version_str, 12);
if (g_strncmp(version_str, "RFB 003.00", 10) != 0)
Jesse-Bakker marked this conversation as resolved.
Show resolved Hide resolved
{
version_str[11] = '\0';
LOG(LOG_LEVEL_ERROR, "Invalid server version string %s", version_str);
error = 1;
}
}
if (error == 0)
{
version = version_str[10] - '0';
if (version != 3 && version != 7 && version != 8)
{
LOG(LOG_LEVEL_ERROR, "Unsupported VNC version 3.%d", version);
error = 1;
}
}
if (error == 0)
{
init_stream(s, 8192);
out_uint8p(s, version_str, 12);
s_mark_end(s);
error = trans_force_write_s(v->trans, s);
}
Expand All @@ -1720,20 +1744,78 @@ lib_mod_connect(struct vnc *v)
if (error == 0)
{
init_stream(s, 8192);
error = trans_force_read_s(v->trans, s, 4);
if (version == 3)
{
// The server chooses the security type
error = trans_force_read_s(v->trans, s, 4);
if (error == 0)
{
in_uint32_be(s, sec_lvl);
}
}
else if (version >= 7)
{
// The client chooses the security type
error = trans_force_read_s(v->trans, s, 1);
if (error == 0)
{
in_uint8(s, n_sec_lvls);
if (n_sec_lvls > 0)
{
error = trans_force_read_s(v->trans, s, n_sec_lvls);
}
else
{
// Read size of reason
error = trans_force_read_s(v->trans, s, 4);
if (error == 0)
{
in_uint32_be(s, i);
error = trans_force_read_s(v->trans, s, i);
Jesse-Bakker marked this conversation as resolved.
Show resolved Hide resolved
in_uint8a(s, text, i);
text[i] = '\0';
LOG(LOG_LEVEL_ERROR, "Connection closed by server with reason: %s", text);
error = 1;
}
}
}
if (error == 0)
{
for (; n_sec_lvls > 0; --n_sec_lvls)
{
in_uint8(s, j);
// Choose the highest security level that we support
if (j > sec_lvl && j <= 2)
{
sec_lvl = j;
}
}
init_stream(s, 8192);
out_uint8(s, sec_lvl);
s_mark_end(s);
Jesse-Bakker marked this conversation as resolved.
Show resolved Hide resolved

error = trans_force_write_s(v->trans, s);
}
}
}

if (error == 0)
{
in_uint32_be(s, i);
g_sprintf(text, "VNC security level is %d (1 = none, 2 = standard)", i);
g_sprintf(text, "VNC security level is %d (1 = none, 2 = standard)", sec_lvl);
v->server_msg(v, text, 0);

if (i == 1) /* none */
if (sec_lvl == 1) /* none */
{
check_sec_result = 0;
if (version >= 8)
{
check_sec_result = 1;
Jesse-Bakker marked this conversation as resolved.
Show resolved Hide resolved
}
else
{
check_sec_result = 0;
}
}
else if (i == 2) /* dec the password and the server random */
else if (sec_lvl == 2) /* dec the password and the server random */
{
init_stream(s, 8192);
error = trans_force_read_s(v->trans, s, 16);
Expand All @@ -1757,14 +1839,14 @@ lib_mod_connect(struct vnc *v)
check_sec_result = 1; // not needed
}
}
else if (i == 0)
else if (sec_lvl == 0)
{
LOG(LOG_LEVEL_ERROR, "VNC Server will disconnect");
error = 1;
}
else
{
LOG(LOG_LEVEL_ERROR, "VNC unsupported security level %d", i);
LOG(LOG_LEVEL_ERROR, "VNC unsupported security level %d", sec_lvl);
error = 1;
}
}
Expand Down Expand Up @@ -1802,8 +1884,7 @@ lib_mod_connect(struct vnc *v)
{
v->server_msg(v, "VNC sending share flag", 0);
init_stream(s, 8192);
s->data[0] = 1;
s->p++;
out_uint8(s, 1);
s_mark_end(s);
Jesse-Bakker marked this conversation as resolved.
Show resolved Hide resolved
error = trans_force_write_s(v->trans, s); /* share flag */
}
Expand Down