Revert OAuth token refresh (#551)

.github/workflows/ci.yaml

@@ -75,7 +75,6 @@ jobs:
               --data-urlencode "client_secret=${CLIENT_SECRET}" \
               --data-urlencode 'grant_type=password' -o oauth.json
           cat oauth.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["access_token"])' > access_token.txt
-          cat oauth.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["refresh_token"])' > refresh_token.txt
 
           docker exec -u dbadmin vertica_docker /opt/vertica/bin/vsql -c "CREATE AUTHENTICATION v_oauth METHOD 'oauth' HOST '0.0.0.0/0';"
           docker exec -u dbadmin vertica_docker /opt/vertica/bin/vsql -c "ALTER AUTHENTICATION v_oauth SET client_id = '${CLIENT_ID}';"
@@ -97,10 +96,5 @@ jobs:
         run: |
           export VP_TEST_USER=dbadmin
           export VP_TEST_OAUTH_ACCESS_TOKEN=`cat access_token.txt`
-          export VP_TEST_OAUTH_REFRESH_TOKEN=`cat refresh_token.txt`
           export VP_TEST_OAUTH_USER=${USER}
-          export VP_TEST_OAUTH_CLIENT_ID=${CLIENT_ID}
-          export VP_TEST_OAUTH_CLIENT_SECRET=${CLIENT_SECRET}
-          export VP_TEST_OAUTH_TOKEN_URL="http://`hostname`:8080/realms/${REALM}/protocol/openid-connect/token"
-          export VP_TEST_OAUTH_DISCOVERY_URL="http://`hostname`:8080/realms/${REALM}/.well-known/openid-configuration"
           tox -e py

README.md

