GithubStar/workflow
1
0
Fork 0
mirror of https://github.com/sogou/workflow.git synced 2026-10-24 16:33:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify codes.

Browse Source
This commit is contained in:
Xie Han
2023-02-09 03:27:45 +08:00
parent 7638d18f58
commit be464eb782
3 changed files with 27 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/factory/MySQLTaskImpl.cc
+22 -27
View File
@@ -13,8 +13,8 @@
See the License for the specific language governing permissions and
limitations under the License.
Authors: Wu Jiaxu (wujiaxu@sogou-inc.com)
Xie Han (xiehan@sogou-inc.com)
Authors: Xie Han (xiehan@sogou-inc.com)
Wu Jiaxu (wujiaxu@sogou-inc.com)
Li Yingxin (liyingxin@sogou-inc.com)
*/
@@ -69,6 +69,7 @@ private:
ST_SSL_REQUEST,
ST_AUTH_REQUEST,
ST_AUTH_SWITCH_REQUEST,
ST_CLEAR_PASSWORD_REQUEST,
ST_PUBLIC_KEY_REQUEST,
ST_CHARSET_REQUEST,
ST_FIRST_USER_REQUEST,
@@ -212,6 +213,8 @@ CommMessageOut *ComplexMySQLTask::message_out()
req->set_seqid(conn->mysql_seqid);
break;
case ST_CLEAR_PASSWORD_REQUEST:
conn->auth_plugin_name = "mysql_clear_password";
case ST_AUTH_SWITCH_REQUEST:
req = new MySQLAuthSwitchRequest;
auth_switch_req = (MySQLAuthSwitchRequest *)req;
@@ -275,10 +278,8 @@ CommMessageIn *ComplexMySQLTask::message_in()
return new SSLHandshaker(get_ssl());
case ST_AUTH_REQUEST:
resp = new MySQLAuthResponse;
break;
case ST_AUTH_SWITCH_REQUEST:
case ST_CLEAR_PASSWORD_REQUEST:
resp = new MySQLAuthResponse;
break;
@@ -359,7 +360,8 @@ int ComplexMySQLTask::auth_switch(MySQLAuthResponse *resp, MyConnection *conn)
{
std::string name = resp->get_auth_plugin_name();
if (name == "mysql_clear_password" && !is_ssl_)
if (name.empty() || (name == "mysql_clear_password" && !is_ssl_) ||
conn->state != ST_AUTH_REQUEST)
{
state_ = WFT_STATE_SYS_ERROR;
error_ = EBADMSG;
@@ -399,17 +401,10 @@ int ComplexMySQLTask::keep_alive_timeout()
case ST_AUTH_REQUEST:
case ST_AUTH_SWITCH_REQUEST:
if (resp->is_error_packet())
{
this->resp = std::move(*resp);
state_ = WFT_STATE_TASK_ERROR;
error_ = WFT_ERR_MYSQL_ACCESS_DENIED;
return 0;
}
case ST_CLEAR_PASSWORD_REQUEST:
if (resp->is_ok_packet())
{
if (res_charset_.size() != 0)
if (!res_charset_.empty())
conn->state = ST_CHARSET_REQUEST;
else
conn->state = ST_FIRST_USER_REQUEST;
@@ -417,24 +412,24 @@ int ComplexMySQLTask::keep_alive_timeout()
break;
}
if (resp->is_error_packet() || conn->state == ST_CLEAR_PASSWORD_REQUEST)
{
this->resp = std::move(*resp);
state_ = WFT_STATE_TASK_ERROR;
error_ = WFT_ERR_MYSQL_ACCESS_DENIED;
return 0;
}
auth_resp = (MySQLAuthResponse *)resp;
if (auth_resp->is_continue())
{
conn->mysql_seqid = auth_resp->get_seqid() + 1;
if (is_ssl_)
auth_resp->set_auth_plugin_name("mysql_clear_password");
conn->state = ST_CLEAR_PASSWORD_REQUEST;
else
{
conn->state = ST_PUBLIC_KEY_REQUEST;
conn->mysql_seqid = auth_resp->get_seqid() + 1;
break;
}
}
else if (auth_resp->get_auth_plugin_name().size() == 0 ||
conn->state == ST_AUTH_SWITCH_REQUEST)
{
state_ = WFT_STATE_SYS_ERROR;
error_ = EBADMSG;
return 0;
break;
}
return auth_switch(auth_resp, conn);
src/protocol/MySQLMessage.cc
+3 -3
View File
@@ -13,8 +13,8 @@
See the License for the specific language governing permissions and
limitations under the License.
Authors: Wu Jiaxu (wujiaxu@sogou-inc.com)
Xie Han (xiehan@sogou-inc.com)
Authors: Xie Han (xiehan@sogou-inc.com)
Wu Jiaxu (wujiaxu@sogou-inc.com)
*/
#include <sys/uio.h>
@@ -376,7 +376,7 @@ int MySQLAuthRequest::encode(struct iovec vectors[], int max)
*pos = (uint8_t)character_set_;
if (password_.empty())
str.push_back('\0');
str.push_back((char)0);
else if (auth_plugin_name_ == CACHING_SHA2_PASSWORD)
{
str.push_back((char)32);
src/protocol/MySQLMessage.inl
+2 -12
View File
@@ -13,8 +13,8 @@
See the License for the specific language governing permissions and
limitations under the License.
Authors: Wu Jiaxu (wujiaxu@sogou-inc.com)
Xie Han (xiehan@sogou-inc.com)
Authors: Xie Han (xiehan@sogou-inc.com)
Wu Jiaxu (wujiaxu@sogou-inc.com)
*/
#include <stdint.h>
@@ -168,16 +168,6 @@ public:
return continue_;
}
void set_auth_plugin_name(const std::string& name)
{
auth_plugin_name_ = name;
}
void set_seed(const unsigned char seed[20])
{
memcpy(seed_, seed, 20);
}
private:
virtual int decode_packet(const unsigned char *buf, size_t buflen);