mysqlx-connector-python 8.3.0__tar.gz → 9.0.0__tar.gz

{mysqlx-connector-python-8.3.0 → mysqlx-connector-python-9.0.0}/CONTRIBUTING.rst

@@ -23,7 +23,7 @@ Contributing to this project is easy. You just need to follow these steps.
 
 - Make sure you have a user account at `bugs.mysql.com <https://bugs.mysql.com>`_. You will need to reference this user account when you submit your Oracle Contributor Agreement (a.k.a. OCA).
 - Sign the Oracle Contributor Agreement. You can find instructions for doing that at the `OCA Page <https://oca.opensource.oracle.com/>`_.
-- Develop your pull request. Make sure you are aware of the `requirements <https://dev.mysql.com/doc/dev/connector-python/8.0/requirements.html>`_ for the project.
+- Develop your pull request. Make sure you are aware of the `requirements <https://dev.mysql.com/doc/dev/connector-python/requirements.html>`_ for the project.
 - Validate your pull request by including tests that sufficiently cover the functionality you are adding.
 - Verify that the entire test suite passes with your code applied.
 - Submit your pull request. While you can submit the pull request via `GitHub <https://github.com/mysql/mysql-connector-python/pulls>`_, you can also submit it directly via `bugs.mysql.com <https://bugs.mysql.com>`_.
@@ -35,7 +35,7 @@ Setting Up a Development Environment
 
 The following tips provide all the technical directions you should follow when writing code and before actually submitting your contribution.
 
-1) Make sure you have the necessary `prerequisites <https://dev.mysql.com/doc/dev/connector-python/8.0/installation.html#prerequisites>`_ for building the project and `Pylint <https://www.pylint.org/>`_ for static code analysis
+1) Make sure you have the necessary `prerequisites <https://dev.mysql.com/doc/dev/connector-python/installation.html#prerequisites>`_ for building the project and `Pylint <https://www.pylint.org/>`_ for static code analysis
 
 2) Clone MySQL Connector/Python
 

mysqlx-connector-python-9.0.0/INFO_BIN

@@ -0,0 +1,2 @@
+build-date: 2024-06-16 09:03:52 
+os-info: Linux-5.4.17-2136.328.3.el7uek.x86_64-x86_64-with-glibc2.17

mysqlx-connector-python-9.0.0/INFO_SRC

@@ -0,0 +1,4 @@
+version: 9.0.0
+branch: release/9.0.0
+commit: 59817f3de42d98ac2875a14ea265d77bd0ac3805
+short: 59817f3

{mysqlx-connector-python-8.3.0 → mysqlx-connector-python-9.0.0}/LICENSE.txt

@@ -1,6 +1,6 @@
 Licensing Information User Manual
 
-MySQL Connector/Python 8.3.0 Community
+MySQL Connector/Python 9.0.0 Community
      __________________________________________________________________
 
 Introduction
@@ -8,25 +8,25 @@ Introduction
    This License Information User Manual contains Oracle's product license
    and other licensing information, including licensing information for
    third-party software which may be included in this distribution of
-   MySQL Connector/Python 8.3.0 Community.
+   MySQL Connector/Python 9.0.0 Community.
 
-   Last updated: November 2023
+   Last updated: May 2024
 
 Licensing Information
 
-   This release of MySQL Connector/Python 8.3.0 Community is brought to
+   This release of MySQL Connector/Python 9.0.0 Community is brought to
    you by the MySQL team at Oracle. This software is released under
    version 2 of the GNU General Public License (GPLv2), as set forth
    below, with the following additional permissions:
 
-   This distribution of MySQL Connector/Python 8.3.0 Community is
-   distributed with certain software (including but not limited to
-   OpenSSL) that is licensed under separate terms, as designated in a
-   particular file or component or in the license documentation. Without
-   limiting your rights under the GPLv2, the authors of MySQL hereby grant
-   you an additional permission to link the program and your derivative
-   works with the separately licensed software that they have included
-   with the program.
+   This distribution of MySQL Connector/Python 9.0.0 Community is designed
+   to work with certain software (including but not limited to OpenSSL)
+   that is licensed under separate terms, as designated in a particular
+   file or component or in the license documentation. Without limiting
+   your rights under the GPLv2, the authors of MySQL hereby grant you an
+   additional permission to link the program and your derivative works
+   with the separately licensed software that they have either included
+   with the program or referenced in the documentation.
 
    Without limiting the foregoing grant of rights under the GPLv2 and
    additional permission as to separately licensed software, this
