fix put object with content length

oss/bucket_test.go

@@ -6022,3 +6022,47 @@ func (s *OssBucketSuite) TestPutObjectWithCallbackResult(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(str, Equals, objectValue)
 }
+
+func (s *OssBucketSuite) TestPutObjectWithContentLength(c *C) {
+	objectName := objectNamePrefix + RandStr(8)
+	objectValue := RandStr(1023)
+	err := s.bucket.PutObject(objectName, strings.NewReader(objectValue), ContentLength(100))
+	c.Assert(err, NotNil)
+	c.Assert(strings.Contains(err.Error(), " transport connection broken"), Equals, true)
+
+	length := int64(len(objectValue))
+	err = s.bucket.PutObject(objectName, strings.NewReader(objectValue), ContentLength(length))
+	c.Assert(err, IsNil)
+
+	length = int64(100)
+	fd := strings.NewReader(objectValue)
+	err = s.bucket.PutObject(objectName, fd, ContentLength(length))
+	c.Assert(err, NotNil)
+	c.Assert(strings.Contains(err.Error(), " transport connection broken"), Equals, true)
+
+	fd2 := io.LimitReader(strings.NewReader(objectValue), length)
+	err = s.bucket.PutObject(objectName, fd2, ContentLength(length))
+	c.Assert(err, IsNil)
+
+	client, err := New(endpoint, accessID, accessKey, EnableMD5(true), EnableCRC(true))
+	c.Assert(err, IsNil)
+	s.client = client
+
+	err = s.bucket.PutObject(objectName, strings.NewReader(objectValue), ContentLength(100))
+	c.Assert(err, NotNil)
+	c.Assert(strings.Contains(err.Error(), " transport connection broken"), Equals, true)
+
+	length = int64(len(objectValue))
+	err = s.bucket.PutObject(objectName, strings.NewReader(objectValue), ContentLength(length))
+	c.Assert(err, IsNil)
+
+	length = int64(100)
+	fd = strings.NewReader(objectValue)
+	err = s.bucket.PutObject(objectName, fd, ContentLength(length))
+	c.Assert(err, NotNil)
+	c.Assert(strings.Contains(err.Error(), " transport connection broken"), Equals, true)
+
+	fd2 = io.LimitReader(strings.NewReader(objectValue), length)
+	err = s.bucket.PutObject(objectName, fd2, ContentLength(length))
+	c.Assert(err, IsNil)
+}

oss/conn.go

@@ -314,6 +314,11 @@ func (conn Conn) doRequest(ctx context.Context, method string, uri *url.URL, can
 	if ctx != nil {
 		req = req.WithContext(ctx)
 	}
+	if headers != nil {
+		for k, v := range headers {
+			req.Header.Set(k, v)
+		}
+	}
 	tracker := &readerTracker{completedBytes: 0}
 	fd, crc := conn.handleBody(req, data, initCRC, listener, tracker)
 	if fd != nil {
@@ -342,13 +347,6 @@ func (conn Conn) doRequest(ctx context.Context, method string, uri *url.URL, can
 	if akIf.GetSecurityToken() != "" {
 		req.Header.Set(HTTPHeaderOssSecurityToken, akIf.GetSecurityToken())
 	}
-
-	if headers != nil {
-		for k, v := range headers {
-			req.Header.Set(k, v)
-		}
-	}
-
 	conn.signHeader(req, canonicalizedResource)
 
 	// Transfer started
@@ -461,12 +459,17 @@ func (conn Conn) handleBody(req *http.Request, body io.Reader, initCRC uint64,
 	var file *os.File
 	var crc hash.Hash64
 	reader := body
-	readerLen, err := GetReaderLen(reader)
-	if err == nil {
-		req.ContentLength = readerLen
+	contentLength := req.Header.Get(HTTPHeaderContentLength)
+	if contentLength != "" {
+		length, _ := strconv.ParseInt(contentLength, 10, 64)
+		req.ContentLength = length
+	} else {
+		readerLen, err := GetReaderLen(reader)
+		if err == nil {
+			req.ContentLength = readerLen
+		}
+		req.Header.Set(HTTPHeaderContentLength, strconv.FormatInt(req.ContentLength, 10))
 	}
-	req.Header.Set(HTTPHeaderContentLength, strconv.FormatInt(req.ContentLength, 10))
-
 	// MD5
 	if body != nil && conn.config.IsEnableMD5 && req.Header.Get(HTTPHeaderContentMD5) == "" {
 		md5 := ""

oss/utils.go

@@ -462,10 +462,12 @@ func GetReaderLen(reader io.Reader) (int64, error) {
 	case *os.File:
 		fInfo, fError := v.Stat()
 		if fError != nil {
-			err = fmt.Errorf("can't get reader content length,%s", fError.Error())
-		} else {
-			contentLength = fInfo.Size()
+			err = fmt.Errorf("can't get reader content length: %s", fError.Error())
+		}
+		if !isRegularFile(fInfo) {
+			err = fmt.Errorf("can't get reader content length: not a regular file")
 		}
+		contentLength = fInfo.Size()
 	case *io.LimitedReader:
 		contentLength = int64(v.N)
 	case *LimitedReadCloser:
@@ -476,6 +478,10 @@ func GetReaderLen(reader io.Reader) (int64, error) {
 	return contentLength, err
 }
 
+func isRegularFile(fInfo os.FileInfo) bool {
+	return fInfo.Mode()&os.ModeType == 0
+}
+
 func LimitReadCloser(r io.Reader, n int64) io.Reader {
 	var lc LimitedReadCloser
 	lc.R = r