Merge pull request #2008 from versity/sis/object-post-boundary-prefix

fix: remove POST object multipart boundary prefix trimming

s3api/utils/multipart_reader.go

@@ -39,8 +39,7 @@ type MultipartParser struct {
 }
 
 // NewMultipartParser creates a new streaming multipart parser.
-// boundary should be the raw boundary value from Content-Type, without the leading "--".
-// If accidentally "--<boundary>" has been passed, it is normalized.
+// boundary should be the raw boundary value from Content-Type,
 func NewMultipartParser(body io.Reader, boundary string, requestContentLength int64) (*MultipartParser, error) {
 	if body == nil {
 		debuglogger.Logf("multipart parser requires non-nil body reader")
@@ -52,7 +51,6 @@ func NewMultipartParser(body io.Reader, boundary string, requestContentLength in
 	}
 
 	boundary = strings.TrimSpace(boundary)
-	boundary = strings.TrimPrefix(boundary, "--")
 	if boundary == "" {
 		debuglogger.Logf("multipart boundary is empty")
 		return nil, s3err.GetAPIError(s3err.ErrMalformedPOSTRequest)

s3api/utils/multipart_reader_test.go

@@ -100,28 +100,28 @@ func TestMultipartParserParseSuccess(t *testing.T) {
 	t.Parallel()
 
 	body := strings.Join([]string{
-		"--abc\r\n",
+		"----abc\r\n",
 		"Content-Disposition: form-data; name=\"key\"\r\n",
 		"\r\n",
 		"uploads/photo.jpg\r\n",
-		"--abc\r\n",
+		"----abc\r\n",
 		"Content-Disposition: form-data; name=\"success_action_status\"\r\n",
 		"\r\n",
 		"201\r\n",
-		"--abc\r\n",
+		"----abc\r\n",
 		"Content-Disposition: form-data; name=\"x-amz-meta-color\"\r\n",
 		"\r\n",
 		"blue\r\n",
-		"--abc\r\n",
+		"----abc\r\n",
 		"Content-Disposition: form-data; name=\"x-amz-meta-color\"\r\n",
 		"\r\n",
 		"green\r\n",
-		"--abc\r\n",
+		"----abc\r\n",
 		"Content-Disposition: form-data; name=\"file\"; filename=\"photo.jpg\"\r\n",
 		"Content-Type: image/jpeg\r\n",
 		"\r\n",
 		"file-body-123",
-		"\r\n--abc--\r\n",
+		"\r\n----abc--\r\n",
 	}, "")
 
 	mp := newMultipartParserForTest(t, body, "--abc")