@@ -34,7 +34,7 @@ Licensing Information
    a copy of which is reproduced below and can also be found along with
    its FAQ at http://oss.oracle.com/licenses/universal-foss-exception.
 
-   Copyright (c) 2012, 2023, Oracle and/or its affiliates.
+   Copyright (c) 2012, 2024, Oracle and/or its affiliates.
 
 Election of GPLv2
 
@@ -642,6 +642,35 @@ of the input file used when generating it.  This code is not
 standalone and requires a support library to be linked with it.  This
 support library is itself covered by the above license.
 
+4th party - abseil-cpp
+----------------------
+
+=== Header in source files:
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// This header file contains C++11 versions of standard <utility> header
+// abstractions available within C++14 and C++17, and are designed to be
+// drop-in replacement for code compliant with C++14 and C++17.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+A copy of the Apache License v2.0, January 2004 license can be found
+in the 'Standard Licenses' section.
+
    ======================================================================
    ======================================================================
 
@@ -2114,6 +2143,13 @@ See Apache License v2.0, January 2004 in the
 
 OpenTelemetry C++
 
+You may be receiving a copy of the opentelemetry-cpp library with
+this MySQL product. The terms of the Oracle license do NOT apply
+to the opentelemetry-cpp library; it is licensed under the following
+license, separately from the Oracle programs you receive.
+If you do not wish to install this program, you may delete its files
+but the Oracle program might not operate properly or at all without it.
+
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 

{mysqlx-connector-python-8.3.0 → mysqlx-connector-python-9.0.0}/README.rst

@@ -8,25 +8,86 @@ MySQL Connector/Python
 .. image:: https://img.shields.io/pypi/l/mysql-connector-python.svg
    :target: https://pypi.org/project/mysql-connector-python/
 
-MySQL Connector/Python enables Python programs to access MySQL databases, using an API that is compliant with the `Python Database API Specification v2.0 (PEP 249) <https://www.python.org/dev/peps/pep-0249/>`_. It also contains an implementation of the `X DevAPI <https://dev.mysql.com/doc/x-devapi-userguide/en>`_, an Application Programming Interface for working with the `MySQL Document Store <https://dev.mysql.com/doc/refman/8.0/en/document-store.html>`_.
+MySQL Connector/Python enables Python programs to access MySQL databases, using
+an API that is compliant with the `Python Database API Specification v2.0
+(PEP 249) <https://www.python.org/dev/peps/pep-0249/>`_ - We refer to it as the
+`Classic API <https://dev.mysql.com/doc/connector-python/en/connector-python-reference.html>`_.
+
+It also contains an implementation of the `XDevAPI <https://dev.mysql.com/doc/x-devapi-userguide/en>`_
+- An Application Programming Interface for working with the `MySQL Document Store
+<https://dev.mysql.com/doc/refman/en/document-store.html>`_.
+
+Features
+--------
+
+* `Asynchronous Connectivity <https://dev.mysql.com/doc/connector-python/en/connector-python-asyncio.html>`_
+* `C-extension <https://dev.mysql.com/doc/connector-python/en/connector-python-cext.html>`_
+* `Telemetry <https://dev.mysql.com/doc/connector-python/en/connector-python-opentelemetry.html>`_
+* `XDevAPI <https://dev.mysql.com/doc/x-devapi-userguide/en>`_
+
 
 Installation
 ------------
 
 The recommended way to install Connector/Python is via `pip <https://pip.pypa.io/>`_.
 
-Make sure you have a recent `pip <https://pip.pypa.io/>`_ version installed on your system. If your system already has ``pip`` installed, you might need to update it. Or you can use the `standalone pip installer <https://pip.pypa.io/en/latest/installing/#installing-with-get-pip-py>`_.
+Make sure you have a recent `pip <https://pip.pypa.io/>`_ version installed
+on your system. If your system already has ``pip`` installed, you might need
+to update it. Or you can use the `standalone pip installer <https://pip.pypa.io/en/latest/installation/>`_.
+
+The *classic API* can be installed via pip as follows:
 
 .. code-block:: bash
 
-    shell> pip install mysql-connector-python
+    $ pip install mysql-connector-python
+
+, similarly, the *XDevAPI* can be installed with:
+
+.. code-block:: bash
 
