taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Fix a number of potential security issues

Browse Source
This commit is contained in:
Chris Cummer 2018-08-03 10:14:57 -07:00
parent b5bdaf3150
commit 7d8acf725d
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gitlab/widget.go
View File

@ -32,13 +32,8 @@ type Widget struct {
} }
func NewWidget(app *tview.Application, pages *tview.Pages) *Widget { func NewWidget(app *tview.Application, pages *tview.Pages) *Widget {
apiKey := wtf.Config.UString(
"wtf.mods.gitlab.apiKey",
os.Getenv("WTF_GITLAB_TOKEN"),
)
baseURL := wtf.Config.UString("wtf.mods.gitlab.domain") baseURL := wtf.Config.UString("wtf.mods.gitlab.domain")
gitlab := glb.NewClient(nil, apiKey) gitlab := glb.NewClient(nil, apiKey())
if baseURL != "" { if baseURL != "" {
gitlab.SetBaseURL(baseURL) gitlab.SetBaseURL(baseURL)
@ -92,6 +87,13 @@ func (widget *Widget) Prev() {
/* -------------------- Unexported Functions -------------------- */ /* -------------------- Unexported Functions -------------------- */
func apiKey() string {
return wtf.Config.UString(
"wtf.mods.gitlab.apiKey",
os.Getenv("WTF_GITLAB_TOKEN"),
)
}
func (widget *Widget) buildProjectCollection(projectData map[string]interface{}) []*GitlabProject { func (widget *Widget) buildProjectCollection(projectData map[string]interface{}) []*GitlabProject {
gitlabProjects := []*GitlabProject{} gitlabProjects := []*GitlabProject{}

2
logger/log.go
View File

@ -36,7 +36,7 @@ func Log(msg string) {
return return
} }
f, err := os.OpenFile(logFilePath(), os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666) f, err := os.OpenFile(logFilePath(), os.O_RDWR|os.O_CREATE|os.O_APPEND, 0600)
if err != nil { if err != nil {
log.Fatalf("error opening file: %v", err) log.Fatalf("error opening file: %v", err)
} }

5
main.go
View File

@ -130,7 +130,10 @@ func refreshAllWidgets() {
} }
func setTerm() { func setTerm() {
os.Setenv("TERM", Config.UString("wtf.term", os.Getenv("TERM"))) err := os.Setenv("TERM", Config.UString("wtf.term", os.Getenv("TERM")))
if err != nil {
return
}
} }
func watchForConfigChanges(app *tview.Application, configFilePath string, grid *tview.Grid, pages *tview.Pages) { func watchForConfigChanges(app *tview.Application, configFilePath string, grid *tview.Grid, pages *tview.Pages) {

4
travisci/client.go
View File

@ -13,8 +13,6 @@ import (
"github.com/senorprogrammer/wtf/wtf" "github.com/senorprogrammer/wtf/wtf"
) )
const APIEnvToken = "WTF_TRAVIS_API_TOKEN"
func BuildsFor() (*Builds, error) { func BuildsFor() (*Builds, error) {
builds := &Builds{} builds := &Builds{}
@ -74,7 +72,7 @@ func travisRequest(path string) (*http.Response, error) {
func apiToken() string { func apiToken() string {
return wtf.Config.UString( return wtf.Config.UString(
"wtf.mods.travisci.apiKey", "wtf.mods.travisci.apiKey",
os.Getenv(APIEnvToken), os.Getenv("WTF_TRAVIS_API_TOKEN"),
) )
} }