OP#792 initial commit after fork

2026-09-27 11:03:48 +02:00
parent 1fc33f4f1f
commit 55b0890196
1338 changed files with 428609 additions and 57 deletions
--- a/internal/amztime/iso8601_time.go
+++ b/internal/amztime/iso8601_time.go
@@ -0,0 +1,59 @@
+// Copyright (c) 2015-2022 MinIO, Inc.
+//
+// This file is part of MinIO Object Storage stack
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package amztime
+
+import (
+	"strings"
+	"time"
+)
+
+// RFC3339 a subset of the ISO8601 timestamp format. e.g 2014-04-29T18:30:38Z
+const (
+	iso8601TimeFormat     = "2006-01-02T15:04:05.000Z"    // Reply date format with millisecond precision.
+	iso8601TimeFormatLong = "2006-01-02T15:04:05.000000Z" // Reply date format with nanosecond precision.
+)
+
+// ISO8601Format converts time 't' into ISO8601 time format expected in AWS S3 spec.
+//
+// This function is needed to avoid a Go's float64 precision bug, where Go avoids
+// padding the extra '0' before the timezone.
+func ISO8601Format(t time.Time) string {
+	value := t.Format(iso8601TimeFormat)
+	if len(value) < len(iso8601TimeFormat) {
+		value = t.Format(iso8601TimeFormat[:len(iso8601TimeFormat)-1])
+		// Pad necessary zeroes to full-fill the iso8601TimeFormat
+		return value + strings.Repeat("0", (len(iso8601TimeFormat)-1)-len(value)) + "Z"
+	}
+	return value
+}
+
+// ISO8601Parse parses ISO8601 date string
+func ISO8601Parse(iso8601 string) (t time.Time, err error) {
+	for _, layout := range []string{
+		iso8601TimeFormat,
+		iso8601TimeFormatLong,
+		time.RFC3339,
+	} {
+		t, err = time.Parse(layout, iso8601)
+		if err == nil {
+			return t, nil
+		}
+	}
+
+	return t, err
+}
--- a/internal/amztime/iso8601_time_test.go
+++ b/internal/amztime/iso8601_time_test.go
@@ -0,0 +1,57 @@
+// Copyright (c) 2015-2022 MinIO, Inc.
+//
+// This file is part of MinIO Object Storage stack
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package amztime
+
+import (
+	"testing"
+	"time"
+)
+
+func TestISO8601Format(t *testing.T) {
+	testCases := []struct {
+		date           time.Time
+		expectedOutput string
+	}{
+		{
+			date:           time.Date(2009, time.November, 13, 4, 51, 1, 940303531, time.UTC),
+			expectedOutput: "2009-11-13T04:51:01.940Z",
+		},
+		{
+			date:           time.Date(2009, time.November, 13, 4, 51, 1, 901303531, time.UTC),
+			expectedOutput: "2009-11-13T04:51:01.901Z",
+		},
+		{
+			date:           time.Date(2009, time.November, 13, 4, 51, 1, 900303531, time.UTC),
+			expectedOutput: "2009-11-13T04:51:01.900Z",
+		},
+		{
+			date:           time.Date(2009, time.November, 13, 4, 51, 1, 941303531, time.UTC),
+			expectedOutput: "2009-11-13T04:51:01.941Z",
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.expectedOutput, func(t *testing.T) {
+			gotOutput := ISO8601Format(testCase.date)
+			t.Log("Go", testCase.date.Format(iso8601TimeFormat))
+			if gotOutput != testCase.expectedOutput {
+				t.Errorf("Expected %s, got %s", testCase.expectedOutput, gotOutput)
+			}
+		})
+	}
+}
--- a/internal/amztime/parse.go
+++ b/internal/amztime/parse.go
@@ -0,0 +1,82 @@
+// Copyright (c) 2015-2022 MinIO, Inc.
+//
+// This file is part of MinIO Object Storage stack
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// Package amztime implements AWS specific time parsing and deviations
+package amztime
+
+import (
+	"errors"
+	"net/http"
+	"time"
+)
+
+// Supported amz date formats.
+var amzDateFormats = []string{
+	// Do not change this order, x-amz-date format is usually in
+	// iso8601Format rest are meant for relaxed handling of other
+	// odd SDKs that might be out there.
+	"20060102T150405Z",
+	time.RFC1123,
+	time.RFC1123Z,
+	// Add new AMZ date formats here.
+}
+
+// ErrMalformedDate always returned for dates that cannot be parsed.
+var ErrMalformedDate = errors.New("malformed date")
+
+// Parse parses date string via supported amz date formats.
+func Parse(amzDateStr string) (time.Time, error) {
+	for _, dateFormat := range amzDateFormats {
+		amzDate, err := time.Parse(dateFormat, amzDateStr)
+		if err == nil {
+			return amzDate, nil
+		}
+	}
+	return time.Time{}, ErrMalformedDate
+}
+
+var httpTimeFormats = []string{
+	// Do not change this order, http time format dates
+	// are usually in http.TimeFormat however there are
+	// situations where for example aws-sdk-java doesn't
+	// send the correct format.
+	http.TimeFormat,
+	"Mon, 2 Jan 2006 15:04:05 GMT",
+}
+
+// ParseHeader parses http.TimeFormat with an acceptable
+// extension for http.TimeFormat - return time might be zero
+// if the timeStr is invalid.
+func ParseHeader(timeStr string) (time.Time, error) {
+	for _, dateFormat := range httpTimeFormats {
+		t, err := time.Parse(dateFormat, timeStr)
+		if err == nil {
+			return t, nil
+		}
+	}
+	return time.Time{}, ErrMalformedDate
+}
+
+// ParseReplicationTS parse http.TimeFormat first
+// will try time.RFC3339Nano when parse http.TimeFormat failed
+func ParseReplicationTS(str string) (time.Time, error) {
+	tm, err := time.Parse(http.TimeFormat, str)
+	if tm.IsZero() || err != nil {
+		tm, err = time.Parse(time.RFC3339Nano, str)
+	}
+	return tm, err
+}
--- a/internal/amztime/parse_test.go
+++ b/internal/amztime/parse_test.go
@@ -0,0 +1,57 @@
+// Copyright (c) 2015-2022 MinIO, Inc.
+//
+// This file is part of MinIO Object Storage stack
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// Package amztime implements AWS specific time parsing and deviations
+package amztime
+
+import (
+	"errors"
+	"testing"
+	"time"
+)
+
+func TestParse(t *testing.T) {
+	type testCase struct {
+		expectedErr  error
+		expectedTime time.Time
+		timeStr      string
+	}
+	testCases := []testCase{
+		{
+			ErrMalformedDate,
+			time.Time{},
+			"Tue Sep  6 07:10:23 PM PDT 2022",
+		},
+		{
+			nil,
+			time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC),
+			"Tue, 10 Nov 2009 23:00:00 UTC",
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.timeStr, func(t *testing.T) {
+			gott, goterr := Parse(testCase.timeStr)
+			if !errors.Is(goterr, testCase.expectedErr) {
+				t.Errorf("expected %v, got %v", testCase.expectedErr, goterr)
+			}
+			if !gott.Equal(testCase.expectedTime) {
+				t.Errorf("expected %v, got %v", testCase.expectedTime, gott)
+			}
+		})
+	}
+}