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

Update to 42.0

Browse Source
This commit is contained in:
deng weijin 2022-05-19 15:00:13 +08:00
parent ccc02e1361
commit 6d73f8a9e6
7 changed files with 425 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
0001-Add-man-page.patch Normal file
View File

@ -0,0 +1,220 @@
From 712d6a036cfb6b49ad35d4d27ba8255f5fef36b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Mon, 14 Mar 2022 10:38:55 +0100
Subject: [PATCH] Add man page
Uses asciidoc; the stylesheet was copied from gnome-shell.
---
.gitlab-ci.yml | 3 +-
man/grdctl.txt | 88 ++++++++++++++++++++++++++++++++++++++++++++++
man/meson.build | 9 +++++
man/stylesheet.xsl | 27 ++++++++++++++
meson.build | 5 +++
meson_options.txt | 5 +++
6 files changed, 136 insertions(+), 1 deletion(-)
create mode 100644 man/grdctl.txt
create mode 100644 man/meson.build
create mode 100644 man/stylesheet.xsl
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f261657..735bb64 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ stages:
.gnome-remote-desktop.fedora:35@common:
variables:
FDO_DISTRIBUTION_VERSION: 35
- BASE_TAG: '2022-02-11.0'
+ BASE_TAG: '2022-03-14.0'
FDO_UPSTREAM_REPO: GNOME/gnome-remote-desktop
FDO_DISTRIBUTION_EXEC: |
dnf -y update && dnf -y upgrade &&
@@ -21,6 +21,7 @@ stages:
dnf builddep -y gnome-remote-desktop &&
dnf install -y 'pkgconfig(epoxy)' 'pkgconfig(libdrm)' 'pkgconfig(gbm)' \
'pkgconfig(gudev-1.0)' &&
+ dnf install -y asciidoc &&
# To test
dnf install -y 'pkgconfig(libvncclient)' &&
diff --git a/man/grdctl.txt b/man/grdctl.txt
new file mode 100644
index 0000000..83777da
--- /dev/null
+++ b/man/grdctl.txt
@@ -0,0 +1,88 @@
+GRDCTL(1)
+=========
+:man manual: User Commands
+:man source: GNOME-REMOTE-DESKTOP
+:doctype: manpage
+:date: March 2022
+
+NAME
+----
+grdctl - Command line tool for configuring GNOME Remote Desktop
+
+SYNOPSIS
+--------
+*grdctl* ['OPTION'...] ['COMMAND'] ['SUBCOMMAND'...]
+
+DESCRIPTION
+-----------
+grdctl provides methods for configuring the GNOME Remote Desktop service,
+for example setting credentials.
+
+OPTIONS
+-------
+*--help*::
+Show help text.
+
+GENERAL COMMANDS
+----------------
+*status*::
+Show current status.
+
+RDP COMMANDS
+------------
+*rdp* *enable*::
+Enable the RDP backend.
+
+*rdp* *disable*::
+Disable the RDP backend.
+
+*rdp* *set-tls-cert* 'TLS-CERT'::
+Set path to TLS certificate.
+
+*rdp* *set-tls-key* 'TLS-KEY'::
+Set path to TLS key.
+
+*rdp* *set-credentials* 'USERNAME' 'PASSWORD'::
+Set username and password credentials.
+
+*rdp* *clear-credentials*::
+Clear username and password credentials.
+
+*rdp* *enable-view-only*::
+Disable remote control of input devices.
+
+*rdp* *disable-view-only*::
+Enable remote control of input devices.
+
+VNC COMMANDS
+------------
+*vnc* *enable*::
+Enable the VNC backend.
+
+*vnc* *disable*::
+Disable the VNC backend.
+
+*vnc* *set-password* 'PASSWORD'::
+Set the VNC password.
+
+*vnc* *clear-password*::
+Clear the VNC password.
+
+*vnc* *set-auth-method* 'AUTH-METHOD'::
+Set the authorization method used for new VNC connections. Can be either
+*password* or *prompt*.
+
+*vnc* *enable-view-only*:
+Disable remote control of input devices.
+
+*vnc* *disable-view-only*::
+Enable remote control of input devices.
+
+BUGS
+----
+The bug tracker can be reached by visiting the website
+https://gitlab.gnome.org/GNOME/gnome-remote-desktop/issues. Before sending
+a bug report, please verify that you have the latest version of
+gnome-remote-desktop. Many bugs (major and minor) are fixed at each
+release, and if yours is out of date, the problem may already have been
+solved.
diff --git a/man/meson.build b/man/meson.build
new file mode 100644
index 0000000..1e73f11
--- /dev/null
+++ b/man/meson.build
@@ -0,0 +1,9 @@
+a2x = find_program('a2x')
+
+custom_target('man page',
+ input: ['grdctl.txt', 'stylesheet.xsl'],
+ output: 'grdctl.1',
+ command: [a2x, '-v', '-D', '@OUTDIR@', '--xsl-file', '@INPUT1@', '-f' ,'manpage', '@INPUT0@'],
+ install_dir: mandir + '/man1',
+ install: true
+)
diff --git a/man/stylesheet.xsl b/man/stylesheet.xsl
new file mode 100644
index 0000000..047bd1b
--- /dev/null
+++ b/man/stylesheet.xsl
@@ -0,0 +1,27 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'>
+<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"/>
+
+<xsl:template match="variablelist/title">
+ <xsl:text>.PP&#10;</xsl:text>
+ <xsl:call-template name="bold">
+ <xsl:with-param name="node" select="."/>
+ <xsl:with-param name="context" select=".."/>
+ </xsl:call-template>
+ <xsl:text>&#10;</xsl:text>
+</xsl:template>
+
+<xsl:template match="varlistentry[preceding-sibling::title]">
+ <xsl:if test="not(preceding-sibling::varlistentry)">
+ <xsl:text>.RS 4&#10;</xsl:text>
+ <!-- comment out the leading .PP added by the original template -->
+ <xsl:text>.\"</xsl:text>
+ </xsl:if>
+ <xsl:apply-imports/>
+ <xsl:if test="position() = last()">
+ <xsl:text>.RE&#10;</xsl:text>
+ </xsl:if>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/meson.build b/meson.build
index 6bd2420..0660cd0 100644
--- a/meson.build
+++ b/meson.build
@@ -55,6 +55,7 @@ endif
prefix = get_option('prefix')
libexecdir = join_paths(prefix, get_option('libexecdir'))
datadir = join_paths(prefix, get_option('datadir'))
+mandir = join_paths(prefix, get_option('mandir'))
schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
grd_datadir = join_paths(datadir, 'gnome-remote-desktop')
@@ -93,6 +94,10 @@ subdir('src')
subdir('tests')
subdir('po')
+if get_option('man')
+ subdir('man')
+endif
+
meson.add_install_script('meson_post_install.py')
output = [
diff --git a/meson_options.txt b/meson_options.txt
index 3527588..2897f30 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,8 @@
+option('man',
+ type: 'boolean',
+ value: true,
+ description: 'Generate man pages')
+
option('rdp',
type: 'boolean',
value: true,
--
2.34.1

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-42.0.tar.xz Normal file
View File

Binary file not shown.

60
gnome-remote-desktop.spec
View File

@ -1,19 +1,35 @@
Name: gnome-remote-desktop %global systemd_unit gnome-remote-desktop.service
Version: 0.1.9
Release: 3
Summary: Screen share service of GNOME Remote Desktop
Name: gnome-remote-desktop
Version: 42.0
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/gnome-remote-desktop/40/%{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 Patch1: 0001-Add-man-page.patch
BuildRequires: meson >= 0.47.0 pkgconfig pkgconfig(glib-2.0) >= 2.32 pkgconfig(gio-unix-2.0) >= 2.32
BuildRequires: pkgconfig(libpipewire-0.3) >= 0.3.0 pkgconfig(libvncserver) >= 0.9.11-7 pkgconfig(libsecret-1) BuildRequires: meson pkgconfig gcc asciidoc systemd freerdp-devel
BuildRequires: pkgconfig(libnotify) pkgconfig(gnutls) systemd pkgconfig(freerdp2) BuildRequires: pkgconfig(glib-2.0) >= 2.32 pkgconfig(gio-unix-2.0) >= 2.32
BuildRequires: pkgconfig(libpipewire-0.3) >= 0.3.0 pkgconfig(libvncserver) pkgconfig(libvncclient) pkgconfig(libsecret-1)
BuildRequires: pkgconfig(libnotify) pkgconfig(gnutls) pkgconfig(gstreamer-1.0) pkgconfig(gstreamer-video-1.0)
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(winpr2)
BuildRequires: pkgconfig(fuse3)
BuildRequires: pkgconfig(ffnvcodec)
BuildRequires: pkgconfig(xkbcommon)
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(epoxy)
BuildRequires: pkgconfig(gbm)
BuildRequires: pkgconfig(gudev-1.0)
Requires: pipewire >= 0.3.0 Requires: pipewire >= 0.3.0
Requires: libdrm
Requires: libepoxy
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.
@ -25,27 +41,35 @@ GNOME Remote Desktop is a remote desktop daemon for GNOME using pipewire.
%meson %meson
%meson_build %meson_build
%install %install
%meson_install %meson_install
%find_lang gnome-remote-desktop
%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 gnome-remote-desktop.lang
%doc README COPYING %license COPYING
%doc README
%{_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}/gnome-remote-desktop.service %{_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
* 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 * Mon Apr 18 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 0.1.9-3
- Add gnome-remote-desktop.yaml - Add gnome-remote-desktop.yaml

273
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 6ca82648e9b6791fbfbbbc9b05f15ec07a992e1a 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,36 +11,36 @@ 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 | 45 ++
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, 678 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 6bd2420..d6c5d9b 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -20,6 +20,7 @@ libvncclient_dep = dependency('libvncclient') @@ -50,6 +50,7 @@ endif
libsecret_dep = dependency('libsecret-1') if have_vnc
libnotify_dep = dependency('libnotify') libvncserver_dep = dependency('libvncserver')
winpr_dep = dependency('winpr2', version: freerdp_req) libvncclient_dep = dependency('libvncclient')
+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 e3ecc40..fa8dfb7 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 @@ -33,4 +33,10 @@ typedef enum
GRD_VNC_AUTH_METHOD_PASSWORD GRD_VNC_AUTH_METHOD_PASSWORD
} GrdVncAuthMethod; } GrdVncAuthMethod;
@ -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 a4cb958..c2e29b4 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, @@ -543,6 +545,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; @@ -550,6 +558,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) @@ -593,44 +613,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) @@ -643,7 +704,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,7 +220,7 @@ 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, @@ -669,8 +733,10 @@ grd_session_vnc_new (GrdVncServer *vnc_server,
"context", context, "context", context,
NULL); NULL);
@ -208,7 +231,7 @@ index a06d34d..d014315 100644
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) @@ -685,6 +751,8 @@ grd_session_vnc_dispose (GObject *object)
g_assert (!session_vnc->rfb_screen); g_assert (!session_vnc->rfb_screen);
@ -218,12 +241,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 fcc508d..092d9dc 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, @@ -36,6 +36,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 +254,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, @@ -62,6 +65,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,10 +276,10 @@ 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 c8f28fb..502d956 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 @@ -69,6 +69,7 @@ struct _GrdSettings
gboolean view_only; gboolean view_only;
GrdVncAuthMethod auth_method; GrdVncAuthMethod auth_method;
int port; int port;
@ -264,7 +287,7 @@ index 3af87be..f37f2da 100644
} vnc; } vnc;
}; };
@@ -232,6 +233,12 @@ grd_settings_get_vnc_auth_method (GrdSettings *settings) @@ -245,6 +246,12 @@ grd_settings_get_vnc_auth_method (GrdSettings *settings)
return settings->vnc.auth_method; return settings->vnc.auth_method;
} }
@ -275,9 +298,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) @@ -303,6 +310,13 @@ update_vnc_auth_method (GrdSettings *settings)
"auth-method"); "auth-method");
} }
@ -291,7 +314,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, @@ -355,6 +369,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);
} }
@ -303,7 +326,7 @@ index 3af87be..f37f2da 100644
} }
static void static void
@@ -335,6 +354,8 @@ grd_settings_init (GrdSettings *settings) @@ -392,6 +411,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 +335,7 @@ index 3af87be..f37f2da 100644
} }
static void static void
@@ -379,4 +400,11 @@ grd_settings_class_init (GrdSettingsClass *klass) @@ -457,4 +478,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 +348,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 449894a..900d81e 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); @@ -65,4 +65,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,7 +359,7 @@ 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 0b4322d..e8833f1 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,11 +24,13 @@
@ -353,7 +376,7 @@ index a6d95cb..f9c68db 100644
enum enum
@@ -130,6 +132,43 @@ on_incoming (GSocketService *service, @@ -129,6 +131,43 @@ on_incoming (GSocketService *service,
return TRUE; return TRUE;
} }
@ -397,7 +420,7 @@ 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 @@ -217,12 +256,18 @@ 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);
@ -901,34 +924,29 @@ 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 1d671d7..ab675ff 100644
--- a/src/meson.build --- a/src/meson.build
+++ b/src/meson.build +++ b/src/meson.build
@@ -33,6 +33,8 @@ daemon_sources = files([ @@ -115,10 +115,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',
+ 'grd-vnc-tls.c', + 'grd-vnc-tls.c',
+ 'grd-vnc-tls.h', + 'grd-vnc-tls.h',
]) ])
deps += [
libvncserver_dep,
+ gnutls_dep,
]
endif
gen_daemon_sources = []
@@ -66,7 +68,8 @@ executable('gnome-remote-desktop-daemon',
libvncserver_dep,
libsecret_dep,
libnotify_dep,
- winpr_dep],
+ 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 939b9a6..e57affb 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 @@ @@ -90,5 +90,15 @@
* password - by requiring the remote client to provide a known password * password - by requiring the remote client to provide a known password
</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 +962,13 @@ index 4b6e593..0086d99 100644
</schema> </schema>
</schemalist> </schemalist>
-- --
2.26.2 2.34.1
From 2e46518f421fd8704770bb6742accfacba3570aa Mon Sep 17 00:00:00 2001 From 212fa98088cb4a754bac8cdb3a69d2a3e6b4dff9 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 +978,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 c2e29b4..4be4c49 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 +1009,8 @@ index d014315..7edd407 100644
rfbScreenInfoPtr rfb_screen; rfbScreenInfoPtr rfb_screen;
rfbClientPtr rfb_client; rfbClientPtr rfb_client;
@@ -73,7 +86,7 @@ struct _GrdSessionVnc @@ -77,7 +90,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 +1018,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) @@ -236,7 +249,8 @@ handle_client_gone (rfbClientPtr rfb_client)
g_debug ("VNC client gone"); g_debug ("VNC client gone");
@ -1010,7 +1028,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) @@ -305,7 +319,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 +1037,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, @@ -536,7 +550,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,7 +1046,7 @@ index d014315..7edd407 100644
return TRUE; return TRUE;
} }
else else
@@ -681,6 +695,36 @@ grd_session_vnc_detach_source (GrdSessionVnc *session_vnc) @@ -721,6 +735,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_destroy);
} }
@ -1065,7 +1083,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, @@ -738,6 +782,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 +1091,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) @@ -767,7 +812,7 @@ grd_session_vnc_stop (GrdSession *session)
g_clear_object (&session_vnc->pipewire_stream); g_clear_object (&session_vnc->pipewire_stream);
@ -1081,8 +1099,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, @@ -827,8 +872,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 +1111,9 @@ index d014315..7edd407 100644
} }
static void static void
@@ -803,4 +848,17 @@ grd_session_vnc_class_init (GrdSessionVncClass *klass) @@ -849,4 +894,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 +1130,13 @@ index d014315..7edd407 100644
+ G_TYPE_NONE, 0); + G_TYPE_NONE, 0);
} }
-- --
2.26.2 2.34.1
From b59c36ccf73939d32ccf5ab4eb47460a9fe415f3 Mon Sep 17 00:00:00 2001 From db1ce3962bbe49491b87cb0a4a90de41614e118b 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 +1146,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 4be4c49..9708de0 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, @@ -675,6 +675,21 @@ vnc_socket_grab_func (GrdSessionVnc *session_vnc,
return TRUE; return TRUE;
} }
@ -1153,7 +1171,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, @@ -691,16 +706,7 @@ handle_socket_data (GSocket *socket,
} }
else if (condition & G_IO_IN) else if (condition & G_IO_IN)
{ {
@ -1172,10 +1190,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 092d9dc..e9eced0 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, @@ -79,6 +79,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 +1203,13 @@ index bba3d56..58f635c 100644
#endif /* GRD_SESSION_VNC_H */ #endif /* GRD_SESSION_VNC_H */
-- --
2.26.2 2.34.1
From 966b2ddbd1c03c9e20dc66e5ea9a2dfb39ba4bfa Mon Sep 17 00:00:00 2001 From d6115fc524886ba716ba22464743c1a72472ff75 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 +1280,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.34.1
From e01d27dc9911f4d7ecfd232c7e389f4dabfd87de Mon Sep 17 00:00:00 2001 From c71c9d295a2921014d55820042fc8bdad02df19c 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 +1300,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 e9eced0..8a916b7 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, @@ -79,6 +79,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 +1450,13 @@ index ac6c35f..312b6b9 100644
} }
-- --
2.26.2 2.34.1
From 682f3b4a8e985f00a00e761a086a15cb5e2b9b04 Mon Sep 17 00:00:00 2001 From edc2380304d19e1bea58b079b943bad42cac5d69 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 +1472,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 9708de0..bc60285 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); @@ -95,11 +95,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 +1487,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) @@ -322,7 +317,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,7 +1495,7 @@ 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) @@ -623,6 +617,8 @@ init_vnc_session (GrdSessionVnc *session_vnc)
rfb_screen->frameBuffer = g_malloc0 (screen_width * screen_height * 4); rfb_screen->frameBuffer = g_malloc0 (screen_width * screen_height * 4);
memset (rfb_screen->frameBuffer, 0x1f, screen_width * screen_height * 4); memset (rfb_screen->frameBuffer, 0x1f, screen_width * screen_height * 4);
@ -1487,5 +1505,40 @@ index 29c94a1..ebe1540 100644
rfbProcessEvents (rfb_screen, 0); rfbProcessEvents (rfb_screen, 0);
} }
-- --
2.26.2 2.34.1
From 539d2c562b8068f1f698468cb87b36b4968c1517 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 8a916b7..e85f31e 100644
--- a/src/grd-session-vnc.h
+++ b/src/grd-session-vnc.h
@@ -67,7 +67,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.34.1