switch to s3

.github/workflows/fair-data-registry.yaml

@@ -22,18 +22,12 @@ jobs:
               else
                   brew install graphviz
               fi
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
-        with:
-          virtualenvs-create: true
-          virtualenvs-in-project: true
       - name: Run Tests
         run: |
-          poetry install 
-          source $VENV
+          python -m pip install -r local-requirements.txt
           DJANGO_SETTINGS_MODULE=drams.test-settings coverage run --omit=drams,scripts,tools manage.py test 
       - name: Generate XML
-        run: poetry run coverage xml
+        run: coverage xml
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
         with:

data_management/object_storage.py

@@ -1,33 +1,26 @@
-from hashlib import sha1
-import hmac
-import time
+import boto3
 
 from django.conf import settings
 
-def create_url(path, method, filename=None):
+def create_url(name, method, filename = None):
     bucket = settings.BUCKETS['default']
-    expiry_time = int(time.time() + int(bucket['duration']))
-    path = bucket['bucket_name'] + '/' + path
-    if method == 'GET':
-        hmac_body = '%s\n%s\n%s' % ('GET', expiry_time, path)
-    elif method == 'PUT':
-        hmac_body = '%s\n%s\n%s' % ('PUT', expiry_time, path)
-    sig = hmac.new(bucket['secret_key'].encode('utf-8'), hmac_body.encode('utf-8'), sha1).hexdigest()
-    url = '%s%s?temp_url_sig=%s&temp_url_expires=%d' % (bucket['url'], path, sig, expiry_time)
-    if filename:
-        url = '%s&filename=%s' % (url, filename)
-    return url
-
-def create_legacy_url(path, method, filename=None):
-    bucket = settings.BUCKETS['default']
-    expiry_time = int(time.time() + int(bucket['duration']))
-    path = bucket['bucket_name'] + '/' + path
-    if method == 'GET':
-        hmac_body = '%s\n%s\n%s' % ('GET', expiry_time, path)
-    elif method == 'PUT':
-        hmac_body = '%s\n%s\n%s' % ('PUT', expiry_time, path)
-    sig = hmac.new(bucket['secret_key'].encode('utf-8'), hmac_body.encode('utf-8'), sha1).hexdigest()
-    url = '%s%s?temp_url_sig=%s&temp_url_expires=%d' % (bucket['url'], path, sig, expiry_time)
-    if filename:
-        url = '%s&filename=%s' % (url, filename)
-    return url
+    session = boto3.session.Session()
+    s3_client = session.client(
+        service_name= 's3',
+        aws_access_key_id= bucket['access_key'],
+        aws_secret_access_key= bucket['secret_key'],
+        endpoint_url= bucket['url'],
+    )
+    if method == "GET":
+        response = s3_client.generate_presigned_url('get_object',
+                                                        Params={'Bucket': bucket['bucket_name'],
+                                                                'Key': name,
+                                                                'ResponseContentDisposition': f'attachment; filename = {filename}]',},
+                                                        ExpiresIn=bucket['duration'])
+    else:
+        response = s3_client.generate_presigned_url('put_object',
+                                                        Params={'Bucket': bucket['bucket_name'],
+                                                                'Key': name},
+                                                        ExpiresIn=bucket['duration'])
+
+    return response

local-requirements.txt

@@ -38,3 +38,4 @@ setuptools>54.2
 whitenoise==5.2.0
 coverage
 rocrate==0.7.0
+boto3>=1.24