Skip to content

Commit

Permalink
notifier: Add proxy parameter to webhook notifier
Browse files Browse the repository at this point in the history
  • Loading branch information
Quentin-M committed Apr 12, 2016
1 parent ed1a2b6 commit 2fb815d
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 7 deletions.
3 changes: 3 additions & 0 deletions config.example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,6 @@ clair:
cafile:
keyfile:
certfile:

# Optional HTTP Proxy: must be a valid URL (including the scheme).
proxy:
25 changes: 18 additions & 7 deletions notifier/notifiers/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ type WebhookNotifierConfiguration struct {
CertFile string
KeyFile string
CAFile string
Proxy string
}

func init() {
Expand Down Expand Up @@ -78,22 +79,32 @@ func (h *WebhookNotifier) Configure(config *config.NotifierConfig) (bool, error)
return false, nil
}
if _, err := url.Parse(httpConfig.Endpoint); err != nil {
return false, errors.New("invalid endpoint URL")
return false, fmt.Errorf("could not parse endpoint URL: %s\n", err)
}
h.endpoint = httpConfig.Endpoint

// Setup HTTP client.
transport := &http.Transport{}
h.client = &http.Client{
Transport: transport,
Timeout: timeout,
}

// Initialize TLS.
tlsConfig, err := loadTLSClientConfig(&httpConfig)
transport.TLSClientConfig, err = loadTLSClientConfig(&httpConfig)
if err != nil {
return false, fmt.Errorf("could not initialize client cert auth: %s\n", err)
}

h.client = &http.Client{
Transport: &http.Transport{
TLSClientConfig: tlsConfig,
},
Timeout: timeout,
// Set proxy.
if httpConfig.Proxy != "" {
proxyURL, err := url.ParseRequestURI(httpConfig.Proxy)
if err != nil {
return false, fmt.Errorf("could not parse proxy URL: %s\n", err)
}
transport.Proxy = http.ProxyURL(proxyURL)
}

return true, nil
}

Expand Down

0 comments on commit 2fb815d

Please sign in to comment.