vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Only use fallback to short IDs when obvious.

Browse source 
As reported in #11294, the Docker daemon will execute contains it
shouldn't run in the event that a requested tag is present in an image's
ID. This leads to the wrong image being started up silently.

This change reduces the risk of such a collision by using the short ID
iff the actual revOrTag looks like a short ID (not that it necessarily
is).

Signed-off-by: Richard Burnison <rburnison@ebay.com>
This commit is contained in:
Richard Burnison 2015-04-10 13:09:08 -04:00
parent fb7d4d784e
commit a513a8b8e0
2 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
stringid/stringid_test.go
View file

@ -1,6 +1,9 @@
package stringid
import "testing"
import (
"strings"
"testing"
)
func TestGenerateRandomID(t *testing.T) {
id := GenerateRandomID()
@ -33,3 +36,21 @@ func TestShortenIdInvalid(t *testing.T) {
t.Fatalf("Id returned is incorrect: truncate on %s returned %s", id, truncID)
}
}
func TestIsShortIDNonHex(t *testing.T) {
id := "some non-hex value"
if IsShortID(id) {
t.Fatalf("%s is not a short ID", id)
}
}
func TestIsShortIDNotCorrectSize(t *testing.T) {
id := strings.Repeat("a", shortLen+1)
if IsShortID(id) {
t.Fatalf("%s is not a short ID", id)
}
id = strings.Repeat("a", shortLen-1)
if IsShortID(id) {
t.Fatalf("%s is not a short ID", id)
}
}