Rebuild for updated FreeRDP

Copy using the right destination stride
Related: https://bugzilla.redhat.com/show_bug.cgi?id=1882718
2021-11-10 19:43:42 +01:00 · 2020-10-12 18:52:54 +02:00 · 2020-09-14 11:02:44 +02:00
8 changed files with 770 additions and 191 deletions
--- a/0001-meson.build-Bump-pipewire-requirement-to-0.2.2.patch
+++ b/0001-meson.build-Bump-pipewire-requirement-to-0.2.2.patch
@ -1,25 +0,0 @@
-From 8f760d73df6011330cd09da7ca7b8a3f40c9a3ef Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
-Date: Tue, 7 Aug 2018 13:35:43 +0200
-Subject: [PATCH] meson.build: Bump pipewire requirement to 0.2.2
-
---
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 6951b89..34ec5ea 100644
--- a/meson.build
-+++ b/meson.build
-@@ -10,7 +10,7 @@ gnome = import('gnome')
- glib_dep = dependency('glib-2.0')
- gio_dep = dependency('gio-2.0')
- gio_unix_dep = dependency('gio-unix-2.0')
-pipewire_dep = dependency('libpipewire-0.1')
-+pipewire_dep = dependency('libpipewire-0.2', version: '>= 0.2.2')
- systemd_dep = dependency('systemd')
- libvncserver_dep = dependency('libvncserver')
- libsecret_dep = dependency('libsecret-1')
-- 
-2.17.1
-
--- a/0001-session-vnc-Don-t-requeue-close-session-idle.patch
+++ b/0001-session-vnc-Don-t-requeue-close-session-idle.patch
@ -1,84 +0,0 @@
-From add0ea34fd1d6835c99aebeb4e56b805b38e53ec Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
-Date: Mon, 1 Oct 2018 18:02:39 +0200
-Subject: [PATCH 1/2] session/vnc: Don't requeue close session idle
-
-If being closed due to a PipeWire error, RFB will still process state
-and invoke callbacks when cleaning up the RFB screen, meaning we'd
-requeue the close session idle handler. Avoid this by avoiding
-requeueing if there is already one queued, and don't mark is as unqueued
-until after actually stopping the session.
---
- src/grd-session-vnc.c | 28 ++++++++++++++++++----------
- 1 file changed, 18 insertions(+), 10 deletions(-)
-
-diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
-index ce4dd29..3c98eeb 100644
--- a/src/grd-session-vnc.c
-+++ b/src/grd-session-vnc.c
-@@ -165,6 +165,16 @@ grd_session_vnc_draw_buffer (GrdSessionVnc *session_vnc,
-   rfbProcessEvents (session_vnc->rfb_screen, 0);
- }
- 
-+static void
-+maybe_queue_close_session_idle (GrdSessionVnc *session_vnc)
-+{
-+  if (session_vnc->close_session_idle_id)
-+    return;
-+
-+  session_vnc->close_session_idle_id =
-+    g_idle_add (close_session_idle, session_vnc);
-+}
-+
- static void
- handle_client_gone (rfbClientPtr rfb_client)
- {
-@@ -172,8 +182,7 @@ handle_client_gone (rfbClientPtr rfb_client)
- 
-   g_debug ("VNC client gone");
- 
-  session_vnc->close_session_idle_id =
-    g_idle_add (close_session_idle, session_vnc);
-+  maybe_queue_close_session_idle (session_vnc);
- }
- 
- static void
-@@ -670,12 +679,6 @@ grd_session_vnc_stop (GrdSession *session)
- 
-   g_debug ("Stopping VNC session");
- 
-  if (session_vnc->close_session_idle_id)
-    {
-      g_source_remove (session_vnc->close_session_idle_id);
-      session_vnc->close_session_idle_id = 0;
-    }
-
-   g_clear_object (&session_vnc->pipewire_stream);
- 
-   grd_session_vnc_detach_source (session_vnc);
-@@ -683,6 +686,12 @@ grd_session_vnc_stop (GrdSession *session)
-   g_clear_object (&session_vnc->connection);
-   g_clear_pointer (&session_vnc->rfb_screen->frameBuffer, g_free);
-   g_clear_pointer (&session_vnc->rfb_screen, (GDestroyNotify) rfbScreenCleanup);
-+
-+  if (session_vnc->close_session_idle_id)
-+    {
-+      g_source_remove (session_vnc->close_session_idle_id);
-+      session_vnc->close_session_idle_id = 0;
-+    }
- }
- 
- static gboolean
-@@ -703,8 +712,7 @@ on_pipwire_stream_closed (GrdVncPipeWireStream *stream,
- {
-   g_warning ("PipeWire stream closed, closing client");
- 
-  session_vnc->close_session_idle_id =
-    g_idle_add (close_session_idle, session_vnc);
-+  maybe_queue_close_session_idle (session_vnc);
- }
- 
- static void
-- 
-2.17.1
-
--- a/0001-vnc-Copy-pixels-using-the-right-destination-stride.patch
+++ b/0001-vnc-Copy-pixels-using-the-right-destination-stride.patch
@ -0,0 +1,71 @@
+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
+
--- a/0001-vnc-Drop-frames-if-client-is-gone.patch
+++ b/0001-vnc-Drop-frames-if-client-is-gone.patch
@ -0,0 +1,80 @@
+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
+
--- a/0002-vnc-pipewire-stream-Close-session-when-disconnected.patch
+++ b/0002-vnc-pipewire-stream-Close-session-when-disconnected.patch
@ -1,28 +0,0 @@
-From 59188d81cf8936cd9f5400df040d875427251bf2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
-Date: Mon, 1 Oct 2018 18:05:07 +0200
-Subject: [PATCH 2/2] vnc-pipewire-stream: Close session when disconnected
-
-When there is an active stream, and we're disconnected from PipeWire
-(e.g. because it terminated), close the session.
---
- src/grd-vnc-pipewire-stream.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/grd-vnc-pipewire-stream.c b/src/grd-vnc-pipewire-stream.c
-index 66d66a0..d6454b8 100644
--- a/src/grd-vnc-pipewire-stream.c
-+++ b/src/grd-vnc-pipewire-stream.c
-@@ -392,6 +392,9 @@ on_state_changed (void                 *user_data,
-         }
-       break;
-     case PW_REMOTE_STATE_UNCONNECTED:
-+      if (stream->pipewire_stream)
-+        g_signal_emit (stream, signals[CLOSED], 0);
-+      break;
-     case PW_REMOTE_STATE_CONNECTING:
-       break;
-     }
-- 
-2.17.1
-
--- a/gnome-remote-desktop.spec
+++ b/gnome-remote-desktop.spec
@ -1,25 +1,33 @@
 %global systemd_unit gnome-remote-desktop.service

 Name:           gnome-remote-desktop
