self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-02 12:47:41 +02:00
Code Issues Releases Activity

All: Enable ignoreTlsErrors and custom certificates for S3 sync (#8980)

Browse Source
This commit is contained in:
Jens Böttge 2023-10-05 11:56:25 +02:00 committed by GitHub
parent 992807eb8f
commit e70f31baea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/lib/SyncTargetAmazonS3.js
View File

@ -56,6 +56,7 @@ class SyncTargetAmazonS3 extends BaseSyncTarget {
UseArnRegion: true, // override the request region with the region inferred from requested resource's ARN. UseArnRegion: true, // override the request region with the region inferred from requested resource's ARN.
forcePathStyle: Setting.value('sync.8.forcePathStyle'), // Older implementations may not support more modern access, so we expose this to allow people the option to toggle. forcePathStyle: Setting.value('sync.8.forcePathStyle'), // Older implementations may not support more modern access, so we expose this to allow people the option to toggle.
endpoint: Setting.value('sync.8.url'), endpoint: Setting.value('sync.8.url'),
ignoreTlsErrors: Setting.value('net.ignoreTlsErrors'),
}; };
} }
@ -87,6 +88,7 @@ class SyncTargetAmazonS3 extends BaseSyncTarget {
UseArnRegion: true, // override the request region with the region inferred from requested resource's ARN. UseArnRegion: true, // override the request region with the region inferred from requested resource's ARN.
forcePathStyle: options.forcePathStyle(), forcePathStyle: options.forcePathStyle(),
endpoint: options.url(), endpoint: options.url(),
ignoreTlsErrors: options.ignoreTlsErrors(),
}; };
const api = new S3Client(apiOptions); const api = new S3Client(apiOptions);

2
packages/lib/models/Setting.ts
View File

@ -1498,6 +1498,7 @@ class Setting extends BaseModel {
advanced: true, advanced: true,
show: (settings: any) => { show: (settings: any) => {
return [ return [
SyncTargetRegistry.nameToId('amazon_s3'),
SyncTargetRegistry.nameToId('nextcloud'), SyncTargetRegistry.nameToId('nextcloud'),
SyncTargetRegistry.nameToId('webdav'), SyncTargetRegistry.nameToId('webdav'),
SyncTargetRegistry.nameToId('joplinServer'), SyncTargetRegistry.nameToId('joplinServer'),
@ -1517,6 +1518,7 @@ class Setting extends BaseModel {
show: (settings: any) => { show: (settings: any) => {
return (shim.isNode() || shim.mobilePlatform() === 'android') && return (shim.isNode() || shim.mobilePlatform() === 'android') &&
[ [
SyncTargetRegistry.nameToId('amazon_s3'),
SyncTargetRegistry.nameToId('nextcloud'), SyncTargetRegistry.nameToId('nextcloud'),
SyncTargetRegistry.nameToId('webdav'), SyncTargetRegistry.nameToId('webdav'),
SyncTargetRegistry.nameToId('joplinServer'), SyncTargetRegistry.nameToId('joplinServer'),