Merge lp:~dbarth/lightdm/vnc-no-password into lp:lightdm

[David Barth]

Add VNCServer options security-types and password-file

This patch makes it effectively possible to connect via VNC, either without a password (security-types: None) or with one stored in a known location, that can be administered via vncpasswd.

[VNCServer]
...
security-types: None or VncAuth (default)
password-file: /var/lib/lightdm/.vnc/passwd (for example)

[Robert Ancell (robert-ancell)]

You have tab characters here that should be 4 spaces instead.

review: Needs Fixing

[lp:~dbarth/lightdm/vnc-no-password]

1543. By David Barth on 2012-09-20

fix indentation

[David Barth (dbarth)]

Should be fixed now

[David Barth (dbarth)]

Ping? is this patch good for merging now? Let me know.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1543
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dbarth/lightdm/vnc-no-password/+merge/123959/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/lightdm-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-quantal-amd64-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/lightdm-ci/4/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1543
http://jenkins.qa.ubuntu.com/job/lightdm-ci/10/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-raring-amd64-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/lightdm-ci/10/rebuild

review: Needs Fixing (continuous-integration)

[Robert Ancell (robert-ancell)]

Sorry for the huge delay. As discussed in person I was a bit worried about how standard these options were between VNC servers, and being able to support all the options. I think the better solution is to be able to specify the whole Xvnc command line so you can set any options you require (like you can for the normal X server). I've done a proposal for that here:

https://code.launchpad.net/~robert-ancell/lightdm/xvnc-command/+merge/158520

review: Disapprove

Unmerged revisions

1543. By David Barth on 2012-09-20

fix indentation

1542. By David Barth on 2012-09-11

switch to defining 2 new options: security-types and password-file

1541. By David Barth on 2012-09-10

re-sync with trunk

1540. By David Barth on 2012-09-03

add VNCServer/no-password option to bypass the VNC auth step

=== modified file 'src/seat-xvnc.c'
--- src/seat-xvnc.c	2012-03-01 03:29:29 +0000
+++ src/seat-xvnc.c	2012-09-20 09:57:19 +0000
@@ -56,6 +56,20 @@
         if (depth == 8 || depth == 16 || depth == 24 || depth == 32)
             xserver_xvnc_set_depth (xserver, depth);
     }
+    if (config_has_key (config_get_instance (), "VNCServer", "password-file"))
+    {
+        gchar *file;
+        file = config_get_string (config_get_instance (), "VNCServer", "password-file");
+        xserver_xvnc_set_password_file (xserver, file);
+        g_free (file);
+    }
+    if (config_has_key (config_get_instance (), "VNCServer", "security-types"))
+    {
+        gchar *types;
+        types = config_get_string (config_get_instance (), "VNCServer", "security-types");
+        xserver_xvnc_set_security_types (xserver, types);
+        g_free (types);
+    }
 
     return DISPLAY_SERVER (xserver);
 }

=== modified file 'src/xserver-xvnc.c'
--- src/xserver-xvnc.c	2012-03-20 05:47:56 +0000
+++ src/xserver-xvnc.c	2012-09-20 09:57:19 +0000
@@ -38,6 +38,12 @@
     /* Geometry and colour depth */
     gint width, height, depth;
 
+    /* Password file for the VNC connection */
+    gchar *password_file;
+
+    /* SecurityTypes: None or VncAuth by default */
+    gchar *security_types;
+
     /* TRUE when received ready signal */
     gboolean got_signal;
 };
@@ -88,6 +94,22 @@
     server->priv->depth = depth;
 }
 
+void
+xserver_xvnc_set_password_file (XServerXVNC *server, const gchar *file)
+{
+    g_return_if_fail (server != NULL);
+    g_free (server->priv->password_file);
+    server->priv->password_file = g_strdup (file);
+}
+
+void
+xserver_xvnc_set_security_types (XServerXVNC *server, const gchar *types)
+{
+    g_return_if_fail (server != NULL);
+    g_free (server->priv->security_types);
+    server->priv->security_types = g_strdup (types);
+}
+
 gchar *
 xserver_xvnc_get_authority_file_path (XServerXVNC *server)
 {
@@ -254,6 +276,10 @@
     g_string_append_printf (command, " -auth %s", path);
     g_free (path);
     g_string_append (command, " -inetd -nolisten tcp");
+    if (server->priv->password_file)
+        g_string_append_printf (command, " -PasswordFile %s", server->priv->password_file);
+    if (server->priv->security_types)
+        g_string_append_printf (command, " -SecurityTypes %s", server->priv->security_types);
     if (server->priv->width > 0 && server->priv->height > 0)
         g_string_append_printf (command, " -geometry %dx%d", server->priv->width, server->priv->height);
     if (server->priv->depth > 0)
@@ -301,6 +327,8 @@
     server->priv->width = 1024;
     server->priv->height = 768;
     server->priv->depth = 8;
+    server->priv->password_file = NULL;
+    server->priv->security_types = NULL;
 }
 
 static void
@@ -315,6 +343,10 @@
     if (self->priv->authority_file)
         g_object_unref (self->priv->authority_file);
     g_free (self->priv->log_file);
+    if (self->priv->password_file)
+        g_free (self->priv->password_file);
+    if (self->priv->security_types)
+        g_free (self->priv->security_types);
 
     G_OBJECT_CLASS (xserver_xvnc_parent_class)->finalize (object);
 }

=== modified file 'src/xserver-xvnc.h'
--- src/xserver-xvnc.h	2011-10-20 07:14:37 +0000
+++ src/xserver-xvnc.h	2012-09-20 09:57:19 +0000
@@ -49,6 +49,10 @@
 
 void xserver_xvnc_set_depth (XServerXVNC *server, gint depth);
 
+void xserver_xvnc_set_password_file (XServerXVNC *server, const gchar *file);
+
+void xserver_xvnc_set_security_types (XServerXVNC *server, const gchar *types);
+
 gchar *xserver_xvnc_get_authority_file_path (XServerXVNC *server);
 
 G_END_DECLS