packages/gnome-remote-desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: packages:3647d99a2edf763ffe8388118a620e3eb46f7237
Branches Tags
packages:main
...
compare: packages:f43bc68a95dce1ee89349a6950d729271869ffd1
Branches Tags
packages:main

10 Commits
3647d99a2e ... f43bc68a95

Author SHA1 Message Date
openeuler-ci-bot
f43bc68a95
!11 update to version 44.2 
From: @lwg99 
Reviewed-by: @open-bot 
Signed-off-by: @open-bot
 2023-11-29 07:30:39 +00:00
lwg K
d7cb1d8502 update to version 44.2 2023-11-23 13:51:15 +08:00
openeuler-ci-bot
7eabf8a811
!9 Update to 43.2 
From: @dwl301 
Reviewed-by: @zhang__3125 
Signed-off-by: @zhang__3125
 2023-02-20 11:03:09 +00:00
dwl301
cff2d66842 Update to 43.2 2023-01-31 19:31:29 +08:00
openeuler-ci-bot
52855ea4ce
!8 Update to 42.2 
From: @weijin-deng 
Reviewed-by: @zhang__3125 
Signed-off-by: @zhang__3125
 2022-06-28 10:04:40 +00:00
deng weijin
47189a3342 Update to 42.2 2022-06-28 17:36:53 +08:00
openeuler-ci-bot
21a7b6d68b
!7 Update to 42.0 
From: @weijin-deng 
Reviewed-by: @zhang__3125 
Signed-off-by: @zhang__3125
 2022-06-22 02:57:17 +00:00
deng weijin
6d73f8a9e6 Update to 42.0 2022-05-19 15:00:13 +08:00
openeuler-ci-bot
ccc02e1361
!6 Add gnome-remote-desktop.yaml 
From: @zhang__3125 
Reviewed-by: @dwl301 
Signed-off-by: @dwl301
 2022-04-20 15:30:34 +00:00
zhang__3125
57b7c0772c Add gnome-remote-desktop.yaml 2022-04-20 22:58:11 +08:00
7 changed files with 258 additions and 296 deletions
Show Stats Expand all files Collapse all files

71
0001-vnc-Copy-pixels-using-the-right-destination-stride.patch
View File

