Skip to content

fix: Enable Xauth access control for X11 sessions #53

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

Merged
zccrs merged 1 commit into from
Dec 5, 2025
Merged

fix: Enable Xauth access control for X11 sessions #53

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
4 changes: 0 additions & 4 deletions data/scripts/Xsetup
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
#!/bin/sh
# Xsetup - run as root before the login dialog appears

# Allow all client connect to the Xorg server. Since our X server is started as
# root, but sessions are started as user.
xhost +
5 changes: 1 addition & 4 deletions src/helper/UserSession.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ namespace DDM {
// If the Xorg display server was already started, write the passed
// auth cookie to /tmp/xauth_XXXXXX. This is done in the parent process
// so that it can clean up the file on session end.
if (env.value(QStringLiteral("XDG_SESSION_TYPE")) == QLatin1String("x11")
&& m_displayServerCmd.isEmpty()) {
if (env.value(QStringLiteral("XDG_SESSION_TYPE")) == QLatin1String("x11")) {
// Create the Xauthority file
QByteArray cookie = helper->cookie();
if (cookie.isEmpty()) {
Expand Down Expand Up @@ -111,9 +110,7 @@ namespace DDM {

env.insert(QStringLiteral("XAUTHORITY"), m_xauthFile.fileName());
setProcessEnvironment(env);
}

if (env.value(QStringLiteral("XDG_SESSION_TYPE")) == QLatin1String("x11")) {
QString command;
if (env.value(QStringLiteral("XDG_SESSION_CLASS")) == QLatin1String("greeter")) {
command = m_path;
Expand Down