Fixes ezhov-evgeny#43 - local certificate options ignored

If the webdav_cert_path and webdav_key_path options are set, they
should be passed to the call to requests in Client.execute_request
as the cert parameter.

.travis.yml

@@ -4,8 +4,7 @@ dist: xenial
 addons:
   sonarcloud:
     organization: "ezhov-evgeny"
-    token:
-      secure: f0f714f3bea6bd103e3eb82724ef3bb0d3b54d1d
+    token: f0f714f3bea6bd103e3eb82724ef3bb0d3b54d1d
 
 services:
   - docker

README.md

@@ -298,6 +298,10 @@ res1.write_async(local_path="~/Downloads/file1", callback)
 
 Release Notes
 -------------
+**Version 3.14.1**
+ * Fixed issue during coping and moving files with cyrillic names
+ * Support OAuth2 bearer tokens by https://github.com/danielloader
+
 **Version 3.14**
  * Override methods for customizing communication with WebDAV servers
  * Support multiple clients simultaneously

setup.py

@@ -6,7 +6,7 @@ from setuptools import setup, find_packages
 from setuptools.command.install import install as InstallCommand
 from setuptools.command.test import test as TestCommand
 
-version = "3.14"
+version = "3.14.1"
 requirements = "libxml2-dev libxslt-dev python-dev"
 
 

tests/base_client_it.py

@@ -13,6 +13,7 @@ class BaseClientTestCase(unittest.TestCase):
     remote_path_dir = 'test_dir'
     remote_path_dir2 = 'test_dir2'
     remote_inner_path_dir = 'test_dir/inner'
+    inner_dir_name = 'inner'
     local_base_dir = 'tests/'
     local_file = 'test.txt'
     local_file_path = local_base_dir + 'test.txt'

tests/test_client_it.py

@@ -208,10 +208,10 @@ class ClientTestCase(BaseClientTestCase):
         self._prepare_for_downloading(True)
         self.client.pull(self.remote_path_dir, self.local_path_dir)
         self.assertTrue(path.exists(self.local_path_dir), 'Expected the directory is downloaded.')
-        self.assertTrue(path.exists(self.local_path_dir + os.path.sep + 'inner'), 'Expected the directory is downloaded.')
-        self.assertTrue(path.exists(self.local_path_dir + os.path.sep + 'inner'), 'Expected the directory is downloaded.')
+        self.assertTrue(path.exists(self.local_path_dir + os.path.sep + self.inner_dir_name), 'Expected the directory is downloaded.')
+        self.assertTrue(path.exists(self.local_path_dir + os.path.sep + self.inner_dir_name), 'Expected the directory is downloaded.')
         self.assertTrue(path.isdir(self.local_path_dir), 'Expected this is a directory.')
