Skip to content

lightdm: pass seat name when loading XDMCP/VNC seat config (#474) #492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Franklin-Qi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

lightdm: pass seat name when loading XDMCP/VNC seat config (#474) #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/lightdm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ service_add_xlocal_seat_cb (DisplayManagerService *service, gint display_number)
if (!seat)
return NULL;

set_seat_properties (seat, NULL);
set_seat_properties (seat, seat_get_name (seat));
g_autofree gchar *display_number_string = g_strdup_printf ("%d", display_number);
seat_set_property (seat, "xserver-display-number", display_number_string);

Expand Down Expand Up @@ -273,7 +273,8 @@ xdmcp_session_cb (XDMCPServer *server, XDMCPSession *session)
xdmcp_client_count++;

seat_set_name (SEAT (seat), name);
set_seat_properties (SEAT (seat), NULL);
/* Match Seat:xdmcp* (and similar) — must pass the seat name, not NULL (#474). */
set_seat_properties (SEAT (seat), name);
return display_manager_add_seat (display_manager, SEAT (seat));
}

Expand All @@ -286,7 +287,7 @@ vnc_connection_cb (VNCServer *server, GSocket *connection)
vnc_client_count++;

seat_set_name (SEAT (seat), name);
set_seat_properties (SEAT (seat), NULL);
set_seat_properties (SEAT (seat), name);
display_manager_add_seat (display_manager, SEAT (seat));
}

Expand Down Expand Up @@ -924,7 +925,7 @@ main (int argc, char **argv)
}
if (seat)
{
set_seat_properties (seat, NULL);
set_seat_properties (seat, seat_get_name (seat));
seat_set_property (seat, "exit-on-failure", "true");

/* in the absence of login1 we find out this using our own heuristics */
Expand Down
2 changes: 2 additions & 0 deletions tests/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ TESTS = \
test-xdmcp-client-xorg-1.16 \
test-xdmcp-server-autologin \
test-xdmcp-server-login \
test-xdmcp-server-seat-glob \
test-xdmcp-server-login-logout \
test-xdmcp-server-double-login \
test-xdmcp-server-guest \
Expand Down Expand Up @@ -628,6 +629,7 @@ EXTRA_DIST = \
scripts/xdmcp-server-invalid-authentication.conf \
scripts/xdmcp-server-keep-alive.conf \
scripts/xdmcp-server-login.conf \
scripts/xdmcp-server-seat-glob.conf \
scripts/xdmcp-server-login-logout.conf \
scripts/xdmcp-server-open-file-descriptors.conf \
scripts/xdmcp-server-request-invalid-authentication.conf \
Expand Down
55 changes: 55 additions & 0 deletions tests/scripts/xdmcp-server-seat-glob.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
#
# XDMCP seats must load Seat:xdmcp* config sections (issue #474)
#

[LightDM]
start-default-seat=false

[XDMCPServer]
enabled=true

# Intentionally no greeter/user-session on Seat:* — only on Seat:xdmcp*
[Seat:xdmcp*]
user-session=alternative
greeter-session=test-gobject-greeter

#?*START-DAEMON
#?RUNNER DAEMON-START
#?*WAIT

#?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix"
#?XSERVER-98 START LISTEN-TCP NO-LISTEN-UNIX

#?*XSERVER-98 SEND-QUERY
#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="lightdm-test" STATUS=""

#?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHORIZATION-NAMES="MIT-MAGIC-COOKIE-1"
#?XSERVER-98 GOT-ACCEPT SESSION-ID=[0-9]+ AUTHENTICATION-NAME="" AUTHENTICATION-DATA= AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1" AUTHORIZATION-DATA=[0-9A-F]{32}
#?*XSERVER-98 SEND-MANAGE

#?XSERVER-98 ACCEPT-CONNECT

# Greeter must start using Seat:xdmcp* greeter-session
#?LOGIN1 ACTIVATE-SESSION SESSION=c0
#?GREETER-X-127.0.0.1:98 START XDG_SESSION_CLASS=greeter
#?GREETER-X-127.0.0.1:98 CONNECT-XSERVER
#?GREETER-X-127.0.0.1:98 CONNECT-TO-DAEMON
#?XSERVER-98 ACCEPT-CONNECT
#?GREETER-X-127.0.0.1:98 CONNECTED-TO-DAEMON

#?*GREETER-X-127.0.0.1:98 AUTHENTICATE USERNAME=have-password1
#?GREETER-X-127.0.0.1:98 SHOW-PROMPT TEXT="Password:"
#?*GREETER-X-127.0.0.1:98 RESPOND TEXT="password"
#?GREETER-X-127.0.0.1:98 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
#?*GREETER-X-127.0.0.1:98 START-SESSION
#?GREETER-X-127.0.0.1:98 TERMINATE SIGNAL=15

# Session uses alternative from Seat:xdmcp*
#?LOGIN1 ACTIVATE-SESSION SESSION=c1
#?SESSION-X-127.0.0.1:98 START XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=have-password1
#?XSERVER-98 ACCEPT-CONNECT
#?SESSION-X-127.0.0.1:98 CONNECT-XSERVER

#?*STOP-DAEMON
#?SESSION-X-127.0.0.1:98 TERMINATE SIGNAL=15
#?RUNNER DAEMON-EXIT STATUS=0
2 changes: 2 additions & 0 deletions tests/test-xdmcp-server-seat-glob
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh
./src/dbus-env ./src/test-runner xdmcp-server-seat-glob test-gobject-greeter