-Version:        0.1.7
-Release:        5%{?dist}
+Version:        0.1.9
+Release:        3%{?dist}
 Summary:        GNOME Remote Desktop screen share service

 License:        GPLv2+
 URL:            https://gitlab.gnome.org/jadahl/gnome-remote-desktop
-Source0:        https://gitlab.gnome.org/jadahl/gnome-remote-desktop/uploads/ed3e8b8ebc1a74b6f4ed7260a2739f40/gnome-remote-desktop-0.1.7.tar.xz
+Source0:        https://download.gnome.org/sources/gnome-remote-desktop/0.1/gnome-remote-desktop-0.1.9.tar.xz
+
+# Avoid race condition on disconnect
+Patch0:         0001-vnc-Drop-frames-if-client-is-gone.patch

 # Adds encryption support (requires patched LibVNCServer)
-Patch0:         0001-vnc-Add-anonymous-TLS-encryption-support.patch
+Patch1:         gnutls-anontls.patch
+
+# Copy using the right destination stride
+Patch2:         0001-vnc-Copy-pixels-using-the-right-destination-stride.patch

 BuildRequires:  git
 BuildRequires:  gcc
 BuildRequires:  meson >= 0.36.0
 BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
 BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.32
-BuildRequires:  pkgconfig(libpipewire-0.2) >= 0.2.5
+BuildRequires:  pkgconfig(libpipewire-0.3) >= 0.3.0
 BuildRequires:  pkgconfig(libvncserver) >= 0.9.11-7
+BuildRequires:  pkgconfig(freerdp2)
 BuildRequires:  pkgconfig(libsecret-1)
 BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(gnutls)
@ -27,7 +35,7 @@ BuildRequires:  pkgconfig(gnutls)
 %{?systemd_requires}
 BuildRequires:  systemd

-Requires:       pipewire >= 0.2.5
+Requires:       pipewire >= 0.3.0

 %description
 GNOME Remote Desktop is a remote desktop and screen sharing service for the
@ -69,6 +77,17 @@ GNOME desktop environment.


 %changelog
+* Wed Nov 10 2021 Simone Caronni <negativo17@gmail.com> - 0.1.9-3
+- Rebuild for updated FreeRDP.
+
+* Mon Sep 14 2020 Jonas Ådahl <jadahl@redhat.com> - 0.1.9-2
+- Copy using the right destination stride
+
+* Mon Sep 14 2020 Jonas Ådahl <jadahl@redhat.com> - 0.1.9-1
+- Update to 0.1.9
+- Backport race condition crash fix
+- Rebase anon-tls patches
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-5
 - Second attempt - Rebuilt for
  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
--- a/0001-vnc-Add-anonymous-TLS-encryption-support.patch
+++ b/0001-vnc-Add-anonymous-TLS-encryption-support.patch
@ -1,7 +1,7 @@
-From 0a6f8835480a1bdb57b77a471bda9993acb8e0b9 Mon Sep 17 00:00:00 2001
+From 546151b4e15fd45901f38172435cd9aa63893727 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Thu, 14 Jun 2018 12:21:37 +0200
-Subject: [PATCH] vnc: Add anonymous TLS encryption support
+Subject: [PATCH 1/6] vnc: Add anonymous TLS encryption support

 Add support for encrypting the VNC connection using anonymous TLS. In
 effect this means that the channel is encrypted using TLS but that no
@ -13,25 +13,25 @@ VNC connection.
 src/grd-enums.h                               |   6 +
 src/grd-session-vnc.c                         |  98 +++-
 src/grd-session-vnc.h                         |  15 +
- src/grd-settings.c                            |  27 ++
+ src/grd-settings.c                            |  28 ++
 src/grd-settings.h                            |   2 +
 src/grd-vnc-server.c                          |  45 ++
 src/grd-vnc-tls.c                             | 444 ++++++++++++++++++
 src/grd-vnc-tls.h                             |  28 ++
 src/meson.build                               |   5 +-
- ...g.gnome.desktop.remote-desktop.gschema.xml |  10 +
- 11 files changed, 665 insertions(+), 16 deletions(-)
+ ...nome.desktop.remote-desktop.gschema.xml.in |  10 +
+ 11 files changed, 666 insertions(+), 16 deletions(-)
 create mode 100644 src/grd-vnc-tls.c
 create mode 100644 src/grd-vnc-tls.h

 diff --git a/meson.build b/meson.build
