Skip to content
This repository has been archived by the owner on Oct 22, 2021. It is now read-only.

Implement SSE support #14

Merged
merged 1 commit into from
Apr 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 76 additions & 8 deletions generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 19 additions & 1 deletion service.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ optional = ["list_mode"]
optional = ["offset", "io_callback", "size"]

[namespace.storage.op.write]
optional = ["content_md5", "content_type", "io_callback", "storage_class"]
optional = ["content_md5", "content_type", "io_callback", "storage_class", "server_side_encryption", "server_side_data_encryption", "server_side_encryption_key_id"]

[pairs.default_service_pairs]
type = "DefaultServicePairs"
Expand All @@ -30,5 +30,23 @@ description = "set default pairs for storager actions"
[pairs.storage_class]
type = "string"

[pairs.server_side_encryption]
type = "string"
description = "specifies the encryption algorithm. Can be AES256, KMS or SM4.\n\nFor Chinese users, refer to https://help.aliyun.com/document_detail/31871.html for details.\n\nFor global users, refer to https://www.alibabacloud.com/help/doc-detail/31871.htm for details, and double-check whether SM4 can be used."
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happened if user input AES256?


[pairs.server_side_data_encryption]
type = "string"
description = "specifies the encryption algorithm when server_side_encryption is KMS. Can only be set to SM4. If this is not set, AES256 will be used.\n\nFor Chinese users, refer to https://help.aliyun.com/document_detail/31871.html for details.\n\nFor global users, refer to https://www.alibabacloud.com/help/doc-detail/31871.htm for details, and double-check whether SM4 can be used."

[pairs.server_side_encryption_key_id]
type = "string"
description = "is the KMS-managed user master key. Only valid when server_side_encryption is KMS."

[infos.object.meta.storage-class]
type = "string"

[infos.object.meta.server_side_encryption]
type = "string"

[infos.object.meta.server_side_encryption_key_id]
type = "string"
15 changes: 15 additions & 0 deletions storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,12 @@ func (s *Storage) stat(ctx context.Context, path string, opt pairStorageStat) (o
if v := output.Get(storageClassHeader); v != "" {
sm[MetadataStorageClass] = v
}
if v := output.Get(serverSideEncryptionHeader); v != "" {
sm[MetadataServerSideEncryption] = v
}
if v := output.Get(serverSideEncryptionKeyIdHeader); v != "" {
sm[MetadataServerSideEncryptionKeyID] = v
}
o.SetServiceMetadata(sm)

return o, nil
Expand All @@ -209,6 +215,15 @@ func (s *Storage) write(ctx context.Context, path string, r io.Reader, size int6
if opt.HasStorageClass {
options = append(options, oss.StorageClass(oss.StorageClassType(opt.StorageClass)))
}
if opt.HasServerSideEncryption {
options = append(options, oss.ServerSideEncryption(opt.ServerSideEncryption))
}
if opt.HasServerSideDataEncryption {
options = append(options, oss.ServerSideDataEncryption(opt.ServerSideDataEncryption))
}
if opt.HasServerSideEncryptionKeyID {
options = append(options, oss.ServerSideEncryptionKeyID(opt.ServerSideEncryptionKeyID))
}

err = s.bucket.PutObject(rp, r, options...)
if err != nil {
Expand Down
12 changes: 12 additions & 0 deletions utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -266,3 +266,15 @@ func (s *Storage) formatFileObject(v oss.ObjectProperties) (o *typ.Object, err e
func (s *Storage) newObject(done bool) *typ.Object {
return typ.NewObject(s, done)
}

// All available encryption algorithms are listed here.
const (
serverSideEncryptionHeader = "x-oss-server-side-encryption"
serverSideEncryptionKeyIdHeader = "x-oss-server-side-encryption-key-id"

ServerSideEncryptionAES256 = "AES256"
ServerSideEncryptionKMS = "KMS"
ServerSideEncryptionSM4 = "SM4"

ServerSideDataEncryptionSM4 = "SM4"
)