From 37b0d22dba113fd9f8dbd22d0368f7a83302e097 Mon Sep 17 00:00:00 2001 From: Anand Sudhir Prayaga Date: Wed, 18 Jul 2018 14:10:29 +0200 Subject: [PATCH] add option to skip verification of jenkins server's certificate chain and hostname --- _site/content/posts/modules/jenkins.md | 5 +++++ docs/posts/modules/jenkins/index.html | 8 +++++++- jenkins/client.go | 11 ++++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/_site/content/posts/modules/jenkins.md b/_site/content/posts/modules/jenkins.md index c556998e..326420c7 100644 --- a/_site/content/posts/modules/jenkins.md +++ b/_site/content/posts/modules/jenkins.md @@ -39,6 +39,7 @@ jenkins: refreshInterval: 300 url: "https://jenkins.domain.com/jenkins/view_url" user: "username" + verifyServerCertificate: true ``` ### Attributes @@ -61,3 +62,7 @@ Your Jenkins username.
The url to your Jenkins project or view.
Values: A valid URI. +`verifyServerCertificate`
+_Optional_
+Determines whether or not the server's certificate chain and host name are verified.
+Values: `true`, `false`. diff --git a/docs/posts/modules/jenkins/index.html b/docs/posts/modules/jenkins/index.html index 9137708a..e83d2d32 100644 --- a/docs/posts/modules/jenkins/index.html +++ b/docs/posts/modules/jenkins/index.html @@ -163,7 +163,8 @@ width="320" height="68" alt="jenkins screenshot" />

width: 3 refreshInterval: 300 url: "https://jenkins.domain.com/jenkins/view_url" - user: "username" + user: "username" + verifyServerCertificate: true

Attributes

enabled
@@ -184,6 +185,11 @@ Your Jenkins username.

The url to your Jenkins project or view.
Values: A valid URI.

+

verifyServerCertificate
+Optional
+Determines whether or not the server’s certificate chain and host name are verified.
+Values: true, false.

+
diff --git a/jenkins/client.go b/jenkins/client.go index ddad50d6..b37d7502 100644 --- a/jenkins/client.go +++ b/jenkins/client.go @@ -2,12 +2,15 @@ package jenkins import ( "bytes" + "crypto/tls" "encoding/json" "io" "io/ioutil" "net/http" "net/url" "strings" + + "github.com/senorprogrammer/wtf/wtf" ) func Create(jenkinsURL string, username string, apiKey string) (*View, error) { @@ -26,7 +29,13 @@ func Create(jenkinsURL string, username string, apiKey string) (*View, error) { req, _ := http.NewRequest("GET", jenkinsAPIURL.String(), nil) req.SetBasicAuth(username, apiKey) - httpClient := &http.Client{} + verifyServerCertificate := wtf.Config.UBool("wtf.mods.jenkins.verifyServerCertificate", true) + httpClient := &http.Client{Transport: &http.Transport{ + TLSClientConfig: &tls.Config{ + InsecureSkipVerify: !verifyServerCertificate, + }, + }, + } resp, err := httpClient.Do(req) if err != nil {