-Please refer to the `installation tutorial <https://dev.mysql.com/doc/dev/connector-python/8.0/installation.html>`_ for installation alternatives.
+    $ pip install mysqlx-connector-python
 
-Getting Started
----------------
+Please refer to the `installation tutorial <https://dev.mysql.com/doc/dev/connector-python/installation.html>`_
+for installation alternatives of the XDevAPI.
 
-Using the MySQL classic protocol:
+++++++++++++++++++++
+Installation Options
+++++++++++++++++++++
+
+Connector packages included in MySQL Connector/Python allow you to install
+optional dependencies to unleash certain functionalities.
+
+.. code-block:: bash
+
+    # 3rd party packages to unleash the telemetry functionality are installed
+    $ pip install mysql-connector-python[telemetry]
+
+similarly, for the XDevAPI:
+
+.. code-block:: bash
+
+    # 3rd party packages to unleash the compression functionality are installed
+    $ pip install mysqlx-connector-python[compression]
+
+This installation option can be seen as a shortcut to install all the
+dependencies needed by a particular feature. Mind that this is optional
+and you are free to install the required dependencies by yourself.
+
+Options for the Classic connector:
+
+* dns-srv
+* gssapi
+* fido2
+* telemetry
+
+Options for the XDevAPI connector:
+
+* dns-srv
+* compression
+
+
+Classic
+-------
 
 .. code:: python
 
@@ -52,7 +113,9 @@ Using the MySQL classic protocol:
     # Close connection
     cnx.close()
 
-Using the MySQL X DevAPI:
+
+XDevAPI
+-------
 
 .. code:: python
 
@@ -83,8 +146,6 @@ Using the MySQL X DevAPI:
     session.close()
 
 
-Please refer to the `MySQL Connector/Python Developer Guide <https://dev.mysql.com/doc/connector-python/en/>`_ and the `MySQL Connector/Python X DevAPI Reference <https://dev.mysql.com/doc/dev/connector-python/>`_ for a complete usage guide.
-
 Additional Resources
 --------------------
 
@@ -94,14 +155,18 @@ Additional Resources
 - `MySQL Public Bug Tracker <https://bugs.mysql.com>`_
 - `Slack <https://mysqlcommunity.slack.com>`_ (`Sign-up <https://lefred.be/mysql-community-on-slack/>`_ required if you do not have an Oracle account)
 - `Stack Overflow <https://stackoverflow.com/questions/tagged/mysql-connector-python>`_
-- `InsideMySQL.com Connectors Blog <https://insidemysql.com/category/mysql-development/connectors/>`_
+- `Oracle Blogs <https://blogs.oracle.com/search.html?q=connector-python>`_
+
 
 Contributing
 ------------
 
-There are a few ways to contribute to the Connector/Python code. Please refer to the `contributing guidelines <CONTRIBUTING.rst>`_ for additional information.
+There are a few ways to contribute to the Connector/Python code. Please refer
+to the `contributing guidelines <CONTRIBUTING.rst>`_ for additional information.
+
 
 License
 -------
 
-Please refer to the `README.txt <README.txt>`_ and `LICENSE.txt <LICENSE.txt>`_ files, available in this repository, for further details.
+Please refer to the `README.txt <README.txt>`_ and `LICENSE.txt <LICENSE.txt>`_
+files, available in this repository, for further details.

{mysqlx-connector-python-8.3.0 → mysqlx-connector-python-9.0.0}/README.txt

@@ -2,12 +2,16 @@ Copyright (c) 2009, 2024, Oracle and/or its affiliates.
 
 This is a release of MySQL Connector/Python, Oracle's Python driver for MySQL.
 
+MySQL Connector/Python enables Python programs to access MySQL databases,
+using an API that is compliant with the Python Database API Specification
+v2.0 (PEP 249). It also contains an implementation of the XDevAPI.
+
 License information can be found in the LICENSE.txt file.
 
 This distribution may include materials developed by third parties. For license
 and attribution notices for these materials, please refer to the LICENSE.txt file.
 
-For more information on MySQL Connector/Python, visit
+For more information on MySQL Connector/Python XDevAPI, visit
   https://dev.mysql.com/doc/dev/connector-python/
 
 For additional downloads and the source of MySQL Connector/Python, visit

{mysqlx-connector-python-8.3.0 → mysqlx-connector-python-9.0.0}/mysqlx/__init__.py

