diff options
Diffstat (limited to 'libxrdp/xrdp_iso.c')
| -rw-r--r-- | libxrdp/xrdp_iso.c | 198 |
1 files changed, 173 insertions, 25 deletions
diff --git a/libxrdp/xrdp_iso.c b/libxrdp/xrdp_iso.c index feba6814..dac31a9c 100644 --- a/libxrdp/xrdp_iso.c +++ b/libxrdp/xrdp_iso.c @@ -2,6 +2,7 @@ * xrdp: A Remote Desktop Protocol server. * * Copyright (C) Jay Sorg 2004-2013 + * Copyright (C) Idan Freiberg 2013 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,12 +51,59 @@ xrdp_iso_delete(struct xrdp_iso *self) /*****************************************************************************/ /* returns error */ static int APP_CC -xrdp_iso_recv_msg(struct xrdp_iso *self, struct stream *s, int *code) +xrdp_iso_recv_rdpnegreq(struct xrdp_iso *self, struct stream *s) { - int ver; + int type; + int flags; int len; - *code = 0; + self->requestedProtocol = 0; + + DEBUG((" in xrdp_iso_recv_rdpnegreq")); + + in_uint8(s, type); + if (type != RDP_NEG_REQ) + { + DEBUG((" xrdp_iso_recv_rdpnegreq: type: %x",type)); + return 1; + } + + in_uint8(s, flags); + if (flags != 0x0) + { + DEBUG((" xrdp_iso_recv_rdpnegreq: flags: %x",flags)); + return 1; + } + + in_uint16_le(s, len); + if (len != 8) // fixed length + { + DEBUG((" xrdp_iso_recv_rdpnegreq: length: %x",len)); + return 1; + } + + in_uint32_le(s, self->requestedProtocol); + + //TODO: think of protocol verification logic +// if (requestedProtocol != PROTOCOL_RDP || PROTOCOL_SSL || PROTOCOL_HYBRID || PROTOCOL_HYBRID_EX) +// { +// DEBUG((" xrdp_iso_recv_rdpnegreq: wrong requestedProtocol: %x",requestedProtocol)); +// return 1; +// } + + DEBUG((" out xrdp_iso_recv_rdpnegreq")); + return 0; +} +/*****************************************************************************/ +/* returns error */ +static int APP_CC +xrdp_iso_recv_msg(struct xrdp_iso *self, struct stream *s, int *code, int *len) +{ + int ver; // TPKT Version + int plen; // TPKT PacketLength + + *code = 0; // X.224 Packet Type + *len = 0; // X.224 Length Indicator if (xrdp_tcp_recv(self->tcp_layer, s, 4) != 0) { @@ -70,14 +118,14 @@ xrdp_iso_recv_msg(struct xrdp_iso *self, struct stream *s, int *code) } in_uint8s(s, 1); - in_uint16_be(s, len); + in_uint16_be(s, plen); if (len < 4) { return 1; } - if (xrdp_tcp_recv(self->tcp_layer, s, len - 4) != 0) + if (xrdp_tcp_recv(self->tcp_layer, s, plen - 4) != 0) { return 1; } @@ -87,7 +135,7 @@ xrdp_iso_recv_msg(struct xrdp_iso *self, struct stream *s, int *code) return 1; } - in_uint8s(s, 1); + in_uint8(s, *len); in_uint8(s, *code); if (*code == ISO_PDU_DT) @@ -109,25 +157,25 @@ xrdp_iso_recv_msg(struct xrdp_iso *self, struct stream *s, int *code) return 0; } - /*****************************************************************************/ /* returns error */ int APP_CC xrdp_iso_recv(struct xrdp_iso *self, struct stream *s) { int code; + int len; DEBUG((" in xrdp_iso_recv")); - if (xrdp_iso_recv_msg(self, s, &code) != 0) + if (xrdp_iso_recv_msg(self, s, &code, &len) != 0) { DEBUG((" out xrdp_iso_recv xrdp_iso_recv_msg return non zero")); return 1; } - if (code != ISO_PDU_DT) + if (code != ISO_PDU_DT || len != 2) { - DEBUG((" out xrdp_iso_recv code != ISO_PDU_DT")); + DEBUG((" out xrdp_iso_recv code != ISO_PDU_DT or length != 2")); return 1; } @@ -137,22 +185,79 @@ xrdp_iso_recv(struct xrdp_iso *self, struct stream *s) /*****************************************************************************/ static int APP_CC -xrdp_iso_send_msg(struct xrdp_iso *self, struct stream *s, int code) +xrdp_iso_send_rdpnegrsp(struct xrdp_iso *self, struct stream *s, int code) { - if (xrdp_tcp_init(self->tcp_layer, s) != 0) + int send_rdpnegdata; + + if (xrdp_tcp_init(self->tcp_layer, s) != 0) { return 1; } - out_uint8(s, 3); + /* TPKT HEADER - 4 bytes */ + out_uint8(s, 3); /* version */ + out_uint8(s, 0); /* RESERVED */ + if (self->selectedProtocol != -1) { + out_uint16_be(s, 19); /* length */ //rdp negotiation happens. + } + else + { + out_uint16_be(s, 11); /* length */ //rdp negotiation doesn't happen. + } + /* ISO LAYER - X.224 - 7 bytes*/ + if (self->selectedProtocol != -1) { + out_uint8(s, 14); /* length */ + } + else + { + out_uint8(s, 6); /* length */ + } + out_uint8(s, code); /* SHOULD BE 0xD for CC */ + out_uint16_be(s, 0); + out_uint16_be(s, 0x1234); out_uint8(s, 0); - out_uint16_be(s, 11); /* length */ - out_uint8(s, 6); - out_uint8(s, code); - out_uint16_le(s, 0); - out_uint16_le(s, 0); + if (self->selectedProtocol != -1) { + /* RDP_NEG_RSP - 8 bytes*/ + out_uint8(s, RDP_NEG_RSP); + out_uint8(s, EXTENDED_CLIENT_DATA_SUPPORTED); /* flags */ + out_uint16_le(s, 8); /* fixed length */ + out_uint32_le(s, self->selectedProtocol); /* selected protocol */ + } + + s_mark_end(s); + + if (xrdp_tcp_send(self->tcp_layer, s) != 0) + { + return 1; + } + + return 0; +} +/*****************************************************************************/ +static int APP_CC +xrdp_iso_send_rdpnegfailure(struct xrdp_iso *self, struct stream *s, int code, int failureCode) +{ + if (xrdp_tcp_init(self->tcp_layer, s) != 0) + { + return 1; + } + + /* TPKT HEADER - 4 bytes */ + out_uint8(s, 3); /* version */ + out_uint8(s, 0); /* RESERVED */ + out_uint16_be(s, 19); /* length */ + /* ISO LAYER - X.224 - 7 bytes*/ + out_uint8(s, 14); /* length */ + out_uint8(s, code); /* SHOULD BE 0xD for CC */ + out_uint16_be(s, 0); + out_uint16_be(s, 0x1234); out_uint8(s, 0); - s_mark_end(s); + /* RDP_NEG_FAILURE - 8 bytes*/ + out_uint8(s, RDP_NEG_FAILURE); + out_uint8(s, 0); /* no flags available */ + out_uint16_le(s, 8); /* fixed length */ + out_uint32_le(s, failureCode); /* failure code */ + s_mark_end(s); if (xrdp_tcp_send(self->tcp_layer, s) != 0) { @@ -161,21 +266,47 @@ xrdp_iso_send_msg(struct xrdp_iso *self, struct stream *s, int code) return 0; } +/*****************************************************************************/ +static int APP_CC +xrdp_iso_proccess_nego(struct xrdp_iso *self, struct stream *s) +{ + //TODO: negotiation logic here. + if (self->requestedProtocol != PROTOCOL_RDP) { + // Send RDP_NEG_FAILURE back to client + if (xrdp_iso_send_rdpnegfailure(self, s, ISO_PDU_CC, SSL_NOT_ALLOWED_BY_SERVER) != 0) + { + free_stream(s); + return 1; + } + } else { + self->selectedProtocol = PROTOCOL_RDP; + // Send RDP_NEG_RSP back to client + if (xrdp_iso_send_rdpnegrsp(self, s, ISO_PDU_CC) != 0) + { + free_stream(s); + return 1; + } + } + return 0; +} /*****************************************************************************/ /* returns error */ int APP_CC xrdp_iso_incoming(struct xrdp_iso *self) { int code; + int len; + int requestedProtocol; + int selectedProtocol; struct stream *s; - make_stream(s); init_stream(s, 8192); DEBUG((" in xrdp_iso_incoming")); - if (xrdp_iso_recv_msg(self, s, &code) != 0) + if (xrdp_iso_recv_msg(self, s, &code, &len) != 0) { + DEBUG((" in xrdp_iso_recv_msg error!!")); free_stream(s); return 1; } @@ -186,11 +317,28 @@ xrdp_iso_incoming(struct xrdp_iso *self) return 1; } - if (xrdp_iso_send_msg(self, s, ISO_PDU_CC) != 0) - { - free_stream(s); - return 1; + if (len > 6) { + // Receive RDP_NEG_REQ data + if (xrdp_iso_recv_rdpnegreq(self, s) != 0) + { + free_stream(s); + return 1; + } + // Process negotiation request, should return protocol type. + if (xrdp_iso_proccess_nego(self, s) != 0) + { + free_stream(s); + return 1; + } + } + else if (len == 6) { + self->selectedProtocol = -1; //we are not doing negotiation + xrdp_iso_send_rdpnegrsp(self, s, ISO_PDU_CC); } + else { + DEBUG((" error in xrdp_iso_incoming: unknown length detected")); + } + DEBUG((" out xrdp_iso_incoming")); free_stream(s); |