-
Notifications
You must be signed in to change notification settings - Fork 14k
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.
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
don't create a new socket every time the command prompt is displayed #11392
Merged
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
Adding |
wvu
reviewed
Feb 13, 2019
wvu
reviewed
Feb 13, 2019
See rapid7/rex-socket#15 and other comments addressed as well. |
wvu
approved these changes
Feb 14, 2019
All comments addressed, landing. |
busterb
added a commit
that referenced
this pull request
Feb 20, 2019
Release NotesThis optimizes the msfconsole shell prompt to not compute every expansion character content if they are not used. Namely, it avoids computing '%L', which appears to be fairly expensive and possibly leads to crashes in some circumstances. |
msjenkins-r7
pushed a commit
that referenced
this pull request
Feb 20, 2019
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.
This probably fixes #11302 though it's not clear what the real root issue is there. @conniest noted that the console prompt randomly segfaults under Kali Linux with Ruby 2.5.3 and MSF5. The crash information shows that Metasploit is creating a new socket every time the command prompt is formatted on the hopes that the user included '%L' in the prompt format string and needs the local IP address displayed.
This PR avoids this expensive operation by first checking if the user actually used that format string, and then uses native Ruby methods for determining the local IP address rather than creating a Rex socket.
This does prevent Metasploit from actually connecting a UDP socket on IP 50.50.50.50 every time a prompt is displayed, which is a good thing independent of the bug reported above.
Verification
List the steps needed to make sure this thing works
msfconsole