mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,051 Commits 9 Branches 44 Tags 20 MiB
52f4920af8
Commit Graph

503 Commits

Author SHA1 Message Date
Koichiro IWAO
e94ab10e14 TLS: new method to specify SSL/TLS version 
SSL/TLS protocols only listed in ssl_protocols should be used.
The name "ssl_protocols" comes from nginx.

Resolves #428.
 2017-02-27 14:17:25 +09:00
Jay Sorg
7825246d7a fix warning new since stdint.h change 2017-02-22 20:39:56 -08:00
Pavel Roskin
0bb048d35e Fix several cases of discarding return values 2017-01-25 23:22:29 -08:00
Idan Freiberg
482671fd18 Merge pull request #625 from speidy/proxy_session_info 
Pass session info in proxy mode
 2017-01-23 08:15:18 +02:00
Idan Freiberg
19375dda7a Merge pull request #426 from metalefty/log-tls-version-and-cipher 
TLS: log TLS version and cipher
 2017-01-16 07:26:51 +02:00
speidy
b7da395b5e libxrdp: use constant RDP_DATA_PDU_LOGON 2017-01-15 08:51:43 +02:00
speidy
0a5bc44a0b libxrdp: use log_message 2017-01-15 08:46:04 +02:00
Jay Sorg
6f74efa70a add session_info 
Conflicts:
	libxrdp/libxrdp.h
 2017-01-15 08:20:50 +02:00
Koichiro IWAO
f29a98b243 TLS: log client port in addition to ssl protocol and cipher 2017-01-13 17:59:29 +09:00
speidy
6810aa3f79 libxrdp: libxrdp_send_to_channel, improve error message 2017-01-06 08:32:30 +02:00
speidy
58d8cb0fd2 libxrdp: ignore incoming channels with empty names 2017-01-06 08:01:33 +02:00
speidy
94cdbdcee6 libxrdp: change channel_code into a meaningful name 2017-01-06 07:59:49 +02:00
Pavel Roskin
bcaa1709e0 Fix all warnings in TurboJPEG code 
Actually use the error code from tjCompress() by logging the errors.

Make sure width is more than zero before filling the pad with the last
pixel data.
 2017-01-05 17:27:12 -08:00
jsorg71
5194311d9d Merge pull request #611 from volth/support-enable-xrdpdebug=yes-2 
fix build with --enable-xrdpdebug=yes
 2017-01-05 16:00:51 -08:00
volth
26a26ef906 fix build with --enable-xrdpdebug=yes 2017-01-04 19:20:44 +00:00
speidy
70e9132ab1 xrdp: add some logging, remove unused var 2016-12-29 08:38:59 -05:00
speidy
a62c467f71 libxrdp: frame acks, make sure max unacked frames value is valid. 2016-12-29 00:33:17 -05:00
speidy
a96c91b38e libxrdp: fix Fast-Path Synchronize Update message 2016-12-27 09:53:53 +02:00
speidy
38253f1371 libxrdp: add XRDP_RFXCODEC to Makefile.am 2016-12-22 11:43:41 -05:00
metalefty
1753f6317c Merge pull request #550 from jsorg71/bitmap_update 
fixes for bitmap update
 2016-12-20 17:01:32 +09:00
metalefty
25e5243ecf Merge pull request #553 from jsorg71/libpainter 
add libpainter for drawing when client does not have minimum orders
 2016-12-20 17:00:48 +09:00
Pavel Roskin
c21b9a78f4 Distribute all files except git and github specific data 
It is better to distribute a few useless file than not to distribute
needed files.
 2016-12-18 00:00:11 -08:00
jsorg71
9584e22ba6 Merge pull request #549 from jsorg71/rlelimit 
fixes for rle bitmap compress limits and raw bitmaps
 2016-12-17 11:58:57 -08:00
Jay Sorg
74ec00a6a6 some code cleanup 2016-12-15 21:52:05 -08:00
jsorg71
870f028692 Merge pull request #546 from proski/jpeg-warning 
Fix a warning in jpeg compression code with --enable-jpeg
 2016-12-15 21:33:25 -08:00
