mirror of
https://github.com/go-gitea/gitea.git
synced 2026-07-13 08:37:47 +00:00
TowyTowy
d2bd1589fe
### What / why `TimeEstimateParse` (used by the issue time-estimate form) only checked that the first token starts at the beginning of the string and the last token ends at its end, but never checked the gaps between consecutive tokens. Non-whitespace garbage embedded between two valid units was silently dropped and the string accepted with a wrong value instead of being reported as invalid. Examples that were wrongly accepted before this change: - `1h 2x 3m` → 3780s (parsed as 1h3m) - `1h_2m` → 3720s - `1h,1m` → 3660s All three now return an "invalid time string" error, while valid inputs such as `1h 1m 1s` and `1h1m1s` keep working. ### How Reject any non-whitespace content between two matched units. --------- Signed-off-by: TowyTowy <towy@airreps.link> Signed-off-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
93 lines
2.3 KiB
Go
93 lines
2.3 KiB
Go
// Copyright 2024 Gitea. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package util
|
|
|
|
import (
|
|
"fmt"
|
|
"regexp"
|
|
"strconv"
|
|
"strings"
|
|
"sync"
|
|
)
|
|
|
|
type timeStrGlobalVarsType struct {
|
|
units []struct {
|
|
name string
|
|
num int64
|
|
}
|
|
re *regexp.Regexp
|
|
}
|
|
|
|
// When tracking working time, only hour/minute/second units are accurate and could be used.
|
|
// For other units like "day", it depends on "how many working hours in a day": 6 or 7 or 8?
|
|
// So at the moment, we only support hour/minute/second units.
|
|
// In the future, it could be some configurable options to help users
|
|
// to convert the working time to different units.
|
|
|
|
var timeStrGlobalVars = sync.OnceValue(func() *timeStrGlobalVarsType {
|
|
v := &timeStrGlobalVarsType{}
|
|
v.re = regexp.MustCompile(`(?i)(\d+)\s*([hms])`)
|
|
v.units = []struct {
|
|
name string
|
|
num int64
|
|
}{
|
|
{"h", 60 * 60},
|
|
{"m", 60},
|
|
{"s", 1},
|
|
}
|
|
return v
|
|
})
|
|
|
|
func TimeEstimateParse(timeStr string) (int64, error) {
|
|
timeStr = strings.TrimSpace(timeStr)
|
|
if timeStr == "" {
|
|
return 0, nil
|
|
}
|
|
var total int64
|
|
matches := timeStrGlobalVars().re.FindAllStringSubmatchIndex(timeStr, -1)
|
|
if len(matches) == 0 {
|
|
return 0, fmt.Errorf("invalid time string: %s", timeStr)
|
|
}
|
|
if matches[0][0] != 0 || matches[len(matches)-1][1] != len(timeStr) {
|
|
return 0, fmt.Errorf("invalid time string: %s", timeStr)
|
|
}
|
|
prevEnd := 0
|
|
for _, match := range matches {
|
|
// only whitespace may separate two units, otherwise the string contains invalid content like "1h x 2m"
|
|
if strings.TrimSpace(timeStr[prevEnd:match[0]]) != "" {
|
|
return 0, fmt.Errorf("invalid time string: %s", timeStr)
|
|
}
|
|
prevEnd = match[1]
|
|
amount, err := strconv.ParseInt(timeStr[match[2]:match[3]], 10, 64)
|
|
if err != nil {
|
|
return 0, fmt.Errorf("invalid time string: %v", err)
|
|
}
|
|
unit := timeStr[match[4]:match[5]]
|
|
found := false
|
|
for _, u := range timeStrGlobalVars().units {
|
|
if strings.EqualFold(unit, u.name) {
|
|
total += amount * u.num
|
|
found = true
|
|
break
|
|
}
|
|
}
|
|
if !found {
|
|
return 0, fmt.Errorf("invalid time unit: %s", unit)
|
|
}
|
|
}
|
|
return total, nil
|
|
}
|
|
|
|
func TimeEstimateString(amount int64) string {
|
|
var timeParts []string
|
|
for _, u := range timeStrGlobalVars().units {
|
|
if amount >= u.num {
|
|
num := amount / u.num
|
|
amount %= u.num
|
|
timeParts = append(timeParts, fmt.Sprintf("%d%s", num, u.name))
|
|
}
|
|
}
|
|
return strings.Join(timeParts, " ")
|
|
}
|