From efff2172eebe979eda1ea848aaf5f03669d7bb61 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Thu, 21 May 2020 18:26:51 +0200 Subject: [PATCH] breakglass: use internal/config to read HTTP password --- cmd/breakglass/breakglass.go | 9 +++------ go.mod | 2 +- go.sum | 4 ++++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cmd/breakglass/breakglass.go b/cmd/breakglass/breakglass.go index 7d36668..765998c 100644 --- a/cmd/breakglass/breakglass.go +++ b/cmd/breakglass/breakglass.go @@ -19,9 +19,10 @@ import ( "net/http/cookiejar" "os" "os/exec" - "path/filepath" "strings" "time" + + "github.com/gokrazy/internal/config" ) type bg struct { @@ -169,11 +170,7 @@ func breakglass() error { } hostname := flag.Arg(0) - dir, err := os.UserConfigDir() - if err != nil { - return err - } - b, err := ioutil.ReadFile(filepath.Join(dir, "gokrazy", "http-password.txt")) + b, err := config.HostnameSpecific(hostname).ReadFile("http-password.txt") if err != nil { return err } diff --git a/go.mod b/go.mod index 7f230f0..4092b1b 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.12 require ( github.com/gokrazy/gokrazy v0.0.0-20190321081644-520b8ca41de7 - github.com/gokrazy/internal v0.0.0-20190630091051-de21a662e434 // indirect + github.com/gokrazy/internal v0.0.0-20200527163528-2cb9182fefff github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf github.com/kr/pty v1.1.8 golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 diff --git a/go.sum b/go.sum index 8473f0c..88ea61d 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,9 @@ github.com/gokrazy/gokrazy v0.0.0-20190321081644-520b8ca41de7 h1:lpARmqp1bhgN6Co github.com/gokrazy/gokrazy v0.0.0-20190321081644-520b8ca41de7/go.mod h1:YbpshsItGhDXnytFAvMTRvZvGkVSpZV/4mwxQsvqzHg= github.com/gokrazy/internal v0.0.0-20190630091051-de21a662e434 h1:3NgMIyCbCOWhjO/9/yIloXsQCuP6MLolya2SItd1NCM= github.com/gokrazy/internal v0.0.0-20190630091051-de21a662e434/go.mod h1:c7C8E8dlEJG/vdLtGN5NJPdbKNzZi/puMD0sKC346TI= +github.com/gokrazy/internal v0.0.0-20200527063429-7e4057347a0f h1:7XojstPtQ87IJ9VZbFuKP7tFQDo1DXZU9WNx6IHS+5A= +github.com/gokrazy/internal v0.0.0-20200527163528-2cb9182fefff h1:NKE8iZv7t84+Tv29zmSe5FdjlQY1P8CX1D2PbTQTvBY= +github.com/gokrazy/internal v0.0.0-20200527163528-2cb9182fefff/go.mod h1:LA5TQy7LcvYGQOy75tkrYkFUhbV2nl5qEBP47PSi2JA= github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf h1:7+FW5aGwISbqUtkfmIpZJGRgNFg2ioYPvFaUxdqpDsg= github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf/go.mod h1:RpwtwJQFrIEPstU94h88MWPXP2ektJZ8cZ0YntAmXiE= github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI= @@ -17,4 +20,5 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200406155108-e3b113bbe6a4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=