mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Only use fallback to short IDs when obvious.
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:
parent
7cec5f50c5
commit
8d1a500303
3 changed files with 39 additions and 7 deletions
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue