diff options
author | JoramWilander <jwawilander@gmail.com> | 2016-02-05 08:21:15 -0500 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2016-02-05 08:21:15 -0500 |
commit | 8c505e7b5cb8138e53b71ed7e0465665654a596b (patch) | |
tree | 4c89f98fc16cb9b91dd02d8244c0e0076e5a9e60 /api | |
parent | 8e79f12f3c6c0f8858addaf6f66ea6e88a965b65 (diff) | |
download | chat-8c505e7b5cb8138e53b71ed7e0465665654a596b.tar.gz chat-8c505e7b5cb8138e53b71ed7e0465665654a596b.tar.bz2 chat-8c505e7b5cb8138e53b71ed7e0465665654a596b.zip |
Accept unsigned TLS certs for SSO and outgoing hooks, also fix delete hooks bug
Diffstat (limited to 'api')
-rw-r--r-- | api/post.go | 7 | ||||
-rw-r--r-- | api/user.go | 7 | ||||
-rw-r--r-- | api/webhook.go | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/api/post.go b/api/post.go index c17da262f..58f490558 100644 --- a/api/post.go +++ b/api/post.go @@ -4,6 +4,7 @@ package api import ( + "crypto/tls" "fmt" l4g "github.com/alecthomas/log4go" "github.com/gorilla/mux" @@ -401,7 +402,11 @@ func handleWebhookEventsAndForget(c *Context, post *model.Post, team *model.Team p.Set("text", post.Message) p.Set("trigger_word", firstWord) - client := &http.Client{} + // accept any TLS certs + tr := &http.Transport{ + TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, + } + client := &http.Client{Transport: tr} for _, url := range hook.CallbackURLs { go func(url string) { diff --git a/api/user.go b/api/user.go index 9926f3ff3..aa06fa910 100644 --- a/api/user.go +++ b/api/user.go @@ -5,6 +5,7 @@ package api import ( "bytes" + "crypto/tls" b64 "encoding/base64" "fmt" l4g "github.com/alecthomas/log4go" @@ -1960,7 +1961,11 @@ func AuthorizeOAuthUser(service, code, state, redirectUri string) (io.ReadCloser p.Set("grant_type", model.ACCESS_TOKEN_GRANT_TYPE) p.Set("redirect_uri", redirectUri) - client := &http.Client{} + // accept any TLS certs + tr := &http.Transport{ + TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, + } + client := &http.Client{Transport: tr} req, _ := http.NewRequest("POST", sso.TokenEndpoint, strings.NewReader(p.Encode())) req.Header.Set("Content-Type", "application/x-www-form-urlencoded") diff --git a/api/webhook.go b/api/webhook.go index 3906d09be..c0f8ea506 100644 --- a/api/webhook.go +++ b/api/webhook.go @@ -238,7 +238,7 @@ func getOutgoingHooks(c *Context, w http.ResponseWriter, r *http.Request) { } func deleteOutgoingHook(c *Context, w http.ResponseWriter, r *http.Request) { - if !utils.Cfg.ServiceSettings.EnableIncomingWebhooks { + if !utils.Cfg.ServiceSettings.EnableOutgoingWebhooks { c.Err = model.NewLocAppError("deleteOutgoingHook", "api.webhook.delete_outgoing.disabled.app_error", nil, "") c.Err.StatusCode = http.StatusNotImplemented return |