feat: support aliyun oss auth v4

langgenius · Apr 26, 2024 · 3ac8d5b · 3ac8d5b
1 parent 2e454c7
commit 3ac8d5b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/api/.env.example b/api/.env.example
@@ -54,6 +54,8 @@ ALIYUN_OSS_BUCKET_NAME=your-bucket-name
 ALIYUN_OSS_ACCESS_KEY=your-access-key
 ALIYUN_OSS_SECRET_KEY=your-secret-key
 ALIYUN_OSS_ENDPOINT=your-endpoint
+ALIYUN_OSS_AUTH_VERSION=v1
+ALIYUN_OSS_REGION=your-region
 
 # CORS configuration
 WEB_API_CORS_ALLOW_ORIGINS=http://127.0.0.1:3000,*

diff --git a/api/config.py b/api/config.py
@@ -213,6 +213,8 @@ def __init__(self):
         self.ALIYUN_OSS_ACCESS_KEY=get_env('ALIYUN_OSS_ACCESS_KEY')
         self.ALIYUN_OSS_SECRET_KEY=get_env('ALIYUN_OSS_SECRET_KEY')
         self.ALIYUN_OSS_ENDPOINT=get_env('ALIYUN_OSS_ENDPOINT')
+        self.ALIYUN_OSS_REGION=get_env('ALIYUN_OSS_REGION')
+        self.ALIYUN_OSS_AUTH_VERSION=get_env('ALIYUN_OSS_AUTH_VERSION')
 
         # ------------------------
         # Vector Store Configurations.

diff --git a/api/extensions/ext_storage.py b/api/extensions/ext_storage.py
@@ -45,10 +45,17 @@ def init_app(self, app: Flask):
                                             credential=sas_token)
         elif self.storage_type == 'aliyun-oss':
             self.bucket_name = app.config.get('ALIYUN_OSS_BUCKET_NAME')
+            oss_auth_method = aliyun_s3.Auth
+            region = None
+            if app.config.get('ALIYUN_OSS_AUTH_VERSION') == 'v4':
+                oss_auth_method = aliyun_s3.AuthV4
+                region = app.config.get('ALIYUN_OSS_REGION')
+            oss_auth = oss_auth_method(app.config.get('ALIYUN_OSS_ACCESS_KEY'), app.config.get('ALIYUN_OSS_SECRET_KEY'))
             self.client = aliyun_s3.Bucket(
-                aliyun_s3.Auth(app.config.get('ALIYUN_OSS_ACCESS_KEY'), app.config.get('ALIYUN_OSS_SECRET_KEY')),
+                oss_auth,
                 app.config.get('ALIYUN_OSS_ENDPOINT'),
                 self.bucket_name,
+                region=region,
                 connect_timeout=30
             )
         else: