Skip to content

fix some bad timestamp strings not returning errors #168

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
gordallott wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix some bad timestamp strings not returning errors #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 22 additions & 8 deletions parseany.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,14 @@ func ParseIn(datestr string, loc *time.Location, opts ...ParserOption) (time.Tim
// Set Location to time.Local. Same as ParseIn Location but lazily uses
// the global time.Local variable for Location argument.
//
// denverLoc, _ := time.LoadLocation("America/Denver")
// time.Local = denverLoc
// denverLoc, _ := time.LoadLocation("America/Denver")
// time.Local = denverLoc
//
// t, err := dateparse.ParseLocal("3/1/2014")
// t, err := dateparse.ParseLocal("3/1/2014")
//
// Equivalent to:
//
// t, err := dateparse.ParseIn("3/1/2014", denverLoc)
//
// t, err := dateparse.ParseIn("3/1/2014", denverLoc)
func ParseLocal(datestr string, opts ...ParserOption) (time.Time, error) {
p, err := parseTime(datestr, time.Local, opts...)
if err != nil {
Expand All @@ -204,9 +203,8 @@ func MustParse(datestr string, opts ...ParserOption) time.Time {
// ParseFormat parse's an unknown date-time string and returns a layout
// string that can parse this (and exact same format) other date-time strings.
//
// layout, err := dateparse.ParseFormat("2013-02-01 00:00:00")
// // layout = "2006-01-02 15:04:05"
//
// layout, err := dateparse.ParseFormat("2013-02-01 00:00:00")
// // layout = "2006-01-02 15:04:05"
func ParseFormat(datestr string, opts ...ParserOption) (string, error) {
p, err := parseTime(datestr, nil, opts...)
if err != nil {
Expand Down Expand Up @@ -1202,8 +1200,16 @@ iterRunes:
p.stateTime = timeZ
if p.seci == 0 {
p.minlen = i - p.mini
// Validate minute length if no seconds
if p.minlen > 2 || p.minlen < 1 {
return nil, unknownErr(datestr)
}
} else {
p.seclen = i - p.seci
// Validate second length
if p.seclen > 2 || p.seclen < 1 {
return nil, unknownErr(datestr)
}
}
// (Z)ulu time
p.loc = time.UTC
Expand Down Expand Up @@ -1246,9 +1252,17 @@ iterRunes:
if p.mini == 0 {
p.mini = i + 1
p.hourlen = i - p.houri
// Validate hour length, must be 1 or 2 digits
if p.hourlen > 2 || p.hourlen < 1 {
return nil, unknownErr(datestr)
}
} else if p.seci == 0 {
p.seci = i + 1
p.minlen = i - p.mini
// Validate minute length, must be 1 or 2 digits
if p.minlen > 2 || p.minlen < 1 {
return nil, unknownErr(datestr)
}
} else if p.seci > 0 {
// 18:31:59:257 ms uses colon, wtf
p.seclen = i - p.seci
Expand Down
6 changes: 6 additions & 0 deletions parseany_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,12 @@ var testParseErrors = []dateTest{
{in: "5,000-9,999", err: true},
{in: "xyzq-baad"},
{in: "oct.-7-1970", err: true},
{in: "2026-01-16T020:00:00Z", err: true},
{in: "2026-01-16T123:00:00Z", err: true},
{in: "2026-01-16T02:000:00Z", err: true},
{in: "2026-01-16T02:00:000Z", err: true},
{in: "2026-01-16T02:123:00Z", err: true},
{in: "2026-01-16T02:00:123Z", err: true},
{in: "septe. 7, 1970", err: true},
{in: "SeptemberRR 7th, 1970", err: true},
{in: "29-06-2016", err: true},
Expand Down