Merge remote-tracking branch 'origin/2.0-wl10077' into 2.0

Author: rsomla1

cdk/parser/tests/parser-t.cc

@@ -1113,10 +1113,18 @@ TEST(Parser, uri)
       "host",
       URI_parts(none, none, "host", 0, none, false)
     },
+    {
+      "[::1]",
+      URI_parts(none, none, "::1", 0, none, false)
+    },
     {
       "host:123",
       URI_parts(none, none, "host", 123, none, false)
     },
+    {
+      "[::1]:123",
+      URI_parts(none, none, "::1", 123, none, false)
+    },
     {
       "host:0",
       URI_parts(none,none, "host", 0, none , false)
@@ -1125,6 +1133,10 @@ TEST(Parser, uri)
       "host/path",
       URI_parts(none , none, "host", 0, "path", false)
     },
+    {
+      "[::1]/path",
+      URI_parts(none , none, "::1", 0, "path", false)
+    },
     {
       "host/",
       URI_parts(none , none, "host", 0, "", false)
@@ -1133,6 +1145,10 @@ TEST(Parser, uri)
       "user@host/path",
       URI_parts("user" , none, "host", 0, "path", false)
     },
+    {
+      "user@[::1]/path",
+      URI_parts("user" , none, "::1", 0, "path", false)
+    },
     {
       "user%40host%2Fpath",
       URI_parts(none , none, "user@host/path", 0, none, false)
@@ -1145,10 +1161,18 @@ TEST(Parser, uri)
       "user:pwd@host",
       URI_parts("user" , "pwd", "host", 0, none, false)
     },
+    {
+      "user:pwd@[::1]",
+      URI_parts("user" , "pwd", "::1", 0, none, false)
+    },
     {
       "user:pwd@host:123",
       URI_parts("user" , "pwd", "host", 123, none, false)
     },
+    {
+      "user:pwd@[::1]:123",
+      URI_parts("user" , "pwd", "::1", 123, none, false)
+    },
     {
       "user:pwd@host:123/",
       URI_parts("user" , "pwd", "host", 123, "", false)
@@ -1157,6 +1181,10 @@ TEST(Parser, uri)
       "user:pwd@host:123/foo?key=val",
       URI_parts("user" , "pwd", "host", 123, "foo", true)
     },
+    {
+      "user:pwd@[::1]:123/foo?key=val",
+      URI_parts("user" , "pwd", "::1", 123, "foo", true)
+    },
     {
       "user:pwd@host:123?key=val",
       URI_parts("user" , "pwd", "host", 123, none, true)
@@ -1277,7 +1305,9 @@ TEST(Parser, uri)
     "host/db?query#foo",
     "host/db?a=[a,b,c&b",
     "host/db?a=[a,b,c]foo=bar",
-    "host/db?a=[a,b=foo"
+    "host/db?a=[a,b=foo",
+    "[::1]:port:123",
+    "[::1"
     //"host/db?l=[a,b&c]" TODO: should this fail?
     // TODO: allowed chars in host/path component
   };

cdk/parser/uri_parser.cc

@@ -263,6 +263,13 @@ struct URI_parser::TokSet
     m_bits.set(tt2);
   }
 