@ -1,71 +0,0 @@
From 81172effba7c70d3b2932c67be79a2924eae9d73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Mon, 12 Oct 2020 17:34:30 +0200
Subject: [PATCH] vnc: Copy pixels using the right destination stride
We're copying the pixels in a separate thread managed by PipeWire, and
in this thread, accessing the VNC framebuffer dimension and stride is
racy. Instead of fetching the dimension directly, pass the expected
width and get the stride it will eventually have.
Already before this patch, when the copied pixel end up on the main
thread and the dimension still doesn't match up, the frame will be
dropped.
---
src/grd-session-vnc.c | 5 +++--
src/grd-session-vnc.h | 3 ++-
src/grd-vnc-pipewire-stream.c | 5 +++--
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
index 69fb33d..f4835aa 100644
--- a/src/grd-session-vnc.c
+++ b/src/grd-session-vnc.c
@@ -535,9 +535,10 @@ grd_session_vnc_get_fd (GrdSessionVnc *session_vnc)
}
int
-grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc)
+grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
+ int width)
{
- return session_vnc->rfb_screen->paddedWidthInBytes;
+ return width * BGRX_BYTES_PER_PIXEL;
}
rfbClientPtr
diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
index 0d01ad3..ccd046c 100644
--- a/src/grd-session-vnc.h
+++ b/src/grd-session-vnc.h
@@ -60,7 +60,8 @@ void grd_session_vnc_move_cursor (GrdSessionVnc *session_vnc,
int grd_session_vnc_get_fd (GrdSessionVnc *session_vnc);
-int grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc);
+int grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
+ int width);
gboolean grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc);
diff --git a/src/grd-vnc-pipewire-stream.c b/src/grd-vnc-pipewire-stream.c
index 96dd7c9..82ceb9b 100644
--- a/src/grd-vnc-pipewire-stream.c
+++ b/src/grd-vnc-pipewire-stream.c
@@ -326,10 +326,11 @@ process_buffer (GrdVncPipeWireStream *stream,
int height;
int y;
- src_stride = buffer->datas[0].chunk->stride;
- dst_stride = grd_session_vnc_get_framebuffer_stride (stream->session);
height = stream->spa_format.size.height;
width = stream->spa_format.size.width;
+ src_stride = buffer->datas[0].chunk->stride;
+ dst_stride = grd_session_vnc_get_stride_for_width (stream->session,
+ width);
frame->data = g_malloc (height * dst_stride);
for (y = 0; y < height; y++)
--
2.28.0

80
0001-vnc-Drop-frames-if-client-is-gone.patch
View File

@ -1,80 +0,0 @@
From ab97841629f5f3f4fab9993b6255b6ae04828b9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 9 Sep 2020 10:14:20 +0200
Subject: [PATCH] vnc: Drop frames if client is gone
Frames from PipeWire are posted asynchronously from a I/O thread to the
main thread where they are turned into VNC frame updates and cursor
movements. On the other hand, sessions are closed asynchronously when
the VNC client disappears. If a frame ended up on the main thread after
a client disappeared but before the session and stream was closed, we'd
try to turn the new frames into VNC updates without a client being
available, causing use after free.
Fix this by dropping frames that happens during this time frame.
Closes: https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/issues/43
---
src/grd-session-vnc.c | 7 +++++++
src/grd-session-vnc.h | 2 ++
src/grd-vnc-pipewire-stream.c | 8 ++++++++
3 files changed, 17 insertions(+)
diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
index 813838a..a06d34d 100644
--- a/src/grd-session-vnc.c
+++ b/src/grd-session-vnc.c
@@ -209,6 +209,12 @@ maybe_queue_close_session_idle (GrdSessionVnc *session_vnc)
g_idle_add (close_session_idle, session_vnc);
}
+gboolean
+grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc)
+{
+ return !session_vnc->rfb_client;
+}
+
static void
handle_client_gone (rfbClientPtr rfb_client)
{
@@ -218,6 +224,7 @@ handle_client_gone (rfbClientPtr rfb_client)
grd_session_vnc_detach_source (session_vnc);
maybe_queue_close_session_idle (session_vnc);
+ session_vnc->rfb_client = NULL;
}
static void
diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
index 579a12a..07678c8 100644
--- a/src/grd-session-vnc.h
+++ b/src/grd-session-vnc.h
@@ -57,4 +57,6 @@ void grd_session_vnc_move_cursor (GrdSessionVnc *session_vnc,
int grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc);
+gboolean grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc);
+
#endif /* GRD_SESSION_VNC_H */
diff --git a/src/grd-vnc-pipewire-stream.c b/src/grd-vnc-pipewire-stream.c
index 78793c4..96dd7c9 100644
--- a/src/grd-vnc-pipewire-stream.c
+++ b/src/grd-vnc-pipewire-stream.c
@@ -234,6 +234,14 @@ do_render (struct spa_loop *loop,
if (!frame)
return 0;
+ if (grd_session_vnc_is_client_gone (stream->session))
+ {
+ g_free (frame->data);
+ g_clear_pointer (&frame->rfb_cursor, rfbFreeCursor);
+ g_free (frame);
+ return 0;
+ }
+
if (frame->rfb_cursor)
grd_session_vnc_set_cursor (stream->session, frame->rfb_cursor);
--
2.26.2

BIN
gnome-remote-desktop-0.1.9.tar.xz
View File

Binary file not shown.

BIN
gnome-remote-desktop-44.2.tar.xz Normal file
View File

Binary file not shown.

93
gnome-remote-desktop.spec
View File

@ -1,20 +1,47 @@
Name: gnome-remote-desktop %global systemd_unit gnome-remote-desktop.service
Version: 0.1.9
Release: 2
Summary: Screen share service of GNOME Remote Desktop
Name: gnome-remote-desktop
Version: 44.2
Release: 1
Summary: Screen share service of GNOME Remote Desktop
License: GPLv2+ License: GPLv2+
URL: https://gitlab.gnome.org/jadahl/gnome-remote-desktop URL: https://gitlab.gnome.org/jadahl/gnome-remote-desktop
Source0: https://download.gnome.org/sources/gnome-remote-desktop/0.1/%{name}-%{version}.tar.xz Source0: https://download.gnome.org/sources/%{name}/44/%{name}-%{version}.tar.xz
Patch00001: 0001-vnc-Drop-frames-if-client-is-gone.patch
Patch00002: 0001-vnc-Add-anonymous-TLS-encryption-support.patch Patch0: gnutls-anontls.patch
Patch00003: 0001-vnc-Copy-pixels-using-the-right-destination-stride.patch
BuildRequires: meson >= 0.47.0 pkgconfig pkgconfig(glib-2.0) >= 2.32 pkgconfig(gio-unix-2.0) >= 2.32 BuildRequires: asciidoc
BuildRequires: pkgconfig(libpipewire-0.3) >= 0.3.0 pkgconfig(libvncserver) >= 0.9.11-7 pkgconfig(libsecret-1) BuildRequires: gcc
BuildRequires: pkgconfig(libnotify) pkgconfig(gnutls) systemd pkgconfig(freerdp2) BuildRequires: meson >= 0.47.0
BuildRequires: systemd
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(epoxy)
BuildRequires: pkgconfig(ffnvcodec)
#BuildRequires: pkgconfig(fdk-aac)
BuildRequires: pkgconfig(freerdp2)
BuildRequires: pkgconfig(fuse3)
BuildRequires: pkgconfig(winpr2)
BuildRequires: pkgconfig(gbm)
BuildRequires: pkgconfig(glib-2.0) >= 2.68
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(gnutls)
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libpipewire-0.3)
BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(libvncserver) >= 0.9.11-7
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(xkbcommon)
BuildRequires: pkgconfig(tss2-esys)
BuildRequires: pkgconfig(tss2-mu)
BuildRequires: pkgconfig(tss2-rc)
BuildRequires: pkgconfig(tss2-tctildr)
Requires: pipewire >= 0.3.0 Requires: pipewire >= 0.3.0
Obsoletes: vino < 3.22.0-21
%description %description
GNOME Remote Desktop is a remote desktop daemon for GNOME using pipewire. GNOME Remote Desktop is a remote desktop daemon for GNOME using pipewire.
@ -22,30 +49,55 @@ GNOME Remote Desktop is a remote desktop daemon for GNOME using pipewire.
%autosetup -n %{name}-%{version} -p1 %autosetup -n %{name}-%{version} -p1
%build %build
%meson %meson \
%meson_build -Drdp=true \
-Dfdk_aac=false \
-Dsystemd=true \
-Dvnc=true
%meson_build
%install %install
%meson_install %meson_install
%find_lang %{name}
%post %post
%systemd_user_post gnome-remote-desktop.service %systemd_user_post %{systemd_unit}
%preun %preun
%systemd_user_preun gnome-remote-desktop.service %systemd_user_preun %{systemd_unit}
%postun %postun
%systemd_user_postun_with_restart gnome-remote-desktop.service %systemd_user_postun_with_restart %{systemd_unit}
%files %files -f %{name}.lang
%doc README COPYING %license COPYING
%doc README.md
%{_bindir}/grdctl
%{_libexecdir}/gnome-remote-desktop-daemon %{_libexecdir}/gnome-remote-desktop-daemon
%{_datadir}/glib-2.0/schemas/org.gnome.desktop.remote-desktop.{gschema.xml,enums.xml} %{_userunitdir}/%{systemd_unit}
%{_userunitdir}/gnome-remote-desktop.service %{_datadir}/glib-2.0/schemas/org.gnome.desktop.remote-desktop.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.desktop.remote-desktop.enums.xml
%{_datadir}/gnome-remote-desktop/
%{_mandir}/man1/grdctl.1*
%changelog %changelog
* Thu Nov 23 2023 lwg <liweiganga@uniontech.com> - 44.2-1
- update to version 44.2
* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 43.2-1
- Update to 43.2
* Fri Jun 24 2022 weijin deng <weijin.deng@turbolinux.com.cn> - 42.2-1
- Update to 42.2
* Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 42.0-1
- Update to 42.0
* Mon Apr 18 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 0.1.9-3
- Add gnome-remote-desktop.yaml
* Mon Sep 27 2021 Wenlong Ding <wenlong.ding@turbolinux.com.cn> - 0.1.9-2 * Mon Sep 27 2021 Wenlong Ding <wenlong.ding@turbolinux.com.cn> - 0.1.9-2
- Add 2 patch to fix core-dump when start gnome-remote-desktop.service - Add 2 patch to fix core-dump when start gnome-remote-desktop.service
@ -56,4 +108,3 @@ GNOME Remote Desktop is a remote desktop daemon for GNOME using pipewire.
* Wed Dec 11 2019 daiqianwen <daiqianwen@huawei.com> - 0.1.6-3 * Wed Dec 11 2019 daiqianwen <daiqianwen@huawei.com> - 0.1.6-3
- Package init - Package init

