Merge lp:~sergei.glushchenko/percona-server/5.6-ps-bug1313696 into lp:percona-server/5.6

[Sergei Glushchenko]

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/597/

Fix XML attribute escaping.

[Sergei Glushchenko (sergei.glushchenko)]

repushed. 5.6 GCA contains audit log plugin. no conflicts

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'mysql-test/include/audit_log_events.inc'
--- mysql-test/include/audit_log_events.inc	2014-04-21 12:07:45 +0000
+++ mysql-test/include/audit_log_events.inc	2014-05-14 14:46:36 +0000
@@ -50,4 +50,5 @@
 connection default;
 create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
 drop user 'jeffrey'@'localhost';
+select '&;&&&""""<><<>>>>';
 disconnect con1;

=== modified file 'mysql-test/r/audit_log.result'
--- mysql-test/r/audit_log.result	2014-04-21 12:07:45 +0000
+++ mysql-test/r/audit_log.result	2014-05-14 14:46:36 +0000
@@ -68,6 +68,9 @@
 drop database sa_db;
 create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
 drop user 'jeffrey'@'localhost';
+select '&;&&&""""<><<>>>>';
+&;&&&""""<><<>>>>
+&;&&&""""<><<>>>>
 CREATE TABLE t1 (c1 INT, c2 CHAR(20));
 CREATE TABLE t1 (c1 INT, c2 CHAR(20));
 ERROR 42S01: Table 't1' already exists
@@ -138,3 +141,6 @@
 drop database sa_db;
 create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
 drop user 'jeffrey'@'localhost';
+select '&;&&&""""<><<>>>>';
+&;&&&""""<><<>>>>
+&;&&&""""<><<>>>>

=== modified file 'plugin/audit_log/audit_log.c'
--- plugin/audit_log/audit_log.c	2014-04-21 12:07:45 +0000
+++ plugin/audit_log/audit_log.c	2014-05-14 14:46:36 +0000
@@ -120,85 +120,43 @@
   const char* base = in;
   char* outend = out + *outlen;
   const char* inend;
-
-  inend = in + (*inlen);
-
-  while ((in < inend) && (out < outend))
-  {
-    if (*in == '<')
-    {
-      if (outend - out < 4)
-        break;
-      *out++ = '&';
-      *out++ = 'l';
-      *out++ = 't';
-      *out++ = ';';
-    }
-    else if (*in == '>')
-    {
-      if (outend - out < 4)
-        break;
-      *out++ = '&';
-      *out++ = 'g';
-      *out++ = 't';
-      *out++ = ';';
-    }
-    else if (*in == '&')
-    {
-      if (outend - out < 5)
-        break;
-      *out++ = '&';
-      *out++ = 'a';
-      *out++ = 'm';
-      *out++ = 'p';
-      *out++ = ';';
-    }
-    else if (*in == '\r')
-    {
-      if (outend - out < 5)
-        break;
-      *out++ = '&';
-      *out++ = '#';
-      *out++ = '1';
-      *out++ = '3';
-      *out++ = ';';
-    }
-    else
-    {
-      *out++ = *in;
-    }
-    ++in;
-  }
-  *outlen = out - outstart;
-  *inlen = in - base;
-}
-
-
-static
-void attr_escape(const char *in, size_t *inlen, char* out, size_t *outlen)
-{
-  char* outstart = out;
-  const char* base = in;
-  char* outend = out + *outlen;
-  const char* inend;
-
-  inend = in + (*inlen);
-
-  while ((in < inend) && (out < outend))
-  {
-    if (*in == '"')
-    {
-      if (outend - out < 2)
-        break;
-      *out++ = '\\';
-      *out++ = '"';
-    }
-    else
-    {
-      *out++ = *in;
-    }
-    ++in;
-  }
+  size_t i;
+  my_bool replaced;
+
+  const struct {
+    char symbol;
+    size_t length;
+    const char *replace;
+  } escape[] = {
+    { '<',  4, "&lt;" },
+    { '>',  4, "&gt;" },
+    { '&',  5, "&amp;" },
+    { '\r', 5, "&#13;" },
+    { '"',  6, "&quot;" },
+  };
+
+  inend = in + (*inlen);
+
+  while ((in < inend) && (out < outend))
+  {
+    replaced= FALSE;
+    for (i= 0; i < array_elements(escape); i++)
+    {
+      if (*in == escape[i].symbol)
+      {
+        if ((outend - out) < (int) escape[i].length)
+          goto end_of_buffer;
+        memcpy(out, escape[i].replace, escape[i].length);
+        out += escape[i].length;
+        replaced= TRUE;
+        break;
+      }
+    }
+    if (!replaced)
+      *out++ = *in;
+    ++in;
+  }
+end_of_buffer:
   *outlen = out - outstart;
   *inlen = in - base;
 }
@@ -222,33 +180,6 @@
 }
 
 static
-char *attr_escape_string(const char *in, size_t inlen,
-                         char *out, size_t outlen)
-{
-  if (in != NULL)
-  {
-    --outlen;
-    attr_escape(in, &inlen, out, &outlen);
-    out[outlen]= 0;
-  }
-  else
-  {
-    out= 0;
-  }
-  return out;
-}
-
-static
-char *escape_string(const char *in, size_t inlen,
-                         char *out, size_t outlen)
-{
-  typedef char *(*escape_func_t)(const char *, size_t, char *, size_t);
-  const escape_func_t escape_func[] = { attr_escape_string, xml_escape_string };
-
-  return escape_func[audit_log_format](in, inlen, out, outlen);
-}
-
-static
 void logger_write_safe(LOGGER_HANDLE *log, const char *buffer, size_t size)
 {
   static int write_error= 0;
@@ -412,9 +343,9 @@
                      make_timestamp(timestamp, sizeof(timestamp), t),
                      event->general_sql_command.str,
                      event->general_thread_id, status,
-                     escape_string(event->general_query,
-                                   event->general_query_length,
-                                   query, sizeof(query)),
+                     xml_escape_string(event->general_query,
+                                       event->general_query_length,
+                                       query, sizeof(query)),
                      event->general_user,
                      event->general_host.str,
                      event->general_external_user.str,