docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simplify and clean logic, gofmt 

Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
This commit is contained in:
Riyaz Faizullabhoy 2015-12-17 15:47:38 -08:00
parent e82371e687
commit 2c39fa2214
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tuf/data/roles.go
View File

@ -2,9 +2,9 @@ package data
import (
"fmt"
"strings"
"regexp"
"path/filepath"
"regexp"
"strings"
)
// Canonical base role names
@ -116,9 +116,13 @@ func ValidRole(name string) bool {
// IsDelegation checks if the role is a delegation or a root role
func IsDelegation(role string) bool {
targetsBase := fmt.Sprintf("%s/", ValidRoles[CanonicalTargetsRole])
whitelistedChars, _ := regexp.MatchString("^[a-zA-Z0-9_/]*$", role)
whitelistedChars, err := regexp.MatchString("^[a-zA-Z0-9_/]*$", role)
if err != nil {
return false
}
// Removes ., .., extra slashes, and trailing slash
isClean := filepath.Clean(role) == role
return strings.HasPrefix(role, targetsBase) && !strings.HasSuffix(role, "/") && whitelistedChars && isClean
return strings.HasPrefix(role, targetsBase) && whitelistedChars && isClean
}
// RootRole is a cut down role as it appears in the root.json