Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-05 20:33:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(dashboard): MySQL backups with a tcp://, unix:// or pipe:// mysql_host

Browse Source 
mysqldump was given --host=tcp --port=//host:port for the tcp:// form the servers accept, so
backups failed. Read mysql_host the way the servers connect with it: tcp://host:port (a trailing
/database is dropped), unix:// as --socket and pipe:// as a named pipe.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-26 18:45:39 -05:00
parent d422a25a01
commit 98fd72cf75
3 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/dWebTests/SecurityFixesTests.cpp
View File

@@ -121,3 +121,32 @@ TEST(BackupFilesTests, MysqldumpArgumentsAreAVector) {
// Passed as one literal argument, never interpreted
EXPECT_EQ(arguments.back(), "dlu$(touch x)");
}
// mysql_host in every form the servers connect with
TEST(BackupFilesTests, MysqldumpArgumentsReadEveryHostForm) {
const auto has = [](const std::vector<std::string>& arguments, const std::string& argument) {
return std::find(arguments.begin(), arguments.end(), argument) != arguments.end();
};
const auto dump = [](const std::string& host) { return BackupFiles::MysqldumpArguments({ "mysqldump", "/tmp/opt", host, "dlu", "/b/x", "" }); };
auto arguments = dump("tcp://10.0.0.5:3307");
EXPECT_TRUE(has(arguments, "--host=10.0.0.5"));
EXPECT_TRUE(has(arguments, "--port=3307"));
arguments = dump("tcp://db.local:3306/dlu");
EXPECT_TRUE(has(arguments, "--host=db.local"));
EXPECT_TRUE(has(arguments, "--port=3306"));
arguments = dump("db.local");
EXPECT_TRUE(has(arguments, "--host=db.local"));
EXPECT_FALSE(std::any_of(arguments.begin(), arguments.end(), [](const std::string& a) { return a.starts_with("--port="); }));
arguments = dump("unix:///run/mysqld/mysqld.sock");
EXPECT_TRUE(has(arguments, "--socket=/run/mysqld/mysqld.sock"));
EXPECT_FALSE(std::any_of(arguments.begin(), arguments.end(), [](const std::string& a) { return a.starts_with("--host=") || a.starts_with("--port="); }));
arguments = dump("pipe://MySQL");
EXPECT_TRUE(has(arguments, "--protocol=PIPE"));
EXPECT_TRUE(has(arguments, "--socket=MySQL"));
EXPECT_EQ(arguments.back(), "dlu");
}