4
gnome-remote-desktop.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: gitlab.gnome
src_repo: gnome-remote-desktop
tag_prefix: ^v
separator: .

292
0001-vnc-Add-anonymous-TLS-encryption-support.patch → gnutls-anontls.patch
View File

@ -1,7 +1,7 @@
From 546151b4e15fd45901f38172435cd9aa63893727 Mon Sep 17 00:00:00 2001 From adf2ee8c9745b3aecd2b909de67b03b178b06f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com> From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 14 Jun 2018 12:21:37 +0200 Date: Thu, 14 Jun 2018 12:21:37 +0200
Subject: [PATCH 1/6] vnc: Add anonymous TLS encryption support Subject: [PATCH 1/7] vnc: Add anonymous TLS encryption support
Add support for encrypting the VNC connection using anonymous TLS. In Add support for encrypting the VNC connection using anonymous TLS. In
effect this means that the channel is encrypted using TLS but that no effect this means that the channel is encrypted using TLS but that no
@ -11,38 +11,38 @@ VNC connection.
--- ---
meson.build | 1 + meson.build | 1 +
src/grd-enums.h | 6 + src/grd-enums.h | 6 +
src/grd-session-vnc.c | 98 +++- src/grd-session-vnc.c | 120 ++++-
src/grd-session-vnc.h | 15 + src/grd-session-vnc.h | 17 +
src/grd-settings.c | 28 ++ src/grd-settings.c | 28 ++
src/grd-settings.h | 2 + src/grd-settings.h | 2 +
src/grd-vnc-server.c | 45 ++ src/grd-vnc-server.c | 47 ++
src/grd-vnc-tls.c | 444 ++++++++++++++++++ src/grd-vnc-tls.c | 444 ++++++++++++++++++
src/grd-vnc-tls.h | 28 ++ src/grd-vnc-tls.h | 28 ++
src/meson.build | 5 +- src/meson.build | 3 +
...nome.desktop.remote-desktop.gschema.xml.in | 10 + ...nome.desktop.remote-desktop.gschema.xml.in | 10 +
11 files changed, 666 insertions(+), 16 deletions(-) 11 files changed, 680 insertions(+), 26 deletions(-)
create mode 100644 src/grd-vnc-tls.c create mode 100644 src/grd-vnc-tls.c
create mode 100644 src/grd-vnc-tls.h create mode 100644 src/grd-vnc-tls.h
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index af423a4..813c97f 100644 index 70a3ef3..2a92588 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -20,6 +20,7 @@ libvncclient_dep = dependency('libvncclient') @@ -63,6 +63,7 @@ endif
libsecret_dep = dependency('libsecret-1') if have_vnc
libnotify_dep = dependency('libnotify') libvncclient_dep = dependency('libvncclient')
winpr_dep = dependency('winpr2', version: freerdp_req) libvncserver_dep = dependency('libvncserver')
+gnutls_dep = dependency('gnutls') + gnutls_dep = dependency('gnutls')
endif
cdata = configuration_data() prefix = get_option('prefix')
cdata.set_quoted('GETTEXT_PACKAGE', 'gnome-remote-desktop')
diff --git a/src/grd-enums.h b/src/grd-enums.h diff --git a/src/grd-enums.h b/src/grd-enums.h
index ffab821..4333863 100644 index 44b181d..de0d0f8 100644
--- a/src/grd-enums.h --- a/src/grd-enums.h
+++ b/src/grd-enums.h +++ b/src/grd-enums.h
@@ -27,4 +27,10 @@ typedef enum @@ -39,4 +39,10 @@ typedef enum
GRD_VNC_AUTH_METHOD_PASSWORD GRD_VNC_SCREEN_SHARE_MODE_EXTEND,
} GrdVncAuthMethod; } GrdVncScreenShareMode;
+typedef enum +typedef enum
+{ +{
@ -52,10 +52,10 @@ index ffab821..4333863 100644
+ +
#endif /* GRD_ENUMS_H */ #endif /* GRD_ENUMS_H */
diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
index a06d34d..d014315 100644 index d310706..d145b8d 100644
--- a/src/grd-session-vnc.c --- a/src/grd-session-vnc.c
+++ b/src/grd-session-vnc.c +++ b/src/grd-session-vnc.c
@@ -44,7 +44,9 @@ struct _GrdSessionVnc @@ -45,7 +45,9 @@ struct _GrdSessionVnc
{ {
GrdSession parent; GrdSession parent;
@ -65,7 +65,7 @@ index a06d34d..d014315 100644
GSource *source; GSource *source;
rfbScreenInfoPtr rfb_screen; rfbScreenInfoPtr rfb_screen;
rfbClientPtr rfb_client; rfbClientPtr rfb_client;
@@ -518,12 +520,30 @@ check_rfb_password (rfbClientPtr rfb_client, @@ -586,6 +588,12 @@ check_rfb_password (rfbClientPtr rfb_client,
} }
} }
@ -76,9 +76,10 @@ index a06d34d..d014315 100644
+} +}
+ +
int int
grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc) grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
{ int width)
return session_vnc->rfb_screen->paddedWidthInBytes; @@ -593,6 +601,18 @@ grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
return width * BGRX_BYTES_PER_PIXEL;
} }
+rfbClientPtr +rfbClientPtr
@ -96,7 +97,7 @@ index a06d34d..d014315 100644
static void static void
init_vnc_session (GrdSessionVnc *session_vnc) init_vnc_session (GrdSessionVnc *session_vnc)
{ {
@@ -564,33 +584,74 @@ init_vnc_session (GrdSessionVnc *session_vnc) @@ -667,44 +687,85 @@ init_vnc_session (GrdSessionVnc *session_vnc)
rfbProcessEvents (rfb_screen, 0); rfbProcessEvents (rfb_screen, 0);
} }
@ -131,6 +132,17 @@ index a06d34d..d014315 100644
+ session_vnc->pending_framebuffer_width, + session_vnc->pending_framebuffer_width,
+ session_vnc->pending_framebuffer_height); + session_vnc->pending_framebuffer_height);
+ session_vnc->pending_framebuffer_resize = FALSE; + session_vnc->pending_framebuffer_resize = FALSE;
+
+ /**
+ * This is a workaround. libvncserver is unable to handle clipboard
+ * changes early and either disconnects the client or crashes g-r-d
+ * if it receives rfbSendServerCutText too early altough the
+ * authentification process is already done.
+ * Doing this after resizing the framebuffer, seems to work fine,
+ * so enable the clipboard here and not when the remote desktop
+ * session proxy is acquired.
+ */
+ grd_clipboard_vnc_maybe_enable_clipboard (session_vnc->clipboard_vnc);
+ } + }
+ } + }
+ +
@ -172,6 +184,17 @@ index a06d34d..d014315 100644
- session_vnc->pending_framebuffer_width, - session_vnc->pending_framebuffer_width,
- session_vnc->pending_framebuffer_height); - session_vnc->pending_framebuffer_height);
- session_vnc->pending_framebuffer_resize = FALSE; - session_vnc->pending_framebuffer_resize = FALSE;
-
- /**
- * This is a workaround. libvncserver is unable to handle clipboard
- * changes early and either disconnects the client or crashes g-r-d
- * if it receives rfbSendServerCutText too early altough the
- * authentification process is already done.
- * Doing this after resizing the framebuffer, seems to work fine,
- * so enable the clipboard here and not when the remote desktop
- * session proxy is acquired.
- */
- grd_clipboard_vnc_maybe_enable_clipboard (session_vnc->clipboard_vnc);
- } - }
+ grd_session_stop (session); + grd_session_stop (session);
} }
@ -185,7 +208,7 @@ index a06d34d..d014315 100644
} }
return G_SOURCE_CONTINUE; return G_SOURCE_CONTINUE;
@@ -603,7 +664,10 @@ grd_session_vnc_attach_source (GrdSessionVnc *session_vnc) @@ -717,7 +778,10 @@ grd_session_vnc_attach_source (GrdSessionVnc *session_vnc)
socket = g_socket_connection_get_socket (session_vnc->connection); socket = g_socket_connection_get_socket (session_vnc->connection);
session_vnc->source = g_socket_create_source (socket, session_vnc->source = g_socket_create_source (socket,
@ -197,18 +220,21 @@ index a06d34d..d014315 100644
NULL); NULL);
g_source_set_callback (session_vnc->source, g_source_set_callback (session_vnc->source,
(GSourceFunc) handle_socket_data, (GSourceFunc) handle_socket_data,
@@ -629,8 +693,10 @@ grd_session_vnc_new (GrdVncServer *vnc_server, @@ -748,11 +812,13 @@ grd_session_vnc_new (GrdVncServer *vnc_server,
"context", context, "context", context,
NULL); NULL);
+ session_vnc->vnc_server = vnc_server; + session_vnc->vnc_server = vnc_server;
session_vnc->connection = g_object_ref (connection); session_vnc->connection = g_object_ref (connection);
settings = grd_context_get_settings (context);
session_vnc->screen_share_mode = grd_settings_get_vnc_screen_share_mode (settings);
+ grd_session_vnc_grab_socket (session_vnc, vnc_socket_grab_func); + grd_session_vnc_grab_socket (session_vnc, vnc_socket_grab_func);
grd_session_vnc_attach_source (session_vnc); grd_session_vnc_attach_source (session_vnc);
init_vnc_session (session_vnc); init_vnc_session (session_vnc);
@@ -645,6 +711,8 @@ grd_session_vnc_dispose (GObject *object) @@ -767,6 +833,8 @@ grd_session_vnc_dispose (GObject *object)
g_assert (!session_vnc->rfb_screen); g_assert (!session_vnc->rfb_screen);
@ -218,12 +244,12 @@ index a06d34d..d014315 100644
G_OBJECT_CLASS (grd_session_vnc_parent_class)->dispose (object); G_OBJECT_CLASS (grd_session_vnc_parent_class)->dispose (object);
diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
index 07678c8..bba3d56 100644 index be79cf4..ffc8d27 100644
--- a/src/grd-session-vnc.h --- a/src/grd-session-vnc.h
+++ b/src/grd-session-vnc.h +++ b/src/grd-session-vnc.h
@@ -36,6 +36,9 @@ G_DECLARE_FINAL_TYPE (GrdSessionVnc, @@ -37,6 +37,9 @@ G_DECLARE_FINAL_TYPE (GrdSessionVnc,
GRD, SESSION_VNC, GRD, SESSION_VNC,
GrdSession); GrdSession)
+typedef gboolean (* GrdVncSocketGrabFunc) (GrdSessionVnc *session_vnc, +typedef gboolean (* GrdVncSocketGrabFunc) (GrdSessionVnc *session_vnc,
+ GError **error); + GError **error);
@ -231,14 +257,14 @@ index 07678c8..bba3d56 100644
GrdSessionVnc *grd_session_vnc_new (GrdVncServer *vnc_server, GrdSessionVnc *grd_session_vnc_new (GrdVncServer *vnc_server,
GSocketConnection *connection); GSocketConnection *connection);
@@ -55,8 +58,20 @@ void grd_session_vnc_move_cursor (GrdSessionVnc *session_vnc, @@ -63,6 +66,20 @@ void grd_session_vnc_set_client_clipboard_text (GrdSessionVnc *session_vnc,
int x, int grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
int y); int width);
+int grd_session_vnc_get_fd (GrdSessionVnc *session_vnc); +int grd_session_vnc_get_fd (GrdSessionVnc *session_vnc);
+ +
int grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc); +int grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc);
+
gboolean grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc); gboolean grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc);
+rfbClientPtr grd_session_vnc_get_rfb_client (GrdSessionVnc *session_vnc); +rfbClientPtr grd_session_vnc_get_rfb_client (GrdSessionVnc *session_vnc);
@ -253,18 +279,18 @@ index 07678c8..bba3d56 100644
+ +
#endif /* GRD_SESSION_VNC_H */ #endif /* GRD_SESSION_VNC_H */
diff --git a/src/grd-settings.c b/src/grd-settings.c diff --git a/src/grd-settings.c b/src/grd-settings.c
index 3af87be..f37f2da 100644 index a95628f..15d2ad2 100644
--- a/src/grd-settings.c --- a/src/grd-settings.c
+++ b/src/grd-settings.c +++ b/src/grd-settings.c
@@ -60,6 +60,7 @@ struct _GrdSettings @@ -74,6 +74,7 @@ struct _GrdSettings
gboolean view_only;
GrdVncAuthMethod auth_method; GrdVncAuthMethod auth_method;
int port; int port;
GrdVncScreenShareMode screen_share_mode;
+ GrdVncEncryption encryption; + GrdVncEncryption encryption;
} vnc; } vnc;
}; };
@@ -232,6 +233,12 @@ grd_settings_get_vnc_auth_method (GrdSettings *settings) @@ -248,6 +249,12 @@ grd_settings_get_vnc_auth_method (GrdSettings *settings)
return settings->vnc.auth_method; return settings->vnc.auth_method;
} }
@ -275,9 +301,9 @@ index 3af87be..f37f2da 100644
+} +}
+ +
static void static void
update_rdp_tls_cert (GrdSettings *settings) update_screen_share_mode (GrdSettings *settings)
{ {
@@ -267,6 +274,13 @@ update_vnc_auth_method (GrdSettings *settings) @@ -313,6 +320,13 @@ update_vnc_auth_method (GrdSettings *settings)
"auth-method"); "auth-method");
} }
@ -291,7 +317,7 @@ index 3af87be..f37f2da 100644
static void static void
on_rdp_settings_changed (GSettings *rdp_settings, on_rdp_settings_changed (GSettings *rdp_settings,
const char *key, const char *key,
@@ -304,6 +318,11 @@ on_vnc_settings_changed (GSettings *vnc_settings, @@ -370,6 +384,11 @@ on_vnc_settings_changed (GSettings *vnc_settings,
update_vnc_auth_method (settings); update_vnc_auth_method (settings);
g_signal_emit (settings, signals[VNC_AUTH_METHOD_CHANGED], 0); g_signal_emit (settings, signals[VNC_AUTH_METHOD_CHANGED], 0);
} }
@ -302,8 +328,8 @@ index 3af87be..f37f2da 100644
+ } + }
} }
static void GrdSettings *
@@ -335,6 +354,8 @@ grd_settings_init (GrdSettings *settings) @@ -419,6 +438,8 @@ grd_settings_init (GrdSettings *settings)
settings->rdp.port = GRD_RDP_SERVER_PORT; settings->rdp.port = GRD_RDP_SERVER_PORT;
settings->vnc.port = GRD_VNC_SERVER_PORT; settings->vnc.port = GRD_VNC_SERVER_PORT;
@ -312,7 +338,7 @@ index 3af87be..f37f2da 100644
} }
static void static void
@@ -379,4 +400,11 @@ grd_settings_class_init (GrdSettingsClass *klass) @@ -491,4 +512,11 @@ grd_settings_class_init (GrdSettingsClass *klass)
0, 0,
NULL, NULL, NULL, NULL, NULL, NULL,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
@ -325,10 +351,10 @@ index 3af87be..f37f2da 100644
+ G_TYPE_NONE, 0); + G_TYPE_NONE, 0);
} }
diff --git a/src/grd-settings.h b/src/grd-settings.h diff --git a/src/grd-settings.h b/src/grd-settings.h
index e12e47e..b940fdb 100644 index 1fe6419..b45f839 100644
--- a/src/grd-settings.h --- a/src/grd-settings.h
+++ b/src/grd-settings.h +++ b/src/grd-settings.h
@@ -64,4 +64,6 @@ gboolean grd_settings_get_vnc_view_only (GrdSettings *settings); @@ -68,4 +68,6 @@ gboolean grd_settings_get_vnc_view_only (GrdSettings *settings);
GrdVncAuthMethod grd_settings_get_vnc_auth_method (GrdSettings *settings); GrdVncAuthMethod grd_settings_get_vnc_auth_method (GrdSettings *settings);
@ -336,10 +362,10 @@ index e12e47e..b940fdb 100644
+ +
#endif /* GRD_SETTINGS_H */ #endif /* GRD_SETTINGS_H */
diff --git a/src/grd-vnc-server.c b/src/grd-vnc-server.c diff --git a/src/grd-vnc-server.c b/src/grd-vnc-server.c
index a6d95cb..f9c68db 100644 index 70efab1..9280dfb 100644
--- a/src/grd-vnc-server.c --- a/src/grd-vnc-server.c
+++ b/src/grd-vnc-server.c +++ b/src/grd-vnc-server.c
@@ -24,11 +24,13 @@ @@ -24,12 +24,14 @@
#include "grd-vnc-server.h" #include "grd-vnc-server.h"
@ -348,12 +374,13 @@ index a6d95cb..f9c68db 100644
#include <rfb/rfb.h> #include <rfb/rfb.h>
#include "grd-context.h" #include "grd-context.h"
#include "grd-debug.h"
#include "grd-session-vnc.h" #include "grd-session-vnc.h"
+#include "grd-vnc-tls.h" +#include "grd-vnc-tls.h"
enum enum
@@ -130,6 +132,43 @@ on_incoming (GSocketService *service, {
@@ -129,6 +131,43 @@ on_incoming (GSocketService *service,
return TRUE; return TRUE;
} }
@ -397,13 +424,14 @@ index a6d95cb..f9c68db 100644
gboolean gboolean
grd_vnc_server_start (GrdVncServer *vnc_server, grd_vnc_server_start (GrdVncServer *vnc_server,
GError **error) GError **error)
@@ -220,12 +259,18 @@ static void @@ -216,11 +255,19 @@ grd_vnc_server_dispose (GObject *object)
static void
grd_vnc_server_constructed (GObject *object) grd_vnc_server_constructed (GObject *object)
{ {
GrdVncServer *vnc_server = GRD_VNC_SERVER (object); + GrdVncServer *vnc_server = GRD_VNC_SERVER (object);
+ GrdSettings *settings = grd_context_get_settings (vnc_server->context); + GrdSettings *settings = grd_context_get_settings (vnc_server->context);
+
if (grd_context_get_debug_flags (vnc_server->context) & GRD_DEBUG_VNC) if (grd_get_debug_flags () & GRD_DEBUG_VNC)
rfbLogEnable (1); rfbLogEnable (1);
else else
rfbLogEnable (0); rfbLogEnable (0);
@ -901,10 +929,10 @@ index 0000000..135ef8c
+ +
+#endif /* GRD_VNC_TLS_H */ +#endif /* GRD_VNC_TLS_H */
diff --git a/src/meson.build b/src/meson.build diff --git a/src/meson.build b/src/meson.build
index 1b6425d..17579b1 100644 index 9f9b9b7..bc82252 100644
--- a/src/meson.build --- a/src/meson.build
+++ b/src/meson.build +++ b/src/meson.build
@@ -33,6 +33,8 @@ daemon_sources = files([ @@ -153,10 +153,13 @@ if have_vnc
'grd-vnc-pipewire-stream.h', 'grd-vnc-pipewire-stream.h',
'grd-vnc-server.c', 'grd-vnc-server.c',
'grd-vnc-server.h', 'grd-vnc-server.h',
@ -912,23 +940,18 @@ index 1b6425d..17579b1 100644
+ 'grd-vnc-tls.h', + 'grd-vnc-tls.h',
]) ])
gen_daemon_sources = [] deps += [
@@ -66,7 +68,8 @@ executable('gnome-remote-desktop-daemon',
libvncserver_dep, libvncserver_dep,
libsecret_dep, + gnutls_dep,
libnotify_dep, ]
- winpr_dep], endif
+ winpr_dep,
+ gnutls_dep],
include_directories: [configinc],
install: true,
install_dir: libexecdir)
diff --git a/src/org.gnome.desktop.remote-desktop.gschema.xml.in b/src/org.gnome.desktop.remote-desktop.gschema.xml.in diff --git a/src/org.gnome.desktop.remote-desktop.gschema.xml.in b/src/org.gnome.desktop.remote-desktop.gschema.xml.in
index 4b6e593..0086d99 100644 index 5b39a5d..c6dc2ab 100644
--- a/src/org.gnome.desktop.remote-desktop.gschema.xml.in --- a/src/org.gnome.desktop.remote-desktop.gschema.xml.in
+++ b/src/org.gnome.desktop.remote-desktop.gschema.xml.in +++ b/src/org.gnome.desktop.remote-desktop.gschema.xml.in
@@ -49,5 +49,15 @@ @@ -116,5 +116,15 @@
* password - by requiring the remote client to provide a known password configuration updates.
</description> </description>
</key> </key>
+ <key name='encryption' flags='org.gnome.desktop.remote-desktop.GrdVncEncryption'> + <key name='encryption' flags='org.gnome.desktop.remote-desktop.GrdVncEncryption'>
@ -944,13 +967,13 @@ index 4b6e593..0086d99 100644
</schema> </schema>
</schemalist> </schemalist>
-- --
2.26.2 2.37.1
From 2e46518f421fd8704770bb6742accfacba3570aa Mon Sep 17 00:00:00 2001 From f91f9a17e8277f15a44720eb180bf22bd91307c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com> From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 27 Nov 2019 11:02:09 +0100 Date: Wed, 27 Nov 2019 11:02:09 +0100
Subject: [PATCH 2/6] session-vnc: Add paused/resumed signals Subject: [PATCH 2/7] session-vnc: Add paused/resumed signals
Paused is when the socket sourec is detached, and resumed when attached. Paused is when the socket sourec is detached, and resumed when attached.
Meant to be used by the TLS channel security to a attach/detach Meant to be used by the TLS channel security to a attach/detach
@ -960,10 +983,10 @@ out-of-socket source.
1 file changed, 65 insertions(+), 7 deletions(-) 1 file changed, 65 insertions(+), 7 deletions(-)
diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
index d014315..7edd407 100644 index d145b8d..e7a77d5 100644
--- a/src/grd-session-vnc.c --- a/src/grd-session-vnc.c
+++ b/src/grd-session-vnc.c +++ b/src/grd-session-vnc.c
@@ -40,14 +40,27 @@ @@ -41,14 +41,27 @@
#define BGRX_SAMPLES_PER_PIXEL 3 #define BGRX_SAMPLES_PER_PIXEL 3
#define BGRX_BYTES_PER_PIXEL 4 #define BGRX_BYTES_PER_PIXEL 4
@ -991,8 +1014,8 @@ index d014315..7edd407 100644
rfbScreenInfoPtr rfb_screen; rfbScreenInfoPtr rfb_screen;
rfbClientPtr rfb_client; rfbClientPtr rfb_client;
@@ -73,7 +86,7 @@ struct _GrdSessionVnc @@ -79,7 +92,7 @@ struct _GrdSessionVnc
G_DEFINE_TYPE (GrdSessionVnc, grd_session_vnc, GRD_TYPE_SESSION); G_DEFINE_TYPE (GrdSessionVnc, grd_session_vnc, GRD_TYPE_SESSION)
static void static void
-grd_session_vnc_detach_source (GrdSessionVnc *session_vnc); -grd_session_vnc_detach_source (GrdSessionVnc *session_vnc);
@ -1000,7 +1023,7 @@ index d014315..7edd407 100644
static gboolean static gboolean
close_session_idle (gpointer user_data); close_session_idle (gpointer user_data);
@@ -224,7 +237,8 @@ handle_client_gone (rfbClientPtr rfb_client) @@ -246,7 +259,8 @@ handle_client_gone (rfbClientPtr rfb_client)
g_debug ("VNC client gone"); g_debug ("VNC client gone");
@ -1010,7 +1033,7 @@ index d014315..7edd407 100644
maybe_queue_close_session_idle (session_vnc); maybe_queue_close_session_idle (session_vnc);
session_vnc->rfb_client = NULL; session_vnc->rfb_client = NULL;
} }
@@ -293,7 +307,7 @@ handle_new_client (rfbClientPtr rfb_client) @@ -315,7 +329,7 @@ handle_new_client (rfbClientPtr rfb_client)
session_vnc->prompt_cancellable, session_vnc->prompt_cancellable,
prompt_response_callback, prompt_response_callback,
session_vnc); session_vnc);
@ -1019,7 +1042,7 @@ index d014315..7edd407 100644
return RFB_CLIENT_ON_HOLD; return RFB_CLIENT_ON_HOLD;
case GRD_VNC_AUTH_METHOD_PASSWORD: case GRD_VNC_AUTH_METHOD_PASSWORD:
session_vnc->rfb_screen->passwordCheck = check_rfb_password; session_vnc->rfb_screen->passwordCheck = check_rfb_password;
@@ -511,7 +525,7 @@ check_rfb_password (rfbClientPtr rfb_client, @@ -579,7 +593,7 @@ check_rfb_password (rfbClientPtr rfb_client,
if (memcmp (challenge_encrypted, response_encrypted, len) == 0) if (memcmp (challenge_encrypted, response_encrypted, len) == 0)
{ {
grd_session_start (GRD_SESSION (session_vnc)); grd_session_start (GRD_SESSION (session_vnc));
@ -1028,8 +1051,8 @@ index d014315..7edd407 100644
return TRUE; return TRUE;
} }
else else
@@ -681,6 +695,36 @@ grd_session_vnc_detach_source (GrdSessionVnc *session_vnc) @@ -799,6 +813,36 @@ grd_session_vnc_detach_source (GrdSessionVnc *session_vnc)
g_clear_pointer (&session_vnc->source, g_source_destroy); g_clear_pointer (&session_vnc->source, g_source_unref);
} }
+gboolean +gboolean
@ -1065,7 +1088,7 @@ index d014315..7edd407 100644
GrdSessionVnc * GrdSessionVnc *
grd_session_vnc_new (GrdVncServer *vnc_server, grd_session_vnc_new (GrdVncServer *vnc_server,
GSocketConnection *connection) GSocketConnection *connection)
@@ -698,6 +742,7 @@ grd_session_vnc_new (GrdVncServer *vnc_server, @@ -820,6 +864,7 @@ grd_session_vnc_new (GrdVncServer *vnc_server,
grd_session_vnc_grab_socket (session_vnc, vnc_socket_grab_func); grd_session_vnc_grab_socket (session_vnc, vnc_socket_grab_func);
grd_session_vnc_attach_source (session_vnc); grd_session_vnc_attach_source (session_vnc);
@ -1073,7 +1096,7 @@ index d014315..7edd407 100644
init_vnc_session (session_vnc); init_vnc_session (session_vnc);
@@ -727,7 +772,7 @@ grd_session_vnc_stop (GrdSession *session) @@ -849,7 +894,7 @@ grd_session_vnc_stop (GrdSession *session)
g_clear_object (&session_vnc->pipewire_stream); g_clear_object (&session_vnc->pipewire_stream);
@ -1081,8 +1104,8 @@ index d014315..7edd407 100644
+ grd_session_vnc_pause (session_vnc); + grd_session_vnc_pause (session_vnc);
g_clear_object (&session_vnc->connection); g_clear_object (&session_vnc->connection);
g_clear_pointer (&session_vnc->rfb_screen->frameBuffer, g_free); g_clear_object (&session_vnc->clipboard_vnc);
@@ -783,8 +828,8 @@ grd_session_vnc_stream_ready (GrdSession *session, @@ -936,8 +981,8 @@ grd_session_vnc_stream_ready (GrdSession *session,
G_CALLBACK (on_pipewire_stream_closed), G_CALLBACK (on_pipewire_stream_closed),
session_vnc); session_vnc);
@ -1093,9 +1116,9 @@ index d014315..7edd407 100644
} }
static void static void
@@ -803,4 +848,17 @@ grd_session_vnc_class_init (GrdSessionVncClass *klass) @@ -958,4 +1003,17 @@ grd_session_vnc_class_init (GrdSessionVncClass *klass)
session_class->remote_desktop_session_started =
session_class->stop = grd_session_vnc_stop; grd_session_vnc_remote_desktop_session_started;
session_class->stream_ready = grd_session_vnc_stream_ready; session_class->stream_ready = grd_session_vnc_stream_ready;
+ +
+ signals[PAUSED] = g_signal_new ("paused", + signals[PAUSED] = g_signal_new ("paused",
@ -1112,13 +1135,13 @@ index d014315..7edd407 100644
+ G_TYPE_NONE, 0); + G_TYPE_NONE, 0);
} }
-- --
2.26.2 2.37.1
From b59c36ccf73939d32ccf5ab4eb47460a9fe415f3 Mon Sep 17 00:00:00 2001 From 5856f0b5da2b3f71d8424db96e777001a8250137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com> From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 27 Nov 2019 11:03:46 +0100 Date: Wed, 27 Nov 2019 11:03:46 +0100
Subject: [PATCH 3/6] session-vnc: Add grd_session_vnc_dispatch() helper Subject: [PATCH 3/7] session-vnc: Add grd_session_vnc_dispatch() helper
To be used by the TLS channel security to dispatch when there is data To be used by the TLS channel security to dispatch when there is data
available that is not visible to the socket source. available that is not visible to the socket source.
@ -1128,10 +1151,10 @@ available that is not visible to the socket source.
2 files changed, 18 insertions(+), 10 deletions(-) 2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
index 7edd407..29c94a1 100644 index e7a77d5..67308a2 100644
--- a/src/grd-session-vnc.c --- a/src/grd-session-vnc.c
+++ b/src/grd-session-vnc.c +++ b/src/grd-session-vnc.c
@@ -635,6 +635,21 @@ vnc_socket_grab_func (GrdSessionVnc *session_vnc, @@ -749,6 +749,21 @@ vnc_socket_grab_func (GrdSessionVnc *session_vnc,
return TRUE; return TRUE;
} }
@ -1153,7 +1176,7 @@ index 7edd407..29c94a1 100644
static gboolean static gboolean
handle_socket_data (GSocket *socket, handle_socket_data (GSocket *socket,
GIOCondition condition, GIOCondition condition,
@@ -651,16 +666,7 @@ handle_socket_data (GSocket *socket, @@ -765,16 +780,7 @@ handle_socket_data (GSocket *socket,
} }
else if (condition & G_IO_IN) else if (condition & G_IO_IN)
{ {
@ -1172,10 +1195,10 @@ index 7edd407..29c94a1 100644
else else
{ {
diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
index bba3d56..58f635c 100644 index ffc8d27..a86d61d 100644
--- a/src/grd-session-vnc.h --- a/src/grd-session-vnc.h
+++ b/src/grd-session-vnc.h +++ b/src/grd-session-vnc.h
@@ -72,6 +72,8 @@ void grd_session_vnc_grab_socket (GrdSessionVnc *session_vnc, @@ -80,6 +80,8 @@ void grd_session_vnc_grab_socket (GrdSessionVnc *session_vnc,
void grd_session_vnc_ungrab_socket (GrdSessionVnc *session_vnc, void grd_session_vnc_ungrab_socket (GrdSessionVnc *session_vnc,
GrdVncSocketGrabFunc grab_func); GrdVncSocketGrabFunc grab_func);
@ -1185,13 +1208,13 @@ index bba3d56..58f635c 100644
#endif /* GRD_SESSION_VNC_H */ #endif /* GRD_SESSION_VNC_H */
-- --
2.26.2 2.37.1
From 966b2ddbd1c03c9e20dc66e5ea9a2dfb39ba4bfa Mon Sep 17 00:00:00 2001 From b8a59836a2348ab10fed0ff1590e12690ea427de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com> From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 27 Nov 2019 11:05:13 +0100 Date: Wed, 27 Nov 2019 11:05:13 +0100
Subject: [PATCH 4/6] vnc/tls: Add some logging Subject: [PATCH 4/7] vnc/tls: Add some logging
Uses the log utility from libvncserver as it is related to the RFB Uses the log utility from libvncserver as it is related to the RFB
protocol rather than the session itself. protocol rather than the session itself.
@ -1262,13 +1285,13 @@ index ec4758e..ac6c35f 100644
{ {
g_warning ("TLS handshake failed: %s", error->message); g_warning ("TLS handshake failed: %s", error->message);
-- --
2.26.2 2.37.1
From e01d27dc9911f4d7ecfd232c7e389f4dabfd87de Mon Sep 17 00:00:00 2001 From 26a824eede76c1d06ac6eb11cb0dd016ec66c739 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com> From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 27 Nov 2019 11:07:40 +0100 Date: Wed, 27 Nov 2019 11:07:40 +0100
Subject: [PATCH 5/6] vnc/tls: Dispatch also when data is pending outside of Subject: [PATCH 5/7] vnc/tls: Dispatch also when data is pending outside of
the socket the socket
gnutls may have data available in its buffers, and we have our own peek gnutls may have data available in its buffers, and we have our own peek
@ -1282,10 +1305,10 @@ long as there is data to read in those buffers.
2 files changed, 86 insertions(+), 6 deletions(-) 2 files changed, 86 insertions(+), 6 deletions(-)
diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
index 58f635c..0d01ad3 100644 index a86d61d..5db388b 100644
--- a/src/grd-session-vnc.h --- a/src/grd-session-vnc.h
+++ b/src/grd-session-vnc.h +++ b/src/grd-session-vnc.h
@@ -72,6 +72,8 @@ void grd_session_vnc_grab_socket (GrdSessionVnc *session_vnc, @@ -80,6 +80,8 @@ void grd_session_vnc_grab_socket (GrdSessionVnc *session_vnc,
void grd_session_vnc_ungrab_socket (GrdSessionVnc *session_vnc, void grd_session_vnc_ungrab_socket (GrdSessionVnc *session_vnc,
GrdVncSocketGrabFunc grab_func); GrdVncSocketGrabFunc grab_func);
@ -1432,13 +1455,13 @@ index ac6c35f..312b6b9 100644
} }
-- --
2.26.2 2.37.1
From 682f3b4a8e985f00a00e761a086a15cb5e2b9b04 Mon Sep 17 00:00:00 2001 From 879b9a26595c338cee40aa919596e439be910f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com> From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 27 Nov 2019 16:48:00 +0100 Date: Wed, 27 Nov 2019 16:48:00 +0100
Subject: [PATCH 6/6] session-vnc: Set our own password handling function up Subject: [PATCH 6/7] session-vnc: Set our own password handling function up
front front
libvncserver decides whether to register a auth security handler libvncserver decides whether to register a auth security handler
@ -1454,10 +1477,10 @@ password prompt.
1 file changed, 2 insertions(+), 6 deletions(-) 1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
index 29c94a1..ebe1540 100644 index 67308a2..39b3a56 100644
--- a/src/grd-session-vnc.c --- a/src/grd-session-vnc.c
+++ b/src/grd-session-vnc.c +++ b/src/grd-session-vnc.c
@@ -91,11 +91,6 @@ grd_session_vnc_pause (GrdSessionVnc *session_vnc); @@ -97,11 +97,6 @@ grd_session_vnc_pause (GrdSessionVnc *session_vnc);
static gboolean static gboolean
close_session_idle (gpointer user_data); close_session_idle (gpointer user_data);
@ -1469,7 +1492,7 @@ index 29c94a1..ebe1540 100644
static void static void
swap_uint8 (uint8_t *a, swap_uint8 (uint8_t *a,
uint8_t *b) uint8_t *b)
@@ -310,7 +305,6 @@ handle_new_client (rfbClientPtr rfb_client) @@ -332,7 +327,6 @@ handle_new_client (rfbClientPtr rfb_client)
grd_session_vnc_pause (session_vnc); grd_session_vnc_pause (session_vnc);
return RFB_CLIENT_ON_HOLD; return RFB_CLIENT_ON_HOLD;
case GRD_VNC_AUTH_METHOD_PASSWORD: case GRD_VNC_AUTH_METHOD_PASSWORD:
@ -1477,9 +1500,9 @@ index 29c94a1..ebe1540 100644
/* /*
* authPasswdData needs to be non NULL in libvncserver to trigger * authPasswdData needs to be non NULL in libvncserver to trigger
* password authentication. * password authentication.
@@ -594,6 +588,8 @@ init_vnc_session (GrdSessionVnc *session_vnc) @@ -697,6 +691,8 @@ init_vnc_session (GrdSessionVnc *session_vnc)
rfb_screen->frameBuffer = g_malloc0 (screen_width * screen_height * 4); session_vnc->monitor_config->connectors = connectors;
memset (rfb_screen->frameBuffer, 0x1f, screen_width * screen_height * 4); }
+ rfb_screen->passwordCheck = check_rfb_password; + rfb_screen->passwordCheck = check_rfb_password;
+ +
@ -1487,5 +1510,40 @@ index 29c94a1..ebe1540 100644
rfbProcessEvents (rfb_screen, 0); rfbProcessEvents (rfb_screen, 0);
} }
-- --
2.26.2 2.37.1
From 7b0523bd3f6981225d2614956f297a698e846c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Mon, 12 Oct 2020 17:34:30 +0200
Subject: [PATCH 7/7] vnc: Copy pixels using the right destination stride
We're copying the pixels in a separate thread managed by PipeWire, and
in this thread, accessing the VNC framebuffer dimension and stride is
racy. Instead of fetching the dimension directly, pass the expected
width and get the stride it will eventually have.
Already before this patch, when the copied pixel end up on the main
thread and the dimension still doesn't match up, the frame will be
dropped.
---
src/grd-session-vnc.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
index 5db388b..c4f4e8d 100644
--- a/src/grd-session-vnc.h
+++ b/src/grd-session-vnc.h
@@ -68,7 +68,8 @@ int grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
int grd_session_vnc_get_fd (GrdSessionVnc *session_vnc);
-int grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc);
+int grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
+ int width);
gboolean grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc);
--
2.37.1