mirror of
https://github.com/versity/versitygw.git
synced 2026-07-02 16:54:25 +00:00
9f786b3c2c
Fixes #2123 Fixes #2120 Fixes #2116 Fixes #2111 Fixes #2108 Fixes #2086 Fixes #2085 Fixes #2083 Fixes #2081 Fixes #2080 Fixes #2073 Fixes #2072 Fixes #2071 Fixes #2069 Fixes #2044 Fixes #2043 Fixes #2042 Fixes #2041 Fixes #2040 Fixes #2039 Fixes #2036 Fixes #2035 Fixes #2034 Fixes #2028 Fixes #2020 Fixes #1842 Fixes #1810 Fixes #1780 Fixes #1775 Fixes #1736 Fixes #1705 Fixes #1663 Fixes #1645 Fixes #1583 Fixes #1526 Fixes #1514 Fixes #1493 Fixes #1487 Fixes #959 Fixes #779 Closes #823 Closes #85 Refactor global S3 error handling around structured error types and centralized XML response generation. All S3 errors now share the common APIError base for the fields every error has: Code, HTTP status code, and Message. Non-traditional errors that need AWS-compatible XML fields now have dedicated typed errors in the s3err package. Each typed error implements the shared S3Error behavior so controllers and middleware can handle errors consistently while still emitting error-specific XML fields. Add a dedicated InvalidArgumentError type because InvalidArgument is used widely across request validation, auth, copy source handling, object lock validation, multipart validation, and header parsing. The new InvalidArgument path uses explicit InvalidArgErrorCode constants with predefined descriptions and ArgumentName values, keeping call sites readable while preserving the correct InvalidArgument XML shape and optional ArgumentValue. New structured errors added in s3err: - `AccessForbiddenError`: Method, ResourceType - `BadDigestError`: CalculatedDigest, ExpectedDigest - `BucketError`: BucketName - `ContentSHA256MismatchError`: ClientComputedContentSHA256, S3ComputedContentSHA256 - `EntityTooLargeError`: ProposedSize, MaxSizeAllowed - `EntityTooSmallError`: ProposedSize, MinSizeAllowed - `ExpiredPresignedURLError`: ServerTime, XAmzExpires, Expires - `InvalidAccessKeyIdError`: AWSAccessKeyId - `InvalidArgumentError`: Description, ArgumentName, ArgumentValue - `InvalidChunkSizeError`: Chunk, BadChunkSize - `InvalidDigestError`: ContentMD5 - `InvalidLocationConstraintError`: LocationConstraint - `InvalidPartError`: UploadId, PartNumber, ETag - `InvalidRangeError`: RangeRequested, ActualObjectSize - `InvalidTagError`: TagKey, TagValue - `KeyTooLongError`: Size, MaxSizeAllowed - `MetadataTooLargeError`: Size, MaxSizeAllowed - `MethodNotAllowedError`: Method, ResourceType, AllowedMethods - `NoSuchUploadError`: UploadId - `NoSuchVersionError`: Key, VersionId - `NotImplementedError`: Header, AdditionalMessage - `PreconditionFailedError`: Condition - `RequestTimeTooSkewedError`: RequestTime, ServerTime, MaxAllowedSkewMilliseconds - `SignatureDoesNotMatchError`: AWSAccessKeyId, StringToSign, SignatureProvided, StringToSignBytes, CanonicalRequest, CanonicalRequestBytes Fix CompleteMultipartUpload validation in the Azure backend so missing or empty `ETag` values return the appropriate S3 error instead of allowing a gateway panic. Fix presigned authentication expiration validation to compare server time in `UTC`, matching the `UTC` timestamp used by presigned URL signing. Add request ID and host ID support across S3 requests. Each request now receives AWS S3-like identifiers, returned in response headers as `x-amz-request-id` and `x-amz-id-2` and included in all XML error responses as RequestId and HostId. The generated ID structure is designed to resemble AWS S3 request IDs and host IDs. The request signature calculation/validation for streaming uploads was previously delayed until the request body was fully read, both for Authorization header authentication and presigned URLs. Now, the signature is validated immediately in the authorization middlewares without reading the request body, since the signature calculation itself does not depend on the request body. Instead, only the `x-amz-content-sha256` SHA-256 hash calculation is delayed.
790 lines
21 KiB
Go
790 lines
21 KiB
Go
// Copyright 2023 Versity Software
|
|
// This file is licensed under the Apache License, Version 2.0
|
|
// (the "License"); you may not use this file except in compliance
|
|
// with the License. You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing,
|
|
// software distributed under the License is distributed on an
|
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
// KIND, either express or implied. See the License for the
|
|
// specific language governing permissions and limitations
|
|
// under the License.
|
|
|
|
package s3response
|
|
|
|
import (
|
|
"encoding/xml"
|
|
"io"
|
|
"time"
|
|
|
|
"github.com/aws/aws-sdk-go-v2/service/s3/types"
|
|
"github.com/versity/versitygw/s3err"
|
|
)
|
|
|
|
const (
|
|
iso8601TimeFormat = "2006-01-02T15:04:05.000Z"
|
|
iso8601TimeFormatExtended = "2006-01-02T15:04:05.000000Z"
|
|
iso8601TimeFormatWithTZ = "2006-01-02T15:04:05-0700"
|
|
)
|
|
|
|
type PutObjectOutput struct {
|
|
ETag string
|
|
VersionID string
|
|
ChecksumCRC32 *string
|
|
ChecksumCRC32C *string
|
|
ChecksumSHA1 *string
|
|
ChecksumSHA256 *string
|
|
ChecksumCRC64NVME *string
|
|
ChecksumSHA512 *string
|
|
ChecksumMD5 *string
|
|
ChecksumXXHASH64 *string
|
|
ChecksumXXHASH3 *string
|
|
ChecksumXXHASH128 *string
|
|
Size *int64
|
|
ChecksumType types.ChecksumType
|
|
}
|
|
|
|
// Part describes part metadata.
|
|
type Part struct {
|
|
PartNumber int
|
|
LastModified time.Time
|
|
ETag string
|
|
Size int64
|
|
ChecksumCRC32 *string
|
|
ChecksumCRC32C *string
|
|
ChecksumSHA1 *string
|
|
ChecksumSHA256 *string
|
|
ChecksumCRC64NVME *string
|
|
ChecksumSHA512 *string
|
|
ChecksumMD5 *string
|
|
ChecksumXXHASH64 *string
|
|
ChecksumXXHASH3 *string
|
|
ChecksumXXHASH128 *string
|
|
}
|
|
|
|
func (p Part) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
|
|
type Alias Part
|
|
aux := &struct {
|
|
LastModified string `xml:"LastModified"`
|
|
*Alias
|
|
}{
|
|
Alias: (*Alias)(&p),
|
|
}
|
|
|
|
aux.LastModified = p.LastModified.UTC().Format(time.RFC3339)
|
|
|
|
return e.EncodeElement(aux, start)
|
|
}
|
|
|
|
// ListPartsResponse - s3 api list parts response.
|
|
type ListPartsResult struct {
|
|
XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ ListPartsResult" json:"-"`
|
|
|
|
Bucket string
|
|
Key string
|
|
UploadID string `xml:"UploadId"`
|
|
ChecksumAlgorithm types.ChecksumAlgorithm
|
|
ChecksumType types.ChecksumType
|
|
|
|
Initiator Initiator
|
|
Owner Owner
|
|
|
|
// The class of storage used to store the object.
|
|
StorageClass types.StorageClass
|
|
|
|
PartNumberMarker int
|
|
NextPartNumberMarker int
|
|
MaxParts int
|
|
IsTruncated bool
|
|
|
|
// List of parts.
|
|
Parts []Part `xml:"Part"`
|
|
}
|
|
|
|
type ObjectAttributes string
|
|
|
|
const (
|
|
ObjectAttributesEtag ObjectAttributes = "ETag"
|
|
ObjectAttributesChecksum ObjectAttributes = "Checksum"
|
|
ObjectAttributesObjectParts ObjectAttributes = "ObjectParts"
|
|
ObjectAttributesStorageClass ObjectAttributes = "StorageClass"
|
|
ObjectAttributesObjectSize ObjectAttributes = "ObjectSize"
|
|
)
|
|
|
|
func (o ObjectAttributes) IsValid() bool {
|
|
return o == ObjectAttributesChecksum ||
|
|
o == ObjectAttributesEtag ||
|
|
o == ObjectAttributesObjectParts ||
|
|
o == ObjectAttributesObjectSize ||
|
|
o == ObjectAttributesStorageClass
|
|
}
|
|
|
|
type GetObjectAttributesResponse struct {
|
|
ETag *string
|
|
ObjectSize *int64
|
|
StorageClass types.StorageClass `xml:",omitempty"`
|
|
ObjectParts *ObjectParts
|
|
Checksum *types.Checksum
|
|
|
|
// Not included in the response body
|
|
VersionId *string
|
|
LastModified *time.Time
|
|
DeleteMarker *bool
|
|
}
|
|
|
|
type ObjectParts struct {
|
|
PartNumberMarker int
|
|
NextPartNumberMarker int
|
|
MaxParts int
|
|
IsTruncated bool
|
|
Parts []types.ObjectPart `xml:"Part"`
|
|
}
|
|
|
|
// ListMultipartUploadsResponse - s3 api list multipart uploads response.
|
|
type ListMultipartUploadsResult struct {
|
|
XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ ListMultipartUploadsResult" json:"-"`
|
|
|
|
Bucket string
|
|
KeyMarker string
|
|
UploadIDMarker string `xml:"UploadIdMarker"`
|
|
NextKeyMarker string
|
|
NextUploadIDMarker string `xml:"NextUploadIdMarker"`
|
|
Delimiter string
|
|
Prefix string
|
|
EncodingType string `xml:"EncodingType,omitempty"`
|
|
MaxUploads int
|
|
IsTruncated bool
|
|
|
|
// List of pending uploads.
|
|
Uploads []Upload `xml:"Upload"`
|
|
|
|
// Delimed common prefixes.
|
|
CommonPrefixes []CommonPrefix
|
|
}
|
|
|
|
type ListObjectsResult struct {
|
|
XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ ListBucketResult" json:"-"`
|
|
Name *string
|
|
Prefix *string
|
|
Marker *string
|
|
NextMarker *string
|
|
MaxKeys *int32
|
|
Delimiter *string
|
|
IsTruncated *bool
|
|
Contents []Object
|
|
CommonPrefixes []types.CommonPrefix
|
|
EncodingType types.EncodingType
|
|
}
|
|
|
|
type ListObjectsV2Result struct {
|
|
XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ ListBucketResult" json:"-"`
|
|
Name *string
|
|
Prefix *string
|
|
StartAfter *string
|
|
ContinuationToken *string `xml:"ContinuationToken,omitempty"`
|
|
NextContinuationToken *string
|
|
KeyCount *int32
|
|
MaxKeys *int32
|
|
Delimiter *string
|
|
IsTruncated *bool
|
|
Contents []Object
|
|
CommonPrefixes []types.CommonPrefix
|
|
EncodingType types.EncodingType
|
|
}
|
|
|
|
type Object struct {
|
|
ChecksumAlgorithm []types.ChecksumAlgorithm
|
|
ChecksumType types.ChecksumType
|
|
ETag *string
|
|
Key *string
|
|
LastModified *time.Time
|
|
Owner *types.Owner
|
|
RestoreStatus *types.RestoreStatus
|
|
Size *int64
|
|
StorageClass types.ObjectStorageClass
|
|
}
|
|
|
|
func (o Object) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
|
|
type Alias Object
|
|
aux := &struct {
|
|
LastModified string `xml:"LastModified,omitempty"`
|
|
*Alias
|
|
}{
|
|
Alias: (*Alias)(&o),
|
|
}
|
|
|
|
if o.LastModified != nil {
|
|
aux.LastModified = o.LastModified.UTC().Format(time.RFC3339)
|
|
}
|
|
|
|
return e.EncodeElement(aux, start)
|
|
}
|
|
|
|
// Upload describes in progress multipart upload
|
|
type Upload struct {
|
|
Key string
|
|
UploadID string `xml:"UploadId"`
|
|
Initiator Initiator
|
|
Owner Owner
|
|
StorageClass types.StorageClass
|
|
Initiated time.Time
|
|
ChecksumAlgorithm types.ChecksumAlgorithm
|
|
ChecksumType types.ChecksumType
|
|
}
|
|
|
|
func (u Upload) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
|
|
type Alias Upload
|
|
aux := &struct {
|
|
Initiated string `xml:"Initiated"`
|
|
*Alias
|
|
}{
|
|
Alias: (*Alias)(&u),
|
|
}
|
|
|
|
aux.Initiated = u.Initiated.UTC().Format(time.RFC3339)
|
|
|
|
return e.EncodeElement(aux, start)
|
|
}
|
|
|
|
// CommonPrefix ListObjectsResponse common prefixes (directory abstraction)
|
|
type CommonPrefix struct {
|
|
Prefix string
|
|
}
|
|
|
|
// Initiator same fields as Owner
|
|
type Initiator Owner
|
|
|
|
// Owner bucket ownership
|
|
type Owner struct {
|
|
ID string
|
|
DisplayName string
|
|
}
|
|
|
|
type Tag struct {
|
|
Key string `xml:"Key"`
|
|
Value string `xml:"Value"`
|
|
}
|
|
|
|
type TagSet struct {
|
|
Tags []Tag `xml:"Tag"`
|
|
}
|
|
|
|
type Tagging struct {
|
|
XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ Tagging" json:"-"`
|
|
TagSet TagSet `xml:"TagSet"`
|
|
}
|
|
|
|
// UnmarshalXML accepts Tagging documents both with and without the S3 XML
|
|
// namespace, while xml.Marshal continues to emit the namespace via XMLName.
|
|
func (t *Tagging) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
|
|
type plain struct {
|
|
TagSet TagSet `xml:"TagSet"`
|
|
}
|
|
var p plain
|
|
if err := d.DecodeElement(&p, &start); err != nil {
|
|
return err
|
|
}
|
|
t.TagSet = p.TagSet
|
|
return nil
|
|
}
|
|
|
|
type DeleteObjects struct {
|
|
Objects []types.ObjectIdentifier `xml:"Object"`
|
|
}
|
|
|
|
type DeleteResult struct {
|
|
Deleted []types.DeletedObject
|
|
Error []types.Error
|
|
}
|
|
type SelectObjectContentPayload struct {
|
|
Expression *string
|
|
ExpressionType types.ExpressionType
|
|
RequestProgress *types.RequestProgress
|
|
InputSerialization *types.InputSerialization
|
|
OutputSerialization *types.OutputSerialization
|
|
ScanRange *types.ScanRange
|
|
}
|
|
|
|
type SelectObjectContentResult struct {
|
|
Records *types.RecordsEvent
|
|
Stats *types.StatsEvent
|
|
Progress *types.ProgressEvent
|
|
Cont *types.ContinuationEvent
|
|
End *types.EndEvent
|
|
}
|
|
|
|
type Bucket struct {
|
|
Name string `json:"name"`
|
|
Owner string `json:"owner"`
|
|
}
|
|
|
|
type ListBucketsInput struct {
|
|
Owner string
|
|
IsAdmin bool
|
|
ContinuationToken string
|
|
Prefix string
|
|
MaxBuckets int32
|
|
}
|
|
|
|
type ListAllMyBucketsResult struct {
|
|
XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ ListAllMyBucketsResult" json:"-"`
|
|
Owner CanonicalUser
|
|
Buckets ListAllMyBucketsList
|
|
ContinuationToken string `xml:"ContinuationToken,omitempty"`
|
|
Prefix string `xml:"Prefix,omitempty"`
|
|
}
|
|
|
|
type ListAllMyBucketsEntry struct {
|
|
Name string
|
|
BucketRegion string
|
|
CreationDate time.Time
|
|
}
|
|
|
|
func (r ListAllMyBucketsEntry) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
|
|
type Alias ListAllMyBucketsEntry
|
|
aux := &struct {
|
|
CreationDate string `xml:"CreationDate"`
|
|
*Alias
|
|
}{
|
|
Alias: (*Alias)(&r),
|
|
}
|
|
|
|
aux.CreationDate = r.CreationDate.UTC().Format(time.RFC3339)
|
|
|
|
return e.EncodeElement(aux, start)
|
|
}
|
|
|
|
type ListAllMyBucketsList struct {
|
|
Bucket []ListAllMyBucketsEntry
|
|
}
|
|
|
|
type CanonicalUser struct {
|
|
ID string
|
|
DisplayName string
|
|
}
|
|
|
|
type CopyObjectOutput struct {
|
|
BucketKeyEnabled *bool
|
|
CopyObjectResult *CopyObjectResult
|
|
CopySourceVersionId *string
|
|
Expiration *string
|
|
SSECustomerAlgorithm *string
|
|
SSECustomerKeyMD5 *string
|
|
SSEKMSEncryptionContext *string
|
|
SSEKMSKeyId *string
|
|
ServerSideEncryption types.ServerSideEncryption
|
|
VersionId *string
|
|
}
|
|
|
|
type CopyObjectResult struct {
|
|
XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ CopyObjectResult" json:"-"`
|
|
ChecksumCRC32 *string
|
|
ChecksumCRC32C *string
|
|
ChecksumCRC64NVME *string
|
|
ChecksumSHA1 *string
|
|
ChecksumSHA256 *string
|
|
ChecksumSHA512 *string
|
|
ChecksumMD5 *string
|
|
ChecksumXXHASH64 *string
|
|
ChecksumXXHASH3 *string
|
|
ChecksumXXHASH128 *string
|
|
ChecksumType types.ChecksumType
|
|
ETag *string
|
|
LastModified *time.Time
|
|
}
|
|
|
|
func (r CopyObjectResult) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
|
|
type Alias CopyObjectResult
|
|
aux := &struct {
|
|
LastModified string `xml:"LastModified,omitempty"`
|
|
*Alias
|
|
}{
|
|
Alias: (*Alias)(&r),
|
|
}
|
|
if r.LastModified != nil {
|
|
aux.LastModified = r.LastModified.UTC().Format(time.RFC3339)
|
|
}
|
|
|
|
return e.EncodeElement(aux, start)
|
|
}
|
|
|
|
type CopyPartResult struct {
|
|
XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ CopyPartResult" json:"-"`
|
|
LastModified time.Time
|
|
ETag *string
|
|
ChecksumCRC32 *string
|
|
ChecksumCRC32C *string
|
|
ChecksumSHA1 *string
|
|
ChecksumSHA256 *string
|
|
ChecksumCRC64NVME *string
|
|
ChecksumSHA512 *string
|
|
ChecksumMD5 *string
|
|
ChecksumXXHASH64 *string
|
|
ChecksumXXHASH3 *string
|
|
ChecksumXXHASH128 *string
|
|
|
|
// not included in the body
|
|
CopySourceVersionId string `xml:"-"`
|
|
}
|
|
|
|
func (r CopyPartResult) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
|
|
type Alias CopyPartResult
|
|
aux := &struct {
|
|
LastModified string `xml:"LastModified,omitempty"`
|
|
*Alias
|
|
}{
|
|
Alias: (*Alias)(&r),
|
|
}
|
|
if !r.LastModified.IsZero() {
|
|
aux.LastModified = r.LastModified.UTC().Format(time.RFC3339)
|
|
}
|
|
|
|
return e.EncodeElement(aux, start)
|
|
}
|
|
|
|
type CompleteMultipartUploadRequestBody struct {
|
|
XMLName xml.Name `xml:"CompleteMultipartUpload" json:"-"`
|
|
Parts []types.CompletedPart `xml:"Part"`
|
|
}
|
|
|
|
type CompleteMultipartUploadResult struct {
|
|
XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ CompleteMultipartUploadResult" json:"-"`
|
|
Location *string
|
|
Bucket *string
|
|
Key *string
|
|
ETag *string
|
|
ChecksumCRC32 *string
|
|
ChecksumCRC32C *string
|
|
ChecksumSHA1 *string
|
|
ChecksumSHA256 *string
|
|
ChecksumCRC64NVME *string
|
|
ChecksumSHA512 *string
|
|
ChecksumMD5 *string
|
|
ChecksumXXHASH64 *string
|
|
ChecksumXXHASH3 *string
|
|
ChecksumXXHASH128 *string
|
|
ChecksumType *types.ChecksumType
|
|
}
|
|
|
|
type AccessControlPolicy struct {
|
|
XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ AccessControlPolicy" json:"-"`
|
|
Owner CanonicalUser
|
|
AccessControlList AccessControlList
|
|
}
|
|
|
|
type AccessControlList struct {
|
|
Grant []Grant
|
|
}
|
|
|
|
type Grant struct {
|
|
Grantee Grantee
|
|
Permission string
|
|
}
|
|
|
|
// Set the following to encode correctly:
|
|
//
|
|
// Grantee: s3response.Grantee{
|
|
// Xsi: "http://www.w3.org/2001/XMLSchema-instance",
|
|
// Type: "CanonicalUser",
|
|
// },
|
|
type Grantee struct {
|
|
XMLName xml.Name `xml:"Grantee"`
|
|
Xsi string `xml:"xmlns:xsi,attr,omitempty"`
|
|
Type string `xml:"xsi:type,attr,omitempty"`
|
|
ID string
|
|
DisplayName string
|
|
}
|
|
|
|
type OwnershipControls struct {
|
|
Rules []types.OwnershipControlsRule `xml:"Rule"`
|
|
}
|
|
|
|
type InitiateMultipartUploadResult struct {
|
|
XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ InitiateMultipartUploadResult" json:"-"`
|
|
Bucket string
|
|
Key string
|
|
UploadId string
|
|
}
|
|
|
|
type ListVersionsResult struct {
|
|
XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ ListVersionsResult" json:"-"`
|
|
CommonPrefixes []types.CommonPrefix
|
|
DeleteMarkers []types.DeleteMarkerEntry `xml:"DeleteMarker"`
|
|
Delimiter *string
|
|
EncodingType types.EncodingType
|
|
IsTruncated *bool
|
|
KeyMarker *string
|
|
MaxKeys *int32
|
|
Name *string
|
|
NextKeyMarker *string
|
|
NextVersionIdMarker *string
|
|
Prefix *string
|
|
VersionIdMarker *string
|
|
Versions []ObjectVersion `xml:"Version"`
|
|
}
|
|
|
|
type ObjectVersion struct {
|
|
ChecksumAlgorithm []types.ChecksumAlgorithm
|
|
ChecksumType types.ChecksumType
|
|
ETag *string
|
|
IsLatest *bool
|
|
Key *string
|
|
LastModified *time.Time
|
|
Owner *types.Owner
|
|
RestoreStatus *types.RestoreStatus
|
|
Size *int64
|
|
StorageClass types.ObjectVersionStorageClass
|
|
VersionId *string
|
|
}
|
|
|
|
func (o ObjectVersion) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
|
|
type Alias ObjectVersion
|
|
aux := &struct {
|
|
LastModified string `xml:"LastModified"`
|
|
*Alias
|
|
}{
|
|
Alias: (*Alias)(&o),
|
|
}
|
|
|
|
if o.LastModified != nil {
|
|
aux.LastModified = o.LastModified.UTC().Format(time.RFC3339)
|
|
}
|
|
|
|
return e.EncodeElement(aux, start)
|
|
}
|
|
|
|
type GetBucketVersioningOutput struct {
|
|
XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ VersioningConfiguration" json:"-"`
|
|
MFADelete *types.MFADeleteStatus
|
|
Status *types.BucketVersioningStatus
|
|
}
|
|
|
|
type PutObjectRetentionInput struct {
|
|
XMLName xml.Name `xml:"Retention"`
|
|
Mode types.ObjectLockRetentionMode
|
|
RetainUntilDate AmzDate
|
|
}
|
|
|
|
type PutObjectInput struct {
|
|
ContentLength *int64
|
|
ObjectLockRetainUntilDate *time.Time
|
|
|
|
Bucket *string
|
|
Key *string
|
|
ContentType *string
|
|
ContentEncoding *string
|
|
ContentDisposition *string
|
|
ContentLanguage *string
|
|
CacheControl *string
|
|
Expires *string
|
|
Tagging *string
|
|
ChecksumCRC32 *string
|
|
ChecksumCRC32C *string
|
|
ChecksumSHA1 *string
|
|
ChecksumSHA256 *string
|
|
ChecksumCRC64NVME *string
|
|
ChecksumSHA512 *string
|
|
ChecksumMD5 *string
|
|
ChecksumXXHASH64 *string
|
|
ChecksumXXHASH3 *string
|
|
ChecksumXXHASH128 *string
|
|
ContentMD5 *string
|
|
ExpectedBucketOwner *string
|
|
GrantFullControl *string
|
|
GrantRead *string
|
|
GrantReadACP *string
|
|
GrantWriteACP *string
|
|
IfMatch *string
|
|
IfNoneMatch *string
|
|
SSECustomerAlgorithm *string
|
|
SSECustomerKey *string
|
|
SSECustomerKeyMD5 *string
|
|
SSEKMSEncryptionContext *string
|
|
SSEKMSKeyId *string
|
|
WebsiteRedirectLocation *string
|
|
|
|
ObjectLockMode types.ObjectLockMode
|
|
ObjectLockLegalHoldStatus types.ObjectLockLegalHoldStatus
|
|
ChecksumAlgorithm types.ChecksumAlgorithm
|
|
|
|
Metadata map[string]string
|
|
Body io.Reader
|
|
}
|
|
|
|
type CreateMultipartUploadInput struct {
|
|
Bucket *string
|
|
Key *string
|
|
ExpectedBucketOwner *string
|
|
CacheControl *string
|
|
ContentDisposition *string
|
|
ContentEncoding *string
|
|
ContentLanguage *string
|
|
ContentType *string
|
|
Expires *string
|
|
SSECustomerAlgorithm *string
|
|
SSECustomerKey *string
|
|
SSECustomerKeyMD5 *string
|
|
SSEKMSEncryptionContext *string
|
|
SSEKMSKeyId *string
|
|
GrantFullControl *string
|
|
GrantRead *string
|
|
GrantReadACP *string
|
|
GrantWriteACP *string
|
|
Tagging *string
|
|
WebsiteRedirectLocation *string
|
|
BucketKeyEnabled *bool
|
|
ObjectLockRetainUntilDate *time.Time
|
|
Metadata map[string]string
|
|
|
|
ACL types.ObjectCannedACL
|
|
ChecksumAlgorithm types.ChecksumAlgorithm
|
|
ChecksumType types.ChecksumType
|
|
ObjectLockLegalHoldStatus types.ObjectLockLegalHoldStatus
|
|
ObjectLockMode types.ObjectLockMode
|
|
RequestPayer types.RequestPayer
|
|
ServerSideEncryption types.ServerSideEncryption
|
|
StorageClass types.StorageClass
|
|
}
|
|
|
|
type CopyObjectInput struct {
|
|
Metadata map[string]string
|
|
Bucket *string
|
|
CopySource *string
|
|
Key *string
|
|
CacheControl *string
|
|
ContentDisposition *string
|
|
ContentEncoding *string
|
|
ContentLanguage *string
|
|
ContentType *string
|
|
CopySourceIfMatch *string
|
|
CopySourceIfNoneMatch *string
|
|
CopySourceSSECustomerAlgorithm *string
|
|
CopySourceSSECustomerKey *string
|
|
CopySourceSSECustomerKeyMD5 *string
|
|
ExpectedBucketOwner *string
|
|
ExpectedSourceBucketOwner *string
|
|
Expires *string
|
|
GrantFullControl *string
|
|
GrantRead *string
|
|
GrantReadACP *string
|
|
GrantWriteACP *string
|
|
SSECustomerAlgorithm *string
|
|
SSECustomerKey *string
|
|
SSECustomerKeyMD5 *string
|
|
SSEKMSEncryptionContext *string
|
|
SSEKMSKeyId *string
|
|
Tagging *string
|
|
WebsiteRedirectLocation *string
|
|
|
|
CopySourceIfModifiedSince *time.Time
|
|
CopySourceIfUnmodifiedSince *time.Time
|
|
ObjectLockRetainUntilDate *time.Time
|
|
|
|
BucketKeyEnabled *bool
|
|
|
|
ACL types.ObjectCannedACL
|
|
ChecksumAlgorithm types.ChecksumAlgorithm
|
|
MetadataDirective types.MetadataDirective
|
|
ObjectLockLegalHoldStatus types.ObjectLockLegalHoldStatus
|
|
ObjectLockMode types.ObjectLockMode
|
|
RequestPayer types.RequestPayer
|
|
ServerSideEncryption types.ServerSideEncryption
|
|
StorageClass types.StorageClass
|
|
TaggingDirective types.TaggingDirective
|
|
}
|
|
|
|
type GetObjectLegalHoldResult struct {
|
|
XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ LegalHold"`
|
|
Status types.ObjectLockLegalHoldStatus
|
|
}
|
|
|
|
type AmzDate struct {
|
|
time.Time
|
|
}
|
|
|
|
// Parses the date from xml string and validates for predefined date formats
|
|
func (d *AmzDate) UnmarshalXML(e *xml.Decoder, startElement xml.StartElement) error {
|
|
var dateStr string
|
|
err := e.DecodeElement(&dateStr, &startElement)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
retDate, err := d.ISO8601Parse(dateStr)
|
|
if err != nil {
|
|
return s3err.GetAPIError(s3err.ErrInvalidRequest)
|
|
}
|
|
|
|
*d = AmzDate{retDate}
|
|
return nil
|
|
}
|
|
|
|
// Encodes expiration date if it is non-zero
|
|
// Encodes empty string if it's zero
|
|
func (d AmzDate) MarshalXML(e *xml.Encoder, startElement xml.StartElement) error {
|
|
if d.IsZero() {
|
|
return nil
|
|
}
|
|
return e.EncodeElement(d.UTC().Format(iso8601TimeFormat), startElement)
|
|
}
|
|
|
|
// Parses ISO8601 date string to time.Time by
|
|
// validating different time layouts
|
|
func (AmzDate) ISO8601Parse(date string) (t time.Time, err error) {
|
|
for _, layout := range []string{
|
|
iso8601TimeFormat,
|
|
iso8601TimeFormatExtended,
|
|
iso8601TimeFormatWithTZ,
|
|
time.RFC3339,
|
|
} {
|
|
t, err = time.Parse(layout, date)
|
|
if err == nil {
|
|
return t, nil
|
|
}
|
|
}
|
|
|
|
return t, err
|
|
}
|
|
|
|
// Admin api response types
|
|
type ListBucketsResult struct {
|
|
Buckets []Bucket
|
|
}
|
|
|
|
type Checksum struct {
|
|
Algorithm types.ChecksumAlgorithm
|
|
Type types.ChecksumType
|
|
|
|
CRC32 *string
|
|
CRC32C *string
|
|
SHA1 *string
|
|
SHA256 *string
|
|
CRC64NVME *string
|
|
SHA512 *string
|
|
MD5 *string
|
|
XXHASH64 *string
|
|
XXHASH3 *string
|
|
XXHASH128 *string
|
|
}
|
|
|
|
// LocationConstraint represents the GetBucketLocation response
|
|
type LocationConstraint struct {
|
|
XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ LocationConstraint"`
|
|
Value *string `xml:",chardata"`
|
|
}
|
|
|
|
type CreateBucketConfiguration struct {
|
|
LocationConstraint *string
|
|
TagSet []types.Tag `xml:"Tags>Tag"`
|
|
}
|
|
|
|
type PostResponse struct {
|
|
XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ PostResponse"`
|
|
Location string
|
|
Bucket string
|
|
Key string
|
|
ETag string
|
|
}
|