diff --git a/common/ms-rdpbcgr.h b/common/ms-rdpbcgr.h index 15d7dcc40..486d2ae42 100644 --- a/common/ms-rdpbcgr.h +++ b/common/ms-rdpbcgr.h @@ -58,6 +58,10 @@ #define SEC_TAG_CLI_4 0xc004 /* CS_CLUSTER? */ #define SEC_TAG_CLI_MONITOR 0xc005 /* CS_MONITOR */ #define SEC_TAG_CLI_MONITOR_EX 0xc008 /* CS_MONITOR_EX */ +#define SEC_TAG_SRV_INFO 0x0c01 /* SC_CORE */ +#define SEC_TAG_SRV_CRYPT 0x0c02 /* SC_SECURITY */ +#define SEC_TAG_SRV_CHANNELS 0x0c03 /* SC_NET? */ + /* Client Core Data: colorDepth, postBeta2ColorDepth (2.2.1.3.2) */ #define RNS_UD_COLOR_4BPP 0xCA00 @@ -159,9 +163,16 @@ #define RDP5_NO_CURSOR_SHADOW 0x20 #define RDP5_NO_CURSORSETTINGS 0x40 /* disables cursor blinking */ +/* LICENSE_PREAMBLE (2.2.1.12.1.1) */ +#define ERROR_ALERT 0xff +#define PREAMBLE_VERSION_3_0 0x03 + /* LICENSE_BINARY_BLOB (2.2.1.12.1.2) */ -#define LICENCE_TAG_USER 0x000f /* BB_CLIENT_USER_NAME_BLOB */ -#define LICENCE_TAG_HOST 0x0010 /* BB_CLIENT_MACHINE_NAME_BLOB */ +#define BB_ERROR_BLOB 0x0004 + +/* LICENSE_ERROR_MESSAGE (2.2.1.12.1.3) */ +#define STATUS_VALID_CLIENT 0x00000007 +#define ST_NO_TRANSITION 0x00000002 /* Maps to generalCapabilitySet in T.128 page 138 */ @@ -452,15 +463,11 @@ #define PDUTYPE2_MONITOR_LAYOUT_PDU 55 /* TS_SECURITY_HEADER: flags (2.2.8.1.1.2.1) */ -/* TODO: to be renamed */ -#define SEC_CLIENT_RANDOM 0x0001 /* SEC_EXCHANGE_PKT? */ +#define SEC_EXCHANGE_PKT 0x0001 #define SEC_ENCRYPT 0x0008 -#define SEC_LOGON_INFO 0x0040 /* SEC_INFO_PKT */ -#define SEC_LICENCE_NEG 0x0080 /* SEC_LICENSE_PKT */ - -#define SEC_TAG_SRV_INFO 0x0c01 /* SC_CORE */ -#define SEC_TAG_SRV_CRYPT 0x0c02 /* SC_SECURITY */ -#define SEC_TAG_SRV_CHANNELS 0x0c03 /* SC_NET? */ +#define SEC_INFO_PKT 0x0040 +#define SEC_LICENSE_PKT 0x0080 +#define SEC_LICENSE_ENCRYPT_CS 0x0280 /* Slow-Path Input Event: messageType (2.2.8.1.1.3.1.1) */ /* TODO: to be renamed */ diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c index 2bc0bdee6..fa7900ea7 100644 --- a/libxrdp/xrdp_sec.c +++ b/libxrdp/xrdp_sec.c @@ -43,207 +43,6 @@ static tui8 g_pad_92[48] = 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92 }; - -/*****************************************************************************/ -/* Licensing request v2 PDU - * - * [MS-RDPBCGR] TS_SECURITY_HEADER - Basic - * [MS-RDPELE] SERVER_LICENSE_REQUEST with PREAMBLE_VERSION_2_0 - */ -/* some compilers need unsigned char to avoid warnings */ -static tui8 g_lic1[322] = -{ - /* [MS-RDPBCGR] TS_SECURITY_HEADER - Basic - * flags (2) = 0x0080 (SEC_LICENSE_PKT) - * flagsHi (2) = unused (arbitrary data) - * [MS-RDPBCGR] LICENSE_PREAMBLE - * bMsgType (1) = 0x01 (LICENSE_REQUEST) - * flags (1) = 0x02 (PREAMBLE_VERSION_2_0) - * wMsgSize (2) = 318 (excludes the 4 bytes TS_SECURITY_HEADER Basic) - */ - 0x80, 0x00, 0x3e, 0x01, 0x01, 0x02, 0x3e, 0x01, - /* [MS-RDPELE] SERVER_LICENSE_REQUEST - * ServerRandom (32) = - */ - 0x7b, 0x3c, 0x31, 0xa6, 0xae, 0xe8, 0x74, 0xf6, - 0xb4, 0xa5, 0x03, 0x90, 0xe7, 0xc2, 0xc7, 0x39, - 0xba, 0x53, 0x1c, 0x30, 0x54, 0x6e, 0x90, 0x05, - 0xd0, 0x05, 0xce, 0x44, 0x18, 0x91, 0x83, 0x81, - /* [MS-RDPELE] SERVER_LICENSE_REQUEST - ProductInfo - * [MS-RDPELE] PRODUCT_INFO - * dwVersion (4) = 0x00040000 - * cbCompanyName (4) = 0x0000002c (44) - */ - 0x00, 0x00, 0x04, 0x00, 0x2c, 0x00, 0x00, 0x00, - /* - * pbCompanyName (44) = UTF-16("Microsoft Corporation") - * cbProductId (4) = 0x00000008 (8) - */ - 0x4d, 0x00, 0x69, 0x00, 0x63, 0x00, 0x72, 0x00, - 0x6f, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x66, 0x00, - 0x74, 0x00, 0x20, 0x00, 0x43, 0x00, 0x6f, 0x00, - 0x72, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x72, 0x00, - 0x61, 0x00, 0x74, 0x00, 0x69, 0x00, 0x6f, 0x00, - 0x6e, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, - /* - * pbProductId (8) = UTF-16("236") - */ - 0x32, 0x00, 0x33, 0x00, 0x36, 0x00, 0x00, 0x00, - /* [MS-RDPELE] SERVER_LICENSE_REQUEST - KeyExchangeList - * [MS-RDPBCGR] LICENSE_BINARY_BLOB - * wBlobType (2) = 0x000d (BB_KEY_EXCHG_ALG_BLOB) - * wBlobLen (2) = 0x0004 (4) - * blobData (4) = 0x00000001 (KEY_EXCHANGE_ALG_RSA) - */ - 0x0d, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, - /* [MS-RDPELE] SERVER_LICENSE_REQUEST - ServerCertificate - * [MS-RDPBCGR] LICENSE_BINARY_BLOB - * wBlobType (2) = BB_CERTIFICATE_BLOB (0x0003) - * wBlobLen (2) = 0x00b8 (184) - * blobData = - * - * [MS-RDPBCGR] SERVER_CERTIFICATE - * dwVersion (31 bits) = 0x00000001 (CERT_CHAIN_VERSION_1) - * t (1 bit) = 0 (temporary certificate) - */ - 0x03, 0x00, 0xb8, 0x00, 0x01, 0x00, 0x00, 0x00, - /* - * certData = - * - * [MS-RDPBCGR] PROPRIETARYSERVERCERTIFICATE - * dwSigAlgId (4) = 0x00000001 (SIGNATURE_ALG_RSA) - * dwKeyAlgId (4) = 0x00000001 (KEY_EXCHANGE_ALG_RSA) - * wPublicKeyBlobType (2) = 0x0006 (BB_RSA_KEY_BLOB) - * wPublicKeyBlobLen (2) = 0x005c (92) - * PublicKeyBlob = - * - * [MS-RDPBCGR] RSA_PUBLIC_KEY - * magic (4) = 0x31415352 - * keylen (4) = 0x00000048 (72) - * bitlen (4) = 0x00000200 (512) - * datalen (4) = 0x0000003f (63) - * pubExp (4) = 0x00010001 (65537) - */ - 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x06, 0x00, 0x5c, 0x00, 0x52, 0x53, 0x41, 0x31, - 0x48, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, - 0x3f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, - /* - * modulus (72) = - */ - 0x01, 0xc7, 0xc9, 0xf7, 0x8e, 0x5a, 0x38, 0xe4, - 0x29, 0xc3, 0x00, 0x95, 0x2d, 0xdd, 0x4c, 0x3e, - 0x50, 0x45, 0x0b, 0x0d, 0x9e, 0x2a, 0x5d, 0x18, - 0x63, 0x64, 0xc4, 0x2c, 0xf7, 0x8f, 0x29, 0xd5, - 0x3f, 0xc5, 0x35, 0x22, 0x34, 0xff, 0xad, 0x3a, - 0xe6, 0xe3, 0x95, 0x06, 0xae, 0x55, 0x82, 0xe3, - 0xc8, 0xc7, 0xb4, 0xa8, 0x47, 0xc8, 0x50, 0x71, - 0x74, 0x29, 0x53, 0x89, 0x6d, 0x9c, 0xed, 0x70, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - /* [MS-RDPELE] SERVER_LICENSE_REQUEST - ServerCertificate - * [MS-RDPBCGR] LICENSE_BINARY_BLOB - blobData - * [MS-RDPBCGR] SERVER_CERTIFICATE - certData - * [MS-RDPBCGR] PROPRIETARYSERVERCERTIFICATE - * wSignatureBlobType (2) = 0x0008 (BB_RSA_SIGNATURE_BLOB) - * wSignatureBlobLen (2) = 0x0048 (72) - * SignatureBlob (72) = - */ - 0x08, 0x00, 0x48, 0x00, 0xa8, 0xf4, 0x31, 0xb9, - 0xab, 0x4b, 0xe6, 0xb4, 0xf4, 0x39, 0x89, 0xd6, - 0xb1, 0xda, 0xf6, 0x1e, 0xec, 0xb1, 0xf0, 0x54, - 0x3b, 0x5e, 0x3e, 0x6a, 0x71, 0xb4, 0xf7, 0x75, - 0xc8, 0x16, 0x2f, 0x24, 0x00, 0xde, 0xe9, 0x82, - 0x99, 0x5f, 0x33, 0x0b, 0xa9, 0xa6, 0x94, 0xaf, - 0xcb, 0x11, 0xc3, 0xf2, 0xdb, 0x09, 0x42, 0x68, - 0x29, 0x56, 0x58, 0x01, 0x56, 0xdb, 0x59, 0x03, - 0x69, 0xdb, 0x7d, 0x37, 0x00, 0x00, 0x00, 0x00, - /* - * - * [MS-RDPELE] SERVER_LICENSE_REQUEST - ScopeList - * [MS-RDPELE] SCOPE_LIST - * ScopeCount (4) = 0x00000001 (1) - * ScopeArray = - * - * [MS-RDPBCGR] LICENSE_BINARY_BLOB - * wBlobType (2) = 0x000e (BB_SCOPE_BLOB) - * wBlobLen (2) = 0x000e (14) - * blobData (14) = ISO-8859-1("microsoft.com") - */ - 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x0e, 0x00, 0x0e, 0x00, 0x6d, 0x69, 0x63, 0x72, - 0x6f, 0x73, 0x6f, 0x66, 0x74, 0x2e, 0x63, 0x6f, - 0x6d, 0x00 -}; - -/*****************************************************************************/ -/* Licensing success response v2 PDU - * - * [MS-RDPBCGR] TS_SECURITY_HEADER - Basic - * [MS-RDPELE] LICENSE_ERROR_MESSAGE with STATUS_VALID_CLIENT - */ -/* some compilers need unsigned char to avoid warnings */ -static tui8 g_lic2[20] = -{ - /* [MS-RDPBCGR] TS_SECURITY_HEADER - Basic - * flags (2) = 0x0080 (SEC_LICENSE_PKT) - * flagsHi (2) = unused (arbitrary data) - * [MS-RDPBCGR] LICENSE_PREAMBLE - * bMsgType (1) = 0xff (ERROR_ALERT) - * flags (1) = 0x02 (PREAMBLE_VERSION_2_0) - * wMsgSize (2) = 0x10 (16, excludes the 4 bytes TS_SECURITY_HEADER Basic) - */ - 0x80, 0x00, 0x10, 0x00, 0xff, 0x02, 0x10, 0x00, - /* - * [MS-RDPBCGR] LICENSE_ERROR_MESSAGE - * dwErrorCode (4) = 0x00000007 (STATUS_VALID_CLIENT) - * dwStateTransition (4) = 0x00000002 (ST_NO_TRANSITION) - * bbErrorInfo = - */ - 0x07, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, - /* - * [MS-RDPBCGR] LICENSE_BINARY_BLOB - * wBlobType (2) = 0x1428 (should be 0x0004 BB_ERROR_BLOB) - * wBlobLen (2) = 0x0000 (0) - */ - 0x28, 0x14, 0x00, 0x00 -}; - -/*****************************************************************************/ -/* Licensing success response v3 PDU - * - * [MS-RDPBCGR] TS_SECURITY_HEADER - Basic - * [MS-RDPELE] LICENSE_ERROR_MESSAGE with STATUS_VALID_CLIENT - * - * used for Media Center Edition - */ -/* some compilers need unsigned char to avoid warnings */ -static tui8 g_lic3[20] = -{ - /* S */ - /* [MS-RDPBCGR] TS_SECURITY_HEADER - Basic - * flags (2) = 0x0280 (SEC_LICENSE_PKT | SEC_LICENSE_ENCRYPT_CS) - * flagsHi (2) = unused (arbitrary data) - * [MS-RDPBCGR] LICENSE_PREAMBLE - * bMsgType (1) = 0xff (ERROR_ALERT) - * flags (1) = 0x03 (PREAMBLE_VERSION_3_0) - * wMsgSize (2) = 0x0010 (16, excludes the 4 bytes TS_SECURITY_HEADER Basic) - */ - 0x80, 0x02, 0x10, 0x00, 0xff, 0x03, 0x10, 0x00, - /* - * [MS-RDPBCGR] LICENSE_ERROR_MESSAGE - * dwErrorCode (4) = 0x00000007 (STATUS_VALID_CLIENT) - * dwStateTransition (4) = 0x00000002 (ST_NO_TRANSITION) - * bbErrorInfo = - */ - 0x07, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, - /* - * [MS-RDPBCGR] LICENSE_BINARY_BLOB - * wBlobType (2) = 0x99f3 (should be 0x0004 BB_ERROR_BLOB) - * wBlobLen (2) = 0x0000 (0) - */ - 0xf3, 0x99, 0x00, 0x00 -}; - static const tui8 g_fips_reverse_table[256] = { 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, @@ -1172,43 +971,10 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s) return 0; } -/*****************************************************************************/ -/* returns error */ -static int -xrdp_sec_send_lic_initial(struct xrdp_sec *self) -{ - struct stream *s; - - - make_stream(s); - init_stream(s, 8192); - - if (xrdp_mcs_init(self->mcs_layer, s) != 0) - { - LOG(LOG_LEVEL_ERROR, "xrdp_sec_send_lic_initial: xrdp_mcs_init failed"); - free_stream(s); - return 1; - } - - out_uint8a(s, g_lic1, sizeof(g_lic1)); - s_mark_end(s); - - LOG_DEVEL(LOG_LEVEL_TRACE, "Sending [MS-RDPELE] SERVER_LICENSE_REQUEST"); - if (xrdp_mcs_send(self->mcs_layer, s, MCS_GLOBAL_CHANNEL) != 0) - { - LOG(LOG_LEVEL_ERROR, "Sending [MS-RDPELE] SERVER_LICENSE_REQUEST failed"); - free_stream(s); - return 1; - } - - free_stream(s); - return 0; -} - /*****************************************************************************/ /* - * Send a [MS-RDPELE] LICENSE_ERROR_MESSAGE with STATUS_VALID_CLIENT - * See also: [MS-RDPELE] 1.3.3 Licensing PDU Flows + * Send a [MS-RDPBCGR] Server License Error PDU (2.2.1.12) with + * STATUS_VALID_CLIENT */ /* returns error */ static int @@ -1226,45 +992,34 @@ xrdp_sec_send_lic_response(struct xrdp_sec *self) return 1; } - out_uint8a(s, g_lic2, sizeof(g_lic2)); - s_mark_end(s); - - LOG_DEVEL(LOG_LEVEL_TRACE, "Sending [MS-RDPELE] LICENSE_ERROR_MESSAGE with STATUS_VALID_CLIENT"); - if (xrdp_mcs_send(self->mcs_layer, s, MCS_GLOBAL_CHANNEL) != 0) - { - LOG(LOG_LEVEL_ERROR, "Sending [MS-RDPELE] LICENSE_ERROR_MESSAGE with STATUS_VALID_CLIENT failed"); - free_stream(s); - return 1; - } - - free_stream(s); - return 0; -} - -/*****************************************************************************/ -/* returns error */ -static int -xrdp_sec_send_media_lic_response(struct xrdp_sec *self) -{ - struct stream *s; - - make_stream(s); - init_stream(s, 8192); - - if (xrdp_mcs_init(self->mcs_layer, s) != 0) - { - LOG(LOG_LEVEL_ERROR, "xrdp_sec_send_media_lic_response: xrdp_mcs_init failed"); - free_stream(s); - return 1; - } - - out_uint8a(s, g_lic3, sizeof(g_lic3)); + /* [MS-RDPBCGR] TS_SECURITY_HEADER */ + /* A careful reading of [MS-RDPBCGR] 2.2.1.12 shows that a securityHeader + * MUST be included, and provided the flag fields of the header does + * not contain SEC_ENCRYPT, it is always possible to send a basic + * security header */ + out_uint16_le(s, SEC_LICENSE_PKT | SEC_LICENSE_ENCRYPT_CS); /* flags */ + out_uint16_le(s, 0); /* flagsHi */ + + /* [MS-RDPBCGR] LICENSE_VALID_CLIENT_DATA */ + /* preamble (LICENSE_PREAMBLE) */ + out_uint8(s, ERROR_ALERT); + out_uint8(s, PREAMBLE_VERSION_3_0); + out_uint16_le(s, 16); /* Message size, including pre-amble */ + + /* validClientMessage */ + /* From [MS-RDPBCGR] 2.2.12.1, dwStateTransition must be ST_NO_TRANSITION, + * and the bbErrorInfo field must contain an empty blob of type + * BB_ERROR_BLOB */ + out_uint32_le(s, STATUS_VALID_CLIENT); /* dwErrorCode */ + out_uint32_le(s, ST_NO_TRANSITION); /* dwStateTransition */ + out_uint16_le(s, BB_ERROR_BLOB); /* wBlobType */ + out_uint16_le(s, 0); /* wBlobLen */ s_mark_end(s); - LOG_DEVEL(LOG_LEVEL_TRACE, "Sending [MS-RDPELE] LICENSE_ERROR_MESSAGE with STATUS_VALID_CLIENT"); + LOG_DEVEL(LOG_LEVEL_TRACE, "Sending [MS-RDPBCGR] Server License Error PDU with STATUS_VALID_CLIENT"); if (xrdp_mcs_send(self->mcs_layer, s, MCS_GLOBAL_CHANNEL) != 0) { - LOG(LOG_LEVEL_ERROR, "Sending [MS-RDPELE] LICENSE_ERROR_MESSAGE with STATUS_VALID_CLIENT failed"); + LOG(LOG_LEVEL_ERROR, "Sending [MS-RDPBCGR] Server License Error PDU with STATUS_VALID_CLIENT failed"); free_stream(s); return 1; } @@ -1633,7 +1388,7 @@ xrdp_sec_recv(struct xrdp_sec *self, struct stream *s, int *chan) } } - if (flags & SEC_CLIENT_RANDOM) /* 0x01 TS_SECURITY_PACKET */ + if (flags & SEC_EXCHANGE_PKT) /* 0x01 TS_SECURITY_PACKET */ { if (!s_check_rem_and_log(s, 4, "Parsing [MS-RDPBCGR] TS_SECURITY_PACKET")) { @@ -1672,7 +1427,7 @@ xrdp_sec_recv(struct xrdp_sec *self, struct stream *s, int *chan) return 0; } - if (flags & SEC_LOGON_INFO) /* 0x40 SEC_INFO_PKT */ + if (flags & SEC_INFO_PKT) { if (xrdp_sec_process_logon_info(self, s) != 0) { @@ -1680,31 +1435,6 @@ xrdp_sec_recv(struct xrdp_sec *self, struct stream *s, int *chan) return 1; } - if (self->rdp_layer->client_info.is_mce) - { - if (xrdp_sec_send_media_lic_response(self) != 0) - { - LOG(LOG_LEVEL_ERROR, "xrdp_sec_recv: xrdp_sec_send_media_lic_response failed"); - return 1; - } - - LOG_DEVEL(LOG_LEVEL_DEBUG, "xrdp_sec_recv: out 'send demand active'"); - return -1; /* special error that means send demand active */ - } - - if (xrdp_sec_send_lic_initial(self) != 0) - { - LOG(LOG_LEVEL_ERROR, "xrdp_sec_recv: xrdp_sec_send_lic_initial failed"); - return 1; - } - - *chan = 1; /* just set a non existing channel and exit */ - LOG_DEVEL(LOG_LEVEL_DEBUG, "xrdp_sec_recv: out channel 1 (non-existing channel)"); - return 0; - } - - if (flags & SEC_LICENCE_NEG) /* 0x80 SEC_LICENSE_PKT */ - { if (xrdp_sec_send_lic_response(self) != 0) { LOG(LOG_LEVEL_ERROR, "xrdp_sec_recv: xrdp_sec_send_lic_response failed");