+  TokSet(token_type tt1, token_type tt2, token_type tt3)
+  {
+    m_bits.set(tt1);
+    m_bits.set(tt2);
+    m_bits.set(tt3);
+  }
+
   bool has_token(token_type tt) const
   {
     return m_bits.test(tt);
@@ -294,21 +301,30 @@ void URI_parser::process(Processor &prc) const
   bool        rescan = false;
   bool        has_port = false;
 
-  self->consume_until(host, TokSet(T_AT, T_COLON));
-
-  if (self->consume_token(T_COLON))
+  if (self->next_token_is(T_SQOPEN))
   {
     /*
+      IPv6 adress found! Will be parsed on rescan
+    */
+    rescan = true;
+  }
+  else
+  {
+    self->consume_until(host, TokSet(T_AT, T_COLON ));
+
+    if (self->consume_token(T_COLON))
+    {
+      /*
       We have seen  "<???>:" and it still can be user followed
       by a password or host followed by a port.
 
       We consume further tokens until @, or end of the authority
       part, whichever comes first.
     */
 
-    self->consume_until(port, T_AT);
+      self->consume_until(port, T_AT);
 
-    /*
+      /*
       If we see @ now, then it means we were looking at user
       credentials so far (and they are stored in host and port,
       respectively). We report them and request re-scanning host/port
@@ -319,25 +335,26 @@ void URI_parser::process(Processor &prc) const
       the corresponding variables.
     */
 
-    if (self->consume_token(T_AT))
-    {
-      // <user>:<pwd>@...
-      prc.user(host);
-      prc.password(port);
-      rescan = true;
+      if (self->consume_token(T_AT))
+      {
+        // <user>:<pwd>@...
+        prc.user(host);
+        prc.password(port);
+        rescan = true;
+      }
+      else
+        has_port = true;
     }
-    else
-      has_port = true;
-  }
-  else if (self->consume_token(T_AT))
-  {
-    /*
+    else if (self->consume_token(T_AT))
+    {
+      /*
       No ':' seen but we see '@'. It means user without password and
       user is stored in host variable. We report it an request
       re-scanning of host/port info.
     */
-    prc.user(host);
-    rescan = true;
+      prc.user(host);
+      rescan = true;
+    }
   }
 
   /*
@@ -350,7 +367,21 @@ void URI_parser::process(Processor &prc) const
   {
     host.clear();
     port.clear();
-    self->consume_until(host, T_COLON);
+
+    if (self->consume_token(T_SQOPEN))
+    {
+      /*
+        IPv6 address
+      */
+      host.clear();
+      self->consume_until(host, T_SQCLOSE);
+      if (!self->consume_token(T_SQCLOSE))
+        throw Error(this, L"Missing ']' while parsing IPv6 address");
+    }
+    else
+    {
+      self->consume_until(host, T_COLON );
+    }
 
     if (self->consume_token(T_COLON))
     {

devapi/tests/session-t.cc

@@ -432,3 +432,57 @@ TEST_F(Sess, ssl_session)
   }
 
 }
+
+TEST_F(Sess, ipv6)
+{
+
+  SKIP_IF_NO_XPLUGIN;
+
+  {
+    mysqlx::XSession sess(SessionSettings::HOST, "::1",
+                          SessionSettings::PORT, get_port(),
+                          SessionSettings::USER, get_user(),
+                          SessionSettings::PWD, get_password() ? get_password() : nullptr ,
+                          SessionSettings::SSL_ENABLE, false);
+  }
+
+  //Using URI
+
+  std::stringstream uri;
+
+  uri << "mysqlx://" << get_user();
+
+  if (get_password() && *get_password())
+    uri << ":"<< get_password();
+
+  uri << "@" << "[::1]:" << get_port();
+
+  //URI without ssl_enable
+  {
+    mysqlx::XSession sess(uri.str());
+
+    SqlResult res =  sess.bindToDefaultShard().sql("SHOW STATUS LIKE 'mysqlx_ssl_cipher'").execute();
+
+    auto row = res.fetchOne();
+    cout << row[0] << ":" << row[1] << endl;
+
+    string cipher = row[1];
+
+    EXPECT_TRUE(cipher.empty());
+  }
+
+  //Enable SSL
+  uri << "/?ssl-enable";
+  {
+    mysqlx::XSession sess(uri.str());
+
+    SqlResult res =  sess.bindToDefaultShard().sql("SHOW STATUS LIKE 'mysqlx_ssl_cipher'").execute();
+
+    auto row = res.fetchOne();
+    cout << row[0] << ":" << row[1] << endl;
+
+    string cipher = row[1];
+
+    EXPECT_FALSE(cipher.empty());
+  }
+}