Commit Graph

714 Commits

Author SHA1 Message Date
metalefty
352107fc5f
Merge pull request #1319 from metalefty/sighup
xrdp: do not exit when caught SIGHUP
2019-11-21 18:42:52 +09:00
Belinsky-L-V
a2fd7c09fa make vsock config accept -1 for cid and port
linux/vm_sockets.h defines VMADDR_CID_ANY and VMADDR_PORT_ANY (both
equal to -1U) for vsock cid and port respectively. This change aims to
add the capability to parse negative cid and port numbers for vsock from
the config and pass them to the kernel.

Allows for valid configurations such as "port=vsock://-1:3389" to be
correctly processed, but will parse port and cid inputs like "---1" to
"-", which should currently get silently turned into 0 by atoi inside
g_sck_vsock_bind_address. Inputs that do not contain "-" get parsed as
by xrdp_listen_parse_integer.
2019-11-12 23:59:49 +03:00
Koichiro IWAO
f37faca65b
xrdp: skip connecting to chansrv when no channels enabled 2019-08-22 17:20:19 +09:00
Koichiro IWAO
bcb281707b
xrdp: reformat comments/descriptions in xrdp.ini 2019-08-19 14:20:32 +09:00
Jay Sorg
1ef47cbf0b xrdp: fix seg fault when fork on connect and disconnect 2019-07-02 21:02:09 -07:00
Jay Sorg
37ade1cb25 remove unused variable 2019-07-01 18:07:36 -07:00
Jay Sorg
ee65ccb31d use address for tcp:// and tcp6:// and vsock:// 2019-07-01 17:56:50 -07:00
Jay Sorg
f42e38125e xrdp: enable listen_test, other parameter fixes about listen_test 2019-07-01 00:53:11 -07:00
Jay Sorg
0bc7803eaa add TCP V4 and V6 only socket functions 2019-06-29 23:59:18 -07:00
Jay Sorg
d7bd6f726b xrdp: support old xrdp.ini port, use_vsock style 2019-06-27 09:09:34 -07:00
Jay Sorg
216ba3b4d4 xrdp: update xrdp.ini.in 2019-06-26 22:16:44 -07:00
Jay Sorg
e3f41da2cc xrdp: parsing for listeners 2019-06-26 22:16:43 -07:00
Jay Sorg
c236f665d2 xrdp: parsing for listeners 2019-06-26 22:16:43 -07:00
Jay Sorg
d6229df5a1 xrdp: work on trans list 2019-06-26 22:16:43 -07:00
Jay Sorg
bacd76f9a2 xrdp: change listen to list 2019-06-26 22:16:43 -07:00
Jay Sorg
21f90e3ca2 work on suppress 2019-04-25 14:54:25 -07:00
Jay Sorg
0ed82f71e8 xrdp: check term event for more responsive shutdown 2019-04-01 23:14:09 -07:00
Koichiro IWAO
fff61cbeca
xrdp: do not exit when caught SIGHUP 2019-03-29 09:27:29 +09:00
Koichiro IWAO
4f85f8787b
xrdpwin: xrdp.sourceforge.net -> www.xrdp.org 2019-03-20 17:00:17 +09:00
netromnetrom
3f42e5d6e5
Add Danish keyboard 2019-02-05 17:00:46 +01:00
metalefty
2e340bd68c
Merge pull request #1244 from metalefty/km-0000080a
correct latam keylayout value
2018-11-08 08:56:27 +09:00
Koichiro IWAO
92fa56546e
correct latam keylayout value 2018-11-07 18:58:07 +09:00
metalefty
3ad380949c
Merge pull request #1240 from metalefty/km-0000080a
add Spanish (Latin American) keyboard
2018-11-02 09:30:40 +09:00
Koichiro IWAO
9f22223b91
capitilize hex keylayout value 2018-11-01 09:25:04 +09:00
Koichiro IWAO
258a7a12ac
add Spanish (Latin Amarican) keyboard
Closes #1237.
2018-11-01 09:24:51 +09:00
Koichiro IWAO
37c04a40d8
Remove console session
it is VNC session to localhost:5900. Can be replaced with vnc-any.
2018-10-19 10:52:12 +09:00
Koichiro IWAO
f64e990ce8
Remove sesman-any as it is not used at all 2018-10-18 11:44:52 +09:00
Koichiro IWAO
a4b0aa9355
Remove x11rdp from config
as it is already deprecated. x11rdp is complicated to build and very few
people using it actually. However, some people still select "X11rdp"
session and get stuck despite not installing x11rdp.

https://github.com/neutrinolabs/xrdp/issues/962#issuecomment-430545526

