Merge branch 'release-8.0.28'

# Conflicts:
#	jdbc

Author: rsomla1

LICENSE.txt

@@ -10,7 +10,7 @@ Introduction
    third-party software which may be included in this distribution of
    MySQL Connector/C++ 8.0.
 
-   Last updated: July 2021
+   Last updated: September 2021
 
 Licensing Information
 
@@ -428,6 +428,7 @@ The Universal FOSS Exception, Version 1.0
    Software with Other FOSS, and the constants, function signatures, data
    structures and other invocation methods used to run or interact with
    each of them (as to each, such software's "Interfaces"):
+
     i. The Software's Interfaces may, to the extent permitted by the
        license of the Other FOSS, be copied into, used and distributed in
        the Other FOSS in order to enable interoperability, without
@@ -437,13 +438,15 @@ The Universal FOSS Exception, Version 1.0
        including without limitation as used in the Other FOSS (which upon
        any such use also then contains a portion of the Software under the
        Software License).
+
    ii. The Other FOSS's Interfaces may, to the extent permitted by the
        license of the Other FOSS, be copied into, used and distributed in
        the Software in order to enable interoperability, without requiring
        that such Interfaces be licensed under the terms of the Software
        License or otherwise altering their original terms, if this does
        not require any portion of the Software other than such Interfaces
        to be licensed under the terms other than the Software License.
+
    iii. If only Interfaces and no other code is copied between the
        Software and the Other FOSS in either direction, the use and/or
        distribution of the Software with the Other FOSS shall not be
@@ -477,6 +480,7 @@ Licenses for Third-Party Components
 Cyrus SASL
 
    Cyrus SASL
+
 * Copyright (c) 1994-2012 Carnegie Mellon University.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -1918,6 +1922,7 @@ OpenSSL License
    the original SSLeay license, separate from the Oracle product. If you
    do not wish to install this library, you may remove it, but the Oracle
    program might not operate properly or at all without it.
+
   LICENSE ISSUES
   ==============
 
@@ -2158,6 +2163,7 @@ SOFTWARE.
 ZSTD
 
    Zstandard
+
 Zstandard is dual-licensed under [BSD](LICENSE) and [GPLv2](COPYING).
 
  /*
@@ -2563,27 +2569,38 @@ Written Offer for Source Code
    request to the address listed below or by sending an email to Oracle
    using the following link:
    http://www.oracle.com/goto/opensourcecode/request.
+
   Oracle America, Inc.
   Attn: Senior Vice President
   Development and Engineering Legal
   500 Oracle Parkway, 10th Floor
   Redwood Shores, CA 94065
 
    Your request should include:
+
      * The name of the binary for which you are requesting the source code
+
      * The name and version number of the Oracle product containing the
        binary
+
      * The date you received the Oracle product
+
      * Your name
+
      * Your company name (if applicable)
+
      * Your return mailing address and email, and
+
      * A telephone number in the event we need to reach you.
 
+
    We may charge you a fee to cover the cost of physical media and
    processing.
 
    Your request must be sent
+
     a. within three (3) years of the date you received the Oracle product
        that included the binary that is the subject of your request, or
+
     b. in the case of code licensed under the GPL v3 for as long as Oracle
        offers spare parts or customer support for that product model.

cdk/foundation/connection_openssl.cc

@@ -79,8 +79,6 @@ POP_SYS_WARNINGS_CDK
 // Note: this list must be in increasing order.
 
 #define TLS_VERSIONS(X) \
-  X("TLSv1",   TLS1_VERSION,   1,0) \
-  X("TLSv1.1", TLS1_1_VERSION, 1,1) \
   X("TLSv1.2", TLS1_2_VERSION, 1,2) \
   X("TLSv1.3", TLS1_3_VERSION, 1,3) \
 

cdk/include/mysql/cdk/codec.h

@@ -67,7 +67,7 @@ class Format<TYPE_INTEGER> : public Format_base
 {
 public:
 
-  enum Fmt { UINT, SINT };
+  enum Fmt { UINT, SINT, BIT };
 
   Format(const Format_info &fi)
     : Format_base(TYPE_INTEGER, fi)
@@ -76,7 +76,8 @@ class Format<TYPE_INTEGER> : public Format_base
     fi.get_info(*this);
   }
 
-  bool is_unsigned() const { return UINT == m_fmt; }
+  bool is_bit() const { return BIT == m_fmt;}
+  bool is_unsigned() const { return UINT == m_fmt || BIT == m_fmt; }
   size_t length() const { return m_length; }
 
 protected:

cdk/include/mysql/cdk/mysqlx/result.h

@@ -155,6 +155,7 @@ class Col_metadata
   {
     switch (m_type)
     {
+    case protocol::mysqlx::col_type::BIT:
     case protocol::mysqlx::col_type::SINT:
     case protocol::mysqlx::col_type::UINT:
       return TYPE_INTEGER == type;
@@ -199,6 +200,9 @@ class Col_metadata
     case protocol::mysqlx::col_type::UINT:
       Format<TYPE_INTEGER>::Access::set_fmt(fmt, Format<TYPE_INTEGER>::UINT);
       break;
+    case protocol::mysqlx::col_type::BIT:
+      Format<TYPE_INTEGER>::Access::set_fmt(fmt, Format<TYPE_INTEGER>::BIT);
+      break;
     }
     Format<TYPE_INTEGER>::Access::set_length(fmt, m_length);
   }

cdk/mysqlx/result.cc

@@ -653,6 +653,7 @@ Type_info Cursor::type(col_count_t pos) const
 
   switch (md.m_type)
   {
+  case col_type::BIT:
   case col_type::SINT:
   case col_type::UINT:
     return TYPE_INTEGER;
@@ -680,7 +681,7 @@ Type_info Cursor::type(col_count_t pos) const
     return TYPE_STRING;
 
   default:
-    // TODO: correctly handle all X types (BIT)
+    // TODO: correctly handle all X types
     return TYPE_BYTES;
   }
 }

common/session.cc

@@ -364,7 +364,12 @@ void prepare_options(
       switch (opt_val.first)
       {
       case Option::TLS_VERSIONS:
+        try {
         tls_opt.add_version(opt_val.second.get_string());
+      }  catch (const cdk::Error&) {
+          //unexpected TLS versions are not errors. Only if no valid tls version
+          //is available, an error will be thrown below.
+        }
         break;
       case Option::TLS_CIPHERSUITES:
         tls_opt.add_ciphersuite(opt_val.second.get_string());

devapi/result.cc

@@ -115,6 +115,9 @@ Type get_api_type(cdk::Type_info type, const Format_info &fmt)
     const Format_descr<cdk::TYPE_INTEGER> &fd
       = fmt.get<cdk::TYPE_INTEGER>();
 
+    if(fd.m_format.is_bit())
+      return Type::BIT;
+
     size_t f_len = fd.m_format.length();
 
     if (f_len < 5)

devapi/session.cc

@@ -257,7 +257,7 @@ Session_detail::Session_detail(common::Settings_impl &settings)
   catch(const cdk::Error &e)
   {
     if (e.code() == cdk::cdkerrc::tls_versions)
-      throw_error("No supported TLS protocol version found in the 'tls-versions' list");
+      throw_error("No valid TLS version was given, valid versions are: TLSv1.2, TLSv1.3");
 
     else if (e.code() == cdk::cdkerrc::tls_ciphers)
       throw_error("No valid cipher suite found in the 'tls-ciphersuites' list");

devapi/tests/session-t.cc

@@ -4123,3 +4123,59 @@ TEST_F(Sess, compression_algorithms)
 
   }
 }
+
+TEST_F(Sess, tls_ver_deprecate)
+{
+  SKIP_IF_NO_XPLUGIN;
+
+  struct TEST_CASES
+  {
+    const std::string& tls_versions;
+    bool succeed;
+  };
+
+  bool has_tlsv1_3 = check_tls_ver("TLSv1.3");
+
+  TEST_CASES test_cases[] =
+  {
+    {"TLSv1.1,TLSv1.2" ,true        },
+    {"foo,TLSv1.3"     ,has_tlsv1_3 },
+    {"TLSv1.0,TLSv1.1" ,false       },
+    {"foo,TLSv1.1"     ,false       },
+    {"foo,bar"         ,false       },
+    {""                ,false       }
+  };
+
+  for(auto test : test_cases)
+  {
+
+    std::cout << "Testing:" << test.tls_versions << std::endl;
+
+    {
+      SessionSettings opt(SessionOption::HOST, get_host(),
+                          SessionOption::PORT, get_port(),
+                          SessionOption::USER, get_user(),
+                          SessionOption::PWD, get_password(),
+                          SessionOption::SSL_MODE,  SSLMode::REQUIRED);
+      EXPECT_EQ(test.succeed, check_tls_ver(test.tls_versions.c_str()));
+    }
+    //URI
+    std::stringstream uri;
+    uri << get_uri() << "/?tls-versions=[" << test.tls_versions << "]";
+
+    if(test.succeed)
+    {
+      EXPECT_NO_THROW(mysqlx::Session(uri.str()));
+    }
+    else
+    {
+      try {
+        mysqlx::Session(uri.str());
+
+      }  catch (const std::exception& e) {
+        EXPECT_EQ(std::string(e.what()), "No valid TLS version was given, valid versions are: TLSv1.2, TLSv1.3");
+      }
+    }
+  }
+
+}