From 466c36d6050b01ac33a7519d68d235a3dfd93cc9 Mon Sep 17 00:00:00 2001 From: Patrick Wade Date: Tue, 11 Oct 2022 19:36:01 +0100 Subject: [PATCH] Added support for: MySQL 64-bit 8.0.30 MySQL 64-bit 5.7.39, 5.7.38 MySQL 32-bit 5.7.39, 5.7.38 MariaDB 64-bit 10.7.5, 10.7.4, 10.7.3, 10.5.16, 10.2.44 MariaDB 32-bit 10.2.44 --- README.md | 14 ++++++++++++++ compiling.txt | 2 +- src/audit_offsets.cc | 30 ++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index db2aaac..385ca1a 100644 --- a/README.md +++ b/README.md @@ -29,3 +29,17 @@ Check out the [CONTRIBUTING.md](https://github.com/mcafee/mysql-audit/blob/maste ## Source Code Source code is available at: https://github.com/mcafee/mysql-audit + +## License +Copyright (C) 2011-2022 Musarubra US LLC. + +This program is free software; you can redistribute it and/or modify it under the terms of the GNU +General Public License as published by the Free Software Foundation; version 2 of the License. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; +without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. + +See COPYING file for a copy of the GPL Version 2 license. + +* Other trademarks and brands may be claimed as the property of others. diff --git a/compiling.txt b/compiling.txt index 65c84eb..d8febfb 100644 --- a/compiling.txt +++ b/compiling.txt @@ -96,5 +96,5 @@ http://dev.mysql.com/doc/refman/5.1/en/source-configuration-options.html 10. cd ../.. 11. chmod +x bootstrap.sh 12. ./bootstrap.sh -13. CXX='gcc -static-libgcc' CC='gcc -static-libgcc' MYSQL_AUDIT_PLUGIN_VERSION=1.1.12 MYSQL_AUDIT_PLUGIN_REVISION=`svn info|grep ^Revision|awk -F ": " '{print $2}'` ./configure --enable-debug=no --with-mysql=mariadb-10.2.10 --with-mysql-libservices=mariadb-10.2.10/libservices/libmysqlservices.a +13. CXX='gcc -static-libgcc' CC='gcc -static-libgcc' MYSQL_AUDIT_PLUGIN_VERSION=1.1.13 MYSQL_AUDIT_PLUGIN_REVISION=`svn info|grep ^Revision|awk -F ": " '{print $2}'` ./configure --enable-debug=no --with-mysql=mariadb-10.2.10 --with-mysql-libservices=mariadb-10.2.10/libservices/libmysqlservices.a 14. gmake <======== This will create the plugin "libaudit_plugin.so" diff --git a/src/audit_offsets.cc b/src/audit_offsets.cc index 02b1d7d..6001ada 100644 --- a/src/audit_offsets.cc +++ b/src/audit_offsets.cc @@ -75,6 +75,12 @@ const ThdOffsets thd_offsets_arr[] = const ThdOffsets thd_offsets_arr[] = { /* +++ MYSQL 64 OFFSETS GO HERE +++ */ + //offsets for: /mysqlrpm/8.0.30/usr/sbin/mysqld (8.0.30) + {"8.0.30","3ddc67dbe6ae09a6bd0ff936341399b0", 9400, 9440, 4936, 6416, 1288, 0, 0, 32, 64, 160, 1376, 9540, 6040, 4248, 4256, 4260, 7696, 1576, 32, 8656, 8696, 8680, 12424, 140, 664, 328}, + //offsets for: /mysqlrpm/5.7.39/usr/sbin/mysqld (5.7.39) + {"5.7.39","1ee93feb714d852927435e6f28097ec7", 7832, 7880, 3640, 4800, 456, 360, 0, 32, 64, 160, 544, 7996, 4368, 3656, 3664, 3668, 6080, 2072, 8, 7064, 7104, 7088, 13480, 148, 672, 0}, + //offsets for: /mysqlrpm/5.7.38/usr/sbin/mysqld (5.7.38) + {"5.7.38","b96ba6e789ee312daed3d6b901048496", 7832, 7880, 3640, 4800, 456, 360, 0, 32, 64, 160, 544, 7996, 4368, 3648, 3656, 3660, 6080, 2072, 8, 7064, 7104, 7088, 13480, 148, 672, 0}, //offsets for: /mysqlrpm/8.0.26/usr/sbin/mysqld (8.0.26) {"8.0.26","0ae5395a4978c024e809b744a799cd3a", 8504, 8544, 4048, 5520, 496, 0, 0, 32, 64, 160, 584, 8644, 5144, 4208, 4216, 4220, 6800, 1608, 32, 7760, 7800, 7784, 11528, 140, 664, 328}, //offsets for: /mysqlrpm/8.0.27/usr/sbin/mysqld (8.0.27) @@ -444,6 +450,24 @@ const ThdOffsets thd_offsets_arr[] = const ThdOffsets thd_offsets_arr[] = { /* +++ MARIADB 64 OFFSETS GO HERE +++ */ + //offsets for: /mariadb/10.5.16/bin/mysqld (10.5.16-MariaDB) + {"10.5.16-MariaDB","a99e23ae8a2a5d1cd2fa802503b68c84", 15248, 15408, 7736, 9504, 88, 3552, 8, 0, 16, 24, 152, 15524, 9136, 5480, 5488, 5492, 672, 0, 0, 14504, 14528, 14512, 24072, 564, 8, 0}, + //offsets for: /mariadb/10.7.4/bin/mysqld (10.7.4-MariaDB) + {"10.7.4-MariaDB","f3864f78ec91ecb1316ed3cab08a39aa", 15792, 15968, 7808, 10016, 88, 3528, 8, 0, 16, 24, 152, 16100, 9600, 5664, 5672, 5676, 688, 0, 0, 15048, 15072, 15056, 24744, 564, 8, 0}, + //offsets for: /mariadbrpm/10.5.16/usr/sbin/mariadbd (10.5.16-MariaDB) + {"10.5.16-MariaDB","fce7d428095be987c56537bfac9e9257", 15248, 15408, 7736, 9504, 88, 3552, 8, 0, 16, 24, 152, 15524, 9136, 5480, 5488, 5492, 672, 0, 0, 14504, 14528, 14512, 24072, 564, 8, 0}, + //offsets for: /mariadbrpm/10.7.4/usr/sbin/mariadbd (10.7.4-MariaDB) + {"10.7.4-MariaDB","5113cb3cb21ea378193d795815ca3da4", 15792, 15968, 7808, 10016, 88, 3528, 8, 0, 16, 24, 152, 16100, 9600, 5664, 5672, 5676, 688, 0, 0, 15048, 15072, 15056, 24744, 564, 8, 0}, + //offsets for: /mariadb/10.7.5/bin/mysqld (10.7.5-MariaDB) + {"10.7.5-MariaDB","6d5ca6eb4257ce6f3b176db4f0216f0c", 15792, 15968, 7808, 10016, 88, 3528, 8, 0, 16, 24, 152, 16100, 9600, 5672, 5680, 5684, 688, 0, 0, 15048, 15072, 15056, 24744, 564, 8, 0}, + //offsets for: /mariadbrpm/10.7.5/usr/sbin/mariadbd (10.7.5-MariaDB) + {"10.7.5-MariaDB","a033181397444805631c860f72f6ff19", 15792, 15968, 7808, 10016, 88, 3528, 8, 0, 16, 24, 152, 16100, 9600, 5672, 5680, 5684, 688, 0, 0, 15048, 15072, 15056, 24744, 564, 8, 0}, + //offsets for: /mariadb/10.2.44/bin/mysqld (10.2.44-MariaDB) + {"10.2.44-MariaDB","9e7388a2050aca7c590e6844f5dd10d1", 13896, 13960, 6688, 8304, 88, 3224, 8, 0, 16, 24, 152, 14060, 8064, 2984, 2992, 2996, 624, 0, 0, 13272, 13296, 13280, 21232, 548, 516, 0}, + //offsets for: /mariadb/10.7.3/bin/mysqld (10.7.3-MariaDB) + {"10.7.3-MariaDB","252cfb62266a7b2af0ff4b1c8f8ec2b2", 15760, 15936, 7776, 9984, 88, 3528, 8, 0, 16, 24, 152, 16068, 9568, 5664, 5672, 5676, 656, 0, 0, 15016, 15040, 15024, 24744, 564, 8, 0}, + //offsets for: /mariadbrpm/10.7.3/usr/sbin/mariadbd (10.7.3-MariaDB) + {"10.7.3-MariaDB","00ab4d466f2e215e664dafe34481a746", 15760, 15936, 7776, 9984, 88, 3528, 8, 0, 16, 24, 152, 16068, 9568, 5664, 5672, 5676, 656, 0, 0, 15016, 15040, 15024, 24744, 564, 8, 0}, //offsets for: /mariadb/10.6.3/bin/mysqld (10.6.3-MariaDB) {"10.6.3-MariaDB","fa61914d3b3a334d3ba5a8d019bafb50", 15688, 15848, 7768, 9928, 88, 3512, 8, 0, 16, 24, 152, 15956, 9560, 5672, 5680, 5684, 656, 0, 0, 14944, 14968, 14952, 24528, 564, 8, 0}, //offsets for: /mariadb/10.6.4/bin/mysqld (10.6.4-MariaDB) @@ -1181,6 +1205,10 @@ const ThdOffsets thd_offsets_arr[] = const ThdOffsets thd_offsets_arr[] = { /* +++ MYSQL 32 OFFSETS GO HERE +++ */ + //offsets for: /mysqlrpm/5.7.39/usr/sbin/mysqld (5.7.39) + {"5.7.39","f78c74f4aad075d98fc0b3868f90d938", 5088, 5116, 2216, 3040, 296, 200, 0, 20, 40, 100, 344, 5204, 2780, 3112, 3116, 3120, 3724, 1152, 4, 4540, 4576, 4560, 9052, 80, 604, 0}, + //offsets for: /mysqlrpm/5.7.38/usr/sbin/mysqld (5.7.38) + {"5.7.38","3265006e4248875c229ba7853c8274f4", 5088, 5116, 2216, 3040, 296, 200, 0, 20, 40, 100, 344, 5204, 2780, 3108, 3112, 3116, 3724, 1152, 4, 4540, 4576, 4560, 9052, 80, 604, 0}, //offsets for: /mysqlrpm/8.0.26/usr/sbin/mysqld (8.0.26) {"8.0.26","39a33a3c2a3f6c076e21fabb10be7ab5", 5668, 5692, 2492, 3636, 320, 0, 0, 20, 40, 100, 368, 5772, 3420, 3652, 3656, 3660, 4324, 928, 16, 5124, 5160, 5144, 8108, 72, 596, 176}, //offsets for: /mysqlrpm/5.7.37/usr/sbin/mysqld (5.7.37) @@ -1516,6 +1544,8 @@ const ThdOffsets thd_offsets_arr[] = const ThdOffsets thd_offsets_arr[] = { /* +++ MARIADB 32 OFFSETS GO HERE +++ */ + //offsets for: /mariadb/10.2.44/bin/mysqld (10.2.44-MariaDB) + {"10.2.44-MariaDB","98c6e3588f979348b6fff89044047f8b", 8620, 8656, 3968, 5436, 44, 2044, 4, 0, 8, 12, 84, 8740, 5296, 2604, 2608, 2612, 384, 0, 0, 8144, 8168, 8152, 13476, 548, 516, 0}, //offsets for: /mariadb/10.2.43/bin/mysqld (10.2.43-MariaDB) {"10.2.43-MariaDB","6fc47e535a86f0b6864a461eb817e2f7", 8612, 8648, 3960, 5428, 44, 2044, 4, 0, 8, 12, 84, 8732, 5288, 2604, 2608, 2612, 376, 0, 0, 8136, 8160, 8144, 13476, 548, 516, 0}, //offsets for: /mariadb/10.2.41/bin/mysqld (10.2.41-MariaDB)