kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Remove Trailing Whitespace in User-Agent

Browse source 
After removed, the User-Agent shows in log like this:

[debug] http.go:160 https://index.docker.io/v1/repositories/busybox/images --
HEADERS: map[User-Agent:[docker/0.11.1-dev go/go1.2.2 git-commit/8887e00-dirty kernel/3.14.3-n1 os/linux arch/amd64]]

The code also moved all validation work into validVersion,
to keep the main logic as clean.

Docker-DCO-1.1-Signed-off-by: Derek <crq@kernel.org> (github: crquan)
This commit is contained in:
Derek 2014-05-16 16:46:22 -07:00
parent 6f651ec62b
commit 42734394b0
1 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
utils/http.go
View file

@ -1,7 +1,6 @@
package utils
import (
"bytes"
"io"
"net/http"
"strings"
@ -15,11 +14,13 @@ type VersionInfo interface {
}
func validVersion(version VersionInfo) bool {
stopChars := " \t\r\n/"
if strings.ContainsAny(version.Name(), stopChars) {
const stopChars = " \t\r\n/"
name := version.Name()
vers := version.Version()
if len(name) == 0 || strings.ContainsAny(name, stopChars) {
return false
}
if strings.ContainsAny(version.Version(), stopChars) {
if len(vers) == 0 || strings.ContainsAny(vers, stopChars) {
return false
}
return true
@ -36,27 +37,18 @@ func appendVersions(base string, versions ...VersionInfo) string {
return base
}
var buf bytes.Buffer
verstrs := make([]string, 0, 1+len(versions))
if len(base) > 0 {
buf.Write([]byte(base))
verstrs = append(verstrs, base)
}
for _, v := range versions {
name := []byte(v.Name())
version := []byte(v.Version())
if len(name) == 0 || len(version) == 0 {
continue
}
if !validVersion(v) {
continue
}
buf.Write([]byte(v.Name()))
buf.Write([]byte("/"))
buf.Write([]byte(v.Version()))
buf.Write([]byte(" "))
verstrs = append(verstrs, v.Name()+"/"+v.Version())
}
return buf.String()
return strings.Join(verstrs, " ")
}
// HTTPRequestDecorator is used to change an instance of