-index 86730f1..f1d10a6 100644
+index af423a4..813c97f 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -14,6 +14,7 @@ systemd_dep = dependency('systemd')
- libvncserver_dep = dependency('libvncserver')
+@@ -20,6 +20,7 @@ libvncclient_dep = dependency('libvncclient')
 libsecret_dep = dependency('libsecret-1')
 libnotify_dep = dependency('libnotify')
+ winpr_dep = dependency('winpr2', version: freerdp_req)
 +gnutls_dep = dependency('gnutls')
 
 cdata = configuration_data()
@ -52,7 +52,7 @@ index ffab821..4333863 100644
 +
 #endif /* GRD_ENUMS_H */
 diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
-index 589ba4b..1990576 100644
+index a06d34d..d014315 100644
 --- a/src/grd-session-vnc.c
 +++ b/src/grd-session-vnc.c
@@ -44,7 +44,9 @@ struct _GrdSessionVnc
@ -65,7 +65,7 @@ index 589ba4b..1990576 100644
   GSource *source;
   rfbScreenInfoPtr rfb_screen;
   rfbClientPtr rfb_client;
-@@ -508,12 +510,30 @@ check_rfb_password (rfbClientPtr  rfb_client,
+@@ -518,12 +520,30 @@ check_rfb_password (rfbClientPtr  rfb_client,
     }
 }
 
@ -96,7 +96,7 @@ index 589ba4b..1990576 100644
 static void
 init_vnc_session (GrdSessionVnc *session_vnc)
 {
-@@ -553,33 +573,74 @@ init_vnc_session (GrdSessionVnc *session_vnc)
+@@ -564,33 +584,74 @@ init_vnc_session (GrdSessionVnc *session_vnc)
   rfbProcessEvents (rfb_screen, 0);
 }
 
@ -185,7 +185,7 @@ index 589ba4b..1990576 100644
     }
 
   return G_SOURCE_CONTINUE;
-@@ -592,7 +653,10 @@ grd_session_vnc_attach_source (GrdSessionVnc *session_vnc)
+@@ -603,7 +664,10 @@ grd_session_vnc_attach_source (GrdSessionVnc *session_vnc)
 
   socket = g_socket_connection_get_socket (session_vnc->connection);
   session_vnc->source = g_socket_create_source (socket,
@ -197,7 +197,7 @@ index 589ba4b..1990576 100644
                                                 NULL);
   g_source_set_callback (session_vnc->source,
                          (GSourceFunc) handle_socket_data,
-@@ -618,8 +682,10 @@ grd_session_vnc_new (GrdVncServer      *vnc_server,
+@@ -629,8 +693,10 @@ grd_session_vnc_new (GrdVncServer      *vnc_server,
                               "context", context,
                               NULL);
 
@ -208,7 +208,7 @@ index 589ba4b..1990576 100644
   grd_session_vnc_attach_source (session_vnc);
 
   init_vnc_session (session_vnc);
-@@ -634,6 +700,8 @@ grd_session_vnc_dispose (GObject *object)
+@@ -645,6 +711,8 @@ grd_session_vnc_dispose (GObject *object)
 
   g_assert (!session_vnc->rfb_screen);
 
@ -218,7 +218,7 @@ index 589ba4b..1990576 100644
 
   G_OBJECT_CLASS (grd_session_vnc_parent_class)->dispose (object);
 diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
-index 25919b6..e0601c3 100644
+index 07678c8..bba3d56 100644
 --- a/src/grd-session-vnc.h
 +++ b/src/grd-session-vnc.h
@@ -36,6 +36,9 @@ G_DECLARE_FINAL_TYPE (GrdSessionVnc,
@ -231,7 +231,7 @@ index 25919b6..e0601c3 100644
 GrdSessionVnc *grd_session_vnc_new (GrdVncServer      *vnc_server,
                                     GSocketConnection *connection);
 
-@@ -53,6 +56,18 @@ void grd_session_vnc_move_cursor (GrdSessionVnc *session_vnc,
+@@ -55,8 +58,20 @@ void grd_session_vnc_move_cursor (GrdSessionVnc *session_vnc,
                                   int            x,
                                   int            y);
 
@ -239,6 +239,8 @@ index 25919b6..e0601c3 100644
 +
 int grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc);
 
+ gboolean grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc);
+ 
 +rfbClientPtr grd_session_vnc_get_rfb_client (GrdSessionVnc *session_vnc);
 +
 +void grd_session_vnc_grab_socket (GrdSessionVnc        *session_vnc,
@ -251,19 +253,19 @@ index 25919b6..e0601c3 100644
 +
 #endif /* GRD_SESSION_VNC_H */
 diff --git a/src/grd-settings.c b/src/grd-settings.c
-index a3a2afa..c886b7e 100644
+index 3af87be..f37f2da 100644
 --- a/src/grd-settings.c
 +++ b/src/grd-settings.c
-@@ -46,6 +46,7 @@ struct _GrdSettings
-     GSettings *settings;
+@@ -60,6 +60,7 @@ struct _GrdSettings
     gboolean view_only;
     GrdVncAuthMethod auth_method;
+     int port;
 +    GrdVncEncryption encryption;
   } vnc;
 };
 
-@@ -87,6 +88,12 @@ grd_settings_get_vnc_auth_method (GrdSettings *settings)
-   return settings->vnc.auth_method;
+@@ -232,6 +233,12 @@ grd_settings_get_vnc_auth_method (GrdSettings *settings)
+     return settings->vnc.auth_method;
 }
 
 +GrdVncEncryption
@ -273,9 +275,9 @@ index a3a2afa..c886b7e 100644
 +}
 +
 static void
- update_vnc_view_only (GrdSettings *settings)
+ update_rdp_tls_cert (GrdSettings *settings)
 {
-@@ -101,6 +108,13 @@ update_vnc_auth_method (GrdSettings *settings)
+@@ -267,6 +274,13 @@ update_vnc_auth_method (GrdSettings *settings)
                                                    "auth-method");
 }
 
