Do not crash if RDP is selected after regular GUI startup failed (#2326410) #5999
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…26410) The ask_rd_question() function returns not only the credentials tuple, but also the "use remote desktop" flag. We correctly handled that in the regular case where we ask for user password if user selected RDP instead of text mode. But we missed that in the harder to test case where RDP is suggested as an option to the user after regular locally running GUI startup fails. Oops! :P So handle the extra value and avoid the crash. :) Resolves: rhbz#2326410
M4rtinK
force-pushed
the
master-fix_rdp_credentials_fetching
branch
from
6430ebd
to
5d4508f
Compare
M4rtinK
had a problem deploying
to
gh-cockpituous
GitHub Actions
Failure
|
/kickstart-test --testtype smoke |
jkonecny12
reviewed
Nov 15, 2024
| rdp_creds = ask_rd_question(anaconda, message) | ||
| # we aren't really interested in the use_rd flag so at least mark it like this | ||
| # to avoid linters being grumpy | ||
| _use_rd, rdp_creds = ask_rd_question(anaconda, message) |
There was a problem hiding this comment.
Honestly to me this doesn't seem correct.
I don't think we should set the flag.use_rd, it looks to me like a side effect. Another option is to not return the value but that would be less preferable to me as the side effect is still there.
In other words, from looking on this change set it doesn't sense why we ignore this value when we ask for it on line below, however, it's not visible that the use_rd flag is set inside the ask_rd_question.
There was a problem hiding this comment.
I would rather rewrite the calls in this method to something like:
def set_gui_mode_on_rdp(anaconda, use_rd):
if not anaconda.gui_mode:
log.info("RDP requested via RDP question, switching Anaconda to GUI mode.")
anaconda.display_mode = constants.DisplayModes.GUI
flags.use_rd = True
use_rd, rdp_creds = ask_rd_question(message)
set_gui_mode_on_rdp(anaconda, use_rd)Seems cleaner to me.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The ask_rd_question() function returns not only the credentials tuple, but also the "use remote desktop" flag.
We correctly handled that in the regular case where we ask for user password if user selected RDP instead of text mode.
But we missed that in the harder to test case where RDP is suggested as an option to the user after regular locally running GUI startup fails. Oops! :P
So handle the extra value and avoid the crash. :)
Resolves: rhbz#2326410