mirror of
https://github.com/gin-gonic/gin.git
synced 2025-10-14 04:08:15 +08:00
Merge 8aa7ada2df773f92ffed431fafb531ea6351503a into 4dec17afdff48e8018c83618fbbe69fceeb2b41d
This commit is contained in:
commit
e69c121adc
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,6 +1,7 @@
|
||||
vendor/*
|
||||
!vendor/vendor.json
|
||||
coverage.out
|
||||
coverage.html
|
||||
count.out
|
||||
test
|
||||
profile.out
|
||||
|
120
context_test.go
120
context_test.go
@ -20,6 +20,7 @@ import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"reflect"
|
||||
"runtime"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
@ -179,6 +180,20 @@ func TestContextFormFileFailed(t *testing.T) {
|
||||
assert.Nil(t, f)
|
||||
}
|
||||
|
||||
func TestContextFormFileParseMultipartFormFailed(t *testing.T) {
|
||||
c, _ := CreateTestContext(httptest.NewRecorder())
|
||||
// Create a request with invalid multipart form data
|
||||
body := strings.NewReader("invalid multipart data")
|
||||
c.Request, _ = http.NewRequest(http.MethodPost, "/", body)
|
||||
c.Request.Header.Set("Content-Type", "multipart/form-data; boundary=invalid")
|
||||
c.engine.MaxMultipartMemory = 8 << 20
|
||||
|
||||
// This should trigger the error handling in FormFile when ParseMultipartForm fails
|
||||
f, err := c.FormFile("file")
|
||||
require.Error(t, err)
|
||||
assert.Nil(t, f)
|
||||
}
|
||||
|
||||
func TestContextMultipartForm(t *testing.T) {
|
||||
buf := new(bytes.Buffer)
|
||||
mw := multipart.NewWriter(buf)
|
||||
@ -273,6 +288,43 @@ func TestSaveUploadedFileWithPermissionFailed(t *testing.T) {
|
||||
require.Error(t, c.SaveUploadedFile(f, "test/permission_test", mode))
|
||||
}
|
||||
|
||||
func TestSaveUploadedFileChmodFailed(t *testing.T) {
|
||||
if runtime.GOOS == "windows" {
|
||||
t.Skip("chmod test not applicable on Windows")
|
||||
}
|
||||
|
||||
buf := new(bytes.Buffer)
|
||||
mw := multipart.NewWriter(buf)
|
||||
w, err := mw.CreateFormFile("file", "chmod_test")
|
||||
require.NoError(t, err)
|
||||
_, err = w.Write([]byte("chmod_test"))
|
||||
require.NoError(t, err)
|
||||
mw.Close()
|
||||
c, _ := CreateTestContext(httptest.NewRecorder())
|
||||
c.Request, _ = http.NewRequest(http.MethodPost, "/", buf)
|
||||
c.Request.Header.Set("Content-Type", mw.FormDataContentType())
|
||||
f, err := c.FormFile("file")
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "chmod_test", f.Filename)
|
||||
|
||||
// Create a temporary directory with restricted permissions
|
||||
tmpDir := t.TempDir()
|
||||
restrictedDir := filepath.Join(tmpDir, "restricted")
|
||||
require.NoError(t, os.MkdirAll(restrictedDir, 0o755))
|
||||
// Make the directory read-only to trigger chmod failure
|
||||
require.NoError(t, os.Chmod(restrictedDir, 0o444))
|
||||
t.Cleanup(func() {
|
||||
// Restore permissions for cleanup
|
||||
os.Chmod(restrictedDir, 0o755)
|
||||
})
|
||||
|
||||
// Try to save file with different permissions - this should fail on chmod
|
||||
var mode fs.FileMode = 0o755
|
||||
err = c.SaveUploadedFile(f, filepath.Join(restrictedDir, "subdir", "chmod_test"), mode)
|
||||
// This might fail on MkdirAll or Chmod depending on the system
|
||||
assert.Error(t, err)
|
||||
}
|
||||
|
||||
func TestContextReset(t *testing.T) {
|
||||
router := New()
|
||||
c := router.allocateContext(0)
|
||||
@ -883,6 +935,20 @@ func TestContextQueryAndPostForm(t *testing.T) {
|
||||
assert.Empty(t, dicts)
|
||||
}
|
||||
|
||||
func TestContextInitFormCacheError(t *testing.T) {
|
||||
c, _ := CreateTestContext(httptest.NewRecorder())
|
||||
// Create a request with invalid multipart form data
|
||||
body := strings.NewReader("invalid multipart data")
|
||||
c.Request, _ = http.NewRequest(http.MethodPost, "/", body)
|
||||
c.Request.Header.Set("Content-Type", "multipart/form-data; boundary=invalid")
|
||||
c.engine.MaxMultipartMemory = 8 << 20
|
||||
|
||||
// This should trigger the error handling in initFormCache
|
||||
values, ok := c.GetPostFormArray("foo")
|
||||
assert.False(t, ok)
|
||||
assert.Empty(t, values)
|
||||
}
|
||||
|
||||
func TestContextPostFormMultipart(t *testing.T) {
|
||||
c, _ := CreateTestContext(httptest.NewRecorder())
|
||||
c.Request = createMultipartRequest()
|
||||
@ -2363,6 +2429,31 @@ func TestContextBadAutoShouldBind(t *testing.T) {
|
||||
assert.False(t, c.IsAborted())
|
||||
}
|
||||
|
||||
func TestContextShouldBindBodyWithReadError(t *testing.T) {
|
||||
w := httptest.NewRecorder()
|
||||
c, _ := CreateTestContext(w)
|
||||
|
||||
// Create a request with a body that will cause read error
|
||||
c.Request, _ = http.NewRequest(http.MethodPost, "/", &errorReader{})
|
||||
|
||||
type testStruct struct {
|
||||
Foo string `json:"foo"`
|
||||
}
|
||||
obj := testStruct{}
|
||||
|
||||
// This should trigger the error handling in ShouldBindBodyWith
|
||||
err := c.ShouldBindBodyWith(&obj, binding.JSON)
|
||||
assert.Error(t, err)
|
||||
assert.Contains(t, err.Error(), "read error")
|
||||
}
|
||||
|
||||
// errorReader is a helper struct that always returns an error when Read is called
|
||||
type errorReader struct{}
|
||||
|
||||
func (e *errorReader) Read(p []byte) (n int, err error) {
|
||||
return 0, errors.New("read error")
|
||||
}
|
||||
|
||||
func TestContextShouldBindBodyWith(t *testing.T) {
|
||||
type typeA struct {
|
||||
Foo string `json:"foo" xml:"foo" binding:"required"`
|
||||
@ -2833,6 +2924,17 @@ func TestContextGetRawData(t *testing.T) {
|
||||
assert.Equal(t, "Fetch binary post data", string(data))
|
||||
}
|
||||
|
||||
func TestContextGetRawDataNilBody(t *testing.T) {
|
||||
c, _ := CreateTestContext(httptest.NewRecorder())
|
||||
c.Request, _ = http.NewRequest(http.MethodPost, "/", nil)
|
||||
c.Request.Body = nil
|
||||
|
||||
data, err := c.GetRawData()
|
||||
assert.Error(t, err)
|
||||
assert.Nil(t, data)
|
||||
assert.Contains(t, err.Error(), "cannot read nil body")
|
||||
}
|
||||
|
||||
func TestContextRenderDataFromReader(t *testing.T) {
|
||||
w := httptest.NewRecorder()
|
||||
c, _ := CreateTestContext(w)
|
||||
@ -3421,6 +3523,24 @@ func TestContextSetCookieData(t *testing.T) {
|
||||
setCookie := c.Writer.Header().Get("Set-Cookie")
|
||||
assert.Contains(t, setCookie, "SameSite=None")
|
||||
})
|
||||
|
||||
// Test that SameSiteDefaultMode uses context's sameSite setting
|
||||
t.Run("SameSite=Default uses context setting", func(t *testing.T) {
|
||||
c, _ := CreateTestContext(httptest.NewRecorder())
|
||||
c.SetSameSite(http.SameSiteStrictMode)
|
||||
cookie := &http.Cookie{
|
||||
Name: "user",
|
||||
Value: "gin",
|
||||
Path: "/",
|
||||
Domain: "localhost",
|
||||
Secure: true,
|
||||
HttpOnly: true,
|
||||
SameSite: http.SameSiteDefaultMode,
|
||||
}
|
||||
c.SetCookieData(cookie)
|
||||
setCookie := c.Writer.Header().Get("Set-Cookie")
|
||||
assert.Contains(t, setCookie, "SameSite=Strict")
|
||||
})
|
||||
}
|
||||
|
||||
func TestGetMapFromFormData(t *testing.T) {
|
||||
|
@ -112,6 +112,59 @@ func TestDebugPrintWARNINGDefault(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestDebugPrintWARNINGDefaultLowGoVersion(t *testing.T) {
|
||||
// Test the Go version warning branch by testing getMinVer with different inputs
|
||||
// and then testing the logic directly
|
||||
|
||||
// First test getMinVer with a version that would trigger the warning
|
||||
v, err := getMinVer("go1.22.1")
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, uint64(22), v)
|
||||
|
||||
// Test that version 22 is less than ginSupportMinGoVer (23)
|
||||
assert.True(t, v < ginSupportMinGoVer)
|
||||
|
||||
// Test the warning message directly by capturing debugPrint output
|
||||
re := captureOutput(t, func() {
|
||||
SetMode(DebugMode)
|
||||
// Simulate the condition that would trigger the warning
|
||||
if v < ginSupportMinGoVer {
|
||||
debugPrint(`[WARNING] Now Gin requires Go 1.23+.
|
||||
|
||||
`)
|
||||
}
|
||||
debugPrint(`[WARNING] Creating an Engine instance with the Logger and Recovery middleware already attached.
|
||||
|
||||
`)
|
||||
SetMode(TestMode)
|
||||
})
|
||||
|
||||
assert.Equal(t, "[GIN-debug] [WARNING] Now Gin requires Go 1.23+.\n\n[GIN-debug] [WARNING] Creating an Engine instance with the Logger and Recovery middleware already attached.\n\n", re)
|
||||
}
|
||||
|
||||
func TestDebugPrintWithCustomFunc(t *testing.T) {
|
||||
// Test debugPrint with custom DebugPrintFunc
|
||||
originalFunc := DebugPrintFunc
|
||||
defer func() {
|
||||
DebugPrintFunc = originalFunc
|
||||
}()
|
||||
|
||||
var capturedFormat string
|
||||
var capturedValues []any
|
||||
DebugPrintFunc = func(format string, values ...any) {
|
||||
capturedFormat = format
|
||||
capturedValues = values
|
||||
}
|
||||
|
||||
SetMode(DebugMode)
|
||||
debugPrint("test %s %d", "message", 42)
|
||||
SetMode(TestMode)
|
||||
|
||||
// debugPrint automatically adds \n if not present
|
||||
assert.Equal(t, "test %s %d", capturedFormat)
|
||||
assert.Equal(t, []any{"message", 42}, capturedValues)
|
||||
}
|
||||
|
||||
func TestDebugPrintWARNINGNew(t *testing.T) {
|
||||
re := captureOutput(t, func() {
|
||||
SetMode(DebugMode)
|
||||
|
Loading…
x
Reference in New Issue
Block a user