Socks5() logs the supplied username and password in BCLog::PROXY
when the server selects USER_PASS.
Keep the log entry for the auth path, but omit the credentials. Log the message before sending the authentication data.
No functional behavior change intended.
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--021abf342d371248e50ceaed478a90ca-->
See the guideline for information on the review process.
| Type | Reviewers |
|---|---|
| ACK | davidgumberg, theStack, sedited |
If your review is incorrectly listed, please copy-paste <code><!--meta-tag:bot-skip--></code> into the comment that the bot should ignore.
<!--174a7506f384e20aa4161008e828411d-->
Reviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
<!--5faf32d7da4f0f540f40219e4f7537a3-->
I don't think a unit test is required for this. Matching that way for a log string seems brittle. I'd be fine with just the log line change.
Removed the unit test.
This only changes the log message.
Do not log SOCKS5 auth credentials.
Keep the log entry for the auth path, but omit the
username and password.
No behavior change intended.
431 | @@ -432,7 +432,7 @@ bool Socks5(const std::string& strDest, uint16_t port, const ProxyCredentials* a 432 | vAuth.push_back(auth->password.size()); 433 | vAuth.insert(vAuth.end(), auth->password.begin(), auth->password.end()); 434 | sock.SendComplete(vAuth, g_socks5_recv_timeout, g_socks5_interrupt); 435 | - LogDebug(BCLog::PROXY, "SOCKS5 sending proxy authentication %s:%s\n", auth->username, auth->password); 436 | + LogDebug(BCLog::PROXY, "SOCKS5 sending username/password authentication\n");
Isn't this occurring after the send happened?. Could move it to the line above to actually log prior to sending the data.
Fixed, moved it above send.
ACK 3bf3b6d59abddd126ca2710fb382b759e57ccdd5
ACK 3bf3b6d59abddd126ca2710fb382b759e57ccdd5