@ -287,9 +289,9 @@ index a3a2afa..c886b7e 100644
 +}
 +
 static void
- on_vnc_settings_changed (GSettings   *vnc_settings,
+ on_rdp_settings_changed (GSettings   *rdp_settings,
                          const char  *key,
-@@ -116,6 +130,11 @@ on_vnc_settings_changed (GSettings   *vnc_settings,
+@@ -304,6 +318,11 @@ on_vnc_settings_changed (GSettings   *vnc_settings,
       update_vnc_auth_method (settings);
       g_signal_emit (settings, signals[VNC_AUTH_METHOD_CHANGED], 0);
     }
@ -301,15 +303,16 @@ index a3a2afa..c886b7e 100644
 }
 
 static void
-@@ -137,6 +156,7 @@ grd_settings_init (GrdSettings *settings)
+@@ -335,6 +354,8 @@ grd_settings_init (GrdSettings *settings)
 
-   update_vnc_view_only (settings);
-   update_vnc_auth_method (settings);
+   settings->rdp.port = GRD_RDP_SERVER_PORT;
+   settings->vnc.port = GRD_VNC_SERVER_PORT;
+
 +  update_vnc_encryption (settings);
 }
 
 static void
-@@ -160,4 +180,11 @@ grd_settings_class_init (GrdSettingsClass *klass)
+@@ -379,4 +400,11 @@ grd_settings_class_init (GrdSettingsClass *klass)
                   0,
                   NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
@ -322,10 +325,10 @@ index a3a2afa..c886b7e 100644
 +                  G_TYPE_NONE, 0);
 }
 diff --git a/src/grd-settings.h b/src/grd-settings.h
-index 9b23b09..4bca403 100644
+index e12e47e..b940fdb 100644
 --- a/src/grd-settings.h
 +++ b/src/grd-settings.h
-@@ -40,4 +40,6 @@ gboolean grd_settings_get_vnc_view_only (GrdSettings *settings);
+@@ -64,4 +64,6 @@ gboolean grd_settings_get_vnc_view_only (GrdSettings *settings);
 
 GrdVncAuthMethod grd_settings_get_vnc_auth_method (GrdSettings *settings);
 
@ -333,7 +336,7 @@ index 9b23b09..4bca403 100644
 +
 #endif /* GRD_SETTINGS_H */
 diff --git a/src/grd-vnc-server.c b/src/grd-vnc-server.c
-index a8fed02..769b7ec 100644
+index a6d95cb..f9c68db 100644
 --- a/src/grd-vnc-server.c
 +++ b/src/grd-vnc-server.c
@@ -24,11 +24,13 @@
@ -348,9 +351,9 @@ index a8fed02..769b7ec 100644
 #include "grd-session-vnc.h"
 +#include "grd-vnc-tls.h"
 
- #define GRD_VNC_SERVER_PORT 5900
 
