Skip to content

Commit d70a7b7

Browse files
authored
chore: remove unused S3 SignatureVersion setting (RocketChat#39244)
1 parent c987432 commit d70a7b7

58 files changed

Lines changed: 9 additions & 74 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apps/meteor/app/file-upload/server/config/AmazonS3.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ const configure = _.debounce(() => {
7070
const AWSSecretAccessKey = settings.get<string>('FileUpload_S3_AWSSecretAccessKey');
7171
const URLExpiryTimeSpan = settings.get<number>('FileUpload_S3_URLExpiryTimeSpan');
7272
const Region = settings.get<string>('FileUpload_S3_Region');
73-
// const SignatureVersion = settings.get<string>('FileUpload_S3_SignatureVersion');
7473
const ForcePathStyle = settings.get<boolean>('FileUpload_S3_ForcePathStyle');
7574
// const CDN = RocketChat.settings.get('FileUpload_S3_CDN');
7675
const BucketURL = settings.get<string>('FileUpload_S3_BucketURL');
@@ -81,7 +80,6 @@ const configure = _.debounce(() => {
8180

8281
const config: Omit<S3Options, 'name' | 'getPath'> = {
8382
connection: {
84-
// signatureVersion: SignatureVersion,
8583
forcePathStyle: ForcePathStyle,
8684
region: Region,
8785
followRegionRedirects: true,

apps/meteor/server/settings/file-upload.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,6 @@ export const createFileUploadSettings = () =>
173173
i18nDescription: 'Override_URL_to_which_files_are_uploaded_This_url_also_used_for_downloads_unless_a_CDN_is_given.',
174174
secret: true,
175175
});
176-
await this.add('FileUpload_S3_SignatureVersion', 'v4', {
177-
type: 'string',
178-
enableQuery: {
179-
_id: 'FileUpload_Storage_Type',
180-
value: 'AmazonS3',
181-
},
182-
});
183176
await this.add('FileUpload_S3_ForcePathStyle', false, {
184177
type: 'boolean',
185178
enableQuery: {

packages/i18n/src/locales/af.i18n.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,6 @@
928928
"FileUpload_S3_Proxy_Uploads": "Volmagoplaaie",
929929
"FileUpload_S3_Proxy_Uploads_Description": "Proxy upload lêer oordragte deur u bediener in plaas van direkte toegang tot die bate se URL",
930930
"FileUpload_S3_Region": "streek",
931-
"FileUpload_S3_SignatureVersion": "Handtekening Weergawe",
932931
"FileUpload_S3_URLExpiryTimeSpan": "URL's Vervaldatum",
933932
"FileUpload_S3_URLExpiryTimeSpan_Description": "Die tyd daarna sal Amazon S3-gegenereerde URL's nie meer geldig wees nie (in sekondes). As dit minder as 5 sekondes is, sal hierdie veld geïgnoreer word.",
934933
"FileUpload_Storage_Type": "Bergingstipe",

packages/i18n/src/locales/ar.i18n.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1601,7 +1601,6 @@
16011601
"FileUpload_S3_Proxy_Uploads": "عمليات الرفع الخاصة بالوكيل",
16021602
"FileUpload_S3_Proxy_Uploads_Description": "إرسال ملف الرفع الخاص بالوكيل من خلال الخادم الخاص بك بدلاً من الوصول المباشر إلى عنوان URL الخاص بالأصل",
16031603
"FileUpload_S3_Region": "المنطقة",
1604-
"FileUpload_S3_SignatureVersion": "إصدار التوقيع",
16051604
"FileUpload_S3_URLExpiryTimeSpan": "فترة انتهاء صلاحية عناوين URL",
16061605
"FileUpload_S3_URLExpiryTimeSpan_Description": "الوقت الذي لن تصبح بعده عناوين URL التي تنشئها Amazon S3 صالحة (بالثواني). إذا تم التعيين على أقل من 5 ثوانٍ، فسيتم تجاهل هذا الحقل.",
16071606
"FileUpload_Storage_Type": "نوع التخزين",

packages/i18n/src/locales/az.i18n.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,6 @@
928928
"FileUpload_S3_Proxy_Uploads": "Proxy yükləmələri",
929929
"FileUpload_S3_Proxy_Uploads_Description": "Proxy, aktivinizin URL'sinə birbaşa daxil olmaq yerine, server vasitəsilə fayl ötürülmələrini yüklə",
930930
"FileUpload_S3_Region": "Region",
931-
"FileUpload_S3_SignatureVersion": "İmza versiyası",
932931
"FileUpload_S3_URLExpiryTimeSpan": "URL'lərin sona çatdırılması Timespan",
933932
"FileUpload_S3_URLExpiryTimeSpan_Description": "Amazon S3-in yaradılan URL-ləri sonradan (saniyədə) qüvvədə qalmayacaq. 5 saniyədən az müddətə təyin edildikdə, bu sahə göz ardı edilir.",
934933
"FileUpload_Storage_Type": "Saxlama növü",
@@ -2602,7 +2601,7 @@
26022601
"registration.component.form.emailOrUsername": "E-poçt və ya istifadəçi adı",
26032602
"registration.component.form.invalidConfirmPass": "Şifrənin təsdiqlənməsi şifrə uyğun gəlmir",
26042603
"registration.component.form.invalidEmail": "Girilən e-poçt etibarsızdır",
2605-
"registration.component.form.invalidEmailDomain":"Daxil edilən e-poçt ünvanının domeni etibarsızdır",
2604+
"registration.component.form.invalidEmailDomain": "Daxil edilən e-poçt ünvanının domeni etibarsızdır",
26062605
"registration.component.form.name": "Adı",
26072606
"registration.component.form.password": "Şifrə",
26082607
"registration.component.form.reasonToJoin": "Qoşulma səbəbi",

packages/i18n/src/locales/be-BY.i18n.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,6 @@
944944
"FileUpload_S3_Proxy_Uploads": "Proxy Спампаваць",
945945
"FileUpload_S3_Proxy_Uploads_Description": "Проксі-перадачы файлаў для загрузкі праз ваш сервер замест прамога доступу да URL актыву",
946946
"FileUpload_S3_Region": "вобласць",
947-
"FileUpload_S3_SignatureVersion": "подпіс Версія",
948947
"FileUpload_S3_URLExpiryTimeSpan": "URL-адрас Заканчэнне TimeSpan",
949948
"FileUpload_S3_URLExpiryTimeSpan_Description": "Час, пасля якога Amazon S3 генерыруюцца адрасу больш не будуць мець сілу (у секундах). Калі ўсталявана значэнне менш чым за 5 секунд, то гэта поле будзе праігнараваны.",
950949
"FileUpload_Storage_Type": "тып захоўвання",
@@ -2624,7 +2623,7 @@
26242623
"registration.component.form.emailOrUsername": "Email або імя карыстальніка",
26252624
"registration.component.form.invalidConfirmPass": "Пацвярджэнне пароля не супадае пароль",
26262625
"registration.component.form.invalidEmail": "Адрас электроннай пошты ня дзейнічае",
2627-
"registration.component.form.invalidEmailDomain":"Уведзены адрас электроннай пошты мае несапраўдны дамен",
2626+
"registration.component.form.invalidEmailDomain": "Уведзены адрас электроннай пошты мае несапраўдны дамен",
26282627
"registration.component.form.name": "імя",
26292628
"registration.component.form.password": "пароль",
26302629
"registration.component.form.reasonToJoin": "прычына рэгістрацыі",

packages/i18n/src/locales/bg.i18n.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,6 @@
928928
"FileUpload_S3_Proxy_Uploads": "Качвания на прокси сървъри",
929929
"FileUpload_S3_Proxy_Uploads_Description": "Прокси файловете прехвърлят файлове през сървъра ви вместо директен достъп до URL адреса на актива",
930930
"FileUpload_S3_Region": "Регион",
931-
"FileUpload_S3_SignatureVersion": "Подписваща версия",
932931
"FileUpload_S3_URLExpiryTimeSpan": "Период на изтичане на URL адресите",
933932
"FileUpload_S3_URLExpiryTimeSpan_Description": "Времето, след което генерираните от Amazon S3 URL адреси вече няма да са валидни (в секунди). Ако е настроено на по-малко от 5 секунди, това поле ще бъде игнорирано.",
934933
"FileUpload_Storage_Type": "Тип съхранение",
@@ -2593,7 +2592,7 @@
25932592
"registration.component.form.email": "Електрона поща",
25942593
"registration.component.form.invalidConfirmPass": "Потвърждението на паролата не съвпада с паролата",
25952594
"registration.component.form.invalidEmail": "Въведеният имейл адрес е невалиден",
2596-
"registration.component.form.invalidEmailDomain":"Въведеният имейл адрес има невалиден домейн",
2595+
"registration.component.form.invalidEmailDomain": "Въведеният имейл адрес има невалиден домейн",
25972596
"registration.component.form.name": "Име",
25982597
"registration.component.form.password": "Парола",
25992598
"registration.component.form.reasonToJoin": "Причина за присъединяване",

packages/i18n/src/locales/bs.i18n.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,6 @@
924924
"FileUpload_S3_Proxy_Uploads": "Proxy učitavanja",
925925
"FileUpload_S3_Proxy_Uploads_Description": "Proxy prenosi datoteke prijenosa putem vašeg poslužitelja umjesto izravnog pristupa URL-u imovine",
926926
"FileUpload_S3_Region": "Regija",
927-
"FileUpload_S3_SignatureVersion": "Potpis verzije",
928927
"FileUpload_S3_URLExpiryTimeSpan": "Vrijeme isteka URLova",
929928
"FileUpload_S3_URLExpiryTimeSpan_Description": "Vrijeme nakon kojega će Amazon S3 generirani URLovi prestati vrijediti (u sekundama). Ako je namješteno na manje od 5 sekundi, polje će biti ignorirano.",
930929
"FileUpload_Storage_Type": "Tip Skladišta",
@@ -2590,7 +2589,7 @@
25902589
"registration.component.form.divider": "ili",
25912590
"registration.component.form.invalidConfirmPass": "Potvrda lozinke se ne slaže sa lozinkom",
25922591
"registration.component.form.invalidEmail": "Uneseni e-mail nije valjan",
2593-
"registration.component.form.invalidEmailDomain":"Unesena e-mail adresa ima nevažeću domenu",
2592+
"registration.component.form.invalidEmailDomain": "Unesena e-mail adresa ima nevažeću domenu",
25942593
"registration.component.form.name": "Ime",
25952594
"registration.component.form.password": "Lozinka",
25962595
"registration.component.form.reasonToJoin": "Razlog pridruživanja",

packages/i18n/src/locales/ca.i18n.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1579,7 +1579,6 @@
15791579
"FileUpload_S3_Proxy_Uploads": "Càrregues proxy",
15801580
"FileUpload_S3_Proxy_Uploads_Description": "Transmissions d'arxius de càrrega proxy a través del seu servidor en lloc d'accés directe a l'URL de l'actiu",
15811581
"FileUpload_S3_Region": "Regió S3",
1582-
"FileUpload_S3_SignatureVersion": "Signature Version",
15831582
"FileUpload_S3_URLExpiryTimeSpan": "Caducitat de les URL",
15841583
"FileUpload_S3_URLExpiryTimeSpan_Description": "Temps després el qual les adreces d'Amazon S3 generades deixaran de ser vàlides (en segons). Si s'estableix a menys de 5 segons, aquest camp serà ignorat.",
15851584
"FileUpload_Storage_Type": "Tipus d'emmagatzematge",
@@ -4420,7 +4419,7 @@
44204419
"registration.component.form.email": "Correu electrònic",
44214420
"registration.component.form.invalidConfirmPass": "La confirmació de la contrasenya no coincideix amb la contrasenya",
44224421
"registration.component.form.invalidEmail": "L'adreça de correu-e és invàlida",
4423-
"registration.component.form.invalidEmailDomain":"El correu electrònic introduït té un domini no vàlid",
4422+
"registration.component.form.invalidEmailDomain": "El correu electrònic introduït té un domini no vàlid",
44244423
"registration.component.form.name": "Nom",
44254424
"registration.component.form.password": "Contrasenya",
44264425
"registration.component.form.reasonToJoin": "Motiu per unir-se",

packages/i18n/src/locales/cs.i18n.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,7 +1344,6 @@
13441344
"FileUpload_S3_Proxy_Uploads": "Nahrané soubory přes proxy",
13451345
"FileUpload_S3_Proxy_Uploads_Description": "Přenášet nahrané soubory přes váš proxy server místo přímého přístupu na zdrojovou URL",
13461346
"FileUpload_S3_Region": "Region",
1347-
"FileUpload_S3_SignatureVersion": "Verze Signature",
13481347
"FileUpload_S3_URLExpiryTimeSpan": "Časová expirace URL adres",
13491348
"FileUpload_S3_URLExpiryTimeSpan_Description": "Doba po které URL adresy z Amazon S3 nebudou platné (v sekundách) Musí být více než 5 sekund jinak bude ignorováno",
13501349
"FileUpload_Storage_Type": "Typ úložiště",
@@ -3762,7 +3761,7 @@
37623761
"registration.component.form.email": "E-mail",
37633762
"registration.component.form.invalidConfirmPass": "Hesla nesouhlasí",
37643763
"registration.component.form.invalidEmail": "Zadaný e-mail je neplatný",
3765-
"registration.component.form.invalidEmailDomain":"Zadaná e-mailová adresa má neplatnou doménu",
3764+
"registration.component.form.invalidEmailDomain": "Zadaná e-mailová adresa má neplatnou doménu",
37663765
"registration.component.form.name": "Jméno",
37673766
"registration.component.form.password": "Heslo",
37683767
"registration.component.form.reasonToJoin": "Důvod připojení",

0 commit comments

Comments
 (0)