-        self.assertTrue(path.isdir(self.local_path_dir + os.path.sep + 'inner'), 'Expected this is a directory.')
+        self.assertTrue(path.isdir(self.local_path_dir + os.path.sep + self.inner_dir_name), 'Expected this is a directory.')
         self.assertTrue(path.exists(self.local_path_dir + os.path.sep + self.local_file),
                         'Expected the file is downloaded')
         self.assertTrue(path.isfile(self.local_path_dir + os.path.sep + self.local_file),

tests/test_cyrilic_client_it.py

@@ -0,0 +1,23 @@
+import os
+import unittest
+
+from tests.test_client_it import ClientTestCase
+
+
+class MultiClientTestCase(ClientTestCase):
+    remote_path_file = 'директория/тестовый.txt'
+    remote_path_file2 = 'директория/тестовый2.txt'
+    remote_inner_path_file = 'директория/вложенная/тестовый.txt'
+    remote_path_dir = 'директория'
+    remote_path_dir2 = 'директория2'
+    remote_inner_path_dir = 'директория/вложенная'
+    inner_dir_name = 'вложенная'
+    local_base_dir = 'tests/'
+    local_file = 'тестовый.txt'
+    local_file_path = local_base_dir + 'тестовый.txt'
+    local_path_dir = local_base_dir + 'res/директория'
+    pulled_file = local_path_dir + os.sep + local_file
+
+
+if __name__ == '__main__':
+    unittest.main()

tests/test_tailing_slash_client_it.py

@@ -0,0 +1,26 @@
+import unittest
+
+from tests.test_client_it import ClientTestCase
+
+
+class TailingSlashClientTestCase(ClientTestCase):
+    options = {
+        'webdav_hostname': 'http://localhost:8585/',
+        'webdav_login': 'alice',
+        'webdav_password': 'secret1234',
+        'webdav_override_methods': {
+            'check': 'GET'
+        }
+    }
+
+    def test_list_inner(self):
+        self._prepare_for_downloading(True)
+        file_list = self.client.list(self.remote_inner_path_dir)
+        self.assertIsNotNone(file_list, 'List of files should not be None')
+
+    def test_hostname_no_tailing_slash(self):
+        self.assertEqual('5', self.client.webdav.hostname[-1])
+
+
+if __name__ == '__main__':
+    unittest.main()

tests/тестовый.txt

@@ -0,0 +1 @@
+test content for testing of webdav client

webdav3/client.py

@@ -177,7 +177,7 @@ class Client(object):
             headers.extend(headers_ext)
 
         if self.webdav.token:
-            webdav_token = "Authorization: OAuth {token}".format(token=self.webdav.token)
+            webdav_token = "Authorization: Bearer {token}".format(token=self.webdav.token)
             headers.append(webdav_token)
         return dict([map(lambda s: s.strip(), i.split(':', 1)) for i in headers])
 
@@ -214,9 +214,10 @@ class Client(object):
         response = self.session.request(
             method=self.requests[action],
             url=self.get_url(path),
-            auth=(self.webdav.login, self.webdav.password),
+            auth=(self.webdav.login, self.webdav.password) if (not self.webdav.token and not self.session.auth) else None,
             headers=self.get_headers(action, headers_ext),
             timeout=self.timeout,
+            cert=(self.webdav.cert_path, self.webdav.key_path) if (self.webdav.cert_path and self.webdav.key_path) else None,
             data=data,
             stream=True,
             verify=self.verify
@@ -535,7 +536,7 @@ class Client(object):
             raise RemoteParentNotFound(urn_to.path())
 
         headers = [
-            "Destination: {url}".format(url=self.get_url(urn_to))
+            "Destination: {url}".format(url=self.get_url(urn_to.quote()))
         ]
         if self.is_dir(urn_from.path()):
             headers.append("Depth: {depth}".format(depth=depth))
@@ -558,7 +559,7 @@ class Client(object):
         if not self.check(urn_to.parent()):
             raise RemoteParentNotFound(urn_to.path())
 
-        header_destination = "Destination: {path}".format(path=self.get_url(urn_to))
+        header_destination = "Destination: {path}".format(path=self.get_url(urn_to.quote()))
         header_overwrite = "Overwrite: {flag}".format(flag="T" if overwrite else "F")
         self.execute_request(action='move', path=urn_from.quote(), headers_ext=[header_destination, header_overwrite])
 

webdav3/connection.py

@@ -50,6 +50,7 @@ class WebDAVSettings(ConnectionSettings):
 
         self.root = Urn(self.root).quote() if self.root else ''
         self.root = self.root.rstrip(Urn.separate)
+        self.hostname = self.hostname.rstrip(Urn.separate)
 
     def is_valid(self):
         if not self.hostname:

webdav3/urn.py

@@ -34,13 +34,11 @@ class Urn(object):
         return self._path
 
     def filename(self):
-
         path_split = self._path.split(Urn.separate)
         name = path_split[-2] + Urn.separate if path_split[-1] == '' else path_split[-1]
         return unquote(name)
 
     def parent(self):
-
         path_split = self._path.split(Urn.separate)
         nesting_level = self.nesting_level()
         parent_path_split = path_split[:nesting_level]