@@ -1,16 +1,16 @@
-# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2024, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
 # published by the Free Software Foundation.
 #
-# This program is also distributed with certain software (including
+# This program is designed to work with certain software (including
 # but not limited to OpenSSL) that is licensed under separate terms,
 # as designated in a particular file or component or in included license
-# documentation.  The authors of MySQL hereby grant you an
+# documentation. The authors of MySQL hereby grant you an
 # additional permission to link the program and your derivative works
-# with the separately licensed software that they have included with
-# MySQL.
+# with the separately licensed software that they have either included with
+# the program or referenced in the documentation.
 #
 # Without limiting anything contained in the foregoing, this file,
 # which is part of MySQL Connector/Python, is also subject to the

{mysqlx-connector-python-8.3.0 → mysqlx-connector-python-9.0.0}/mysqlx/authentication.py

@@ -1,16 +1,16 @@
-# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2024, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
 # published by the Free Software Foundation.
 #
-# This program is also distributed with certain software (including
+# This program is designed to work with certain software (including
 # but not limited to OpenSSL) that is licensed under separate terms,
 # as designated in a particular file or component or in included license
-# documentation.  The authors of MySQL hereby grant you an
+# documentation. The authors of MySQL hereby grant you an
 # additional permission to link the program and your derivative works
-# with the separately licensed software that they have included with
-# MySQL.
+# with the separately licensed software that they have either included with
+# the program or referenced in the documentation.
 #
 # Without limiting anything contained in the foregoing, this file,
 # which is part of MySQL Connector/Python, is also subject to the

{mysqlx-connector-python-8.3.0 → mysqlx-connector-python-9.0.0}/mysqlx/charsets.py

@@ -1,18 +1,18 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2024, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
 # published by the Free Software Foundation.
 #
-# This program is also distributed with certain software (including
+# This program is designed to work with certain software (including
 # but not limited to OpenSSL) that is licensed under separate terms,
 # as designated in a particular file or component or in included license
-# documentation.  The authors of MySQL hereby grant you an
+# documentation. The authors of MySQL hereby grant you an
 # additional permission to link the program and your derivative works
-# with the separately licensed software that they have included with
-# MySQL.
+# with the separately licensed software that they have either included with
+# the program or referenced in the documentation.
 #
 # Without limiting anything contained in the foregoing, this file,
 # which is part of MySQL Connector/Python, is also subject to the

{mysqlx-connector-python-8.3.0 → mysqlx-connector-python-9.0.0}/mysqlx/connection.py

@@ -1,16 +1,16 @@
-# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2024, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
 # published by the Free Software Foundation.
 #
-# This program is also distributed with certain software (including
+# This program is designed to work with certain software (including
 # but not limited to OpenSSL) that is licensed under separate terms,
 # as designated in a particular file or component or in included license
-# documentation.  The authors of MySQL hereby grant you an
+# documentation. The authors of MySQL hereby grant you an
 # additional permission to link the program and your derivative works
-# with the separately licensed software that they have included with
-# MySQL.
+# with the separately licensed software that they have either included with
+# the program or referenced in the documentation.
 #
 # Without limiting anything contained in the foregoing, this file,
 # which is part of MySQL Connector/Python, is also subject to the
@@ -39,8 +39,6 @@ try:
 
     SSL_AVAILABLE = True
     TLS_VERSIONS = {
-        "TLSv1": ssl.PROTOCOL_TLSv1,
-        "TLSv1.1": ssl.PROTOCOL_TLSv1_1,
         "TLSv1.2": ssl.PROTOCOL_TLSv1_2,
     }
     # TLSv1.3 included in PROTOCOL_TLS, but PROTOCOL_TLS is not included on 3.4
@@ -65,7 +63,6 @@ import socket
 import sys
 import threading
 import uuid
-import warnings
 
 from typing import Any, Callable, Dict, List, Mapping, Optional, Tuple, Type, Union
 