Jay Sorg
1f51586769 add libpainter for drawing when client does not have minimum orders 2016-12-15 21:17:50 -08:00
Jay Sorg
81e72fc99c code cleanup, add some comments 2016-12-15 14:47:37 -08:00
Jay Sorg
519359a823 fixes for bitmap update 2016-12-15 00:39:13 -08:00
Jay Sorg
492116d535 fixes for rle bitmap compress limits and raw bitmaps 2016-12-14 23:55:13 -08:00
Pavel Roskin
380729e982 Fix a warning in jpeg compression code with --enable-jpeg 
If the image width is not divisible by 4, the image is padded to the next
multiple of 4. The additional pixels are filled with the colors of the
last pixel in the row.

The last pixel colors may not be initialized if the width is 0. In this
case, the would be no padding, but the compiler doesn't know that.

Add a check that the width is more that 0 before filling the padding.
 2016-12-14 22:35:08 -08:00
speidy
a614b60157 lixrdp: typo fix 2016-12-13 18:19:32 -05:00
speidy
917aadd2d1 libxrdp: more constants 2016-12-13 18:18:34 -05:00
speidy
3dc0f2860c Merge branch 'surface_cmds' of git://github.com/speidy/xrdp into surface_cmds 2016-12-13 15:08:37 -05:00
speidy
5e39bb1f87 libxrdp: caps, group caps require fastpath output, use FASTPATH_OUTPUT_SUPPORTED constant 2016-12-13 15:05:39 -05:00
speidy
d6a470e973 libxrdp: improve messages 2016-12-13 14:31:27 -05:00
Speidy
a0cf6030df Merge branch 'devel' of https://github.com/neutrinolabs/xrdp into surface_cmds 2016-12-12 15:51:39 -08:00
jsorg71
5966de4ee2 Merge pull request #536 from jsorg71/unicode 
add unicode support
 2016-12-11 17:15:34 -08:00
Jay Sorg
c264862afe change some magics to defines 2016-12-10 01:06:45 -08:00
Jay Sorg
7a1a481ff9 use defines for flags 2016-12-10 00:43:33 -08:00
Jay Sorg
2f8d3ba9da add unicode support 2016-12-10 00:11:28 -08:00
speidy
1ef5c2412c xrdp_caps: fix jpeg codec properties 2016-12-10 02:14:50 -05:00
speidy
4f04801b11 o caps: advertise remotefx codec capsets only when supported (RFX mode, 
proxy mode)
o xrdp_encoder: do not initialze encoder context for RFX when rfxcodec
is not supported
 2016-12-10 02:03:20 -05:00
speidy
bf07c20571 no logic change, indent only 2016-12-08 20:12:00 -05:00
speidy
8a0fec5e66 o send RFX tiles as stream (Stream Surface Bits Command) 
o silent frame ack logging
o support surface commands in capsets
o fix some wrong constants
 2016-12-08 20:12:00 -05:00
speidy
1fe048b63d xrdp_encoder: do not initialize for non-UNIX rdp clients 
xrdp_encoder: comment about temporary workaround
 2016-11-29 15:25:14 -05:00
Pavel Roskin
d3c36b0376 Don't select SSL protocol if no keys, fall back to RDP for "hybrid" 
If both the client and the server are configured to allow both RDP and
SSL connections, the server is free to choose RDP in absense of the SSL
keys.
 2016-11-28 00:18:33 -08:00
Pavel Roskin
d73f20499e Log the result of the security level negotiation 2016-11-28 00:18:16 -08:00
Pavel Roskin
8069b29429 Recognize security_layer=negotiate in xrdp.ini, improve logging 
security_layer=negotiate is documented, but the code is complaining
loudly about it. Fix it, make sure not to change the actual behavior
apart from the logging.

Improve the log message for unrecognized security_layer setting.
 2016-11-27 23:49:32 -08:00
