MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-09 21:49:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

ignore if-unmodified-since header if if-match is set (#20326)

Browse Source
This commit is contained in:
T-TRz879
2024-09-03 14:33:53 +08:00
committed by GitHub
parent d7ef6315ae
commit 69258d5945
2 changed files with 138 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
cmd/object-handlers-common_test.go
View File

@@ -18,7 +18,14 @@
package cmd
import (
"bytes"
"context"
"net/http"
"net/http/httptest"
"testing"
"time"
xhttp "github.com/minio/minio/internal/http"
)
// Tests - canonicalizeETag()
@@ -51,3 +58,125 @@ func TestCanonicalizeETag(t *testing.T) {
}
}
}
// Tests - CheckPreconditions()
func TestCheckPreconditions(t *testing.T) {
objModTime := time.Date(2024, time.August, 26, 0o2, 0o1, 0o1, 0, time.UTC)
objInfo := ObjectInfo{ETag: "aa", ModTime: objModTime}
testCases := []struct {
name string
ifMatch string
ifNoneMatch string
ifModifiedSince string
ifUnmodifiedSince string
objInfo ObjectInfo
expectedFlag bool
expectedCode int
}{
// If-None-Match(false) and If-Modified-Since(true)
{
name: "If-None-Match1",
ifNoneMatch: "aa",
ifModifiedSince: "Sun, 26 Aug 2024 02:01:00 GMT",
objInfo: objInfo,
expectedFlag: true,
expectedCode: 304,
},
// If-Modified-Since(false)
{
name: "If-None-Match2",
ifNoneMatch: "aaa",
ifModifiedSince: "Sun, 26 Aug 2024 02:01:01 GMT",
objInfo: objInfo,
expectedFlag: true,
expectedCode: 304,
},
{
name: "If-None-Match3",
ifNoneMatch: "aaa",
ifModifiedSince: "Sun, 26 Aug 2024 02:01:02 GMT",
objInfo: objInfo,
expectedFlag: true,
expectedCode: 304,
},
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
recorder := httptest.NewRecorder()
request := httptest.NewRequest(http.MethodHead, "/bucket/a", bytes.NewReader([]byte{}))
request.Header.Set(xhttp.IfNoneMatch, tc.ifNoneMatch)
request.Header.Set(xhttp.IfModifiedSince, tc.ifModifiedSince)
request.Header.Set(xhttp.IfMatch, tc.ifMatch)
request.Header.Set(xhttp.IfUnmodifiedSince, tc.ifUnmodifiedSince)
actualFlag := checkPreconditions(context.Background(), recorder, request, tc.objInfo, ObjectOptions{})
if tc.expectedFlag != actualFlag {
t.Errorf("test: %s, got flag: %v, want: %v", tc.name, actualFlag, tc.expectedFlag)
}
if tc.expectedCode != recorder.Code {
t.Errorf("test: %s, got code: %d, want: %d", tc.name, recorder.Code, tc.expectedCode)
}
})
}
testCases = []struct {
name string
ifMatch string
ifNoneMatch string
ifModifiedSince string
ifUnmodifiedSince string
objInfo ObjectInfo
expectedFlag bool
expectedCode int
}{
// If-Match(true) and If-Unmodified-Since(false)
{
name: "If-Match1",
ifMatch: "aa",
ifUnmodifiedSince: "Sun, 26 Aug 2024 02:01:00 GMT",
objInfo: objInfo,
expectedFlag: false,
expectedCode: 200,
},
// If-Unmodified-Since(true)
{
name: "If-Match2",
ifMatch: "aa",
ifUnmodifiedSince: "Sun, 26 Aug 2024 02:01:01 GMT",
objInfo: objInfo,
expectedFlag: false,
expectedCode: 200,
},
{
name: "If-Match3",
ifMatch: "aa",
ifUnmodifiedSince: "Sun, 26 Aug 2024 02:01:02 GMT",
objInfo: objInfo,
expectedFlag: false,
expectedCode: 200,
},
// If-Match(true)
{
name: "If-Match4",
ifMatch: "aa",
objInfo: objInfo,
expectedFlag: false,
expectedCode: 200,
},
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
recorder := httptest.NewRecorder()
request := httptest.NewRequest(http.MethodHead, "/bucket/a", bytes.NewReader([]byte{}))
request.Header.Set(xhttp.IfNoneMatch, tc.ifNoneMatch)
request.Header.Set(xhttp.IfModifiedSince, tc.ifModifiedSince)
request.Header.Set(xhttp.IfMatch, tc.ifMatch)
request.Header.Set(xhttp.IfUnmodifiedSince, tc.ifUnmodifiedSince)
actualFlag := checkPreconditions(context.Background(), recorder, request, tc.objInfo, ObjectOptions{})
if tc.expectedFlag != actualFlag {
t.Errorf("test: %s, got flag: %v, want: %v", tc.name, actualFlag, tc.expectedFlag)
}
if tc.expectedCode != recorder.Code {
t.Errorf("test: %s, got code: %d, want: %d", tc.name, recorder.Code, tc.expectedCode)
}
})
}
}