@@ -85,7 +82,6 @@ from urllib.parse import parse_qsl, unquote, urlparse
 from .authentication import MySQL41AuthPlugin, PlainAuthPlugin, Sha256MemoryAuthPlugin
 from .constants import (
     COMPRESSION_ALGORITHMS,
-    DEPRECATED_TLS_VERSIONS,
     OPENSSL_CS_NAMES,
     SUPPORTED_TLS_VERSIONS,
     TLS_CIPHER_SUITES,
@@ -126,7 +122,12 @@ from .types import ColumnType, MessageType, ResultBaseType, StatementType
 
 sys.path.append("..")
 
-from .utils import linux_distribution
+from .tls_ciphers import UNACCEPTABLE_TLS_CIPHERSUITES, UNACCEPTABLE_TLS_VERSIONS
+from .utils import (
+    linux_distribution,
+    warn_ciphersuites_deprecated,
+    warn_tls_version_deprecated,
+)
 from .version import LICENSE, VERSION
 
 DUPLICATED_IN_LIST_ERROR = (
@@ -139,7 +140,7 @@ TLS_VERSION_ERROR = (
     "TLS protocol version (should be one of {})."
 )
 
-TLS_VERSION_DEPRECATED_ERROR = (
+TLS_VERSION_UNACCEPTABLE_ERROR = (
     "The given tls_version: '{}' are no longer allowed (should be one of {})."
 )
 
@@ -438,15 +439,11 @@ class SocketStream:
 
         self._is_ssl = True
 
-        # Raise a deprecation warning if TLSv1 or TLSv1.1 is being used
-        tls_version = self._socket.version()
-        if tls_version in ("TLSv1", "TLSv1.1"):
-            warn_msg = (
-                f"This connection is using {tls_version} which is now "
-                "deprecated and will be removed in a future release of "
-                "MySQL Connector/Python"
-            )
-            warnings.warn(warn_msg, DeprecationWarning)
+        # Raise a deprecation warning if a deprecated TLS cipher or
+        # version is being used.
+        cipher, tls_version, _ = self._socket.cipher()
+        warn_tls_version_deprecated(tls_version)
+        warn_ciphersuites_deprecated(cipher, tls_version)
 
     def is_ssl(self) -> bool:
         """Verifies if SSL is being used.
@@ -1544,6 +1541,7 @@ class ConnectionPool(queue.Queue):
     """
 
     def __init__(self, name: str, **kwargs: Any) -> None:
+        self.name: Optional[str] = None
         self._set_pool_name(name)
         self._open_sessions: int = 0
         self._connections_openned: List[PooledConnection] = []
@@ -3093,13 +3091,13 @@ def _validate_tls_versions(settings: Dict[str, Any]) -> None:
         )
 
     use_tls_versions = []
-    deprecated_tls_versions = []
+    unacceptable_tls_versions = []
     not_tls_versions = []
     for tls_ver in tls_versions:
         if tls_ver in SUPPORTED_TLS_VERSIONS:
             use_tls_versions.append(tls_ver)
-        if tls_ver in DEPRECATED_TLS_VERSIONS:
-            deprecated_tls_versions.append(tls_ver)
+        if tls_ver in UNACCEPTABLE_TLS_VERSIONS:
+            unacceptable_tls_versions.append(tls_ver)
         else:
             not_tls_versions.append(tls_ver)
 
@@ -3108,12 +3106,11 @@ def _validate_tls_versions(settings: Dict[str, Any]) -> None:
             raise NotSupportedError(
                 TLS_VER_NO_SUPPORTED.format(tls_versions, SUPPORTED_TLS_VERSIONS)
             )
-        use_tls_versions.sort()
         settings["tls-versions"] = use_tls_versions
-    elif deprecated_tls_versions:
+    elif unacceptable_tls_versions:
         raise NotSupportedError(
-            TLS_VERSION_DEPRECATED_ERROR.format(
-                deprecated_tls_versions, SUPPORTED_TLS_VERSIONS
+            TLS_VERSION_UNACCEPTABLE_ERROR.format(
+                unacceptable_tls_versions, SUPPORTED_TLS_VERSIONS
             )
         )
     elif not_tls_versions:
@@ -3206,6 +3203,19 @@ def _validate_tls_ciphersuites(settings: Dict[str, Any]) -> None:
             "No valid cipher suite found in the 'tls-ciphersuites' list"
         )
 
+    # raise an error when using an unacceptable cipher
+    for cipher_as_ossl in translated_names:
+        for tls_ver in SUPPORTED_TLS_VERSIONS[
+            : SUPPORTED_TLS_VERSIONS.index(newer_tls_ver) + 1
+        ]:
+            if (
+                cipher_as_ossl
+                in UNACCEPTABLE_TLS_CIPHERSUITES.get(tls_ver, {}).values()
+            ):
+                raise NotSupportedError(
+                    f"Cipher {cipher_as_ossl} when used with {tls_ver} is unacceptable."
+                )
+
     settings["tls-ciphersuites"] = translated_names
 
 

{mysqlx-connector-python-8.3.0 → mysqlx-connector-python-9.0.0}/mysqlx/constants.py

@@ -1,16 +1,16 @@
-# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2024, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
 # published by the Free Software Foundation.
 #
-# This program is also distributed with certain software (including
+# This program is designed to work with certain software (including
 # but not limited to OpenSSL) that is licensed under separate terms,
 # as designated in a particular file or component or in included license
-# documentation.  The authors of MySQL hereby grant you an
+# documentation. The authors of MySQL hereby grant you an
 # additional permission to link the program and your derivative works
-# with the separately licensed software that they have included with
-# MySQL.
+# with the separately licensed software that they have either included with
+# the program or referenced in the documentation.
 #
 # Without limiting anything contained in the foregoing, this file,
 # which is part of MySQL Connector/Python, is also subject to the
@@ -30,6 +30,8 @@
 
 from enum import Enum
 
+from . import tls_ciphers
+
 
 class Auth(Enum):
     """Enum to identify the authentication mechanisms."""
@@ -74,66 +76,11 @@ COMPRESSION_ALGORITHMS = {
     "zstd_stream": "zstd_stream",
 }
 
-TLS_VERSIONS = ["TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3"]
-SUPPORTED_TLS_VERSIONS = ["TLSv1.2", "TLSv1.3"]
-DEPRECATED_TLS_VERSIONS = ["TLSv1", "TLSv1.1"]
 
-# TLS v1.0 cipher suites IANI to OpenSSL name translation
-TLSV1_CIPHER_SUITES = {
-    "TLS_RSA_WITH_NULL_MD5": "NULL-MD5",
-    "TLS_RSA_WITH_NULL_SHA": "NULL-SHA",
-    "TLS_RSA_WITH_RC4_128_MD5": "RC4-MD5",
-    "TLS_RSA_WITH_RC4_128_SHA": "RC4-SHA",
-    "TLS_RSA_WITH_IDEA_CBC_SHA": "IDEA-CBC-SHA",
-    "TLS_RSA_WITH_3DES_EDE_CBC_SHA": "DES-CBC3-SHA",
-    "TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA": "Not implemented.",
-    "TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA": "Not implemented.",
-    "TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA": "DHE-DSS-DES-CBC3-SHA",
-    "TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA": "DHE-RSA-DES-CBC3-SHA",
-    "TLS_DH_anon_WITH_RC4_128_MD5": "ADH-RC4-MD5",
-    "TLS_DH_anon_WITH_3DES_EDE_CBC_SHA": "ADH-DES-CBC3-SHA",
-    # AES cipher suites from RFC3268, extending TLS v1.0
-    "TLS_RSA_WITH_AES_128_CBC_SHA": "AES128-SHA",
-    "TLS_RSA_WITH_AES_256_CBC_SHA": "AES256-SHA",
-    "TLS_DH_DSS_WITH_AES_128_CBC_SHA": "DH-DSS-AES128-SHA",
-    "TLS_DH_DSS_WITH_AES_256_CBC_SHA": "DH-DSS-AES256-SHA",
-    "TLS_DH_RSA_WITH_AES_128_CBC_SHA": "DH-RSA-AES128-SHA",
-    "TLS_DH_RSA_WITH_AES_256_CBC_SHA": "DH-RSA-AES256-SHA",
-    "TLS_DHE_DSS_WITH_AES_128_CBC_SHA": "DHE-DSS-AES128-SHA",
-    "TLS_DHE_DSS_WITH_AES_256_CBC_SHA": "DHE-DSS-AES256-SHA",
-    "TLS_DHE_RSA_WITH_AES_128_CBC_SHA": "DHE-RSA-AES128-SHA",
-    "TLS_DHE_RSA_WITH_AES_256_CBC_SHA": "DHE-RSA-AES256-SHA",
-    "TLS_DH_anon_WITH_AES_128_CBC_SHA": "ADH-AES128-SHA",
-    "TLS_DH_anon_WITH_AES_256_CBC_SHA": "ADH-AES256-SHA",
-    # Camellia cipher suites from RFC4132, extending TLS v1.0
-    "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA": "CAMELLIA128-SHA",
-    "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA": "CAMELLIA256-SHA",
-    "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA": "DH-DSS-CAMELLIA128-SHA",
-    "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA": "DH-DSS-CAMELLIA256-SHA",
-    "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA": "DH-RSA-CAMELLIA128-SHA",
-    "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA": "DH-RSA-CAMELLIA256-SHA",
-    "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA": "DHE-DSS-CAMELLIA128-SHA",
-    "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA": "DHE-DSS-CAMELLIA256-SHA",
-    "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA": "DHE-RSA-CAMELLIA128-SHA",
-    "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA": "DHE-RSA-CAMELLIA256-SHA",
-    "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA": "ADH-CAMELLIA128-SHA",
-    "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA": "ADH-CAMELLIA256-SHA",
-    # SEED cipher suites from RFC4162, extending TLS v1.0
-    "TLS_RSA_WITH_SEED_CBC_SHA": "SEED-SHA",
-    "TLS_DH_DSS_WITH_SEED_CBC_SHA": "DH-DSS-SEED-SHA",
-    "TLS_DH_RSA_WITH_SEED_CBC_SHA": "DH-RSA-SEED-SHA",
-    "TLS_DHE_DSS_WITH_SEED_CBC_SHA": "DHE-DSS-SEED-SHA",
-    "TLS_DHE_RSA_WITH_SEED_CBC_SHA": "DHE-RSA-SEED-SHA",
-    "TLS_DH_anon_WITH_SEED_CBC_SHA": "ADH-SEED-SHA",
-    # GOST cipher suites from draft-chudov-cryptopro-cptls, extending TLS v1.0
-    "TLS_GOSTR341094_WITH_28147_CNT_IMIT": "GOST94-GOST89-GOST89",
-    "TLS_GOSTR341001_WITH_28147_CNT_IMIT": "GOST2001-GOST89-GOST89",
-    "TLS_GOSTR341094_WITH_NULL_GOSTR3411": "GOST94-NULL-GOST94",
-    "TLS_GOSTR341001_WITH_NULL_GOSTR3411": "GOST2001-NULL-GOST94",
-}
+SUPPORTED_TLS_VERSIONS = (
+    tls_ciphers.APPROVED_TLS_VERSIONS + tls_ciphers.DEPRECATED_TLS_VERSIONS
+)
 
-# TLS v1.1 cipher suites IANI to OpenSSL name translation
-TLSV1_1_CIPHER_SUITES = TLSV1_CIPHER_SUITES
 
 # TLS v1.2 cipher suites IANI to OpenSSL name translation
 TLSV1_2_CIPHER_SUITES = {
@@ -283,15 +230,11 @@ TLSV1_3_CIPHER_SUITES = {
 }
 
 TLS_CIPHER_SUITES = {
-    "TLSv1": TLSV1_CIPHER_SUITES,
-    "TLSv1.1": TLSV1_1_CIPHER_SUITES,
     "TLSv1.2": TLSV1_2_CIPHER_SUITES,
     "TLSv1.3": TLSV1_3_CIPHER_SUITES,
 }
 
 OPENSSL_CS_NAMES = {
-    "TLSv1": TLSV1_CIPHER_SUITES.values(),
-    "TLSv1.1": TLSV1_1_CIPHER_SUITES.values(),
     "TLSv1.2": TLSV1_2_CIPHER_SUITES.values(),
     "TLSv1.3": TLSV1_3_CIPHER_SUITES.values(),
 }

{mysqlx-connector-python-8.3.0 → mysqlx-connector-python-9.0.0}/mysqlx/crud.py

@@ -1,16 +1,16 @@
-# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2024, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
 # published by the Free Software Foundation.
 #
-# This program is also distributed with certain software (including
+# This program is designed to work with certain software (including
 # but not limited to OpenSSL) that is licensed under separate terms,
 # as designated in a particular file or component or in included license
-# documentation.  The authors of MySQL hereby grant you an
+# documentation. The authors of MySQL hereby grant you an
 # additional permission to link the program and your derivative works
-# with the separately licensed software that they have included with
-# MySQL.
+# with the separately licensed software that they have either included with
+# the program or referenced in the documentation.
 #
 # Without limiting anything contained in the foregoing, this file,
 # which is part of MySQL Connector/Python, is also subject to the