Pavel Roskin
077e3f5bfc Fix pointer sign warnings in TurboJPEG compression code 2016-11-22 08:34:45 -08:00
Pavel Roskin
e7433ec69c Fix pointer sign warnings in JPEG compression code 2016-11-22 08:34:45 -08:00
Koichiro IWAO
2c9ff1a4d4 log non TLS session 2016-11-22 10:50:31 +09:00
Koichiro IWAO
40e8194122 TLS: log TLS version and cipher 2016-11-22 10:50:30 +09:00
Jay Sorg
da9439f24d libxrdp: warn when using 512 bit key 2016-11-11 22:29:54 -08:00
Pavel Roskin
a370306f75 Get rid of EXTRA_LIBS, use variables with more specific names 2016-10-20 10:43:02 -07:00
Pavel Roskin
5c69f3cd57 Eliminate EXTRA_FLAGS, it's a poor name, use AM_LDFLAGS 2016-10-20 10:43:02 -07:00
Pavel Roskin
0422734fc7 Merge EXTRA_DEFINES and EXTRA_INCLUDES into AM_CPPFLAGS 
AM_CPPFLAGS is a documented Automake variable for C preprocessor flags
that should not be overridden when compiling the package.

There is no need to have two additional variables that are ultimately
merged into AM_CPPFLAGS.

Their names are also confusing. EXTDA_DIST is a documented Automake
variable. Everything else that starts with "EXTRA" is not.
 2016-10-20 10:43:02 -07:00
Pavel Roskin
9ac592b218 Don't use term "missing" when using default files, it's too alarming 
Also improve messages when non-absolute path is rejected.
 2016-10-17 08:38:22 -07:00
Koichiro IWAO
e2d4b65787 libxrdp: cleanup log log in xrdp_load_keyboard_layout 2016-09-06 15:55:11 +09:00
Koichiro IWAO
2488159645 libxrdp: log keyboard type/subtype 2016-09-02 13:44:11 +09:00
Koichiro IWAO
644242fc53 libxrdp: log keyboard options 2016-09-02 13:44:11 +09:00
metalefty
b934e55fc8 Merge pull request #364 from laigor/devel 
Allows use the xkb options that for example allows you to specify a key combination to change the layouts.
 2016-08-30 09:28:25 +09:00
Alex Illsley
47124df4ed new options for xrdp.ini disableSSlv3=yes and tls_ciphers=HIGH and code to implement 2016-08-25 11:20:47 -07:00
jsorg71
97cd690f84 Merge pull request #384 from CarstenGrohmann/improve_cert_log_messages 
Improve certificate log messages
 2016-08-05 14:44:34 -07:00
Pavel Roskin
aeeb3d2c2e Fix warnings detected by -Wwrite-strings 2016-07-08 04:29:42 +00:00
Pavel Roskin
ae5bb5bf9c Fix incorrect use of "it's" and "its", adjust wording 2016-06-21 16:30:15 -07:00
Carsten Grohmann
7f0d059d84 Improve certificate log messages 2016-06-11 10:58:15 +02:00
speidy
f5ec7f4102 libxrdp: oops, fix virtual desktop size check 2016-05-18 00:24:16 -04:00
speidy
881756a82c libxrdp: oops, fix virtual desktop size check 2016-05-18 00:23:07 -04:00
speidy
36c17767b7 libxrdp: in CS_MONITOR, validate virtual desktop size we got from client 2016-05-18 00:20:41 -04:00
speidy
b38dcf1bb0 xrdp_wm: fix for multimon, draw login window and log window on primary 
monitor
 2016-05-17 20:11:49 -04:00
Pavel Roskin
ca9cbcafc8 Typo fixes 2016-05-04 23:33:30 -07:00
Pavel Roskin
70f3d4c5e2 Fix warnings for unused variables read from byte streams 2016-04-23 00:18:38 -07:00
Pavel Roskin
0629b25d5f Fix warnings about unused variables and functions 2016-04-21 22:27:27 -07:00
laigor
59be4134c3 Allows use the xkb options that for example allows you to specify a key combination to change the layouts. 
Example of xrdp_keyboard.ini for russian keyboard

[default_rdp_layouts]
rdp_layout_us=0x00000409
rdp_layout_de=0x00000407
rdp_layout_fr=0x0000040C
rdp_layout_it=0x00000410
rdp_layout_jp=0x00000411
rdp_layout_jp2=0xe0010411
rdp_layout_jp3=0xe0200411
rdp_layout_jp4=0xe0210411
rdp_layout_ru=0x00000419
rdp_layout_se=0x0000041D
rdp_layout_pt=0x00000816
rdp_layout_br=0x00000416
rdp_layout_pl=0x00000415

