AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-16 06:05:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

add aws s3 iam check (#5174)

Browse Source
This commit is contained in:
Jyong 2024-06-14 15:19:59 +08:00 committed by GitHub
parent 0633aae7dc
commit d7fbae286a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/.env.example
View File

@ -42,6 +42,7 @@ DB_DATABASE=dify
# storage type: local, s3, azure-blob # storage type: local, s3, azure-blob
STORAGE_TYPE=local STORAGE_TYPE=local
STORAGE_LOCAL_PATH=storage STORAGE_LOCAL_PATH=storage
S3_USE_AWS_MANAGED_IAM=false
S3_ENDPOINT=https://your-bucket-name.storage.s3.clooudflare.com S3_ENDPOINT=https://your-bucket-name.storage.s3.clooudflare.com
S3_BUCKET_NAME=your-bucket-name S3_BUCKET_NAME=your-bucket-name
S3_ACCESS_KEY=your-access-key S3_ACCESS_KEY=your-access-key

2
api/config.py
View File

@ -24,6 +24,7 @@ DEFAULTS = {
'APP_WEB_URL': 'https://udify.app', 'APP_WEB_URL': 'https://udify.app',
'FILES_URL': '', 'FILES_URL': '',
'FILES_ACCESS_TIMEOUT': 300, 'FILES_ACCESS_TIMEOUT': 300,
'S3_USE_AWS_MANAGED_IAM': 'False',
'S3_ADDRESS_STYLE': 'auto', 'S3_ADDRESS_STYLE': 'auto',
'STORAGE_TYPE': 'local', 'STORAGE_TYPE': 'local',
'STORAGE_LOCAL_PATH': 'storage', 'STORAGE_LOCAL_PATH': 'storage',
@ -226,6 +227,7 @@ class Config:
self.STORAGE_LOCAL_PATH = get_env('STORAGE_LOCAL_PATH') self.STORAGE_LOCAL_PATH = get_env('STORAGE_LOCAL_PATH')
# S3 Storage settings # S3 Storage settings
self.S3_USE_AWS_MANAGED_IAM = get_bool_env('S3_USE_AWS_MANAGED_IAM')
self.S3_ENDPOINT = get_env('S3_ENDPOINT') self.S3_ENDPOINT = get_env('S3_ENDPOINT')
self.S3_BUCKET_NAME = get_env('S3_BUCKET_NAME') self.S3_BUCKET_NAME = get_env('S3_BUCKET_NAME')
self.S3_ACCESS_KEY = get_env('S3_ACCESS_KEY') self.S3_ACCESS_KEY = get_env('S3_ACCESS_KEY')

4
api/extensions/storage/s3_storage.py
View File

@ -16,6 +16,10 @@ class S3Storage(BaseStorage):
super().__init__(app) super().__init__(app)
app_config = self.app.config app_config = self.app.config
self.bucket_name = app_config.get('S3_BUCKET_NAME') self.bucket_name = app_config.get('S3_BUCKET_NAME')
if app_config.get('S3_USE_AWS_MANAGED_IAM'):
session = boto3.Session()
self.client = session.client('s3')
else:
self.client = boto3.client( self.client = boto3.client(
's3', 's3',
aws_secret_access_key=app_config.get('S3_SECRET_KEY'), aws_secret_access_key=app_config.get('S3_SECRET_KEY'),

2
docker/docker-compose.yaml
View File

@ -81,6 +81,7 @@ services:
# only available when STORAGE_TYPE is `local`. # only available when STORAGE_TYPE is `local`.
STORAGE_LOCAL_PATH: storage STORAGE_LOCAL_PATH: storage
# The S3 storage configurations, only available when STORAGE_TYPE is `s3`. # The S3 storage configurations, only available when STORAGE_TYPE is `s3`.
S3_USE_AWS_MANAGED_IAM: 'false'
S3_ENDPOINT: 'https://xxx.r2.cloudflarestorage.com' S3_ENDPOINT: 'https://xxx.r2.cloudflarestorage.com'
S3_BUCKET_NAME: 'difyai' S3_BUCKET_NAME: 'difyai'
S3_ACCESS_KEY: 'ak-difyai' S3_ACCESS_KEY: 'ak-difyai'
@ -236,6 +237,7 @@ services:
STORAGE_TYPE: local STORAGE_TYPE: local
STORAGE_LOCAL_PATH: storage STORAGE_LOCAL_PATH: storage
# The S3 storage configurations, only available when STORAGE_TYPE is `s3`. # The S3 storage configurations, only available when STORAGE_TYPE is `s3`.
S3_USE_AWS_MANAGED_IAM: 'false'
S3_ENDPOINT: 'https://xxx.r2.cloudflarestorage.com' S3_ENDPOINT: 'https://xxx.r2.cloudflarestorage.com'
S3_BUCKET_NAME: 'difyai' S3_BUCKET_NAME: 'difyai'
S3_ACCESS_KEY: 'ak-difyai' S3_ACCESS_KEY: 'ak-difyai'