Commit Graph

554 Commits (c15cd91198b7393cf7c9d2576f1762a22acc017f)

Author SHA1 Message Date
Koichiro IWAO c15cd91198
common: add constants of glyph support level 6 years ago
Koichiro IWAO 74497752dc
Add TLSv1.3 support
Actually, TLSv1.3 will be enabled without this change if xrdp is compiled
with OpenSSL or alternatives which support TLSv1.3. This commit makes to
enable or disable TLSv1.3 explicitly.  Also, this commit adds a log
"TLSv1.3 enabled by config, but not supported by system OpenSSL". if
xrdp installation doesn't support TLSv1.3. It should be user-friendly.
7 years ago
daixj 88b3c06311 fix issue #1112: set SSL object's read_ahead flag to be 0 7 years ago
metalefty f52f632e21
Merge pull request #1096 from metalefty/version_info
Show OpenSSL version to --version
7 years ago
Koichiro IWAO b2b42d28f3
xrdp: add OpenSSL version to --version
While here, cleanup --help,  --version, and when unknown option.
7 years ago
Ben Cohen 3b5b7a5935 UDS file deleted after first connection
If you run xrdp with a Unix Domain Socket (UDS) for the port specified in
/etc/xrdp/xrdp.ini then the first connection succeeds but subsequent
connections fail.  In fact the UDS is deleted from the filesystem as soon
as the first connection is established.

Test case:

1. Edit /etc/xrdp/xrdp.ini to set "port=/var/run/xrdp-local.socket".

2. Restart xrdp.

3. Run the following.  When rdesktop starts up and the logon dialog is
   displayed, press "Cancel".

   sudo socat TCP-LISTEN:12345 UNIX-CONNECT:/var/run/xrdp-local.socket &
   rdesktop localhost:12345

4. Run the following:

    sudo socat TCP-LISTEN:12346 UNIX-CONNECT:/var/run/xrdp-local.socket &
    rdesktop localhost:12346

Expected behaviour: rdesktop starts up and displays the logon dialog.
Observed behaviour: rdesktop exits with "ERROR: Connection closed" and
                    socat exits with "No such file or directory.

This is because in the child process after forking, xrdp_listen_fork()
calls trans_delete() which deletes the UDS.  Simply commenting out the
g_file_delete() and g_free() fixes this, but that isn't a proper solution
because trans_delete() is called from elsewhere where the UDS might no
longer be wanted.

Fix by adding a function trans_delete_from_child() that frees and clears
listen_filename before calling trans_delete(), and call the new function
from xrdp_listen_fork().

(Workaround: set "fork=false" in /etc/xrdp/xrdp.ini, because
trans_delete() is then not called.)
7 years ago
Fernando Seiti Furusato 9f80fcd74e Corrected endianness detection on ppc64el.
In common/arch.h, the endianness detection considers all powerpc
architectures as big endian. Since that is not true for ppc64el, I
added a verification that checks other preprocessor macros, only for
ppc cases.

Signed-off-by: Fernando Seiti Furusato <ferseiti@gmail.com>
7 years ago
speidy a432969746 common: ssl_calls: add support for OpenSSL>=1.1.0 API for DH keys
also fixes some memory leak introduced in PR#1024.
and adds a check that DH params generated successfully. write a proper log message if not.
7 years ago
speidy 8effc09ab7 common: ssl_calls: check if SSL object created right after its creation. 7 years ago
Koichiro IWAO e3d0fd6d46
common: temporarily disable DHE
until make it possible to use generated DH parameters per installation.
7 years ago
Koichiro IWAO 1690950cc8
common: regenerate dhparam
Generated by: openssl dhparam -C 2236
7 years ago
Koichiro IWAO 578d23477c
common: obey coding style, remove trailing space 7 years ago
Enrico Tagliavini 70b5adb396 add support for DHE ciphers via compiled in dhparam
make it possible to use regular (non EC) EDH ciphers. To make this
possible a Diffie-Hellman parameter must be passed to the openssl
library. There are a few options possible as described in the manuals at
[1] and [2]. Simplest approach is to generate a DH parameter using
openssl dhparam -C <lenght> and include the code into the application.
The lenght used for this commit is 2236 bits long, which is the longest
possible without risking backward incompatibilities with old systems as
stated in [1]. Newer systems should use ECDH anyway, so it makes sense
to keep this method as compatible with older system as possible.
Paramters longer than 2048 should still be secure enough at the time of
writing.

[1] https://wiki.openssl.org/index.php/Diffie-Hellman_parameters
[2] https://wiki.openssl.org/index.php/Manual:SSL_CTX_set_tmp_dh_callback(3)
7 years ago
Enrico Tagliavini 6cdc0f31b0 enable automatic ECDH when possible (openssl 1.0.2)
Openssl 1.1.0 and later are enabling ECDH automatically, but for older
version it must be enabled explicitly or all Perfect Forward Secrecy
ciphers will be silently ignored. See also [1]. This commit applies the
same fix as found in CnetOS 7 httpd package to enable automatic ECDH as
found in [2].

