diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2020-04-12 20:32:34 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 20:32:34 +0900 |
| commit | 36b9a0d42fa4bd7036d5d4a11203006d0ceb59f0 (patch) | |
| tree | 6fb00ab7bdf952ebb7e0c6e705fc5837a8022689 /src/services | |
| parent | Resolve #6242 (diff) | |
| download | sharkey-36b9a0d42fa4bd7036d5d4a11203006d0ceb59f0.tar.gz sharkey-36b9a0d42fa4bd7036d5d4a11203006d0ceb59f0.tar.bz2 sharkey-36b9a0d42fa4bd7036d5d4a11203006d0ceb59f0.zip | |
プロキシの除外ホスト (#6244)
* プロキシの除外ホスト
* オブジェクトストレージとの通信にProxyを使うかを選択できるように
* fix lint
* コメント
Co-authored-by: rinsuki <428rinsuki+git@gmail.com>
Diffstat (limited to 'src/services')
| -rw-r--r-- | src/services/drive/s3.ts | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/services/drive/s3.ts b/src/services/drive/s3.ts index 2cbeef106d..abe3c166a5 100644 --- a/src/services/drive/s3.ts +++ b/src/services/drive/s3.ts @@ -1,8 +1,12 @@ import * as S3 from 'aws-sdk/clients/s3'; import { Meta } from '../../models/entities/meta'; -import { httpsAgent, httpAgent } from '../../misc/fetch'; +import { getAgentByUrl } from '../../misc/fetch'; export function getS3(meta: Meta) { + const u = meta.objectStorageEndpoint != null + ? `${meta.objectStorageUseSSL ? 'https://' : 'http://'}${meta.objectStorageEndpoint}` + : `${meta.objectStorageUseSSL ? 'https://' : 'http://'}example.net`; + return new S3({ endpoint: meta.objectStorageEndpoint || undefined, accessKeyId: meta.objectStorageAccessKey!, @@ -11,7 +15,7 @@ export function getS3(meta: Meta) { sslEnabled: meta.objectStorageUseSSL, s3ForcePathStyle: !!meta.objectStorageEndpoint, httpOptions: { - agent: meta.objectStorageUseSSL ? httpsAgent : httpAgent + agent: getAgentByUrl(new URL(u), !meta.objectStorageUseProxy) } }); } |