tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-04-08 17:05:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9312 from Icinga/9308

Browse Source 
IDO MySQL: explicitly use latin1
This commit is contained in:
Julian Brost 2022-04-06 09:49:33 +02:00 committed by GitHub
commit 24f2d8c9c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/db_ido_mysql/idomysqlconnection.cpp
View File

@ -266,6 +266,11 @@ void IdoMysqlConnection::Reconnect()
BOOST_THROW_EXCEPTION(std::bad_alloc());
}
/* Read "latin1" (here, in the schema and in Icinga Web) as "bytes".
Icinga 2 and Icinga Web use byte-strings everywhere and every byte-string is a valid latin1 string.
This way the (actually mostly UTF-8) bytes are transferred end-to-end as-is. */
m_Mysql->options(&m_Connection, MYSQL_SET_CHARSET_NAME, "latin1");
if (enableSsl)
m_Mysql->ssl_set(&m_Connection, sslKey, sslCert, sslCa, sslCaPath, sslCipher);

5
lib/mysql_shim/mysqlinterface.cpp
View File

@ -92,6 +92,11 @@ struct MysqlInterfaceImpl final : public MysqlInterface
return mysql_real_escape_string(mysql, to, from, length);
}
int options(MYSQL *mysql, mysql_option option, const void *arg) const override
{
return mysql_options(mysql, option, arg);
}
bool ssl_set(MYSQL *mysql, const char *key, const char *cert, const char *ca, const char *capath, const char *cipher) const override
{
return mysql_ssl_set(mysql, key, cert, ca, capath, cipher);

1
lib/mysql_shim/mysqlinterface.hpp
View File

@ -35,6 +35,7 @@ struct MysqlInterface
virtual MYSQL *real_connect(MYSQL *mysql, const char *host, const char *user, const char *passwd,
const char *db, unsigned int port, const char *unix_socket, unsigned long clientflag) const = 0;
virtual unsigned long real_escape_string(MYSQL *mysql, char *to, const char *from, unsigned long length) const = 0;
virtual int options(MYSQL *mysql, mysql_option option, const void *arg) const = 0;
virtual bool ssl_set(MYSQL *mysql, const char *key, const char *cert, const char *ca, const char *capath, const char *cipher) const = 0;
virtual MYSQL_RES *store_result(MYSQL *mysql) const = 0;
virtual unsigned int thread_safe() const = 0;