[1] https://wiki.openssl.org/index.php/Diffie-Hellman_parameters
[2] https://git.centos.org/blob/rpms!httpd.git/c7/SOURCES!httpd-2.4.6-ssl-ecdh-auto.patch
7 years ago
Koichiro IWAO 793a418cfb
common: log what value is set to tls_ciphers
Related to #1033.
7 years ago
Koichiro IWAO 3da4d72323
common: quit using `!` as comment out symbol in config files
It is not used anywhere in default config. Some config like
`tls_ciphers` might contain `!` like this:

    tls_ciphers=FIPS:!aNULL:!eNULL

Fixes #1033.
7 years ago
daixj 31ef2552c4 log: revert permission 7 years ago
daixj ea6bb62410 log: fix fd checking 7 years ago
daixj 551bb185c5 log: remove unused code and fix potential memory leak 7 years ago
Koichiro IWAO 577bd8214f common: add more capset constants
defined at MS-RDPBCGR 2.2.1.13.1.1.1 [1] and sort

[1] https://msdn.microsoft.com/en-us/library/cc240486.aspx
7 years ago
Koichiro IWAO 77a34e0a7b common: express capability set constants in hex
as same as done in  MS-RDPBCGR 2.2.1.13.1.1.1 [1].

[1] https://msdn.microsoft.com/en-us/library/cc240486.aspx
7 years ago
Koichiro IWAO 788ae1467a xrdp_sec: constify color depth value 7 years ago
Koichiro IWAO d0c27a2904 common: suppress log when closing log files
because if xrdp is running 'fork=yes' mode, the log message
'shutting down log subsystem...' is logged everytime when the child
process is exitting. In other words, everytime when clients are
disconnecting.  This is a little bit too vebose.
7 years ago
Koichiro IWAO 3de3a4fab5 common: add more references to constants' origin
classify constants into these 5 types

* constants for xrdp
* constants come from ITU-T Recommendations
* constants come from Remote Desktop Protocol
* constants come from other MS products
* unclassified yet
7 years ago
Koichiro IWAO 799c230998 common: add references to constants' origin 7 years ago
Jay Sorg a9eb21e6d7 common: avoid 100% cpu on ssl accept, can be fake client 7 years ago
Justin Terry (VM) d7d14d7462 Implements the accept/close logic for vsock 7 years ago
Jay Sorg bc48578a90 remove crc16.h from common/Makefile.am 7 years ago
Jay Sorg 54285d26dd remove empty crc16.h file 7 years ago
Jay Sorg 285465a1f5 common, return -1 for bad socket 7 years ago
Jay Sorg c6c513b23c use g_memcpy, braces 7 years ago
Jay Sorg 26507644e3 vsock, move some defines 7 years ago
Justin Terry (VM) 50bd624cc4 Implements XRDP over vsock
1. Implements the ability to use AV_VSOCK for the transport rather than TCP.
2. Updates the ini file to be able to conditionally turn this feature on.
7 years ago
Koichiro IWAO a6fd518a48 fix typo s/Roration/Rotation/ 7 years ago
Koichiro IWAO 2475893402 Constify extended mouse events 7 years ago
Koichiro IWAO 27aef96e81 Constify mouse event flags, use the MS name for constants 7 years ago
Koichiro IWAO 4a2818e183 Add some more Input Capability Set constants 7 years ago
Koichiro IWAO 2411a0be14 log: add log level TRACE
TRACE means more verbose than DEBUG. syslog doesn't have more verbose
level than DEBUG, map TRACE to DEBUG for syslog.
7 years ago
Koichiro IWAO 00bf62bd42 common: prevent raw use of snprintf 7 years ago
Koichiro IWAO ced3a4817f xrdp: constify input event type 7 years ago
Koichiro IWAO f9ab4df7f2 common: fix g_write_ip_address() didn't return correct IP address
Fixes: #878.
8 years ago
Jay Sorg 021a78f4c6 chansrv: sound, use WAVE_FORMAT_AAC not WAVE_FORMAT_AAC_MS 8 years ago
Jay Sorg bf0d56c314 chansrv: sound, add aac 8 years ago
Koichiro IWAO 4d14f344fd fix indent, no logic change 8 years ago
Koichiro IWAO 04187945a8 move base64 functions to base64.c 8 years ago
Koichiro IWAO eae5cdf1fd pass through except for the first '='
if "foo=ba=r" is found in ini files, it should be parsed like this.
      key : foo
    value : ba=r
8 years ago
Koichiro IWAO d57e02626d add base64_decode function 8 years ago
Koichiro IWAO dbaf23e93b chansrv: constify wFormatTag 8 years ago
Ian Geiser 324a334315 append a / to ensure the full path is created even when the config variable lacks a trailing / 8 years ago
Koichiro IWAO aa0721a90e common: fix more glitches in IPv4 initialization 8 years ago