@@ -104,8 +104,6 @@ with vertica_python.connect(**conn_info) as connection:
 | log_level | See [Logging](#logging). |
 | log_path | See [Logging](#logging). |
 | oauth_access_token | See [OAuth Authentication](#oauth-authentication). <br>**_Default_**: "" |
-| oauth_refresh_token | See [OAuth Authentication](#oauth-authentication). <br>**_Default_**: "" |
-| oauth_config | See [OAuth Authentication](#oauth-authentication). <br>**_Default_**: {} |
 | request_complex_types | See [SQL Data conversion to Python objects](#sql-data-conversion-to-python-objects). <br>**_Default_**: True |
 | session_label | Sets a label for the connection on the server. This value appears in the client_label column of the _v_monitor.sessions_ system table. <br>**_Default_**: an auto-generated label with format of `vertica-python-{version}-{random_uuid}` |
 | ssl | See [TLS/SSL](#tlsssl). <br>**_Default_**: False (disabled) |
@@ -261,7 +259,7 @@ with vertica_python.connect(**conn_info) as conn:
 ```
 
 #### OAuth Authentication
-To authenticate via OAuth, one way is to provide an `oauth_access_token` that authorizes a user to the database. 
+To authenticate via OAuth, provide an `oauth_access_token` that authorizes a user to the database.
 ```python
 import vertica_python
 
@@ -274,35 +272,6 @@ conn_info = {'host': '127.0.0.1',
 with vertica_python.connect(**conn_info) as conn:
     # do things
 ```
-In cases where `oauth_access_token` is not set or introspection fails (e.g. when the access token expires), the client can do a token refresh when both `oauth_refresh_token` and `oauth_config` are set. The client will retrieve a new access token from the identity provider and use it to connect with the database.
-```python
-import vertica_python
-
-conn_info = {'host': '127.0.0.1',
-             'port': 5433,
-             'database': 'a_database',
-             # OAuth refresh token and configurations
-             'oauth_refresh_token': 'xxxxxx',
-             'oauth_config': {
-                 'client_secret': 'wK3SqFbExDS',
-                 'client_id': 'vertica',
-                 'token_url': 'https://example.com:8443/realms/master/protocol/openid-connect/token',
-             }
-}
-
-with vertica_python.connect(**conn_info) as conn:
-    # do things
-```
-The following table lists the `oauth_config` parameters used to configure OAuth token refresh:
-
-| Parameter     |  Description |
-| ------------- | ------------- |
-| client_id     | The client ID of the client application registered in the identity provider. |
-| client_secret | The client secret of the client application registered in the identity provider.|
-| token_url     | The endpoint to which token refresh requests are sent. The format for this depends on your provider. For examples, see the [Keycloak](https://www.keycloak.org/docs/latest/securing_apps/#token-endpoint) and [Okta](https://developer.okta.com/docs/reference/api/oidc/#token) documentation.|
-| discovery_url | Also known as the [OpenID Provider Configuration Document](https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderConfigurationRequest), this endpoint contains a list of all other endpoints supported by the identity provider. If set, *token_url* do not need to be specified.<br>If you set both *discovery_url* and *token_url*, then *token_url* takes precedence.|
-| scope         | The requested OAuth scopes, delimited with spaces. These scopes define the extent of access to the resource server (in this case, Vertica) granted to the client by the access token. For details, see the [OAuth documentation](https://www.oauth.com/oauth2-servers/scope/defining-scopes/). |
-
 
 #### Logging
 Logging is disabled by default if neither ```log_level``` or ```log_path``` are set. Passing value to at least one of those options to enable logging.

requirements-dev.txt

@@ -2,6 +2,5 @@ pytest
 pytest-timeout
 python-dateutil
 six
-requests
 tox
 #kerberos

setup.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -59,8 +59,7 @@
     python_requires=">=3.7",
     install_requires=[
         'python-dateutil>=1.5',
-        'six>=1.10.0',
-        'requests>=2.26.0'
+        'six>=1.10.0'
     ],
     classifiers=[
         "Development Status :: 5 - Production/Stable",

vertica_python/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -47,7 +47,7 @@
 
 # Main module for this library.
 __author__ = 'Vertica'
-__copyright__ = 'Copyright (c) 2018-2023 Open Text.'
+__copyright__ = 'Copyright (c) 2018-2024 Open Text.'
 __license__ = 'Apache 2.0'
 
 __all__ = ['Connection', 'PROTOCOL_VERSION', 'version_info', 'apilevel', 'threadsafety',

vertica_python/compat.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

vertica_python/datatypes.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

vertica_python/errors.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -103,15 +103,6 @@ class KerberosError(ConnectionError):
 class SSLNotSupported(ConnectionError):
     pass
 
-class OAuthConfigurationError(ConnectionError):
-    pass
-
-class OAuthEndpointDiscoveryError(ConnectionError):
-    pass
-
-class OAuthTokenRefreshError(ConnectionError):
-    pass
-
 class MessageError(InternalError):
     pass
 

vertica_python/os_utils.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023 Open Text.
+# Copyright (c) 2020-2024 Open Text.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

vertica_python/tests/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

vertica_python/tests/common/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

vertica_python/tests/common/base.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -56,11 +56,6 @@
     'password': '',
     'database': '',
     'oauth_access_token': '',
-    'oauth_refresh_token': '',
-    'oauth_client_id': '',
-    'oauth_client_secret': '',
-    'oauth_token_url': '',
-    'oauth_discovery_url': '',
     'oauth_user': '',
 }
 

vertica_python/tests/common/vp_test.conf.example

@@ -18,9 +18,3 @@ VP_TEST_LOG_DIR=mylog/vp_tox_tests_log
 # OAuth authentication information
 #VP_TEST_OAUTH_USER=<can be ignored if VP_TEST_DATABASE is set>
 #VP_TEST_OAUTH_ACCESS_TOKEN=******
-#VP_TEST_OAUTH_REFRESH_TOKEN=******
-#VP_TEST_OAUTH_CLIENT_ID=vertica
-#VP_TEST_OAUTH_CLIENT_SECRET=******
-#VP_TEST_OAUTH_TOKEN_URL=http://hostname:8080/realms/test/protocol/openid-connect/token
-#VP_TEST_OAUTH_DISCOVERY_URL=http://hostname:8080/realms/test/.well-known/openid-configuration
-

vertica_python/tests/conftest.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023 Open Text.
+# Copyright (c) 2019-2024 Open Text.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

vertica_python/tests/integration_tests/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

vertica_python/tests/integration_tests/base.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -55,10 +55,7 @@ class VerticaPythonIntegrationTestCase(VerticaPythonTestCase):
     def setUpClass(cls):
         config_list = ['log_dir', 'log_level', 'host', 'port',
                        'user', 'password', 'database',
-                       'oauth_access_token', 'oauth_refresh_token',
-                       'oauth_client_secret', 'oauth_client_id',
-                       'oauth_token_url', 'oauth_discovery_url',
-                       'oauth_user',]
+                       'oauth_access_token', 'oauth_user',]
         cls.test_config = cls._load_test_config(config_list)
 
         # Test logger
@@ -79,11 +76,6 @@ def setUpClass(cls):
         }
         cls._oauth_info = {
             'access_token': cls.test_config['oauth_access_token'],
-            'refresh_token': cls.test_config['oauth_refresh_token'],
-            'client_secret': cls.test_config['oauth_client_secret'],
-            'client_id': cls.test_config['oauth_client_id'],
-            'token_url': cls.test_config['oauth_token_url'],
-            'discovery_url': cls.test_config['oauth_discovery_url'],
             'user': cls.test_config['oauth_user'],
         }
         cls.db_node_num = cls._get_node_num()

vertica_python/tests/integration_tests/test_authentication.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
 from __future__ import print_function, division, absolute_import, annotations
 
 from .base import VerticaPythonIntegrationTestCase
-from ...errors import OAuthTokenRefreshError
 
 
 class AuthenticationTestCase(VerticaPythonIntegrationTestCase):
@@ -29,10 +28,6 @@ def tearDown(self):
         self._conn_info['password'] = self._password
         if 'oauth_access_token' in self._conn_info:
             del self._conn_info['oauth_access_token']
-        if 'oauth_refresh_token' in self._conn_info:
-            del self._conn_info['oauth_refresh_token']
-        if 'oauth_config' in self._conn_info:
-            del self._conn_info['oauth_config']
         super(AuthenticationTestCase, self).tearDown()
 
     def test_SHA512(self):
@@ -129,67 +124,5 @@ def test_oauth_access_token(self):
             res = cur.fetchone()
             self.assertEqual(res[0], 'OAuth')
 
-    def _test_oauth_refresh(self, access_token):
-        self.require_protocol_at_least(3 << 16 | 11)
-        if not self._oauth_info['refresh_token']:
-            self.skipTest('OAuth refresh token not set')
-        if not (self._oauth_info['client_secret'] and self._oauth_info['client_id'] and self._oauth_info['token_url']):
-            self.skipTest('One or more OAuth config (client_id, client_secret, token_url) not set')
-        if not self._oauth_info['user'] and not self._conn_info['database']:
-            self.skipTest('Both database and oauth_user are not set')
-
-        if access_token is not None:
-            self._conn_info['oauth_access_token'] = access_token
-        self._conn_info['user'] = self._oauth_info['user']
-        self._conn_info['oauth_refresh_token'] = self._oauth_info['refresh_token']
-        self._conn_info['oauth_config'] = {
-                'client_secret': self._oauth_info['client_secret'],
-                'client_id': self._oauth_info['client_id'],
-                'token_url': self._oauth_info['token_url'],
-        }
-        with self._connect() as conn:
-            cur = conn.cursor()
-            cur.execute("SELECT authentication_method FROM sessions WHERE session_id=(SELECT current_session())")
-            res = cur.fetchone()
-            self.assertEqual(res[0], 'OAuth')
-
-    def test_oauth_token_refresh_with_access_token_not_set(self):
-        self._test_oauth_refresh(access_token=None)
-
-    def test_oauth_token_refresh_with_invalid_access_token(self):
-        self._test_oauth_refresh(access_token='invalid_value')
-
-    def test_oauth_token_refresh_with_empty_access_token(self):
-        self._test_oauth_refresh(access_token='')
-
-    def test_oauth_token_refresh_with_discovery_url(self):
-        self.require_protocol_at_least(3 << 16 | 11)
-        if not self._oauth_info['refresh_token']:
-            self.skipTest('OAuth refresh token not set')
-        if not (self._oauth_info['client_secret'] and self._oauth_info['client_id'] and self._oauth_info['discovery_url']):
-            self.skipTest('One or more OAuth config (client_id, client_secret, discovery_url) not set')
-        if not self._oauth_info['user'] and not self._conn_info['database']:
-            self.skipTest('Both database and oauth_user are not set')
-
-        self._conn_info['user'] = self._oauth_info['user']
-        self._conn_info['oauth_refresh_token'] = self._oauth_info['refresh_token']
-        msg = 'Token URL or Discovery URL must be set.'
-        self.assertConnectionFail(err_type=OAuthTokenRefreshError, err_msg=msg)
-
-        self._conn_info['oauth_config'] = {
-                'client_secret': self._oauth_info['client_secret'],
-                'client_id': self._oauth_info['client_id'],
-                'discovery_url': self._oauth_info['discovery_url'],
-        }
-        with self._connect() as conn:
-            cur = conn.cursor()
-            cur.execute("SELECT authentication_method FROM sessions WHERE session_id=(SELECT current_session())")
-            res = cur.fetchone()
-            self.assertEqual(res[0], 'OAuth')
-
-        # Token URL takes precedence over Discovery URL
-        self._conn_info['oauth_config']['token_url'] = 'invalid_value'
-        self.assertConnectionFail(err_type=OAuthTokenRefreshError, err_msg='Failed getting OAuth access token from a refresh token.')
-
 
 exec(AuthenticationTestCase.createPrepStmtClass())

vertica_python/tests/integration_tests/test_cancel.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023 Open Text.
+# Copyright (c) 2019-2024 Open Text.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

vertica_python/tests/integration_tests/test_column.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

vertica_python/tests/integration_tests/test_connection.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

vertica_python/tests/integration_tests/test_cursor.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

vertica_python/tests/integration_tests/test_datatypes.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

vertica_python/tests/integration_tests/test_dates.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

vertica_python/tests/integration_tests/test_errors.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

vertica_python/tests/integration_tests/test_loadbalance.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

vertica_python/tests/integration_tests/test_timezones.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

vertica_python/tests/integration_tests/test_tls.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Open Text.
+# Copyright (c) 2023-2024 Open Text.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

vertica_python/tests/integration_tests/test_transfer_format.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023 Open Text.
+# Copyright (c) 2022-2024 Open Text.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

vertica_python/tests/integration_tests/test_unicode.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023 Open Text.
+# Copyright (c) 2018-2024 Open Text.
 # Copyright (c) 2018 Uber Technologies, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");