Merge branch 'master' into 2525-java-sdk

[arvados.git] / services / keep / src / keep / perms.go

diff --git a/services/keep/src/keep/perms.go b/services/keep/src/keep/perms.go
index 0d1b091365085bbb079cc9cb1dd86eb1d6973b54..143815576b33f077a89fead6e46efb795de20f9d 100644 (file)
--- a/services/keep/src/keep/perms.go
+++ b/services/keep/src/keep/perms.go
@@ -83,7 +83,7 @@ func SignLocator(blob_locator string, api_token string, expiry time.Time) string
 // VerifySignature returns true if the signature on the signed_locator
 // can be verified using the given api_token.
 func VerifySignature(signed_locator string, api_token string) bool {
-       if re, err := regexp.Compile(`^(.*)\+A(.*)@(.*)$`); err == nil {
+       if re, err := regexp.Compile(`^([a-f0-9]{32}(\+[0-9]+)?).*\+A[[:xdigit:]]+@([[:xdigit:]]{8})`); err == nil {
                if matches := re.FindStringSubmatch(signed_locator); matches != nil {
                        blob_locator := matches[1]
                        timestamp_hex := matches[3]