use rsplitn for rpc info extraction in case passwords have @ #37
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
ghost
mentioned this pull request
TheBlueMatt
reviewed
Oct 17, 2021
src/cli.rs
Outdated
| @@ -45,11 +45,12 @@ pub(crate) fn parse_startup_args() -> Result<LdkUserInfo, ()> { | |||
| return Err(()); | |||
| } | |||
| let bitcoind_rpc_info = env::args().skip(1).next().unwrap(); | |||
| let bitcoind_rpc_info_parts: Vec<&str> = bitcoind_rpc_info.split("@").collect(); | |||
| let mut bitcoind_rpc_info_parts: Vec<&str> = bitcoind_rpc_info.rsplitn(2,"@").collect(); | |||
There was a problem hiding this comment.
Here and on the line below, rustfmt demands a space after the , in the parameter list.
There was a problem hiding this comment.
didn't know about this tool yet, thanks, should be fixed in the latest commit
src/cli.rs
Outdated
| if bitcoind_rpc_info_parts.len() != 2 { | ||
| println!("ERROR: bad bitcoind RPC URL provided"); | ||
| return Err(()); | ||
| } | ||
| bitcoind_rpc_info_parts.swap(0,1); |
There was a problem hiding this comment.
nit: maybe more readable to just change the two lines that access bitcoind_rpc_info_parts?
There was a problem hiding this comment.
good suggestion, I tried this originally but wasn't sure if the reverse index access would be confusing, sounds like this is the better approach.
TheBlueMatt
approved these changes
Oct 17, 2021
remove swap, fix rustfmt issue remove return
should be squashed now. |
TheBlueMatt
approved these changes
Oct 17, 2021
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.
@being a character in password, the current behaviour will split n times depending on how many of the @ special character appears and then will fail on URL since there are not two vectors.