diff --git a/Makefile b/Makefile index 4d54bd05..70dcc34c 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,11 @@ -BRANCH := `git rev-parse --abbrev-ref HEAD` - .PHONY: dependencies install run build: go build -o bin/wtf install: - which wtf | xargs rm || true - go install -ldflags="-X main.version=$(shell git describe --always --abbrev=6)_$(BRANCH) -X main.date=$(shell date +%FT%T%z)" + go clean + go install -ldflags="-X main.version=$(shell git describe --always --abbrev=6) -X main.date=$(shell date +%FT%T%z)" which wtf run: build diff --git a/_site/content/posts/modules/jira.md b/_site/content/posts/modules/jira.md index a25cc1f3..3daf62b7 100644 --- a/_site/content/posts/modules/jira.md +++ b/_site/content/posts/modules/jira.md @@ -45,6 +45,7 @@ jira: project: "ProjectA" refreshInterval: 900 username: "chris.cummer" + verifyServerCertificate: true ``` ### Multiple Jira Projects @@ -70,6 +71,7 @@ jira: project: ["ProjectA", "ProjectB"] refreshInterval: 900 username: "chris.cummer" + verifyServerCertificate: true ``` ### Attributes @@ -113,3 +115,8 @@ Values: A positive integer, `0..n`. `username`
Your Jira username.
+ +`verifyServerCertificate`
+_Optional_
+Determines whether or not the server's certificate chain and host name are verified.
+Values: `true`, `false`. diff --git a/cmdrunner/widget.go b/cmdrunner/widget.go index 0708527e..c1460a16 100644 --- a/cmdrunner/widget.go +++ b/cmdrunner/widget.go @@ -36,14 +36,16 @@ func NewWidget() *Widget { func (widget *Widget) Refresh() { widget.UpdateRefreshedAt() widget.execute() - widget.View.SetTitle(fmt.Sprintf(" %s ", widget)) + + title := Config.UString("wtf.mods.cmdrunner.title", widget.String()) + widget.View.SetTitle(fmt.Sprintf("%s", title)) widget.View.SetText(fmt.Sprintf("%s", widget.result)) } func (widget *Widget) String() string { args := strings.Join(widget.args, " ") - return fmt.Sprintf("%s %s", widget.cmd, args) + return fmt.Sprintf(" %s %s ", widget.cmd, args) } func (widget *Widget) execute() { diff --git a/docs/index.xml b/docs/index.xml index 06220520..d5b16ac5 100644 --- a/docs/index.xml +++ b/docs/index.xml @@ -266,8 +266,8 @@ Key: j Action: Select the next item in the list. Displays all Jira issues assigned to you for the specified project. Source Code wtf/jira/ Required ENV Variables Key: WTF_JIRA_API_KEY Value: Your Jira API key. Keyboard Commands None. -Configuration Single Jira Project jira:colors:rows:even:"lightblue"odd:"white"domain:"https://umbrellacorp.atlassian.net"email:"chriscummer@me.com"enabled:truejql:"issueType = Story"position:top:4left:1height:1width:2project:"ProjectA"refreshInterval:900username:"chris.cummer" Multiple Jira Projects If you want to monitor multiple Jira projects, use the following configuration (note the difference in project): -jira:colors:rows:even:"lightblue"odd:"white"domain:"https://umbrellacorp.atlassian.net"email:"chriscummer@me.com"enabled:truejql:"issueType = Story"position:top:4left:1height:1width:2project:["ProjectA","ProjectB"]refreshInterval:900username:"chris.cummer" Attributes colors.rows.even Define the foreground color for even-numbered rows. Values: Any X11 color name. +Configuration Single Jira Project jira:colors:rows:even:"lightblue"odd:"white"domain:"https://umbrellacorp.atlassian.net"email:"chriscummer@me.com"enabled:truejql:"issueType = Story"position:top:4left:1height:1width:2project:"ProjectA"refreshInterval:900username:"chris.cummer"verifyServerCertificate:true Multiple Jira Projects If you want to monitor multiple Jira projects, use the following configuration (note the difference in project): +jira:colors:rows:even:"lightblue"odd:"white"domain:"https://umbrellacorp.atlassian.net"email:"chriscummer@me.com"enabled:truejql:"issueType = Story"position:top:4left:1height:1width:2project:["ProjectA","ProjectB"]refreshInterval:900username:"chris.cummer"verifyServerCertificate:true Attributes colors.rows.even Define the foreground color for even-numbered rows. Values: Any X11 color name. diff --git a/docs/posts/index.xml b/docs/posts/index.xml index f35cc613..82b0045a 100644 --- a/docs/posts/index.xml +++ b/docs/posts/index.xml @@ -266,8 +266,8 @@ Key: j Action: Select the next item in the list. Displays all Jira issues assigned to you for the specified project. Source Code wtf/jira/ Required ENV Variables Key: WTF_JIRA_API_KEY Value: Your Jira API key. Keyboard Commands None. -Configuration Single Jira Project jira:colors:rows:even:"lightblue"odd:"white"domain:"https://umbrellacorp.atlassian.net"email:"chriscummer@me.com"enabled:truejql:"issueType = Story"position:top:4left:1height:1width:2project:"ProjectA"refreshInterval:900username:"chris.cummer" Multiple Jira Projects If you want to monitor multiple Jira projects, use the following configuration (note the difference in project): -jira:colors:rows:even:"lightblue"odd:"white"domain:"https://umbrellacorp.atlassian.net"email:"chriscummer@me.com"enabled:truejql:"issueType = Story"position:top:4left:1height:1width:2project:["ProjectA","ProjectB"]refreshInterval:900username:"chris.cummer" Attributes colors.rows.even Define the foreground color for even-numbered rows. Values: Any X11 color name. +Configuration Single Jira Project jira:colors:rows:even:"lightblue"odd:"white"domain:"https://umbrellacorp.atlassian.net"email:"chriscummer@me.com"enabled:truejql:"issueType = Story"position:top:4left:1height:1width:2project:"ProjectA"refreshInterval:900username:"chris.cummer"verifyServerCertificate:true Multiple Jira Projects If you want to monitor multiple Jira projects, use the following configuration (note the difference in project): +jira:colors:rows:even:"lightblue"odd:"white"domain:"https://umbrellacorp.atlassian.net"email:"chriscummer@me.com"enabled:truejql:"issueType = Story"position:top:4left:1height:1width:2project:["ProjectA","ProjectB"]refreshInterval:900username:"chris.cummer"verifyServerCertificate:true Attributes colors.rows.even Define the foreground color for even-numbered rows. Values: Any X11 color name. diff --git a/docs/posts/modules/jira/index.html b/docs/posts/modules/jira/index.html index f101522c..aa8d189b 100644 --- a/docs/posts/modules/jira/index.html +++ b/docs/posts/modules/jira/index.html @@ -153,7 +153,8 @@ width: 2 project: "ProjectA" refreshInterval: 900 - username: "chris.cummer" + username: "chris.cummer" + verifyServerCertificate: true

Multiple Jira Projects

If you want to monitor multiple Jira projects, use the following @@ -174,7 +175,8 @@ configuration (note the difference in project):

width: 2 project: ["ProjectA", "ProjectB"] refreshInterval: 900 - username: "chris.cummer" + username: "chris.cummer" + verifyServerCertificate: true

Attributes

colors.rows.even
@@ -217,6 +219,11 @@ Values: A positive integer, 0..n.

username
Your Jira username.

+

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

+
diff --git a/jira/client.go b/jira/client.go index 226dd14c..ad1f51a9 100644 --- a/jira/client.go +++ b/jira/client.go @@ -2,6 +2,7 @@ package jira import ( "bytes" + "crypto/tls" "encoding/json" "fmt" "io" @@ -60,7 +61,13 @@ func jiraRequest(path string) (*http.Response, error) { } req.SetBasicAuth(Config.UString("wtf.mods.jira.email"), os.Getenv("WTF_JIRA_API_KEY")) - httpClient := &http.Client{} + verifyServerCertificate := Config.UBool("wtf.mods.jira.verifyServerCertificate", true) + httpClient := &http.Client{Transport: &http.Transport{ + TLSClientConfig: &tls.Config{ + InsecureSkipVerify: !verifyServerCertificate, + }, + }, + } resp, err := httpClient.Do(req) if err != nil { return nil, err diff --git a/wtf/focus_tracker.go b/wtf/focus_tracker.go index 34a4d5b7..596affef 100644 --- a/wtf/focus_tracker.go +++ b/wtf/focus_tracker.go @@ -36,6 +36,10 @@ func (tracker *FocusTracker) Next() { // None removes focus from the currently-focused widget. func (tracker *FocusTracker) None() { + if tracker.focusState() == NonWidget { + return + } + tracker.blur(tracker.Idx) }