Andreas/watchtower
1
0
Fork 0
mirror of https://github.com/containrrr/watchtower.git synced 2025-09-22 05:40:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adds the option to skip TLS verification for a Gotify instance (#544)

Browse source
This commit is contained in:
Sebastiaan Tammer 2020-05-22 16:02:20 +02:00 • committed by GitHub
parent 10fd81a2c1
commit dccdf708a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/notifications.md
View file

@ -170,6 +170,8 @@ docker run -d \
containrrr/watchtower containrrr/watchtower
``` ```
If you want to disable TLS verification for the Gotify instance, you can use either `-e WATCHTOWER_NOTIFICATION_GOTIFY_TLS_SKIP_VERIFY=true` or `--notification-gotify-tls-skip-verify`.
### [containrrr/shoutrrr](https://github.com/containrrr/shoutrrr) ### [containrrr/shoutrrr](https://github.com/containrrr/shoutrrr)
To send notifications via shoutrrr, the following command-line options, or their corresponding environment variables, can be set: To send notifications via shoutrrr, the following command-line options, or their corresponding environment variables, can be set:

14
internal/flags/flags.go
View file

@ -183,10 +183,8 @@ func RegisterNotificationFlags(rootCmd *cobra.Command) {
"notification-email-server-tls-skip-verify", "notification-email-server-tls-skip-verify",
"", "",
viper.GetBool("WATCHTOWER_NOTIFICATION_EMAIL_SERVER_TLS_SKIP_VERIFY"), viper.GetBool("WATCHTOWER_NOTIFICATION_EMAIL_SERVER_TLS_SKIP_VERIFY"),
` `Controls whether watchtower verifies the SMTP server's certificate chain and host name.
Controls whether watchtower verifies the SMTP server's certificate chain and host name. Should only be used for testing.`)
Should only be used for testing.
`)
flags.StringP( flags.StringP(
"notification-email-server-user", "notification-email-server-user",
@ -253,12 +251,20 @@ Should only be used for testing.
"", "",
viper.GetString("WATCHTOWER_NOTIFICATION_GOTIFY_URL"), viper.GetString("WATCHTOWER_NOTIFICATION_GOTIFY_URL"),
"The Gotify URL to send notifications to") "The Gotify URL to send notifications to")
flags.StringP( flags.StringP(
"notification-gotify-token", "notification-gotify-token",
"", "",
viper.GetString("WATCHTOWER_NOTIFICATION_GOTIFY_TOKEN"), viper.GetString("WATCHTOWER_NOTIFICATION_GOTIFY_TOKEN"),
"The Gotify Application required to query the Gotify API") "The Gotify Application required to query the Gotify API")
flags.BoolP(
"notification-gotify-tls-skip-verify",
"",
viper.GetBool("WATCHTOWER_NOTIFICATION_GOTIFY_TLS_SKIP_VERIFY"),
`Controls whether watchtower verifies the Gotify server's certificate chain and host name.
Should only be used for testing.`)
flags.StringP( flags.StringP(
"notification-template", "notification-template",
"", "",

2
pkg/api/api.go
View file

@ -18,7 +18,7 @@ func init() {
lock <- true lock <- true
} }
// SetupHTTPUpdates configures the endopint needed for triggering updates via http // SetupHTTPUpdates configures the endpoint needed for triggering updates via http
func SetupHTTPUpdates(apiToken string, updateFunction func()) error { func SetupHTTPUpdates(apiToken string, updateFunction func()) error {
if apiToken == "" { if apiToken == "" {
return errors.New("api token is empty or has not been set. not starting api") return errors.New("api token is empty or has not been set. not starting api")

27
pkg/notifications/gotify.go
View file

@ -2,6 +2,7 @@ package notifications
import ( import (
"bytes" "bytes"
"crypto/tls"
"encoding/json" "encoding/json"
"fmt" "fmt"
"net/http" "net/http"
@ -17,9 +18,10 @@ const (
) )
type gotifyTypeNotifier struct { type gotifyTypeNotifier struct {
gotifyURL string gotifyURL string
gotifyAppToken string gotifyAppToken string
logLevels []log.Level gotifyInsecureSkipVerify bool
logLevels []log.Level
} }
func newGotifyNotifier(c *cobra.Command, acceptedLogLevels []log.Level) t.Notifier { func newGotifyNotifier(c *cobra.Command, acceptedLogLevels []log.Level) t.Notifier {
@ -39,10 +41,13 @@ func newGotifyNotifier(c *cobra.Command, acceptedLogLevels []log.Level) t.Notifi
log.Fatal("Required argument --notification-gotify-token(cli) or WATCHTOWER_NOTIFICATION_GOTIFY_TOKEN(env) is empty.") log.Fatal("Required argument --notification-gotify-token(cli) or WATCHTOWER_NOTIFICATION_GOTIFY_TOKEN(env) is empty.")
} }
gotifyInsecureSkipVerify, _ := flags.GetBool("notification-gotify-tls-skip-verify")
n := &gotifyTypeNotifier{ n := &gotifyTypeNotifier{
gotifyURL: gotifyURL, gotifyURL: gotifyURL,
gotifyAppToken: gotifyToken, gotifyAppToken: gotifyToken,
logLevels: acceptedLogLevels, gotifyInsecureSkipVerify: gotifyInsecureSkipVerify,
logLevels: acceptedLogLevels,
} }
log.AddHook(n) log.AddHook(n)
@ -79,8 +84,16 @@ func (n *gotifyTypeNotifier) Fire(entry *log.Entry) error {
return return
} }
// Explicitly define the client so we can set InsecureSkipVerify to the desired value.
client := &http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
InsecureSkipVerify: n.gotifyInsecureSkipVerify,
},
},
}
jsonBodyBuffer := bytes.NewBuffer([]byte(jsonBody)) jsonBodyBuffer := bytes.NewBuffer([]byte(jsonBody))
resp, err := http.Post(n.getURL(), "application/json", jsonBodyBuffer) resp, err := client.Post(n.getURL(), "application/json", jsonBodyBuffer)
if err != nil { if err != nil {
fmt.Println("Failed to send Gotify notification: ", err) fmt.Println("Failed to send Gotify notification: ", err)
return return