wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-06-08 00:37:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support S3 presign URI expire (#5706)

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2024-05-31 13:38:49 +07:00 committed by GitHub
parent 651d46d635
commit 6fcabb9946
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/core/src/classes.ts
View File

@ -567,6 +567,7 @@ export interface Blob extends Doc {
export interface BlobLookup extends Blob { export interface BlobLookup extends Blob {
// An URL document could be downloaded from, with ${id} to put blobId into // An URL document could be downloaded from, with ${id} to put blobId into
downloadUrl: string downloadUrl: string
downloadUrlExpire?: number
// A URL document could be updated at // A URL document could be updated at
uploadUrl?: string uploadUrl?: string
// A URL document could be previewed at // A URL document could be previewed at

19
server/s3/src/index.ts
View File

@ -62,7 +62,10 @@ export interface S3Config extends StorageConfig {
// Defaults: ['avif', 'webp', 'heif', 'jpeg'] // Defaults: ['avif', 'webp', 'heif', 'jpeg']
formats?: string formats?: string
allowPresign?: boolean // If not specified will be enabled
allowPresign?: string
// Expire time for presigned URIs
expireTime?: string
} }
/** /**
@ -70,6 +73,7 @@ export interface S3Config extends StorageConfig {
*/ */
export class S3Service implements StorageAdapter { export class S3Service implements StorageAdapter {
static config = 's3' static config = 's3'
expireTime: number
client: S3 client: S3
constructor (readonly opt: S3Config) { constructor (readonly opt: S3Config) {
this.client = new S3({ this.client = new S3({
@ -80,6 +84,8 @@ export class S3Service implements StorageAdapter {
}, },
region: opt.region ?? 'auto' region: opt.region ?? 'auto'
}) })
this.expireTime = parseInt(this.opt.expireTime ?? '168') * 3600 // use 7 * 24 - hours as default value for expireF
} }
/** /**
@ -102,6 +108,7 @@ export class S3Service implements StorageAdapter {
lookups: [], lookups: [],
updates: new Map() updates: new Map()
} }
const now = Date.now()
for (const d of docs) { for (const d of docs) {
// Let's add current from URI for previews. // Let's add current from URI for previews.
const bl = d as BlobLookup const bl = d as BlobLookup
@ -109,8 +116,14 @@ export class S3Service implements StorageAdapter {
Bucket: this.getBucketId(workspaceId), Bucket: this.getBucketId(workspaceId),
Key: this.getDocumentKey(workspaceId, d.storageId) Key: this.getDocumentKey(workspaceId, d.storageId)
}) })
if (bl.downloadUrl === undefined && (this.opt.allowPresign ?? true)) { if (
bl.downloadUrl = await getSignedUrl(this.client, command) (bl.downloadUrl === undefined || (bl.downloadUrlExpire ?? 0) > now) &&
(this.opt.allowPresign ?? 'true') === 'true'
) {
bl.downloadUrl = await getSignedUrl(this.client, command, {
expiresIn: this.expireTime
})
bl.downloadUrlExpire = now + this.expireTime * 1000
result.updates?.set(bl._id, { result.updates?.set(bl._id, {
downloadUrl: bl.downloadUrl downloadUrl: bl.downloadUrl
}) })