Skip to content

Fixed bug with argument parsing that was preventing register and unregister #1707

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

Fixed bug with argument parsing that was preventing register and unregister #1707

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
2 changes: 1 addition & 1 deletion devolutions-gateway/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ fn run() -> anyhow::Result<()> {
// Parse remaining arguments for CLI actions
let action = match remaining_args.first().map(String::as_str) {
Some("--service") => CliAction::Run { service_mode: true },
Some("service") => match args.next().as_deref() {
Some("service") => match remaining_args.get(1).map(String::as_str) {
Copy link
Member

@CBenoit Benoît Cortier (CBenoit) Mar 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original code looks correct. Can you provide more information?

Copy link
Author

@bhillowasa bhillowasa Mar 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original code was calling args.next but the problem is that the args iterator was already consumed and its values pushed to remaining_args earlier on in the code.

I ran into this issue when I was installing the latest RPM on AlmaLinux; the pre and post scripts were failing. Calling /usr/bin/devolutions_gateway service register or /usr/bin/devolutions_gateway service unregister with the original code simply resulted in nothing happening except the execution falling through to CliAction::ShowHelp.

Copy link
Member

@CBenoit Benoît Cortier (CBenoit) Mar 12, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh! I see. The bug seems to have been introduced by this commit: 3bcff86
The new code is quite convoluted, so I would rather update the whole parsing logic to something better.

Copy link
Member

@CBenoit Benoît Cortier (CBenoit) Mar 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’m sending a patch for that.

Some("register") => CliAction::RegisterService,
Some("unregister") => CliAction::UnregisterService,
_ => CliAction::ShowHelp,
Expand Down