This repository has been archived by the owner on Jun 23, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 59
feat(security): client_negotiation handle mechanism selected response #612
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
neverchanje
reviewed
Sep 3, 2020
acelyc111
reviewed
Sep 4, 2020
Comment on lines
+77
to
+100
if (!check_status(rpc.request().status, negotiation_status::type::SASL_SELECT_MECHANISMS)) { | ||
fail_negotiation(); | ||
return; | ||
} | ||
|
||
error_s err_s = _sasl->init(); | ||
if (!err_s.is_ok()) { | ||
dwarn_f("{}: server initialize sasl failed, error = {}, msg = {}", | ||
_name, | ||
err_s.code().to_string(), | ||
err_s.description()); | ||
fail_negotiation(); | ||
return; | ||
} | ||
_selected_mechanism = request.msg; | ||
if (supported_mechanisms.find(_selected_mechanism) == supported_mechanisms.end()) { | ||
dwarn_f("the mechanism of {} is not supported", _selected_mechanism); | ||
fail_negotiation(); | ||
return; | ||
} | ||
|
||
negotiation_response &response = rpc.response(); | ||
_status = response.status = negotiation_status::type::SASL_SELECT_MECHANISMS_RESP; | ||
} else { | ||
dwarn_f("{}: got message({}) while expect({})", | ||
error_s err_s = _sasl->init(); | ||
if (!err_s.is_ok()) { | ||
dwarn_f("{}: server initialize sasl failed, error = {}, msg = {}", | ||
_name, | ||
enum_to_string(request.status), | ||
negotiation_status::type::SASL_SELECT_MECHANISMS); | ||
err_s.code().to_string(), | ||
err_s.description()); | ||
fail_negotiation(); | ||
return; | ||
} | ||
|
||
negotiation_response &response = rpc.response(); | ||
_status = response.status = negotiation_status::type::SASL_SELECT_MECHANISMS_RESP; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good refactor!
hycdong
reviewed
Sep 4, 2020
src/runtime/security/negotiation.cpp
Outdated
@@ -48,5 +50,18 @@ void negotiation::fail_negotiation() | |||
_session->on_failure(true); | |||
} | |||
|
|||
bool negotiation::check_status(negotiation_status::type status, | |||
negotiation_status::type expect_status) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
expected_status
may be better.
neverchanje
approved these changes
Sep 4, 2020
acelyc111
approved these changes
Sep 4, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
client_negotiation handle mechanism selected response