From 6d521ff8cdbb2bae1a9a16bb64f765aff8d4be56 Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Thu, 10 Oct 2019 22:59:50 +0000 Subject: [PATCH] rpcclient: Read first line of cookie instead of trimming space --- rpcclient/cookiefile.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/rpcclient/cookiefile.go b/rpcclient/cookiefile.go index b29e29b7..c3f7068b 100644 --- a/rpcclient/cookiefile.go +++ b/rpcclient/cookiefile.go @@ -6,18 +6,27 @@ package rpcclient import ( + "bufio" "fmt" - "io/ioutil" + "os" "strings" ) func readCookieFile(path string) (username, password string, err error) { - b, err := ioutil.ReadFile(path) + f, err := os.Open(path) if err != nil { return } + defer f.Close() + + scanner := bufio.NewScanner(f) + scanner.Scan() + err = scanner.Err() + if err != nil { + return + } + s := scanner.Text() - s := strings.TrimSpace(string(b)) parts := strings.SplitN(s, ":", 2) if len(parts) != 2 { err = fmt.Errorf("malformed cookie file")