People who really want to use x11rdp should revert this commit.
2018-10-18 11:19:38 +09:00
jsorg71
ae1514c167
dynamic virtual channel improvements
remove not used chansrv <-> xrdp messages
move static channel disable control into libxrdp
remove some blocking read, write chansrv calls
add drdynvc calls to libxrdp
add drdynvc calls to chansrv
channel cleanup
2018-10-11 22:09:20 -07:00
Idan Freiberg
28d1fa7620
Merge pull request #1192 from hate-m-dollarsign/devel
xrdp: Use configured values instead of hardcoded ones in login_wnd inputs.
2018-09-18 05:34:16 +03:00
Koichiro IWAO
171f8e79ed
xrdp: deprecate TLSv1 and TLSv1.1
Most websites disabled TLSv1 (1.0) and TLSv1.1 since March 2018
[1][2][3]. It is HTTPS context but there's few differences between HTTPS
and other TLS connections. Users can whenever re-enable these deprecated
TLS versions by editing xrdp.ini but not enabled by default.

[1] https://www.globalsign.com/en/blog/disable-tls-10-and-all-ssl-versions/
[2] https://www.thesslstore.com/blog/deprecation-tls-1-0-1-1-underway/
[3] https://www.digicert.com/blog/depreciating-tls-1-0-and-1-1/
2018-09-14 11:50:55 +09:00
Koichiro IWAO
1ad8cbb2a0
Document TLSv1.3 support 2018-09-14 11:50:55 +09:00
jsane
fadbd20baf xrdp: Use configured values instead of hardcoded ones in login_wnd inputs.
Configured ls_label_width and ls_input_width currently only apply to the combo l
abel and dropdown. Other labels and inputs (username, password, port, ...) use hardcoded defaults.

Also had to change the default label width; for the previous value of 60, "username" ends up just a few pixels too wide.
2018-09-07 14:50:45 +02:00
Koichiro IWAO
c0c7c3f106
xrdp: unify inconsistent mixed use of
* configure params
* configure options
* configure string
2018-06-27 09:00:55 +09:00
Koichiro IWAO
be05afb30b
xrdp: print configure options to --version more pretty 2018-06-27 09:00:52 +09:00
Jay Sorg
349616a35d add ipv6only to configure echo and add configure parameter to xrdp -h output 2018-05-25 22:17:31 -07:00
metalefty
f52f632e21
Merge pull request #1096 from metalefty/version_info
Show OpenSSL version to --version
2018-04-13 14:49:26 +09:00
Koichiro IWAO
2eb4be426b
xrdp: show which CLI option is unknown to xrdp 2018-04-10 23:58:31 +09:00
Koichiro IWAO
b2b42d28f3
xrdp: add OpenSSL version to --version
While here, cleanup --help,  --version, and when unknown option.
2018-04-10 23:58:31 +09:00
Koichiro IWAO
48aafc1866
xrdp: xrdp should exit with error code when unknown CLI option given 2018-04-10 13:07:40 +09:00
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.)
2018-03-27 09:22:49 +03:00
fbourqui
3d9e7db849
Update xrdp_keyboard.ini
Add the missing Swiss French rdp_layout_ definitions, ch(fr) in X11
2018-03-05 12:11:31 +01:00
Vraiment
9ed5243de9 Make xrdp.ini to be dynamic for each operating system 2018-02-19 11:41:55 +09:00
Jay Sorg
f763cb3788 fix for zombie processes sometimes appearing 2018-01-22 04:34:09 +00:00
Jay Sorg
acd05f365f xrdp: xrdp_encoder.c fix compile when XRDP_RFXCODEC is not defined 2018-01-22 04:32:36 +00:00
Jay Sorg
a64cb81a36 xrdp: fix some leaks in xrdp_encoder.c 2018-01-22 04:32:36 +00:00
Koichiro IWAO
b17c45d86f
fix potential fd leak
In most cases, checking fd > 0 is not valid. open(2) returns -1 on
error, 0 on stdin, 1 on stdout, 2 on stderr, >2 . The border should be
between -1 and 0. Additionally, between 2 and 3.

Pointed out by: #919
2018-01-17 09:38:28 +09:00
Koichiro IWAO
942bb6316a add comment on sessions xrdp.ini 2017-12-16 00:27:06 +09:00
rkantos
cdba988f52 Update xrdp_keyboard.ini
Add the missing? Finnish rdp_layout_ definitions. Makes my install now work with Finnish keyboard layout. (same as Swedish)
2017-12-14 14:43:04 +09:00
Koichiro IWAO
8d951ab02e xrdp_listen: suppress log when TRANS_STATUS_DOWN
The log is always logged when clients are disconnecting even though
nothing unusual is happening. This scares users too much. Actually,
some users created a issue on GitHub with the following log. It will
lose focus from the real error.

> [ERROR] Listening socket is in wrong state, terminating listener
2017-11-30 15:13:18 +09:00