Merge pull request containerd#2871 from linxiulei/fix_oauth_utf8

crosbymichael · web-flow · commit cc06a65a79be · 2018-12-13T14:56:10.000-05:00
Explicitly stating utf-8 when fetching oauth token
diff --git a/remotes/docker/authorizer.go b/remotes/docker/authorizer.go
@@ -194,7 +194,11 @@ func (a *dockerAuthorizer) fetchTokenWithOAuth(ctx context.Context, to tokenOpti
 		form.Set("password", to.secret)
 	}
 
-	resp, err := ctxhttp.PostForm(ctx, a.client, to.realm, form)
+	resp, err := ctxhttp.Post(
+		ctx, a.client, to.realm,
+		"application/x-www-form-urlencoded; charset=utf-8",
+		strings.NewReader(form.Encode()),
+	)
 	if err != nil {
 		return "", err
 	}

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,11 @@ func (a *dockerAuthorizer) fetchTokenWithOAuth(ctx context.Context, to tokenOpti`
`194`	`194`	`form.Set("password", to.secret)`
`195`	`195`	`}`
`196`	`196`
`197`		`- resp, err := ctxhttp.PostForm(ctx, a.client, to.realm, form)`
	`197`	`+ resp, err := ctxhttp.Post(`
	`198`	`+ ctx, a.client, to.realm,`
	`199`	`+ "application/x-www-form-urlencoded; charset=utf-8",`
	`200`	`+ strings.NewReader(form.Encode()),`
	`201`	`+ )`
`198`	`202`	`if err != nil {`
`199`	`203`	`return "", err`
`200`	`204`	`}`