containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pkg/config: do not use regexp in validateUmask 

Using ParseUint is faster and simpler.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2025-03-04 12:33:35 -08:00
parent 97b3f8b60b
commit 22a1d1c8f5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/pkg/config/config_local.go
View File

@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"regexp" "strconv"
"strings" "strings"
"github.com/containers/storage/pkg/fileutils" "github.com/containers/storage/pkg/fileutils"
@ -97,8 +97,9 @@ func (c *ContainersConfig) validateTZ() error {
} }
func (c *ContainersConfig) validateUmask() error { func (c *ContainersConfig) validateUmask() error {
validUmask := regexp.MustCompile(`^[0-7]{1,4}$`) // Valid values are 0 to 7777 octal.
if !validUmask.MatchString(c.Umask) { _, err := strconv.ParseUint(c.Umask, 8, 12)
if err != nil {
return fmt.Errorf("not a valid umask %s", c.Umask) return fmt.Errorf("not a valid umask %s", c.Umask)
} }
return nil return nil