fix: `UserDataFiles` store uploads not proxied through server because of missing setting (#32182)

pull/32327/head^2
Kevin Aleman 2 years ago committed by GitHub
parent 3b650018e5
commit bc50dd54a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 6
      .changeset/lazy-gorilas-shop.md
  2. 21
      apps/meteor/server/settings/file-upload.ts
  3. 6
      packages/i18n/src/locales/en.i18n.json

@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/i18n": patch
---
Fixed an issue with object storage settings that was not allowing admins to decide if files generated via "Export conversation" feature were being proxied through server or not.

@ -187,6 +187,13 @@ export const createFileUploadSettings = () =>
value: 'AmazonS3',
},
});
await this.add('FileUpload_S3_Proxy_UserDataFiles', false, {
type: 'boolean',
enableQuery: {
_id: 'FileUpload_Storage_Type',
value: 'AmazonS3',
},
});
});
await this.section('Google Cloud Storage', async function () {
@ -244,6 +251,13 @@ export const createFileUploadSettings = () =>
value: 'GoogleCloudStorage',
},
});
await this.add('FileUpload_GoogleStorage_Proxy_UserDataFiles', false, {
type: 'boolean',
enableQuery: {
_id: 'FileUpload_Storage_Type',
value: 'GoogleCloudStorage',
},
});
});
await this.section('File System', async function () {
@ -302,6 +316,13 @@ export const createFileUploadSettings = () =>
value: 'Webdav',
},
});
await this.add('FileUpload_Webdav_Proxy_UserDataFiles', false, {
type: 'boolean',
enableQuery: {
_id: 'FileUpload_Storage_Type',
value: 'Webdav',
},
});
});
await this.add('FileUpload_Enabled_Direct', true, {

@ -2360,6 +2360,8 @@
"FileUpload_GoogleStorage_Proxy_Uploads": "Proxy Uploads",
"FileUpload_GoogleStorage_Proxy_Uploads_Description": "Proxy upload file transmissions through your server instead of direct access to the asset's URL",
"FileUpload_GoogleStorage_Secret": "Google Storage Secret",
"FileUpload_GoogleStorage_Proxy_UserDataFiles": "Proxy User Data Files",
"FileUpload_GoogleStorage_Proxy_UserDataFiles_Description": "Proxy user data file transmissions through your server instead of direct access to the asset's URL",
"FileUpload_GoogleStorage_Secret_Description": "Please follow [these instructions](https://github.com/CulturalMe/meteor-slingshot#google-cloud) and paste the result here.",
"FileUpload_json_web_token_secret_for_files": "File Upload Json Web Token Secret",
"FileUpload_json_web_token_secret_for_files_description": "File Upload Json Web Token Secret (Used to be able to access uploaded files without authentication)",
@ -2390,6 +2392,8 @@
"FileUpload_S3_Proxy_Avatars_Description": "Proxy avatar file transmissions through your server instead of direct access to the asset's URL",
"FileUpload_S3_Proxy_Uploads": "Proxy Uploads",
"FileUpload_S3_Proxy_Uploads_Description": "Proxy upload file transmissions through your server instead of direct access to the asset's URL",
"FileUpload_S3_Proxy_UserDataFiles": "Proxy User Data Files",
"FileUpload_S3_Proxy_UserDataFiles_Description": "Proxy user data file transmissions through your server instead of direct access to the asset's URL",
"Hold_Call_EE_only": "Hold Call (Enterprise Edition only)",
"FileUpload_S3_Region": "Region",
"FileUpload_S3_SignatureVersion": "Signature Version",
@ -2401,6 +2405,8 @@
"FileUpload_Webdav_Proxy_Avatars_Description": "Proxy avatar file transmissions through your server instead of direct access to the asset's URL",
"FileUpload_Webdav_Proxy_Uploads": "Proxy Uploads",
"FileUpload_Webdav_Proxy_Uploads_Description": "Proxy upload file transmissions through your server instead of direct access to the asset's URL",
"FileUpload_Webdav_Proxy_UserDataFiles": "Proxy User Data Files",
"FileUpload_Webdav_Proxy_UserDataFiles_Description": "Proxy user data file transmissions through your server instead of direct access to the asset's URL",
"FileUpload_Webdav_Server_URL": "WebDAV Server Access URL",
"FileUpload_Webdav_Upload_Folder_Path": "Upload Folder Path",
"FileUpload_Webdav_Upload_Folder_Path_Description": "WebDAV folder path which the files should be uploaded to",

Loading…
Cancel
Save