diff --git a/plugin/http-getter/http_getter.go b/plugin/http-getter/http_getter.go deleted file mode 100644 index aaaaa7cd..00000000 --- a/plugin/http-getter/http_getter.go +++ /dev/null @@ -1,4 +0,0 @@ -// Package getter is using to get resources from url. -// * Get metadata for website; -// * Get image blob to avoid CORS; -package getter diff --git a/plugin/http-getter/html_meta.go b/plugin/httpgetter/html_meta.go similarity index 99% rename from plugin/http-getter/html_meta.go rename to plugin/httpgetter/html_meta.go index a4c24ef2..f69bad61 100644 --- a/plugin/http-getter/html_meta.go +++ b/plugin/httpgetter/html_meta.go @@ -1,4 +1,4 @@ -package getter +package httpgetter import ( "errors" diff --git a/plugin/http-getter/html_meta_test.go b/plugin/httpgetter/html_meta_test.go similarity index 94% rename from plugin/http-getter/html_meta_test.go rename to plugin/httpgetter/html_meta_test.go index 310e64e4..45345d30 100644 --- a/plugin/http-getter/html_meta_test.go +++ b/plugin/httpgetter/html_meta_test.go @@ -1,4 +1,4 @@ -package getter +package httpgetter import ( "testing" diff --git a/plugin/httpgetter/http_getter.go b/plugin/httpgetter/http_getter.go new file mode 100644 index 00000000..c545baf6 --- /dev/null +++ b/plugin/httpgetter/http_getter.go @@ -0,0 +1,4 @@ +// Package httpgetter is using to get resources from url. +// * Get metadata for website; +// * Get image blob to avoid CORS; +package httpgetter diff --git a/plugin/http-getter/image.go b/plugin/httpgetter/image.go similarity index 97% rename from plugin/http-getter/image.go rename to plugin/httpgetter/image.go index 05678306..2d6a163f 100644 --- a/plugin/http-getter/image.go +++ b/plugin/httpgetter/image.go @@ -1,4 +1,4 @@ -package getter +package httpgetter import ( "errors" diff --git a/plugin/http-getter/util.go b/plugin/httpgetter/util.go similarity index 93% rename from plugin/http-getter/util.go rename to plugin/httpgetter/util.go index c9125ee8..d83f5efb 100644 --- a/plugin/http-getter/util.go +++ b/plugin/httpgetter/util.go @@ -1,4 +1,4 @@ -package getter +package httpgetter import ( "mime" diff --git a/plugin/storage/s3/s3.go b/plugin/storage/s3/s3.go index cc6f587d..a8c6a3b5 100644 --- a/plugin/storage/s3/s3.go +++ b/plugin/storage/s3/s3.go @@ -15,10 +15,6 @@ import ( storepb "github.com/usememos/memos/proto/gen/store" ) -// presignLifetimeSecs is the lifetime of a presigned URL in seconds. -// The presigned URL is valid for 7 days. -const presignLifetimeSecs = 7 * 24 * 60 * 60 - type Client struct { Client *s3.Client Bucket *string @@ -74,7 +70,7 @@ func (c *Client) PresignGetObject(ctx context.Context, key string) (string, erro Bucket: aws.String(*c.Bucket), Key: aws.String(key), }, func(opts *s3.PresignOptions) { - opts.Expires = time.Duration(presignLifetimeSecs * int64(time.Second)) + opts.Expires = time.Duration(7 * 24 * time.Hour) }) if err != nil { return "", errors.Wrap(err, "failed to presign put object") diff --git a/server/router/api/v1/markdown_service.go b/server/router/api/v1/markdown_service.go index 2b6bfc27..14e9f817 100644 --- a/server/router/api/v1/markdown_service.go +++ b/server/router/api/v1/markdown_service.go @@ -9,7 +9,7 @@ import ( "github.com/yourselfhosted/gomark/parser/tokenizer" "github.com/yourselfhosted/gomark/restore" - getter "github.com/usememos/memos/plugin/http-getter" + "github.com/usememos/memos/plugin/httpgetter" v1pb "github.com/usememos/memos/proto/gen/api/v1" ) @@ -33,7 +33,7 @@ func (*APIV1Service) RestoreMarkdown(_ context.Context, request *v1pb.RestoreMar } func (*APIV1Service) GetLinkMetadata(_ context.Context, request *v1pb.GetLinkMetadataRequest) (*v1pb.LinkMetadata, error) { - htmlMeta, err := getter.GetHTMLMeta(request.Link) + htmlMeta, err := httpgetter.GetHTMLMeta(request.Link) if err != nil { return nil, err } diff --git a/server/service/s3_object_presigner/s3_object_presigner.go b/server/service/s3_object_presigner/s3_object_presigner.go index 76ae2b42..2363355a 100644 --- a/server/service/s3_object_presigner/s3_object_presigner.go +++ b/server/service/s3_object_presigner/s3_object_presigner.go @@ -53,8 +53,9 @@ func (p *S3ObjectPresigner) CheckAndPresign(ctx context.Context) { } if s3ObjectPayload.LastPresignedTime != nil { - // Skip if the presigned URL is still valid. - if time.Now().Before(s3ObjectPayload.LastPresignedTime.AsTime().Add(24 * time.Hour)) { + // Skip if the presigned URL is still valid for the next 6 days. + // The default expiration time is 7 days. + if time.Now().Before(s3ObjectPayload.LastPresignedTime.AsTime().Add(6 * 24 * time.Hour)) { continue } }