Patch fix: 0.23.1 (#1129)

* Allow injection of session_factory to allow use of a custom session * Jac/show server info (#1118) * Fix bug in exposing ExcelRequestOptions and test (#1123) * Fix a few pylint errors (#1124) * fix behavior when url has no protocol (#1125) * smoke test for pypi * Add permission control for Data Roles and Metrics (Issue #1063) (#1120) Co-authored-by: Marwan Baghdad <[email protected]> Co-authored-by: jorwoods <[email protected]> Co-authored-by: Brian Cantoni <[email protected]> Co-authored-by: TrimPeachu <[email protected]>
tableau · Oct 11, 2022 · 4873a58 · 4873a58
1 parent ef9e7fd
commit 4873a58
Show file tree

Hide file tree

Showing 12 changed files with 156 additions and 31 deletions.
diff --git a/.github/workflows/pypi-smoke-tests.yml b/.github/workflows/pypi-smoke-tests.yml
@@ -0,0 +1,36 @@
+# This workflow will install TSC from pypi and validate that it runs. For more information see:
+# https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Pypi smoke tests
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: 0 11 * * * # Every day at 11AM UTC (7AM EST)
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: ['3.x']
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: pip install
+      run: |
+        pip uninstall tableauserverclient
+        pip install tableauserverclient
+    - name: Launch app
+      run: |
+        python -c "import tableauserverclient as TSC
+        server = TSC.Server('http://example.com', use_server_version=False)"
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Tableau
+Copyright (c) 2022 Tableau
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/samples/smoke_test.py b/samples/smoke_test.py
@@ -0,0 +1,8 @@
+# This sample verifies that tableau server client is installed
+# and you can run it. It also shows the version of the client.
+
+import tableauserverclient as TSC
+
+server = TSC.Server("Fake-Server-Url", use_server_version=False)
+print("Client details:")
+print(TSC.server.endpoint.Endpoint._make_common_headers("fake-token", "any-content"))
diff --git a/tableauserverclient/__init__.py b/tableauserverclient/__init__.py
@@ -1,3 +1,4 @@
+from ._version import get_versions
 from .namespace import NEW_NAMESPACE as DEFAULT_NAMESPACE
 from .models import (
     BackgroundJobItem,

diff --git a/tableauserverclient/models/tableau_auth.py b/tableauserverclient/models/tableau_auth.py
@@ -65,6 +65,6 @@ def credentials(self):
         }
 
     def __repr__(self):
-        return "<PersonalAccessToken name={} token={} site={}>".format(
+        return "<PersonalAccessToken name={} token={}>(site={})".format(
             self.token_name, self.personal_access_token[:2] + "...", self.site_id
         )
diff --git a/tableauserverclient/models/tableau_types.py b/tableauserverclient/models/tableau_types.py
@@ -11,9 +11,11 @@
 
 class Resource:
     Database = "database"
+    Datarole = "datarole"
     Datasource = "datasource"
     Flow = "flow"
     Lens = "lens"
+    Metric = "metric"
     Project = "project"
     Table = "table"
     View = "view"

diff --git a/tableauserverclient/server/endpoint/auth_endpoint.py b/tableauserverclient/server/endpoint/auth_endpoint.py
@@ -28,7 +28,18 @@ def baseurl(self):
     def sign_in(self, auth_req):
         url = "{0}/{1}".format(self.baseurl, "signin")
         signin_req = RequestFactory.Auth.signin_req(auth_req)
-        server_response = self.parent_srv.session.post(url, data=signin_req, **self.parent_srv.http_options)
+        server_response = self.parent_srv.session.post(
+            url, data=signin_req, **self.parent_srv.http_options, allow_redirects=False
+        )
+        # manually handle a redirect so that we send the correct POST request instead of GET
+        # this will make e.g http://online.tableau.com work to redirect to http://east.online.tableau.com
+        if server_response.status_code == 301:
+            server_response = self.parent_srv.session.post(
+                server_response.headers["Location"],
+                data=signin_req,
+                **self.parent_srv.http_options,
+                allow_redirects=False,
+            )
         self.parent_srv._namespace.detect(server_response.content)
         self._check_status(server_response, url)
         parsed_response = fromstring(server_response.content)

diff --git a/tableauserverclient/server/endpoint/endpoint.py b/tableauserverclient/server/endpoint/endpoint.py
@@ -12,11 +12,11 @@
     EndpointUnavailableError,
 )
 from ..query import QuerySet
-from ... import helpers
-from ..._version import get_versions
+from ... import helpers, get_versions
 
-__TSC_VERSION__ = get_versions()["version"]
-del get_versions
+if TYPE_CHECKING:
+    from ..server import Server
+    from requests import Response
 
 logger = logging.getLogger("tableau.endpoint")
 
@@ -25,11 +25,9 @@
 XML_CONTENT_TYPE = "text/xml"
 JSON_CONTENT_TYPE = "application/json"
 
-USERAGENT_HEADER = "User-Agent"
-
-if TYPE_CHECKING:
-    from ..server import Server
-    from requests import Response
+CONTENT_TYPE_HEADER = "content-type"
+TABLEAU_AUTH_HEADER = "x-tableau-auth"
+USER_AGENT_HEADER = "User-Agent"
 
 
 class Endpoint(object):
@@ -38,12 +36,13 @@ def __init__(self, parent_srv: "Server"):
 
     @staticmethod
     def _make_common_headers(auth_token, content_type):
+        _client_version: Optional[str] = get_versions()["version"]
         headers = {}
         if auth_token is not None:
-            headers["x-tableau-auth"] = auth_token
+            headers[TABLEAU_AUTH_HEADER] = auth_token
         if content_type is not None:
-            headers["content-type"] = content_type
-        headers["User-Agent"] = "Tableau Server Client/{}".format(__TSC_VERSION__)
+            headers[CONTENT_TYPE_HEADER] = content_type
+        headers[USER_AGENT_HEADER] = "Tableau Server Client/{}".format(_client_version)
         return headers
 
     def _make_request(

diff --git a/tableauserverclient/server/endpoint/projects_endpoint.py b/tableauserverclient/server/endpoint/projects_endpoint.py
@@ -99,6 +99,14 @@ def populate_workbook_default_permissions(self, item):
     def populate_datasource_default_permissions(self, item):
         self._default_permissions.populate_default_permissions(item, Resource.Datasource)
 
+    @api(version="3.2")
+    def populate_metric_default_permissions(self, item):
+        self._default_permissions.populate_default_permissions(item, Resource.Metric)
+
+    @api(version="3.4")
+    def populate_datarole_default_permissions(self, item):
+        self._default_permissions.populate_default_permissions(item, Resource.Datarole)
+
     @api(version="3.4")
     def populate_flow_default_permissions(self, item):
         self._default_permissions.populate_default_permissions(item, Resource.Flow)
@@ -115,6 +123,14 @@ def update_workbook_default_permissions(self, item, rules):
     def update_datasource_default_permissions(self, item, rules):
         return self._default_permissions.update_default_permissions(item, rules, Resource.Datasource)
 
+    @api(version="3.2")
+    def update_metric_default_permissions(self, item, rules):
+        return self._default_permissions.update_default_permissions(item, rules, Resource.Metric)
+
+    @api(version="3.4")
+    def update_datarole_default_permissions(self, item, rules):
+        return self._default_permissions.update_default_permissions(item, rules, Resource.Datarole)
+
     @api(version="3.4")
     def update_flow_default_permissions(self, item, rules):
         return self._default_permissions.update_default_permissions(item, rules, Resource.Flow)
@@ -131,6 +147,14 @@ def delete_workbook_default_permissions(self, item, rule):
     def delete_datasource_default_permissions(self, item, rule):
         self._default_permissions.delete_default_permission(item, rule, Resource.Datasource)
 
+    @api(version="3.2")
+    def delete_metric_default_permissions(self, item, rule):
+        self._default_permissions.delete_default_permission(item, rule, Resource.Metric)
+
+    @api(version="3.4")
+    def delete_datarole_default_permissions(self, item, rule):
+        self._default_permissions.delete_default_permission(item, rule, Resource.Datarole)
+
     @api(version="3.4")
     def delete_flow_default_permissions(self, item, rule):
         self._default_permissions.delete_default_permission(item, rule, Resource.Flow)

diff --git a/tableauserverclient/server/server.py b/tableauserverclient/server/server.py
@@ -1,9 +1,10 @@
+import logging
 import warnings
 
 import requests
 import urllib3
 
-from defusedxml.ElementTree import fromstring
+from defusedxml.ElementTree import fromstring, ParseError
 from packaging.version import Version
 from .endpoint import (
     Sites,
@@ -61,7 +62,7 @@ def __init__(self, server_address, use_server_version=False, http_options=None,
         self._site_id = None
         self._user_id = None
 
-        self._server_address = server_address
+        self._server_address: str = server_address
         self._session_factory = session_factory or requests.session
 
         self.auth = Auth(self)
@@ -103,10 +104,13 @@ def __init__(self, server_address, use_server_version=False, http_options=None,
 
     def validate_server_connection(self):
         try:
-            self._session.prepare_request(requests.Request("GET", url=self._server_address, params=self._http_options))
+            if not self._server_address.startswith("http://") and not self._server_address.startswith("https://"):
+                self._server_address = "http://" + self._server_address
+                self._session.prepare_request(
+                    requests.Request("GET", url=self._server_address, params=self._http_options)
+                )
         except Exception as req_ex:
-            warnings.warn("Invalid server initialization\n  {}".format(req_ex.__str__()), UserWarning)
-        print("==================")
+            raise ValueError("Invalid server initialization", req_ex)
 
     def __repr__(self):
         return "<TableauServerClient> [Connection: {}, {}]".format(self.baseurl, self.server_info.serverInfo)
@@ -140,7 +144,13 @@ def _set_auth(self, site_id, user_id, auth_token):
 
     def _get_legacy_version(self):
         response = self._session.get(self.server_address + "/auth?format=xml")
-        info_xml = fromstring(response.content)
+        try:
+            info_xml = fromstring(response.content)
+        except ParseError as parseError:
+            logging.getLogger("TSC.server").info(
+                "Could not read server version info. The server may not be running or configured."
+            )
+            return self.version
         prod_version = info_xml.find(".//product_version").text
         version = _PRODUCT_TO_REST_VERSION.get(prod_version, "2.1")  # 2.1
         return version
@@ -164,8 +174,6 @@ def use_server_version(self):
 
     def use_highest_version(self):
         self.use_server_version()
-        import warnings
-
         warnings.warn("use use_server_version instead", DeprecationWarning)
 
     def check_at_least_version(self, target: str):

diff --git a/test/http/test_http_requests.py b/test/http/test_http_requests.py
@@ -1,41 +1,58 @@
 import tableauserverclient as TSC
 import unittest
 import requests
+import requests_mock
 
-from requests_mock import adapter, mock
+from unittest import mock
 from requests.exceptions import MissingSchema
 
 
+# This method will be used by the mock to replace requests.get
+def mocked_requests_get(*args, **kwargs):
+    class MockResponse:
+        def __init__(self, status_code):
+            self.content = (
+                "<xml>"
+                "<version version='0.31'>"
+                "<api_version>0.31</api_version>"
+                "<server_api_version>0.31</server_api_version>"
+                "<product_version>2022.3</product_version>"
+                "</version>"
+                "</xml>"
+            )
+            self.status_code = status_code
+
+    return MockResponse(200)
+
+
 class ServerTests(unittest.TestCase):
     def test_init_server_model_empty_throws(self):
         with self.assertRaises(TypeError):
             server = TSC.Server()
 
-    def test_init_server_model_bad_server_name_complains(self):
-        # by default, it will just set the version to 2.3
+    def test_init_server_model_no_protocol_defaults_htt(self):
         server = TSC.Server("fake-url")
 
     def test_init_server_model_valid_server_name_works(self):
-        # by default, it will just set the version to 2.3
         server = TSC.Server("http://fake-url")
 
     def test_init_server_model_valid_https_server_name_works(self):
         # by default, it will just set the version to 2.3
         server = TSC.Server("https://fake-url")
 
     def test_init_server_model_bad_server_name_not_version_check(self):
-        # by default, it will just set the version to 2.3
         server = TSC.Server("fake-url", use_server_version=False)
 
     def test_init_server_model_bad_server_name_do_version_check(self):
-        with self.assertRaises(MissingSchema):
+        with self.assertRaises(requests.exceptions.ConnectionError):
             server = TSC.Server("fake-url", use_server_version=True)
 
     def test_init_server_model_bad_server_name_not_version_check_random_options(self):
-        # by default, it will just set the version to 2.3
+        # with self.assertRaises(MissingSchema):
         server = TSC.Server("fake-url", use_server_version=False, http_options={"foo": 1})
 
     def test_init_server_model_bad_server_name_not_version_check_real_options(self):
+        # with self.assertRaises(ValueError):
         server = TSC.Server("fake-url", use_server_version=False, http_options={"verify": False})
 
     def test_http_options_skip_ssl_works(self):
@@ -62,6 +79,25 @@ def test_http_options_not_sequence_fails(self):
         with self.assertRaises(ValueError):
             server.add_http_options({1, 2, 3})
 
+    def test_validate_connection_http(self):
+        url = "http://cookies.com"
+        server = TSC.Server(url)
+        server.validate_server_connection()
+        self.assertEqual(url, server.server_address)
+
+    def test_validate_connection_https(self):
+        url = "https://cookies.com"
+        server = TSC.Server(url)
+        server.validate_server_connection()
+        self.assertEqual(url, server.server_address)
+
+    def test_validate_connection_no_protocol(self):
+        url = "cookies.com"
+        fixed_url = "http://cookies.com"
+        server = TSC.Server(url)
+        server.validate_server_connection()
+        self.assertEqual(fixed_url, server.server_address)
+
 
 class SessionTests(unittest.TestCase):
     test_header = {"x-test": "true"}
@@ -74,6 +110,6 @@ def session_factory():
 
     def test_session_factory_adds_headers(self):
         test_request_bin = "http://capture-this-with-mock.com"
-        with mock() as m:
+        with requests_mock.mock() as m:
             m.get(url="http://capture-this-with-mock.com/api/2.4/serverInfo", request_headers=SessionTests.test_header)
             server = TSC.Server(test_request_bin, use_server_version=True, session_factory=SessionTests.session_factory)
diff --git a/versioneer.py b/versioneer.py