prepare crypto

ci.go

@@ -271,10 +271,13 @@ func (s *CIService) Put(ctx context.Context, name string, r io.Reader, uopt *Obj
 	if err := CheckReaderLen(r); err != nil {
 		return nil, nil, err
 	}
-	opt := cloneObjectPutOptions(uopt)
+	opt := CloneObjectPutOptions(uopt)
 	totalBytes, err := GetReaderLen(r)
 	if err != nil && opt != nil && opt.Listener != nil {
-		return nil, nil, err
+		if opt.ContentLength == 0 {
+			return nil, nil, err
+		}
+		totalBytes = opt.ContentLength
 	}
 	if err == nil {
 		// 与 go http 保持一致, 非bytes.Buffer/bytes.Reader/strings.Reader由用户指定ContentLength, 或使用 Chunk 上传

cos.go

@@ -133,6 +133,26 @@ func NewClient(uri *BaseURL, httpClient *http.Client) *Client {
 	return c
 }
 
+type Credential struct {
+    SecretID string
+    SecretKey string
+    SessionToken string
+}
+
+func (c *Client) GetCredential() *Credential {
+    auth, ok := c.client.Transport.(*AuthorizationTransport)
+    if !ok {
+        return nil
+    }
+    auth.rwLocker.Lock()
+    defer auth.rwLocker.Unlock()
+    return &Credential{
+        SecretID: auth.SecretID,
+        SecretKey: auth.SecretKey,
+        SessionToken: auth.SessionToken,
+    }
+}
+
 func (c *Client) newRequest(ctx context.Context, baseURL *url.URL, uri, method string, body interface{}, optQuery interface{}, optHeader interface{}) (req *http.Request, err error) {
 	uri, err = addURLOptions(uri, optQuery)
 	if err != nil {

helper.go

@@ -12,6 +12,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"strconv"
 	"strings"
 )
 
@@ -214,7 +215,7 @@ func CopyOptionsToMulti(opt *ObjectCopyOptions) *InitiateMultipartUploadOptions
 }
 
 // 浅拷贝ObjectPutOptions
-func cloneObjectPutOptions(opt *ObjectPutOptions) *ObjectPutOptions {
+func CloneObjectPutOptions(opt *ObjectPutOptions) *ObjectPutOptions {
 	res := &ObjectPutOptions{
 		&ACLHeaderOptions{},
 		&ObjectPutHeaderOptions{},
@@ -230,8 +231,24 @@ func cloneObjectPutOptions(opt *ObjectPutOptions) *ObjectPutOptions {
 	return res
 }
 
+func CloneInitiateMultipartUploadOptions(opt *InitiateMultipartUploadOptions) *InitiateMultipartUploadOptions {
+	res := &InitiateMultipartUploadOptions{
+		&ACLHeaderOptions{},
+		&ObjectPutHeaderOptions{},
+	}
+	if opt != nil {
+		if opt.ACLHeaderOptions != nil {
+			*res.ACLHeaderOptions = *opt.ACLHeaderOptions
+		}
+		if opt.ObjectPutHeaderOptions != nil {
+			*res.ObjectPutHeaderOptions = *opt.ObjectPutHeaderOptions
+		}
+	}
+	return res
+}
+
 // 浅拷贝ObjectUploadPartOptions
-func cloneObjectUploadPartOptions(opt *ObjectUploadPartOptions) *ObjectUploadPartOptions {
+func CloneObjectUploadPartOptions(opt *ObjectUploadPartOptions) *ObjectUploadPartOptions {
 	var res ObjectUploadPartOptions
 	if opt != nil {
 		res = *opt
@@ -239,6 +256,14 @@ func cloneObjectUploadPartOptions(opt *ObjectUploadPartOptions) *ObjectUploadPar
 	return &res
 }
 
+func CloneObjectGetOptions(opt *ObjectGetOptions) *ObjectGetOptions {
+	var res ObjectGetOptions
+	if opt != nil {
+		res = *opt
+	}
+	return &res
+}
+
 type RangeOptions struct {
 	HasStart bool
 	HasEnd   bool
@@ -259,7 +284,45 @@ func FormatRangeOptions(opt *RangeOptions) string {
 	if opt.HasEnd {
 		return fmt.Sprintf("bytes=-%v", opt.End)
 	}
-	return "bytes=-"
+	return ""
+}
+
+func GetRangeOptions(opt *ObjectGetOptions) (*RangeOptions, error) {
+	if opt == nil || opt.Range == "" {
+		return nil, nil
+	}
+	// bytes=M-N
+	slices := strings.Split(opt.Range, "=")
+	if len(slices) != 2 || slices[0] != "bytes" {
+		return nil, fmt.Errorf("Invalid Parameter Range: %v", opt.Range)
+	}
+	// byte=M-N, X-Y
+	fSlice := strings.Split(slices[1], ",")
+	rstr := fSlice[0]
+
+	var err error
+	var ropt RangeOptions
+	sted := strings.Split(rstr, "-")
+	if len(sted) != 2 {
+		return nil, fmt.Errorf("Invalid Parameter Range: %v", opt.Range)
+	}
+	// M
+	if len(sted[0]) > 0 {
+		ropt.Start, err = strconv.ParseInt(sted[0], 10, 64)
+		if err != nil {
+			return nil, fmt.Errorf("Invalid Parameter Range: %v,err: %v", opt.Range, err)
+		}
+		ropt.HasStart = true
+	}
+	// N
+	if len(sted[1]) > 0 {
+		ropt.End, err = strconv.ParseInt(sted[1], 10, 64)
+		if err != nil || ropt.End == 0 {
+			return nil, fmt.Errorf("Invalid Parameter Range: %v,err: %v", opt.Range, err)
+		}
+		ropt.HasEnd = true
+	}
+	return &ropt, nil
 }
 
 var deliverHeader = map[string]bool{}

object.go

@@ -200,10 +200,13 @@ func (s *ObjectService) Put(ctx context.Context, name string, r io.Reader, uopt
 	if err := CheckReaderLen(r); err != nil {
 		return nil, err
 	}
-	opt := cloneObjectPutOptions(uopt)
+	opt := CloneObjectPutOptions(uopt)
 	totalBytes, err := GetReaderLen(r)
 	if err != nil && opt != nil && opt.Listener != nil {
-		return nil, err
+		if opt.ContentLength == 0 {
+			return nil, err
+		}
+		totalBytes = opt.ContentLength
 	}
 	if err == nil {
 		// 与 go http 保持一致, 非bytes.Buffer/bytes.Reader/strings.Reader由用户指定ContentLength, 或使用 Chunk 上传
@@ -630,6 +633,35 @@ func (lc *LimitedReadCloser) Close() error {
 	return nil
 }
 
+type DiscardReadCloser struct {
+	RC      io.ReadCloser
+	Discard int
+}
+
+func (drc *DiscardReadCloser) Read(data []byte) (int, error) {
+	n, err := drc.RC.Read(data)
+	if drc.Discard == 0 || n <= 0 {
+		return n, err
+	}
+
+	if n <= drc.Discard {
+		drc.Discard -= n
+		return 0, err
+	}
+
+	realLen := n - drc.Discard
+	copy(data[0:realLen], data[drc.Discard:n])
+	drc.Discard = 0
+	return realLen, err
+}
+
+func (drc *DiscardReadCloser) Close() error {
+	if rc, ok := drc.RC.(io.ReadCloser); ok {
+		return rc.Close()
+	}
+	return nil
+}
+
 func worker(s *ObjectService, jobs <-chan *Jobs, results chan<- *Results) {
 	for j := range jobs {
 		j.Opt.ContentLength = j.Chunk.Size
@@ -736,7 +768,6 @@ func SplitFileIntoChunks(filePath string, partSize int64) (int64, []Chunk, int,
 	}
 	var partNum int64
 	if partSize > 0 {
-		partSize = partSize * 1024 * 1024
 		partNum = stat.Size() / partSize
 		if partNum >= 10000 {
 			return 0, nil, 0, errors.New("Too many parts, out of 10000")
@@ -855,7 +886,7 @@ func (s *ObjectService) Upload(ctx context.Context, name string, filepath string
 	}
 	var localcrc uint64
 	// 1.Get the file chunk
-	totalBytes, chunks, partNum, err := SplitFileIntoChunks(filepath, opt.PartSize)
+	totalBytes, chunks, partNum, err := SplitFileIntoChunks(filepath, opt.PartSize*1024*1024)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -1035,7 +1066,6 @@ func (s *ObjectService) Upload(ctx context.Context, name string, filepath string
 func SplitSizeIntoChunks(totalBytes int64, partSize int64) ([]Chunk, int, error) {
 	var partNum int64
 	if partSize > 0 {
-		partSize = partSize * 1024 * 1024
 		partNum = totalBytes / partSize
 		if partNum >= 10000 {
 			return nil, 0, errors.New("Too manry parts, out of 10000")
@@ -1130,7 +1160,7 @@ func (s *ObjectService) Download(ctx context.Context, name string, filepath stri
 	}
 
 	// 切分
-	chunks, partNum, err := SplitSizeIntoChunks(totalBytes, opt.PartSize)
+	chunks, partNum, err := SplitSizeIntoChunks(totalBytes, opt.PartSize*1024*1024)
 	if err != nil {
 		return resp, err
 	}

object_part.go

@@ -77,10 +77,13 @@ func (s *ObjectService) UploadPart(ctx context.Context, name, uploadID string, p
 		return nil, err
 	}
 	// opt 不为 nil
-	opt := cloneObjectUploadPartOptions(uopt)
+	opt := CloneObjectUploadPartOptions(uopt)
 	totalBytes, err := GetReaderLen(r)
 	if err != nil && opt.Listener != nil {
-		return nil, err
+		if opt.ContentLength == 0 {
+			return nil, err
+		}
+		totalBytes = opt.ContentLength
 	}
 	// 分块上传不支持 Chunk 上传
 	if err == nil {