Skip to content

docker: parse suffixed Docker versions strictly #3878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Haihan-Jiang wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −8
Open

docker: parse suffixed Docker versions strictly #3878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion container/docker/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func ValidateInfo(GetInfo func() (*dockersystem.Info, error), ServerVersion func
}
}

version, err := ParseVersion(info.ServerVersion, VersionRe, 3)
version, err := ParseVersion(info.ServerVersion, dockerVersionRe, 3)
if err != nil {
return nil, err
}
Expand Down
6 changes: 4 additions & 2 deletions container/docker/docker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ func TestParseDockerAPIVersion(t *testing.T) {
expected []int
expectedError string
}{
{"17.03.0", VersionRe, 3, []int{17, 03, 0}, ""},
{"17.a3.0", VersionRe, 3, []int{}, `version string "17.a3.0" doesn't match expected regular expression: "(\d+)\.(\d+)\.(\d+)"`},
{"17.03.0", dockerVersionRe, 3, []int{17, 03, 0}, ""},
{"v20.10.12-v1.0.2", dockerVersionRe, 3, []int{20, 10, 12}, ""},
{"17.a3.0", dockerVersionRe, 3, []int{}, `version string "17.a3.0" doesn't match expected regular expression: "^v?(\d+)\.(\d+)\.(\d+)(?:[-+].*)?$"`},
{"random text 1.2.3 and also 9.9.9 build", dockerVersionRe, 3, []int{}, `version string "random text 1.2.3 and also 9.9.9 build" doesn't match expected regular expression: "^v?(\d+)\.(\d+)\.(\d+)(?:[-+].*)?$"`},
{"1.20", apiVersionRe, 2, []int{1, 20}, ""},
{"1.a", apiVersionRe, 2, []int{}, `version string "1.a" doesn't match expected regular expression: "(\d+)\.(\d+)"`},
}
Expand Down
12 changes: 7 additions & 5 deletions container/docker/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,12 @@ func (f *dockerFactory) DebugInfo() map[string][]string {
}

var (
versionRegexpString = `(\d+)\.(\d+)\.(\d+)`
VersionRe = regexp.MustCompile(versionRegexpString)
apiVersionRegexpString = `(\d+)\.(\d+)`
apiVersionRe = regexp.MustCompile(apiVersionRegexpString)
versionRegexpString = `(\d+)\.(\d+)\.(\d+)`
VersionRe = regexp.MustCompile(versionRegexpString)
dockerVersionRegexpString = `^v?(\d+)\.(\d+)\.(\d+)(?:[-+].*)?$`
dockerVersionRe = regexp.MustCompile(dockerVersionRegexpString)
apiVersionRegexpString = `(\d+)\.(\d+)`
apiVersionRe = regexp.MustCompile(apiVersionRegexpString)
)

func StartThinPoolWatcher(dockerInfo *dockersystem.Info) (*devicemapper.ThinPoolWatcher, error) {
Expand Down Expand Up @@ -320,7 +322,7 @@ func Register(factory info.MachineInfoFactory, fsInfo fs.FsInfo, includedMetrics
}

// Version already validated above, assume no error here.
dockerVersion, _ := ParseVersion(dockerInfo.ServerVersion, VersionRe, 3)
dockerVersion, _ := ParseVersion(dockerInfo.ServerVersion, dockerVersionRe, 3)

dockerAPIVersion, _ := APIVersion()

Expand Down