-@@ -131,6 +133,43 @@ on_incoming (GSocketService    *service,
+ enum
+@@ -130,6 +132,43 @@ on_incoming (GSocketService    *service,
   return TRUE;
 }
 
@ -394,7 +397,7 @@ index a8fed02..769b7ec 100644
 gboolean
 grd_vnc_server_start (GrdVncServer  *vnc_server,
                       GError       **error)
-@@ -219,12 +258,18 @@ static void
+@@ -220,12 +259,18 @@ static void
 grd_vnc_server_constructed (GObject *object)
 {
   GrdVncServer *vnc_server = GRD_VNC_SERVER (object);
@ -898,10 +901,10 @@ index 0000000..135ef8c
 +
 +#endif /* GRD_VNC_TLS_H */
 diff --git a/src/meson.build b/src/meson.build
-index e6ba615..31c7221 100644
+index 1b6425d..17579b1 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -21,6 +21,8 @@ daemon_sources = files([
+@@ -33,6 +33,8 @@ daemon_sources = files([
   'grd-vnc-pipewire-stream.h',
   'grd-vnc-server.c',
   'grd-vnc-server.h',
@ -910,21 +913,21 @@ index e6ba615..31c7221 100644
 ])
 
 gen_daemon_sources = []
-@@ -51,7 +53,8 @@ executable('gnome-remote-desktop-daemon',
-                           pipewire_dep,
+@@ -66,7 +68,8 @@ executable('gnome-remote-desktop-daemon',
                           libvncserver_dep,
                           libsecret_dep,
-                          libnotify_dep],
-+                          libnotify_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 b/src/org.gnome.desktop.remote-desktop.gschema.xml
-index a5c2022..846e65b 100644
--- a/src/org.gnome.desktop.remote-desktop.gschema.xml
-+++ b/src/org.gnome.desktop.remote-desktop.gschema.xml
-@@ -23,5 +23,15 @@
+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
+--- a/src/org.gnome.desktop.remote-desktop.gschema.xml.in
+++ b/src/org.gnome.desktop.remote-desktop.gschema.xml.in
+@@ -49,5 +49,15 @@
 	 * password - by requiring the remote client to provide a known password
       </description>
     </key>
@ -941,5 +944,548 @@ index a5c2022..846e65b 100644
   </schema>
 </schemalist>
 -- 
-2.20.1
+2.26.2
+
+
+From 2e46518f421fd8704770bb6742accfacba3570aa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
+Date: Wed, 27 Nov 2019 11:02:09 +0100
+Subject: [PATCH 2/6] session-vnc: Add paused/resumed signals
+
+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
+out-of-socket source.
+---
+ src/grd-session-vnc.c | 72 ++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 65 insertions(+), 7 deletions(-)
+
+diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
+index d014315..7edd407 100644
+--- a/src/grd-session-vnc.c
+++ b/src/grd-session-vnc.c
+@@ -40,14 +40,27 @@
+ #define BGRX_SAMPLES_PER_PIXEL 3
+ #define BGRX_BYTES_PER_PIXEL 4
+ 
+enum
+{
+  PAUSED,
+  RESUMED,
+
+  N_SIGNALS
+};
+
+static guint signals[N_SIGNALS];
+
+ struct _GrdSessionVnc
+ {
+   GrdSession parent;
+ 
+   GrdVncServer *vnc_server;
+   GSocketConnection *connection;
+
+   GList *socket_grabs;
+   GSource *source;
+  gboolean is_paused;
+
+   rfbScreenInfoPtr rfb_screen;
+   rfbClientPtr rfb_client;
+ 
+@@ -73,7 +86,7 @@ struct _GrdSessionVnc
+ G_DEFINE_TYPE (GrdSessionVnc, grd_session_vnc, GRD_TYPE_SESSION);
+ 
+ static void
+-grd_session_vnc_detach_source (GrdSessionVnc *session_vnc);
+grd_session_vnc_pause (GrdSessionVnc *session_vnc);
+ 
+ static gboolean
+ close_session_idle (gpointer user_data);
+@@ -224,7 +237,8 @@ handle_client_gone (rfbClientPtr rfb_client)
+ 
+   g_debug ("VNC client gone");
+ 
+-  grd_session_vnc_detach_source (session_vnc);
+  grd_session_vnc_pause (session_vnc);
+
+   maybe_queue_close_session_idle (session_vnc);
+   session_vnc->rfb_client = NULL;
+ }
+@@ -293,7 +307,7 @@ handle_new_client (rfbClientPtr rfb_client)
+                               session_vnc->prompt_cancellable,
+                               prompt_response_callback,
+                               session_vnc);
+-      grd_session_vnc_detach_source (session_vnc);
+      grd_session_vnc_pause (session_vnc);
+       return RFB_CLIENT_ON_HOLD;
+     case GRD_VNC_AUTH_METHOD_PASSWORD:
+       session_vnc->rfb_screen->passwordCheck = check_rfb_password;
+@@ -511,7 +525,7 @@ check_rfb_password (rfbClientPtr  rfb_client,
+   if (memcmp (challenge_encrypted, response_encrypted, len) == 0)
+     {
+       grd_session_start (GRD_SESSION (session_vnc));
+-      grd_session_vnc_detach_source (session_vnc);
+      grd_session_vnc_pause (session_vnc);
+       return TRUE;
+     }
+   else
+@@ -681,6 +695,36 @@ grd_session_vnc_detach_source (GrdSessionVnc *session_vnc)
+   g_clear_pointer (&session_vnc->source, g_source_destroy);
+ }
+ 
+gboolean
+grd_session_vnc_is_paused (GrdSessionVnc *session_vnc)
+{
+  return session_vnc->is_paused;
+}
+
+static void
+grd_session_vnc_pause (GrdSessionVnc *session_vnc)
+{
+  if (grd_session_vnc_is_paused (session_vnc))
+    return;
+
+  session_vnc->is_paused = TRUE;
+
+  grd_session_vnc_detach_source (session_vnc);
+  g_signal_emit (session_vnc, signals[PAUSED], 0);
+}
+
+static void
+grd_session_vnc_resume (GrdSessionVnc *session_vnc)
+{
+  if (!grd_session_vnc_is_paused (session_vnc))
+    return;
+
+  session_vnc->is_paused = FALSE;
+
+  grd_session_vnc_attach_source (session_vnc);
+  g_signal_emit (session_vnc, signals[RESUMED], 0);
+}
+
+ GrdSessionVnc *
+ grd_session_vnc_new (GrdVncServer      *vnc_server,
+                      GSocketConnection *connection)
+@@ -698,6 +742,7 @@ grd_session_vnc_new (GrdVncServer      *vnc_server,
+ 
+   grd_session_vnc_grab_socket (session_vnc, vnc_socket_grab_func);
+   grd_session_vnc_attach_source (session_vnc);
+  session_vnc->is_paused = FALSE;
+ 
+   init_vnc_session (session_vnc);
+ 
+@@ -727,7 +772,7 @@ grd_session_vnc_stop (GrdSession *session)
+ 
+   g_clear_object (&session_vnc->pipewire_stream);
+ 
+-  grd_session_vnc_detach_source (session_vnc);
+  grd_session_vnc_pause (session_vnc);
+ 
+   g_clear_object (&session_vnc->connection);
+   g_clear_pointer (&session_vnc->rfb_screen->frameBuffer, g_free);
+@@ -783,8 +828,8 @@ grd_session_vnc_stream_ready (GrdSession *session,
+                     G_CALLBACK (on_pipewire_stream_closed),
+                     session_vnc);
+ 
+-  if (!session_vnc->source)
+-    grd_session_vnc_attach_source (session_vnc);
+  if (grd_session_vnc_is_paused (session_vnc))
+    grd_session_vnc_resume (session_vnc);
+ }
+ 
+ static void
+@@ -803,4 +848,17 @@ grd_session_vnc_class_init (GrdSessionVncClass *klass)
+ 
+   session_class->stop = grd_session_vnc_stop;
+   session_class->stream_ready = grd_session_vnc_stream_ready;
+
+  signals[PAUSED] = g_signal_new ("paused",
+                                  G_TYPE_FROM_CLASS (klass),
+                                  G_SIGNAL_RUN_LAST,
+                                  0,
+                                  NULL, NULL, NULL,
+                                  G_TYPE_NONE, 0);
+  signals[RESUMED] = g_signal_new ("resumed",
+                                   G_TYPE_FROM_CLASS (klass),
+                                   G_SIGNAL_RUN_LAST,
+                                   0,
+                                   NULL, NULL, NULL,
+                                   G_TYPE_NONE, 0);
+ }
+-- 
+2.26.2
+
+
+From b59c36ccf73939d32ccf5ab4eb47460a9fe415f3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
+Date: Wed, 27 Nov 2019 11:03:46 +0100
+Subject: [PATCH 3/6] session-vnc: Add grd_session_vnc_dispatch() helper
+
+To be used by the TLS channel security to dispatch when there is data
+available that is not visible to the socket source.
+---
+ src/grd-session-vnc.c | 26 ++++++++++++++++----------
+ src/grd-session-vnc.h |  2 ++
+ 2 files changed, 18 insertions(+), 10 deletions(-)
+
+diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
+index 7edd407..29c94a1 100644
+--- a/src/grd-session-vnc.c
+++ b/src/grd-session-vnc.c
+@@ -635,6 +635,21 @@ vnc_socket_grab_func (GrdSessionVnc  *session_vnc,
+   return TRUE;
+ }
+ 
+void
+grd_session_vnc_dispatch (GrdSessionVnc *session_vnc)
+{
+  GrdVncSocketGrabFunc grab_func;
+  g_autoptr (GError) error = NULL;
+
+  grab_func = g_list_first (session_vnc->socket_grabs)->data;
+  if (!grab_func (session_vnc, &error))
+    {
+      g_warning ("Error when reading socket: %s", error->message);
+
+      grd_session_stop (GRD_SESSION (session_vnc));
+    }
+}
+
+ static gboolean
+ handle_socket_data (GSocket *socket,
+                     GIOCondition condition,
+@@ -651,16 +666,7 @@ handle_socket_data (GSocket *socket,
+     }
+   else if (condition & G_IO_IN)
+     {
+-      GrdVncSocketGrabFunc grab_func;
+-      g_autoptr (GError) error = NULL;
+-
+-      grab_func = g_list_first (session_vnc->socket_grabs)->data;
+-      if (!grab_func (session_vnc, &error))
+-        {
+-          g_warning ("Error when reading socket: %s", error->message);
+-
+-          grd_session_stop (session);
+-        }
+      grd_session_vnc_dispatch (session_vnc);
+     }
+   else
+     {
+diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
+index bba3d56..58f635c 100644
+--- a/src/grd-session-vnc.h
+++ b/src/grd-session-vnc.h
+@@ -72,6 +72,8 @@ void grd_session_vnc_grab_socket (GrdSessionVnc        *session_vnc,
+ void grd_session_vnc_ungrab_socket (GrdSessionVnc        *session_vnc,
+                                     GrdVncSocketGrabFunc  grab_func);
+ 
+void grd_session_vnc_dispatch (GrdSessionVnc *session_vnc);
+
+ GrdVncServer * grd_session_vnc_get_vnc_server (GrdSessionVnc *session_vnc);
+ 
+ #endif /* GRD_SESSION_VNC_H */
+-- 
+2.26.2
+
+
+From 966b2ddbd1c03c9e20dc66e5ea9a2dfb39ba4bfa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
+Date: Wed, 27 Nov 2019 11:05:13 +0100
+Subject: [PATCH 4/6] vnc/tls: Add some logging
+
+Uses the log utility from libvncserver as it is related to the RFB
+protocol rather than the session itself.
+---
+ src/grd-vnc-tls.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/grd-vnc-tls.c b/src/grd-vnc-tls.c
+index ec4758e..ac6c35f 100644
+--- a/src/grd-vnc-tls.c
+++ b/src/grd-vnc-tls.c
+@@ -67,6 +67,7 @@ grd_vnc_tls_context_new (void)
+ 
+   tls_context = g_new0 (GrdVncTlsContext, 1);
+ 
+  rfbLog ("TLS: Initializing gnutls context\n");
+   gnutls_global_init ();
+ 
+   gnutls_anon_allocate_server_credentials (&tls_context->anon_credentials);
+@@ -127,6 +128,7 @@ perform_anon_tls_handshake (GrdVncTlsSession  *tls_session,
+   ret = gnutls_handshake (tls_session->tls_session);
+   if (ret != GNUTLS_E_SUCCESS && !gnutls_error_is_fatal (ret))
+     {
+      rfbLog ("TLS: More handshake pending\n");
+       tls_session->handshake_state = GRD_TLS_HANDSHAKE_STATE_DURING;
+       return TRUE;
+     }
+@@ -140,6 +142,8 @@ perform_anon_tls_handshake (GrdVncTlsSession  *tls_session,
+       return FALSE;
+     }
+ 
+  rfbLog ("TLS: Handshake finished");
+
+   tls_session->handshake_state = GRD_TLS_HANDSHAKE_STATE_FINISHED;
+   return TRUE;
+ }
+@@ -373,6 +377,7 @@ perform_handshake (GrdSessionVnc  *session_vnc,
+       break;
+     case GRD_TLS_HANDSHAKE_STATE_FINISHED:
+       grd_session_vnc_ungrab_socket (session_vnc, tls_handshake_grab_func);
+      rfbLog ("TLS: Sending post-channel security security list\n");
+       rfbSendSecurityTypeList (grd_session_vnc_get_rfb_client (session_vnc),
+                                RFB_SECURITY_TAG_CHANNEL);
+       break;
+@@ -387,6 +392,7 @@ tls_handshake_grab_func (GrdSessionVnc  *session_vnc,
+ {
+   g_autoptr (GError) handshake_error = NULL;
+ 
+  rfbLog ("TLS: Continuing handshake\n");
+   if (!perform_handshake (session_vnc, &handshake_error))
+     {
+       g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+@@ -404,6 +410,8 @@ rfb_tls_security_handler (rfbClientPtr rfb_client)
+   GrdVncTlsSession *tls_session;
+   g_autoptr(GError) error = NULL;
+ 
+  rfbLog ("TLS: Setting up rfbClient for gnutls encrypted traffic\n");
+
+   tls_session = grd_vnc_tls_session_from_vnc_session (session_vnc);
+   if (!tls_session)
+     {
+@@ -424,6 +432,7 @@ rfb_tls_security_handler (rfbClientPtr rfb_client)
+       grd_session_vnc_grab_socket (session_vnc, tls_handshake_grab_func);
+     }
+ 
+  rfbLog ("TLS: Performing handshake\n");
+   if (!perform_handshake (session_vnc, &error))
+     {
+       g_warning ("TLS handshake failed: %s", error->message);
+-- 
+2.26.2
+
+
+From e01d27dc9911f4d7ecfd232c7e389f4dabfd87de Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
+Date: Wed, 27 Nov 2019 11:07:40 +0100
+Subject: [PATCH 5/6] vnc/tls: Dispatch also when data is pending outside of
+ the socket
+
+gnutls may have data available in its buffers, and we have our own peek
+buffer temporarly storing data later to be processed. This would missed
+by the socket source, as it wouldn't get any notification about it from
+epoll(). Deal with this by adding a custom source that dispatches as
+long as there is data to read in those buffers.
+---
+ src/grd-session-vnc.h |  2 +
+ src/grd-vnc-tls.c     | 90 ++++++++++++++++++++++++++++++++++++++++---
+ 2 files changed, 86 insertions(+), 6 deletions(-)
+
+diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
+index 58f635c..0d01ad3 100644
+--- a/src/grd-session-vnc.h
+++ b/src/grd-session-vnc.h
+@@ -72,6 +72,8 @@ void grd_session_vnc_grab_socket (GrdSessionVnc        *session_vnc,
+ void grd_session_vnc_ungrab_socket (GrdSessionVnc        *session_vnc,
+                                     GrdVncSocketGrabFunc  grab_func);
+ 
+gboolean grd_session_vnc_is_paused (GrdSessionVnc *session_vnc);
+
+ void grd_session_vnc_dispatch (GrdSessionVnc *session_vnc);
+ 
+ GrdVncServer * grd_session_vnc_get_vnc_server (GrdSessionVnc *session_vnc);
+diff --git a/src/grd-vnc-tls.c b/src/grd-vnc-tls.c
+index ac6c35f..312b6b9 100644
+--- a/src/grd-vnc-tls.c
+++ b/src/grd-vnc-tls.c
+@@ -41,6 +41,12 @@ typedef enum _GrdTlsHandshakeState
+   GRD_TLS_HANDSHAKE_STATE_FINISHED
+ } GrdTlsHandshakeState;
+ 
+typedef struct _PeekBufferSource
+{
+  GSource parent;
+  GrdSessionVnc *session_vnc;
+} PeekBufferSource;
+
+ typedef struct _GrdVncTlsSession
+ {
+   GrdVncTlsContext *tls_context;
+@@ -53,6 +59,8 @@ typedef struct _GrdVncTlsSession
+   char *peek_buffer;
+   int peek_buffer_size;
+   int peek_buffer_len;
+
+  GSource *peek_buffer_source;
+ } GrdVncTlsSession;
+ 
+ static gboolean
+@@ -299,13 +307,9 @@ grd_vnc_tls_peek_at_socket (rfbClientPtr  rfb_client,
+   return peekable_len;
+ }
+ 
+-static rfbBool
+-grd_vnc_tls_has_pending_on_socket (rfbClientPtr rfb_client)
+static gboolean
+grd_vnc_tls_session_has_pending_data (GrdVncTlsSession *tls_session)
+ {
+-  GrdSessionVnc *session_vnc = rfb_client->screen->screenData;
+-  GrdVncTlsSession *tls_session =
+-    grd_vnc_tls_session_from_vnc_session (session_vnc);
+-
+   if (tls_session->peek_buffer_len > 0)
+     return TRUE;
+ 
+@@ -315,6 +319,16 @@ grd_vnc_tls_has_pending_on_socket (rfbClientPtr rfb_client)
+   return FALSE;
+ }
+ 
+static rfbBool
+grd_vnc_tls_has_pending_on_socket (rfbClientPtr rfb_client)
+{
+  GrdSessionVnc *session_vnc = rfb_client->screen->screenData;
+  GrdVncTlsSession *tls_session =
+    grd_vnc_tls_session_from_vnc_session (session_vnc);
+
+  return grd_vnc_tls_session_has_pending_data (tls_session);
+}
+
+ static int
+ grd_vnc_tls_write_to_socket (rfbClientPtr  rfb_client,
+                              const char   *buf,
+@@ -403,6 +417,62 @@ tls_handshake_grab_func (GrdSessionVnc  *session_vnc,
+   return TRUE;
+ }
+ 
+static gboolean
+peek_buffer_source_prepare (GSource *source,
+                            int     *timeout)
+{
+  PeekBufferSource *psource = (PeekBufferSource *) source;
+  GrdSessionVnc *session_vnc = psource->session_vnc;
+  GrdVncTlsSession *tls_session =
+    grd_vnc_tls_session_from_vnc_session (session_vnc);
+
+  return grd_vnc_tls_session_has_pending_data (tls_session);
+}
+
+static gboolean
+peek_buffer_source_dispatch (GSource     *source,
+                             GSourceFunc  callback,
+                             gpointer     user_data)
+{
+  PeekBufferSource *psource = (PeekBufferSource *) source;
+  GrdSessionVnc *session_vnc = psource->session_vnc;
+
+  grd_session_vnc_dispatch (session_vnc);
+
+  return G_SOURCE_CONTINUE;
+}
+
+static GSourceFuncs peek_buffer_source_funcs = {
+  .prepare = peek_buffer_source_prepare,
+  .dispatch = peek_buffer_source_dispatch,
+};
+
+static void
+attach_peek_buffer_source (GrdSessionVnc *session_vnc)
+{
+  GrdVncTlsSession *tls_session;
+
+  tls_session = grd_vnc_tls_session_from_vnc_session (session_vnc);
+  tls_session->peek_buffer_source = g_source_new (&peek_buffer_source_funcs,
+                                                  sizeof (PeekBufferSource));
+  ((PeekBufferSource *) tls_session->peek_buffer_source)->session_vnc =
+    session_vnc;
+  g_source_set_priority (tls_session->peek_buffer_source,
+                         G_PRIORITY_DEFAULT + 1);
+
+  g_source_attach (tls_session->peek_buffer_source, NULL);
+}
+
+static void
+detach_peek_buffer_source (GrdSessionVnc *session_vnc)
+{
+  GrdVncTlsSession *tls_session;
+
+  tls_session = grd_vnc_tls_session_from_vnc_session (session_vnc);
+
+  g_clear_pointer (&tls_session->peek_buffer_source, g_source_destroy);
+}
+
+ static void
+ rfb_tls_security_handler (rfbClientPtr rfb_client)
+ {
+@@ -429,6 +499,14 @@ rfb_tls_security_handler (rfbClientPtr rfb_client)
+       rfb_client->hasPendingOnSocket = grd_vnc_tls_has_pending_on_socket;
+       rfb_client->writeToSocket = grd_vnc_tls_write_to_socket;
+ 
+      if (!grd_session_vnc_is_paused (session_vnc))
+        attach_peek_buffer_source (session_vnc);
+
+      g_signal_connect (session_vnc, "paused",
+                        G_CALLBACK (detach_peek_buffer_source), NULL);
+      g_signal_connect (session_vnc, "resumed",
+                        G_CALLBACK (attach_peek_buffer_source), NULL);
+
+       grd_session_vnc_grab_socket (session_vnc, tls_handshake_grab_func);
+     }
+ 
+-- 
+2.26.2
+
+
+From 682f3b4a8e985f00a00e761a086a15cb5e2b9b04 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
+Date: Wed, 27 Nov 2019 16:48:00 +0100
+Subject: [PATCH 6/6] session-vnc: Set our own password handling function up
+ front
+
+libvncserver decides whether to register a auth security handler
+depending on whether the password data is set or not. When we use the
+prompt auth method, we don't want to ask for password, so set the
+password data to NULL.
+
+Also, to be a bit more in control of the password mechanism, always set
+the password function up front, instead of just when the client uses the
+password prompt.
+---
+ src/grd-session-vnc.c | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
+index 29c94a1..ebe1540 100644
+--- a/src/grd-session-vnc.c
+++ b/src/grd-session-vnc.c
+@@ -91,11 +91,6 @@ grd_session_vnc_pause (GrdSessionVnc *session_vnc);
+ static gboolean
+ close_session_idle (gpointer user_data);
+ 
+-static rfbBool
+-check_rfb_password (rfbClientPtr  rfb_client,
+-                    const char   *response_encrypted,
+-                    int           len);
+-
+ static void
+ swap_uint8 (uint8_t *a,
+             uint8_t *b)
+@@ -310,7 +305,6 @@ handle_new_client (rfbClientPtr rfb_client)
+       grd_session_vnc_pause (session_vnc);
+       return RFB_CLIENT_ON_HOLD;
+     case GRD_VNC_AUTH_METHOD_PASSWORD:
+-      session_vnc->rfb_screen->passwordCheck = check_rfb_password;
+       /*
+        * authPasswdData needs to be non NULL in libvncserver to trigger
+        * password authentication.
+@@ -594,6 +588,8 @@ init_vnc_session (GrdSessionVnc *session_vnc)
+   rfb_screen->frameBuffer = g_malloc0 (screen_width * screen_height * 4);
+   memset (rfb_screen->frameBuffer, 0x1f, screen_width * screen_height * 4);
+ 
+  rfb_screen->passwordCheck = check_rfb_password;
+
+   rfbInitServer (rfb_screen);
+   rfbProcessEvents (rfb_screen, 0);
+ }
+-- 
+2.26.2

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (gnome-remote-desktop-0.1.7.tar.xz) = dd20e5e6fd724ff03d8a32319c7145f1fef4331439e52921b812f087e6b83185bf318bb2fb9758fe083ec3cfea30448b601da4ed1aba85fa892ef7fbb794b9ed
+SHA512 (gnome-remote-desktop-0.1.9.tar.xz) = 6ac2962c824634cd5322785b6d251e899ea38668010b18b1b50124497895d9c00752904abf01490e27b74e1661aeae39d83fbbd77b841329b1e0fd381c3ea440
Author	SHA1	Message	Date
Simone Caronni	bea9409b66	Rebuild for updated FreeRDP	2021-11-10 19:43:42 +01:00
Jonas Ådahl	32d6ca484e	Copy using the right destination stride Related: https://bugzilla.redhat.com/show_bug.cgi?id=1882718	2020-10-12 18:52:54 +02:00
Jonas Ådahl	e81d7945a5	Update gnome-remote-desktop - Update to 0.1.9 - Backport race condition crash fix - Rebase anon-tls patches - Cleanup left-over patches	2020-09-14 11:02:44 +02:00