[rdp_keyboard_ru]
keyboard_type=4
keyboard_subtype=1
model=pc105
options=grp:alt_shift_toggle
rdp_layouts=default_rdp_layouts
layouts_map=layouts_map_ru

[layouts_map_ru]
rdp_layout_us=us,ru
rdp_layout_ru=us,ru
 2016-04-14 22:35:56 +03:00
Jay Sorg
87208db090 fix warnings 2016-04-09 22:10:12 -07:00
Jay Sorg
38241f2a0b Fix all format warnings and some unused variable warnings 2016-03-14 17:04:08 -07:00
Pavel Roskin
59a5fb0ddb Move headers from EXTRA_DIST to sources, sort alphabetically 
There should be no functional difference.
 2016-02-21 23:06:48 -08:00
Pavel Roskin
92a6833e9b Fix typos 2016-02-13 20:41:07 -08:00
Pavel Roskin
dcab7552db Stop redefining libdir, use moduledir for ${libdir}/xrdp 
libdir is for shared and static libraries. Some xrdp libraries are loaded
dynamically from a non-standard directory, so they are used like modules.

Having separate libdir and moduledir would eventually allow to separate
dynamically loaded modules from shared libraries.
 2016-02-12 23:52:46 -08:00
Pavel Roskin
22e808a186 Add missing spaces in the strings that are split for line wrapping 2016-02-12 23:52:45 -08:00
Pavel Roskin
a452d8d36a Merge AM_CFLAGS and INCLUDES info AM_CPPFLAGS 
AM_CPPFLAGS is for flags passed to the preprocessor, such as defines and
includes. AM_CFLAGS is for flags affecting the compiler, such as debug
and optimization settings.

INCLUDES is an obsolete name. Users can pass INCLUDES and break
compilation. AM_CPPFLAGS is more explicit that the flags come from
Automake and should not be overridden.
 2016-01-29 22:45:00 -08:00
Pavel Roskin
ee1a237685 Remove GOT_PREFIX, it's a broken hack of limited utility 
To add flags to the compiler, CFLAGS, CPPFLAGS or LDFLAGS can be used on
the configure command line.

The need to add flags depends on the location of the headers and
libraries of the dependencies, which is orthogonal to the directory where
xrdp will be installed.

The implementation in configure.ac has a stray closing bracket, making
GOT_PREFIX true even if --prefix is not passed.

The implementation is inconsistent - the only affected makefiles are for
xrdp and libxrdp.

Changing rpath manually is wrong in most cases. Libtool should be able to
set rpath correctly on its own.

Using $(prefix)/lib ignores the libdir setting. For many 64-bit systems,
/usr/lib is used for 32-bit libraries. Adding 32-bit libraries to the
rpath slows down 64-bit executables, as the dynamic loader searches for
libraries in a wrong directory.

There is no way to disable GOT_PREFIX if --prefix has to be passed.
Fedora RPM patches configure.ac and needs to rerun autoconf and automake
after that.
 2016-01-26 22:36:59 -08:00
Pavel Roskin
964e860072 Run through codespell 2016-01-14 08:47:50 -08:00
Jay Sorg
96a237c8ef libxrdp: rail fix for when no flags are set 2015-12-11 20:05:40 -08:00
Jay Sorg
a303f9aaec remove trailing white space 2015-08-03 20:37:43 -07:00
Jay Sorg
a4f8705e99 multimon fix, mstsc reports desktop width and height of primary only 2015-08-03 17:12:46 -07:00
itamarjp
960cc62a0e add missing files into extra_dist, 
this is required when using make dist to generate a tarball
 2015-07-14 11:35:33 -03:00
Jay Sorg
914b4acf39 fix for libxrdp_reset 2015-07-11 00:13:50 -07:00
Jay Sorg
b56aa9832e work on main loop changes 2015-07-05 23:14:46 -07:00
speidy
9fb02e381d libxrdp: xrdp_iso: changed logs, some fixes in security layer 
negotiation.
 2015-06-04 16:48:41 +03:00
