Skip to content

Add ability to skip TLS verification for amtool #2663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roidelapluie merged 5 commits into from
Aug 6, 2021
Merged

Add ability to skip TLS verification for amtool #2663

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f086428
Add ability to skip TLS verification for amtool
nedvna Aug 1, 2021
88d2088
Update README with skip.verify flag
nedvna Aug 1, 2021
21c2dfd
Rename flag to tls.insecure.skip.verify
nedvna Aug 4, 2021
961af8d
Remove scheme check to handle redirects properly
nedvna Aug 4, 2021
b7fea4a
Rename the option throughout the code
nedvna Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions cli/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
package cli

import (
"crypto/tls"
"net/http"
"net/url"
"os"
"path"
Expand All @@ -31,10 +33,11 @@ import (
)

var (
verbose bool
alertmanagerURL *url.URL
output string
timeout time.Duration
verbose bool
alertmanagerURL *url.URL
output string
timeout time.Duration
tlsInsecureSkipVerify bool

configFiles = []string{os.ExpandEnv("$HOME/.config/amtool/config.yml"), "/etc/amtool/config.yml"}
legacyFlags = map[string]string{"comment_required": "require-comment"}
Expand Down Expand Up @@ -78,6 +81,13 @@ func NewAlertmanagerClient(amURL *url.URL) *client.Alertmanager {

cr := clientruntime.New(address, path.Join(amURL.Path, defaultAmApiv2path), schemes)

if tlsInsecureSkipVerify {
transport := http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}
cr.Transport = &transport
}

if amURL.User != nil {
password, _ := amURL.User.Password()
cr.DefaultAuthentication = clientruntime.BasicAuth(amURL.User.Username(), password)
Expand All @@ -98,6 +108,7 @@ func Execute() {
app.Flag("alertmanager.url", "Alertmanager to talk to").URLVar(&alertmanagerURL)
app.Flag("output", "Output formatter (simple, extended, json)").Short('o').Default("simple").EnumVar(&output, "simple", "extended", "json")
app.Flag("timeout", "Timeout for the executed command").Default("30s").DurationVar(&timeout)
app.Flag("tls.insecure.skip.verify", "Skip TLS certificate verification").BoolVar(&tlsInsecureSkipVerify)

app.Version(version.Print("amtool"))
app.GetFlag("help").Short('h')
Expand Down Expand Up @@ -151,5 +162,9 @@ static configuration:

date.format
Sets the output format for dates. Defaults to "2006-01-02 15:04:05 MST"

tls.insecure.skip.verify
Skips TLS certificate verification for all HTTPS requests.
Defaults to false.
`
)