From ceb148c0e7af29e8b18ae6f6f17d080b4aed7196 Mon Sep 17 00:00:00 2001
From: Tom Ridley <ridley2@jsfl05.jusuf>
Date: Fri, 22 Jul 2022 16:57:10 +0200
Subject: [PATCH 1/2] Added signature version variable and try/except behaviour
 to account for older S3 interfaces

---
 jupyterlab_s3_browser/__init__.py |  6 ++++++
 jupyterlab_s3_browser/handlers.py | 28 +++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/jupyterlab_s3_browser/__init__.py b/jupyterlab_s3_browser/__init__.py
index 9d56a88..ebb06ec 100755
--- a/jupyterlab_s3_browser/__init__.py
+++ b/jupyterlab_s3_browser/__init__.py
@@ -45,6 +45,12 @@ class JupyterLabS3(Configurable):
         config=True,
         help="(Optional) Token if you use STS as auth method",
     )
+    
+    signature_version = Unicode(
+        default_value="",
+        config=True,
+        help="Signature version variable to support older S3 interfaces",
+    )
 
 
 def _load_jupyter_server_extension(server_app):
diff --git a/jupyterlab_s3_browser/handlers.py b/jupyterlab_s3_browser/handlers.py
index a611be7..b9494c6 100644
--- a/jupyterlab_s3_browser/handlers.py
+++ b/jupyterlab_s3_browser/handlers.py
@@ -8,6 +8,8 @@
 import boto3
 import tornado
 from botocore.exceptions import NoCredentialsError
+from botocore.exceptions import ClientError
+from botocore.client import Config
 from jupyter_server.base.handlers import APIHandler
 from jupyter_server.utils import url_path_join
 from pathlib import Path
@@ -28,6 +30,7 @@ def create_s3fs(config):
             secret=config.client_secret,
             token=config.session_token,
             client_kwargs={"endpoint_url": config.endpoint_url},
+            config_kwargs={'signature_version': config.signature_version},
         )
 
     else:
@@ -43,6 +46,7 @@ def create_s3_resource(config):
             aws_secret_access_key=config.client_secret,
             aws_session_token=config.session_token,
             endpoint_url=config.endpoint_url,
+            config=Config(signature_version=config.signature_version)
         )
 
     else:
@@ -107,6 +111,7 @@ def test_s3_credentials(endpoint_url, client_id, client_secret, session_token):
         aws_secret_access_key=client_secret,
         endpoint_url=endpoint_url,
         aws_session_token=session_token,
+        config=Config(signature_version=signature_version),
     )
     all_buckets = test.buckets.all()
     logging.debug(
@@ -146,6 +151,7 @@ def get(self, path=""):
                         config.client_id,
                         config.client_secret,
                         config.session_token,
+                        config.signature_version
                     )
                     logging.debug("...successfully authenticated")
 
@@ -174,14 +180,34 @@ def post(self, path=""):
             client_id = req["client_id"]
             client_secret = req["client_secret"]
             session_token = req["session_token"]
+            signature_version = 's3v4'
 
-            test_s3_credentials(endpoint_url, client_id, client_secret, session_token)
+            test_s3_credentials(endpoint_url, client_id, client_secret, session_token, signature_version)
 
             self.config.endpoint_url = endpoint_url
             self.config.client_id = client_id
             self.config.client_secret = client_secret
             self.config.session_token = session_token
+            self.config.signature_version = signature_version
 
+            self.finish(json.dumps({"success": True}))
+        except ClientError as pe:
+            req = json.loads(self.request.body)
+            endpoint_url = req["endpoint_url"]
+            client_id = req["client_id"]
+            client_secret = req["client_secret"]
+            session_token = req["session_token"]
+            signature_version = 's3'
+
+            test_s3_credentials(endpoint_url, client_id, client_secret, session_token,signature_version)
+
+            self.config.endpoint_url = endpoint_url
+            self.config.client_id = client_id
+            self.config.client_secret = client_secret
+            self.config.session_token = session_token
+            self.config.signature_version = signature_version
+            
+            logging.info("authenticated with s3 credentials signature_version")
             self.finish(json.dumps({"success": True}))
         except Exception as err:
             logging.info("unable to authenticate using credentials")

From 73770b0eaf865a52fe100d705796407e4bbd8af9 Mon Sep 17 00:00:00 2001
From: tktridley <77678086+tktridley@users.noreply.github.com>
Date: Wed, 27 Jul 2022 10:56:26 +0200
Subject: [PATCH 2/2] Update handlers.py

Fixed function definition
---
 jupyterlab_s3_browser/handlers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jupyterlab_s3_browser/handlers.py b/jupyterlab_s3_browser/handlers.py
index b9494c6..301ff7b 100644
--- a/jupyterlab_s3_browser/handlers.py
+++ b/jupyterlab_s3_browser/handlers.py
@@ -100,7 +100,7 @@ def has_aws_s3_role_access():
         return False
 
 
-def test_s3_credentials(endpoint_url, client_id, client_secret, session_token):
+def test_s3_credentials(endpoint_url, client_id, client_secret, session_token, signature_version):
     """
     Checks if we're able to list buckets with these credentials.
     If not, it throws an exception.