github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-26 10:13:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

s3: Cap expiry duration to 1 Week and return error when sharing dir

Browse Source
This commit is contained in:
Nick Craig-Wood 2020-06-18 17:50:50 +01:00
parent 4b4ee72796
commit 85bcacac90
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/s3/s3.go
View File

@ -965,6 +965,7 @@ const (
memoryPoolFlushTime = fs.Duration(time.Minute) // flush the cached buffers after this long memoryPoolFlushTime = fs.Duration(time.Minute) // flush the cached buffers after this long
memoryPoolUseMmap = false memoryPoolUseMmap = false
maxExpireDuration = fs.Duration(7 * 24 * time.Hour) // max expiry is 1 week
) )
// Options defines the configuration for this backend // Options defines the configuration for this backend
@ -2021,9 +2022,16 @@ func (f *Fs) getMemoryPool(size int64) *pool.Pool {
// PublicLink generates a public link to the remote path (usually readable by anyone) // PublicLink generates a public link to the remote path (usually readable by anyone)
func (f *Fs) PublicLink(ctx context.Context, remote string, expire fs.Duration, unlink bool) (link string, err error) { func (f *Fs) PublicLink(ctx context.Context, remote string, expire fs.Duration, unlink bool) (link string, err error) {
if strings.HasSuffix(remote, "/") {
return "", fs.ErrorCantShareDirectories
}
if _, err := f.NewObject(ctx, remote); err != nil { if _, err := f.NewObject(ctx, remote); err != nil {
return "", err return "", err
} }
if expire > maxExpireDuration {
fs.Logf(f, "Public Link: Reducing expiry to %v as %v is greater than the max time allowed", maxExpireDuration, expire)
expire = maxExpireDuration
}
bucket, bucketPath := f.split(remote) bucket, bucketPath := f.split(remote)
httpReq, _ := f.c.GetObjectRequest(&s3.GetObjectInput{ httpReq, _ := f.c.GetObjectRequest(&s3.GetObjectInput{
Bucket: &bucket, Bucket: &bucket,