Jay Sorg
33167a7c74 add frame acks and h264 codec mode basics 2015-03-28 18:34:25 -07:00
Jay Sorg
253028431c libxrdp: opps, fix typeo 2014-12-23 22:51:10 -06:00
Jay Sorg
25809f4f1c libxrdp: no logic change, tabs to spaces 2014-12-23 20:04:20 -08:00
Jay Sorg
eddf0eefdc libxrdp: no logic change, statis functions, indent 2014-12-18 19:40:26 -08:00
Jay Sorg
ce1a4e660b libxrdp: fastpath RDP_INPUT_SYNCHRONIZE fix 2014-12-16 17:36:18 -08:00
Jay Sorg
69a551cdf7 libxrdp: indent, no logic change 2014-12-16 12:20:57 -08:00
Jay Sorg
d1bc5b0bf7 libxrdp: no logic change, tabs to spaces 2014-12-15 16:26:32 -08:00
speidy
5e89424129 libxrdp: fix for 'low' RDP security level (issue #202) 2014-12-15 22:12:16 +02:00
speidy
bf622c46a6 libxrdp: security layer, error handling 2014-12-13 16:36:23 +02:00
speidy
fb306e624e libxrdp: changes for security layer negotiation, 
security_layer=negotiate is working now
 2014-12-13 16:24:07 +02:00
speidy
52cac06092 libxrdp: delete NLA header detection for now, TLS is working now with 
mstsc
 2014-11-21 03:17:45 +02:00
Jay Sorg
605df27103 libxrdp: remove a global, remove some tabs 2014-11-06 16:51:39 -08:00
speidy
4015f526db work on tls mode 2014-08-22 09:13:33 +03:00
Jay Sorg
c7144744a4 security change for none 2014-08-05 14:41:59 -07:00
Jay Sorg
ffed349875 added option to set rdp crypto level to none 2014-08-05 12:28:54 -07:00
Jay Sorg
821bf3e2a5 no logic change, convert tabs to spaces 2014-08-05 11:59:52 -07:00
Jay Sorg
779f0bf470 add xrdp_keyboard.ini to Makefile.am 2014-07-31 21:54:16 -07:00
Jay Sorg
4ef60f163d load the rdp to X11 keybaord mappings from file 2014-07-31 16:17:19 -07:00
Laxmikant Rashinkar
0915d33d70 coverity: dead code 2014-07-26 15:06:35 -07:00
Idan Freiberg
16929efb05 Merge branch 'devel' of https://github.com/neutrinolabs/xrdp into 
devel

Conflicts:
	libxrdp/xrdp_sec.c
 2014-07-23 16:44:59 +03:00
Idan Freiberg
0795400fe2 libxrdp: mcs, delete temp hexdump 2014-07-23 15:51:21 +03:00
Idan Freiberg
5a0d1f028a libxrdp: work on TLS mode 2014-07-23 15:42:19 +03:00
Idan Freiberg
afdf638c7b libxrdp, common: work on TLS mode 2014-07-23 15:31:45 +03:00
speidy
1acdc3085e libxrdp: work on TLS mode, temporary changes 2014-07-21 07:00:12 +03:00
Jay Sorg
1291d2dbbe work on codec mode 2014-07-19 13:25:23 -07:00
Laxmikant Rashinkar
3bb31876e7 coverity: fixed resolution leak issues 2014-07-19 11:56:00 -07:00
Idan Freiberg
7ab1d887ae libxrdp: work on TLS support 2014-07-17 14:29:23 +03:00
Idan Freiberg
f0b6c6b1d1 libxrdp: started adding TLS support 2014-07-15 18:29:40 +03:00
Idan Freiberg
5fcf6beffa libxrdp: enforce server security layer when rdpNegData is not exists 2014-07-14 15:33:41 +03:00
speidy
194ad781ba libxrdp: another len fix 2014-07-12 07:19:02 +03:00
speidy
13a376ae38 libxrdp: fix off by one length indicator issue 2014-07-12 02:07:33 +03:00
Idan Freiberg
9795ce010a libxrdp: changes in rdp security layer negotiation 2014-07-10 15:40:16 +03:00
Idan Freiberg
9007deae6f libxrdp: added an option to enforce security layer in xrdp.ini 2014-07-09 15:33:39 +03:00
Jay Sorg
d9a91ca11b libxrdp: minor mppc compressor change 2014-07-04 13:56:57 -07:00
speidy
ba6c71fd37 libxrdp: iso: fixed a validation check in RDP_NEG_REQ (CORRELATION_INFO_PRESENT flag is sent by mac itap client by default from now) 2014-07-02 00:57:38 +03:00
Jay Sorg
57d492d79c libxrdp: fastpath fragmented mppc fix, make sure we have at least 16 bytes to compress 2014-06-30 18:22:37 -07:00
Jay Sorg
1ed0dffeb6 libxrdp: mppc fix when compressor fails 2014-06-30 01:22:26 -07:00
Jay Sorg
0cabb4a565 32 bpp compress the alpha, leave room for biggest 32 bpp data 2014-06-29 13:58:54 -07:00
Jay Sorg
faa0ab1f36 libxrdp: complete fastpath mppc compression 2014-06-28 20:53:05 -07:00
Jay Sorg
02d53436ec libxrdp: planar unroll delta 2014-06-23 20:41:29 -07:00
Jay Sorg
00806b55a6 libxrdp: planar compreesion, check for temp buffer limits 2014-06-22 20:01:49 -07:00
Idan Freiberg
34fc3d4aae libxrdp: changed the way we calculate gcc-response length, RSA 2048 working now with mstsc 2014-06-19 18:27:35 +03:00
Jay Sorg
bd810c0695 support 2048 bit RSA keys 2014-06-18 22:02:58 -07:00
Jay Sorg
a16b83ac8a libxrdp: remove some alloc / free 2014-06-18 21:10:15 -07:00
Jay Sorg
b142a59e69 libxrdp: changes for planar compression 2014-06-17 22:41:10 -07:00
Jay Sorg
ca6bec36e6 libxrdp: no logic change, fix warning, some optimize planar compression 2014-06-17 13:06:45 -07:00
Jay Sorg
aa35a32752 libxrdp: 32 bpp compression changes / fixes 2014-06-15 16:17:40 -07:00
Jay Sorg
e494f5367f libxrdp: planar(32 bit) compression working now 2014-06-15 13:59:25 -07:00
Jay Sorg
73bdb57ee2 more fixes for 32 bit color 2014-06-10 17:49:15 -07:00
Jay Sorg
5d49553919 work on 32 bit planar bitmap compressor 2014-06-10 16:25:54 -07:00
Jay Sorg
d672eb8995 no logic change, indent 2014-06-02 22:00:51 -07:00
speidy
702f76c078 libxrdp: xrdp_channel: don't change channel flags when 
CHANNEL_OPTION_SHOW_PROTOCOL flag exists.
[according to doc:
http://msdn.microsoft.com/en-us/library/cc240513.aspx]
 2014-04-21 16:57:06 +03:00
speidy
7e9e343d7c libxrdp: make sure jpeg quality is valid 2014-04-02 07:33:02 +03:00
Laxmikant Rashinkar
1b3dd12568 addec checks for TurboJPEG in autoconf 2014-03-23 17:45:40 -07:00
Jay Sorg
e840c8f335 libxrdp: memory leak fixes on error 2014-03-22 00:28:52 -07:00
Jay Sorg
ab73d48fb3 libxrdp: fix for fips and fragmented fastpath 2014-03-22 00:24:06 -07:00
Jay Sorg
6d7e315b0c work on surface command 2014-03-18 00:07:11 -07:00
Jay Sorg
63032b000d libxrdp: fix for when not compiling with turbo jpeg 2014-03-16 22:03:05 -07:00
Jay Sorg
50a1b1fdb9 work on codec mode jpeg 2014-03-16 21:56:27 -07:00
Jay Sorg
9414467af2 libxrdp: export jpeg compress for codec mode 2014-03-16 15:54:13 -07:00