1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compile mariabackup with its own copy of net_serv.cc

Browse Source 
Don't use the server's version, that expects a valid THD.
Modify net_serv.cc not not use any THD if MYSQL_SERVER isn't defined.

This reverts commit aaddac5cd7b23795ee617ee6f8b5613eec343e79.
This commit is contained in:
Sergei Golubchik 2017-08-23 16:27:24 +02:00
parent 7a5eb00322
commit 4040a17ea2
2 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extra/mariabackup/CMakeLists.txt
View File

@ -73,6 +73,7 @@ MYSQL_ADD_EXECUTABLE(mariabackup
backup_mysql.cc backup_mysql.cc
backup_copy.cc backup_copy.cc
encryption_plugin.cc encryption_plugin.cc
${PROJECT_SOURCE_DIR}/sql/net_serv.cc
${NT_SERVICE_SOURCE} ${NT_SERVICE_SOURCE}
${PROJECT_SOURCE_DIR}/libmysqld/libmysql.c ${PROJECT_SOURCE_DIR}/libmysqld/libmysql.c
COMPONENT backup COMPONENT backup

57
sql/net_serv.cc
View File

@ -46,8 +46,6 @@
#include <signal.h> #include <signal.h>
#include "probes_mysql.h" #include "probes_mysql.h"
#include "proxy_protocol.h" #include "proxy_protocol.h"
#include <sql_class.h>
#include <sql_connect.h>
/* /*
to reduce the number of ifdef's in the code to reduce the number of ifdef's in the code
@ -60,8 +58,11 @@ static void inline EXTRA_DEBUG_fprintf(...) {}
#ifndef MYSQL_SERVER #ifndef MYSQL_SERVER
static int inline EXTRA_DEBUG_fflush(...) { return 0; } static int inline EXTRA_DEBUG_fflush(...) { return 0; }
#endif #endif
#endif #endif /* EXTRA_DEBUG */
#ifdef MYSQL_SERVER #ifdef MYSQL_SERVER
#include <sql_class.h>
#include <sql_connect.h>
#define MYSQL_SERVER_my_error my_error #define MYSQL_SERVER_my_error my_error
#else #else
static void inline MYSQL_SERVER_my_error(...) {} static void inline MYSQL_SERVER_my_error(...) {}
@ -837,15 +838,29 @@ static my_bool my_net_skip_rest(NET *net, uint32 remain, thr_alarm_t *alarmed,
Note, that proxy header can only be sent either when the connection is established, Note, that proxy header can only be sent either when the connection is established,
or as the client reply packet to or as the client reply packet to
*/ */
static int handle_proxy_header(NET *net) #undef IGNORE /* for Windows */
typedef enum { RETRY, ABORT, IGNORE} handle_proxy_header_result;
static handle_proxy_header_result handle_proxy_header(NET *net)
{ {
proxy_peer_info peer_info; #if !defined(MYSQL_SERVER) || defined(EMBEDDED_LIBRARY)
return IGNORE;
#else
THD *thd= (THD *)net->thd; THD *thd= (THD *)net->thd;
if (!thd || !thd->net.vio) if (!has_proxy_protocol_header(net) || !thd ||
thd->get_command() != COM_CONNECT)
return IGNORE;
/*
Proxy information found in the first 4 bytes received so far.
Read and parse proxy header , change peer ip address and port in THD.
*/
proxy_peer_info peer_info;
if (!thd->net.vio)
{ {
DBUG_ASSERT(0); DBUG_ASSERT(0);
return 1; return ABORT;
} }
if (!is_proxy_protocol_allowed((sockaddr *)&(thd->net.vio->remote))) if (!is_proxy_protocol_allowed((sockaddr *)&(thd->net.vio->remote)))
@ -853,25 +868,22 @@ static int handle_proxy_header(NET *net)
/* proxy-protocol-networks variable needs to be set to allow this remote address */ /* proxy-protocol-networks variable needs to be set to allow this remote address */
my_printf_error(ER_HOST_NOT_PRIVILEGED, "Proxy header is not accepted from %s", my_printf_error(ER_HOST_NOT_PRIVILEGED, "Proxy header is not accepted from %s",
MYF(0), thd->main_security_ctx.ip); MYF(0), thd->main_security_ctx.ip);
return 1; return ABORT;
} }
if (parse_proxy_protocol_header(net, &peer_info)) if (parse_proxy_protocol_header(net, &peer_info))
{ {
/* Failed to parse proxy header*/ /* Failed to parse proxy header*/
my_printf_error(ER_UNKNOWN_ERROR, "Failed to parse proxy header", MYF(0)); my_printf_error(ER_UNKNOWN_ERROR, "Failed to parse proxy header", MYF(0));
return 1; return ABORT;
} }
if (peer_info.is_local_command) if (peer_info.is_local_command)
/* proxy header indicates LOCAL connection, no action necessary */ /* proxy header indicates LOCAL connection, no action necessary */
return 0; return RETRY;
#ifdef EMBEDDED_LIBRARY
DBUG_ASSERT(0);
return 1;
#else
/* Change peer address in THD and ACL structures.*/ /* Change peer address in THD and ACL structures.*/
return thd_set_peer_addr(thd, &(peer_info.peer_addr), NULL, peer_info.port, false); return (handle_proxy_header_result)thd_set_peer_addr(thd,
&(peer_info.peer_addr), NULL, peer_info.port, false);
#endif #endif
} }
@ -1131,20 +1143,15 @@ end:
packets_out_of_order: packets_out_of_order:
{ {
if (has_proxy_protocol_header(net) switch (handle_proxy_header(net)) {
&& net->thd && case ABORT:
((THD *)net->thd)->get_command() == COM_CONNECT)
{
/* Proxy information found in the first 4 bytes received so far.
Read and parse proxy header , change peer ip address and port in THD.
*/
if (handle_proxy_header(net))
{
/* error happened, message is already written. */ /* error happened, message is already written. */
len= packet_error; len= packet_error;
goto end; goto end;
} case RETRY:
goto retry; goto retry;
case IGNORE:
break;
} }
DBUG_PRINT("error", DBUG_PRINT("error",