PLT-6358: Server HTTP client improvements (#6980)
* restrict untrusted, internal http connections by default * command test fix * more test fixes * change setting from toggle to whitelist * requested ui changes * add isdefault diagnostic * fix tests
Этот коммит содержится в:
коммит произвёл
Christopher Speller
родитель
504582b824
Коммит
ffbf8e51fe
@@ -673,7 +673,7 @@ func AuthorizeOAuthUser(w http.ResponseWriter, r *http.Request, service, code, s
|
||||
|
||||
var ar *model.AccessResponse
|
||||
var bodyBytes []byte
|
||||
if resp, err := utils.HttpClient().Do(req); err != nil {
|
||||
if resp, err := utils.HttpClient(true).Do(req); err != nil {
|
||||
return nil, "", stateProps, model.NewLocAppError("AuthorizeOAuthUser", "api.user.authorize_oauth_user.token_failed.app_error", nil, err.Error())
|
||||
} else {
|
||||
bodyBytes, _ = ioutil.ReadAll(resp.Body)
|
||||
@@ -702,7 +702,7 @@ func AuthorizeOAuthUser(w http.ResponseWriter, r *http.Request, service, code, s
|
||||
req.Header.Set("Accept", "application/json")
|
||||
req.Header.Set("Authorization", "Bearer "+ar.AccessToken)
|
||||
|
||||
if resp, err := utils.HttpClient().Do(req); err != nil {
|
||||
if resp, err := utils.HttpClient(true).Do(req); err != nil {
|
||||
return nil, "", stateProps, model.NewLocAppError("AuthorizeOAuthUser", "api.user.authorize_oauth_user.service.app_error",
|
||||
map[string]interface{}{"Service": service}, err.Error())
|
||||
} else {
|
||||
|
||||
Ссылка в новой задаче
Block a user