Skip to content

fix: handle missing DBus session on headless servers #11

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
fegauthier-paragon wants to merge 1 commit into
base: stable
Choose a base branch
from
Open

fix: handle missing DBus session on headless servers #11

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
31 changes: 18 additions & 13 deletions proton/vpn/cli/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,27 @@


async def _vpn_gui_running() -> bool:
bus = await MessageBus(bus_type=BusType.SESSION).connect()

reply = await bus.call(
Message(
destination="org.freedesktop.DBus",
path="/org/freedesktop/DBus",
interface="org.freedesktop.DBus",
member="ListNames",
try:
bus = await MessageBus(bus_type=BusType.SESSION).connect()

reply = await bus.call(
Message(
destination="org.freedesktop.DBus",
path="/org/freedesktop/DBus",
interface="org.freedesktop.DBus",
member="ListNames",
)
)
)

if reply.message_type == MessageType.ERROR:
return False
if reply.message_type == MessageType.ERROR:
return False

session_bus_names = reply.body[0]
return GTK_APP_ID in session_bus_names
session_bus_names = reply.body[0]
return GTK_APP_ID in session_bus_names
except Exception:
# No DBus session available (e.g. headless server).
# If DBus is not running, the GUI can't be running either.
return False


_CLICK_CONTEXT_SETTINGS = {"help_option_names": ['--help', '-h']}
Expand Down