Expose port for audit plugin

Summary: Expose the port current mysqld is running on for the audit plugin. If no port, 0 is used.

Reviewed By: cevans87

Differential Revision: D5046701

fbshipit-source-id: e9d19be

Author: lth

include/mysql/plugin_audit.h

@@ -71,6 +71,7 @@ struct mysql_event_general
   unsigned long long affected_rows;
   const char *query_attributes;
   unsigned int query_attributes_length;
+  unsigned int port;
 };
 
 
@@ -110,6 +111,7 @@ struct mysql_event_connection
   /* Added in version 0x304 */
   const char *connection_certificate;
   unsigned int connection_certificate_length;
+  unsigned int port;
 };
 
 

include/mysql/plugin_audit.h.pp

@@ -292,6 +292,7 @@
   unsigned long long affected_rows;
   const char *query_attributes;
   unsigned int query_attributes_length;
+  unsigned int port;
 };
 struct mysql_event_connection
 {
@@ -314,6 +315,7 @@
   unsigned int database_length;
   const char *connection_certificate;
   unsigned int connection_certificate_length;
+  unsigned int port;
 };
 struct st_mysql_audit
 {

sql/sql_audit.cc

@@ -93,6 +93,7 @@ static void general_class_handler(THD *thd, uint event_subtype, va_list ap)
   event.query_attributes= va_arg(ap, const char*);
   event.query_attributes_length= va_arg(ap, unsigned int);
   event.query_id= thd ? (unsigned long long) thd->query_id : 0LL;
+  event.port = va_arg(ap, unsigned int);
   event_class_dispatch(thd, MYSQL_AUDIT_GENERAL_CLASS, &event);
 }
 
@@ -119,6 +120,7 @@ static void connection_class_handler(THD *thd, uint event_subclass, va_list ap)
   event.database_length= va_arg(ap, unsigned int);
   event.connection_certificate= va_arg(ap, const char*);
   event.connection_certificate_length= va_arg(ap, unsigned int);
+  event.port = va_arg(ap, unsigned int);
   event_class_dispatch(thd, MYSQL_AUDIT_CONNECTION_CLASS, &event);
 }
 

sql/sql_audit.h

@@ -135,7 +135,7 @@ void mysql_audit_general_log(THD *thd, const char *cmd, uint cmdlen,
                        error_code, time, user, userlen, cmd, cmdlen, query.str,
                        query.length, clientcs, resultrows, affectrows,
                        sql_command, host, external_user, ip, database,
-                       databaselen, queryattr, queryattrlen);
+                       databaselen, queryattr, queryattrlen, mysqld_port);
   }
 #endif
 }
@@ -223,7 +223,7 @@ void mysql_audit_general(THD *thd, uint event_subtype,
                        query.str(), query.length(), query.charset(),
                        resultrows, affectrows, sql_command, host,
                        external_user, ip, database, databaselen,
-                       queryattr, queryattrlen);
+                       queryattr, queryattrlen, mysqld_port);
   }
 #endif
 }
@@ -243,7 +243,7 @@ void mysql_audit_general(THD *thd, uint event_subtype,
   (thd)->security_ctx->get_ip()->length(),\
   (thd)->db, (thd)->db ? strlen((thd)->db) : 0,\
   (thd)->connection_certificate(),\
-  (thd)->connection_certificate_length());
+  (thd)->connection_certificate_length(), mysqld_port);
 
 
 #define MYSQL_AUDIT_NOTIFY_CONNECTION_DISCONNECT(thd, errcode)\
@@ -262,7 +262,7 @@ void mysql_audit_general(THD *thd, uint event_subtype,
   (thd)->security_ctx->get_ip()->length(),\
   (thd)->db, (thd)->db ? strlen((thd)->db) : 0,\
   (thd)->connection_certificate(),\
-  (thd)->connection_certificate_length());
+  (thd)->connection_certificate_length(), mysqld_port);
 
 #define MYSQL_AUDIT_NOTIFY_CONNECTION_CHANGE_USER(thd) mysql_audit_notify(\
   (thd), MYSQL_AUDIT_CONNECTION_CLASS, MYSQL_AUDIT_CONNECTION_CHANGE_USER,\
@@ -279,6 +279,6 @@ void mysql_audit_general(THD *thd, uint event_subtype,
   (thd)->security_ctx->get_ip()->length(),\
   (thd)->db, (thd)->db ? strlen((thd)->db) : 0,\
   (thd)->connection_certificate(),\
-  (thd)->connection_certificate_length());
+  (thd)->connection_certificate_length(), mysqld_port);
 
 #endif /* SQL_AUDIT_INCLUDED */