diff options
author | Wim <wim@42.be> | 2020-03-01 21:09:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-01 21:09:23 +0100 |
commit | d893421c7b2a5ceccac01600d976f3f7ba7ab780 (patch) | |
tree | 51a4634ec3adae31c578e3f2e774f238778b0628 /vendor/github.com/keybase/go-keybase-chat-bot/kbchat | |
parent | 250b3bb5795240d5ebdab5416ab99dbc41be734b (diff) | |
download | matterbridge-msglm-d893421c7b2a5ceccac01600d976f3f7ba7ab780.tar.gz matterbridge-msglm-d893421c7b2a5ceccac01600d976f3f7ba7ab780.tar.bz2 matterbridge-msglm-d893421c7b2a5ceccac01600d976f3f7ba7ab780.zip |
Update vendor keybase/go-keybase-chat-bot (#1019)
Diffstat (limited to 'vendor/github.com/keybase/go-keybase-chat-bot/kbchat')
-rw-r--r-- | vendor/github.com/keybase/go-keybase-chat-bot/kbchat/kbchat.go | 57 | ||||
-rw-r--r-- | vendor/github.com/keybase/go-keybase-chat-bot/kbchat/team.go | 20 |
2 files changed, 61 insertions, 16 deletions
diff --git a/vendor/github.com/keybase/go-keybase-chat-bot/kbchat/kbchat.go b/vendor/github.com/keybase/go-keybase-chat-bot/kbchat/kbchat.go index 0a74dd90..de76e75a 100644 --- a/vendor/github.com/keybase/go-keybase-chat-bot/kbchat/kbchat.go +++ b/vendor/github.com/keybase/go-keybase-chat-bot/kbchat/kbchat.go @@ -8,12 +8,13 @@ import ( "io" "io/ioutil" "log" + "os" "os/exec" - "strings" "sync" "time" "github.com/keybase/go-keybase-chat-bot/kbchat/types/chat1" + "github.com/keybase/go-keybase-chat-bot/kbchat/types/keybase1" "github.com/keybase/go-keybase-chat-bot/kbchat/types/stellar1" ) @@ -29,30 +30,39 @@ type API struct { } func getUsername(runOpts RunOptions) (username string, err error) { - p := runOpts.Command("status") + p := runOpts.Command("whoami", "-json") output, err := p.StdoutPipe() if err != nil { return "", err } + p.ExtraFiles = []*os.File{output.(*os.File)} if err = p.Start(); err != nil { return "", err } doneCh := make(chan error) go func() { - scanner := bufio.NewScanner(output) - if !scanner.Scan() { - doneCh <- errors.New("unable to find Keybase username") + defer func() { close(doneCh) }() + statusJSON, err := ioutil.ReadAll(output) + if err != nil { + doneCh <- fmt.Errorf("error reading whoami output: %v", err) return } - text := scanner.Text() - toks := strings.Fields(text) - if len(toks) != 2 { - doneCh <- fmt.Errorf("invalid Keybase username output: %q", text) + var status keybase1.CurrentStatus + if err := json.Unmarshal(statusJSON, &status); err != nil { + doneCh <- fmt.Errorf("invalid whoami JSON %q: %v", statusJSON, err) return } - username = toks[1] - doneCh <- nil + if status.LoggedIn && status.User != nil { + username = status.User.Username + doneCh <- nil + } else { + doneCh <- fmt.Errorf("unable to authenticate to keybase service: logged in: %v user: %+v", status.LoggedIn, status.User) + } + // Cleanup the command + if err := p.Wait(); err != nil { + log.Printf("unable to wait for cmd: %v", err) + } }() select { @@ -176,6 +186,7 @@ func (a *API) startPipes() (err error) { if err != nil { return err } + a.apiCmd.ExtraFiles = []*os.File{output.(*os.File)} if err := a.apiCmd.Start(); err != nil { return err } @@ -360,7 +371,14 @@ func (a *API) Listen(opts ListenOptions) (*NewSubscription, error) { a.registerSubscription(sub) pause := 2 * time.Second readScanner := func(boutput *bufio.Scanner) { + defer func() { done <- struct{}{} }() for { + select { + case <-shutdownCh: + log.Printf("readScanner: received shutdown") + return + default: + } boutput.Scan() t := boutput.Text() var typeHolder TypeHolder @@ -413,12 +431,17 @@ func (a *API) Listen(opts ListenOptions) (*NewSubscription, error) { continue } } - done <- struct{}{} } attempts := 0 maxAttempts := 1800 go func() { + defer func() { + close(newMsgsCh) + close(newConvsCh) + close(newWalletCh) + close(errorCh) + }() for { select { case <-shutdownCh: @@ -428,6 +451,9 @@ func (a *API) Listen(opts ListenOptions) (*NewSubscription, error) { } if attempts >= maxAttempts { + if err := a.LogSend("Listen: failed to auth, giving up"); err != nil { + log.Printf("Listen: logsend failed to send: %v", err) + } panic("Listen: failed to auth, giving up") } attempts++ @@ -456,8 +482,10 @@ func (a *API) Listen(opts ListenOptions) (*NewSubscription, error) { time.Sleep(pause) continue } + p.ExtraFiles = []*os.File{stderr.(*os.File), output.(*os.File)} boutput := bufio.NewScanner(output) if err := p.Start(); err != nil { + log.Printf("Listen: failed to make listen scanner: %s", err) time.Sleep(pause) continue @@ -505,6 +533,11 @@ func (a *API) Shutdown() error { for _, sub := range a.subscriptions { sub.Shutdown() } + if a.apiCmd != nil { + if err := a.apiCmd.Wait(); err != nil { + return err + } + } if a.runOpts.Oneshot != nil { err := a.runOpts.Command("logout", "--force").Run() diff --git a/vendor/github.com/keybase/go-keybase-chat-bot/kbchat/team.go b/vendor/github.com/keybase/go-keybase-chat-bot/kbchat/team.go index 0f9d9524..71ec37d3 100644 --- a/vendor/github.com/keybase/go-keybase-chat-bot/kbchat/team.go +++ b/vendor/github.com/keybase/go-keybase-chat-bot/kbchat/team.go @@ -1,8 +1,10 @@ package kbchat import ( + "bytes" "encoding/json" "fmt" + "log" "strings" "github.com/keybase/go-keybase-chat-bot/kbchat/types/keybase1" @@ -27,13 +29,18 @@ func (a *API) ListMembersOfTeam(teamName string) (res keybase1.TeamMembersDetail apiInput := fmt.Sprintf(`{"method": "list-team-memberships", "params": {"options": {"team": "%s"}}}`, teamName) cmd := a.runOpts.Command("team", "api") cmd.Stdin = strings.NewReader(apiInput) - bytes, err := cmd.CombinedOutput() + var stderr bytes.Buffer + cmd.Stderr = &stderr + output, err := cmd.Output() if err != nil { return res, APIError{err} } + if stderr.Len() != 0 { + log.Printf("ListMembersOfTeam error: %s", stderr.String()) + } members := ListTeamMembers{} - err = json.Unmarshal(bytes, &members) + err = json.Unmarshal(output, &members) if err != nil { return res, UnmarshalError{err} } @@ -47,13 +54,18 @@ func (a *API) ListUserMemberships(username string) ([]keybase1.AnnotatedMemberIn apiInput := fmt.Sprintf(`{"method": "list-user-memberships", "params": {"options": {"username": "%s"}}}`, username) cmd := a.runOpts.Command("team", "api") cmd.Stdin = strings.NewReader(apiInput) - bytes, err := cmd.CombinedOutput() + var stderr bytes.Buffer + cmd.Stderr = &stderr + output, err := cmd.Output() if err != nil { return nil, APIError{err} } + if stderr.Len() != 0 { + log.Printf("ListUserMemberships error: %s", stderr.String()) + } members := ListUserMemberships{} - err = json.Unmarshal(bytes, &members) + err = json.Unmarshal(output, &members) if err != nil { return nil, UnmarshalError{err} } |