Merge branch 'release/25.0.0'

Author: felliott

.github/workflows/test-build.yml

@@ -21,7 +21,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Cache Build Requirements
         id: pip-cache-step
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ env.pythonLocation }}
           key: ${{ env.GHA_DISTRO }}-${{ env.pythonLocation }}-${{ hashFiles('requirements.txt', 'dev-requirements.txt') }}
@@ -44,7 +44,7 @@ jobs:
         with:
           python-version: 3.6
       - name: Cache pip
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ env.pythonLocation }}
           key: ${{ env.GHA_DISTRO }}-${{ env.pythonLocation }}-${{ hashFiles('requirements.txt', 'dev-requirements.txt') }}

CHANGELOG

@@ -2,6 +2,13 @@
 ChangeLog
 *********
 
+25.0.0 (2025-02-21)
+===================
+
+- Fix: Sometimes OneDrive gets mad if we include the `Authorization` header along with a signed
+request. Not every onedrive host server complains, but some do. Ergo, we stop doing it globally.
+- Feature: Support OSF's gravyvalet service by allowing gv to define provider in settings.
+
 23.0.0 (2023-08-17)
 ===================
 

tests/providers/onedrive/test_provider.py

@@ -516,7 +516,6 @@ async def test_download_standard_file_range(self, provider, download_fixtures):
         assert content == b'te'
         assert aiohttpretty.has_call(method='GET', uri=download_url,
                                      headers={'Range': 'bytes=0-1',
-                                              'Authorization': 'bearer wrote harry potter',
                                               'accept-encoding': ''})
 
     @pytest.mark.asyncio

waterbutler/core/utils.py

@@ -37,7 +37,9 @@ def make_provider(name: str, auth: dict, credentials: dict, settings: dict, **kw
     try:
         manager = driver.DriverManager(
             namespace='waterbutler.providers',
-            name=name,
+            # with gravyvalet active, "name" is opaque id for a specific addon
+            # instance and osf puts the provider name in settings['service']
+            name=settings.pop('service', name),
             invoke_on_load=True,
             invoke_args=(auth, credentials, settings),
             invoke_kwds=kwargs,

waterbutler/providers/onedrive/provider.py

@@ -310,6 +310,7 @@ async def download(self,  # type: ignore
             'GET',
             download_url,
             range=range,
+            no_auth_header=True,  # if download_url is signed, OD will sometimes 401 if auth header is included
             expects=(HTTPStatus.OK, HTTPStatus.PARTIAL_CONTENT),
             headers={'accept-encoding': ''},
             throws=exceptions.DownloadError,
@@ -766,6 +767,7 @@ async def _chunked_upload_stream_by_range(self, upload_url, data, start_range=0,
                                                                      start_range + len(data) - 1,
                                                                      total_size)
             },
+            no_auth_header=True,  # this endpoint will sometimes 401 if the Auth header included
             expects=(HTTPStatus.ACCEPTED, HTTPStatus.CREATED),
             throws=exceptions.UploadError
         )

waterbutler/version.py

@@ -1 +1 @@
-__version__ = '23.0.0'
+__version__ = '25.0.0'