func Validate in digest doesn't filter no-hex data

opencontainers · Mar 5, 2015 · 072e3da · 072e3da
1 parent 69d1d7d
commit 072e3da
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/digest.go b/digest.go
@@ -47,7 +47,7 @@ func NewDigestFromHex(alg, hex string) Digest {
 }
 
 // DigestRegexp matches valid digest types.
-var DigestRegexp = regexp.MustCompile(`[a-zA-Z0-9-_+.]+:[a-zA-Z0-9-_+.=]+`)
+var DigestRegexp = regexp.MustCompile(`[a-zA-Z0-9-_+.]+:[a-fA-F0-9-_+.=]+$`)
 
 var (
 	// ErrDigestInvalidFormat returned when digest format invalid.
@@ -112,6 +112,10 @@ func (d Digest) Validate() error {
 
 	// Continue on for general parser
 
+	if !DigestRegexp.MatchString(s) {
+		return ErrDigestInvalidFormat
+	}
+
 	i := strings.Index(s, ":")
 	if i < 0 {
 		return ErrDigestInvalidFormat