Skip to content

fix(gvalid): date validation allows invalid formats like Y-MMMM and invalid dates like 2026-13-33 #4740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cococolanosugar wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix(gvalid): date validation allows invalid formats like Y-MMMM and invalid dates like 2026-13-33 #4740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51b3149
fix(gvalid): date validation allows invalid formats like Y-MMMM and i…
cococolanosugar Mar 21, 2026
6d45dee
fix(gvalid): support slash date format and fix function name mistake
cococolanosugar Mar 23, 2026
2d87e45
Apply gci import order changes
github-actions[bot] Mar 23, 2026
57770ba
Merge branch 'master' into fix-date-validation-bug
cococolanosugar Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions util/gvalid/gvalid_z_unit_feature_rule_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,11 @@ func Test_Date(t *testing.T) {
"2010/11/01": true,
"2010=11=01": false,
"123": false,
"2026-1111": false, // Bug: invalid format should not pass
"2026-13-33": false, // Bug: invalid date should not pass
"2026-02-29": false, // Non-leap year should not pass
"2024-02-29": true, // Leap year should pass
"202611-11": false, // Invalid separator should not pass
}
for k, v := range m {
err := g.Validator().Data(k).Rules("date").Run(ctx)
Expand Down
19 changes: 13 additions & 6 deletions util/gvalid/internal/builtin/builtin_date.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"errors"
"time"

"github.com/gogf/gf/v2/text/gregex"
"github.com/gogf/gf/v2/os/gtime"
)

// RuleDate implements `date` rule:
Expand Down Expand Up @@ -41,12 +41,19 @@ func (r RuleDate) Run(in RunInput) error {
if obj.IsZero() {
return errors.New(in.Message)
}
return nil
}
if !gregex.IsMatchString(
`\d{4}[\.\-\_/]{0,1}\d{2}[\.\-\_/]{0,1}\d{2}`,
in.Value.String(),
) {
return errors.New(in.Message)
// Try direct time conversion for validation, which handles both format and date validity.
// Support common date formats: 2006-01-02, 20060102, 2006.01.02, 2006/01/02
if _, err := gtime.StrToTimeFormat(in.Value.String(), "Ymd"); err != nil {
// Try with different separator formats
if _, err := gtime.StrToTimeFormat(in.Value.String(), "Y-m-d"); err != nil {
if _, err := gtime.StrToTimeFormat(in.Value.String(), "Y.m.d"); err != nil {
if _, err := gtime.StrToTimeFormat(in.Value.String(), "Y/m/d"); err != nil {
return errors.New(in.Message)
}
}
}
}
return nil
}
Loading