6.2.8 hotfix

Jenkinsfile

@@ -196,6 +196,8 @@ helpers.rootLinuxNode(env, {
                 "GPG=/usr/bin/gpg.distrib",
               ]) {
                 if (hasGoChanges || hasJenkinsfileChanges) {
+                  // install the updater test binary
+                  sh "go install github.com/keybase/client/go/updater/test"
                   testGo("test_linux_go_", packagesToTest, hasKBFSChanges)
                 }
               }},
@@ -458,6 +460,7 @@ def testGoBuilds(prefix, packagesToTest, hasKBFSChanges) {
         sh 'go install github.com/golangci/golangci-lint/cmd/golangci-lint'
       }
     }
+    //
 
     // TODO re-enable for kbfs.
     // if (hasKBFSChanges) {

go/buildtools/tools.go

@@ -6,7 +6,7 @@ package tools
 import (
 	_ "github.com/golang/mock/mockgen"
 	_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
-	_ "github.com/keybase/release"
+	_ "github.com/keybase/client/go/release"
 	_ "golang.org/x/lint/golint"
 	_ "golang.org/x/mobile/cmd/gobind"
 	_ "golang.org/x/mobile/cmd/gomobile"

go/chat/giphy/search.go

@@ -173,10 +173,14 @@ func Asset(mctx libkb.MetaContext, sourceURL string) (res io.ReadCloser, length
 	}
 	req.Header.Add("Accept", "image/*")
 	req.Host = MediaHost
-	resp, err := ctxhttp.Do(mctx.Ctx(), WebClient(mctx), req)
+	resp, err := ctxhttp.Do(mctx.Ctx(), AssetClient(mctx), req)
 	if err != nil {
 		return nil, 0, err
 	}
+
+	if resp.StatusCode != 200 {
+		return nil, 0, fmt.Errorf("Status %s", resp.Status)
+	}
 	return resp.Body, resp.ContentLength, nil
 }
 

go/chat/uithreadloader.go

@@ -317,7 +317,7 @@ func (t *UIThreadLoader) setUIStatus(ctx context.Context, chatUI libkb.ChatUI,
 			case <-ctx.Done():
 				t.Debug(ctx, "setUIStatus: context canceled")
 			default:
-				if err := chatUI.ChatThreadStatus(ctx, status); err != nil {
+				if err := chatUI.ChatThreadStatus(context.Background(), status); err != nil {
 					t.Debug(ctx, "setUIStatus: failed to send: %s", err)
 				}
 				displayed = true
@@ -661,6 +661,8 @@ func (t *UIThreadLoader) LoadNonblock(ctx context.Context, chatUI libkb.ChatUI,
 		}
 		// wait until we are online before attempting the full pull, otherwise we just waste an attempt
 		if fullErr = t.waitForOnline(ctx); fullErr != nil {
+			t.Debug(ctx, "LoadNonblock: waitForOnline error: %s", fullErr)
+			setDisplayedStatus(cancelUIStatus)
 			return
 		}
 		customRi := t.makeRi(ctx, uid, convID, knownRemotes)
@@ -806,7 +808,11 @@ func (t *UIThreadLoader) LoadNonblock(ctx context.Context, chatUI libkb.ChatUI,
 				t.Debug(ctx, "LoadNonblock: failed to set status: %s", err)
 			}
 		}
+		t.Debug(ctx, "LoadNonblock: clear complete")
+	} else {
+		t.Debug(ctx, "LoadNonblock: no status displayed, not clearing")
 	}
+
 	cancel()
 	return fullErr
 }

go/chat/unfurl/packager.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"net/http"
 	"strings"
 
 	"github.com/keybase/client/go/avatars"
@@ -57,10 +58,20 @@ func (p *Packager) assetFilename(url string) string {
 }
 
 func (p *Packager) assetBodyAndLength(ctx context.Context, url string) (body io.ReadCloser, size int64, err error) {
-	resp, err := libkb.ProxyHTTPGet(p.G().ExternalG(), p.G().Env, url, "UnfurlPackager")
+	client := libkb.ProxyHTTPClient(p.G().ExternalG(), p.G().Env, "UnfurlPackager")
+	req, err := http.NewRequest(http.MethodGet, url, nil)
+	if err != nil {
+		return nil, 0, err
+	}
+	req.Header.Add("User-Agent", libkb.UserAgent)
+
+	resp, err := client.Do(req)
 	if err != nil {
 		return body, size, err
 	}
+	if resp.StatusCode != 200 {
+		return nil, 0, fmt.Errorf("Status %s", resp.Status)
+	}
 	return resp.Body, resp.ContentLength, nil
 }
 

go/client/cmd_ctl_watchdog.go

@@ -15,7 +15,7 @@ import (
 	"github.com/keybase/client/go/install"
 	"github.com/keybase/client/go/libcmdline"
 	"github.com/keybase/client/go/libkb"
-	"github.com/keybase/go-updater/watchdog"
+	"github.com/keybase/client/go/updater/watchdog"
 )
 
 // CmdWatchdog defines watchdog command

go/go.mod

@@ -42,16 +42,14 @@ require (
 	github.com/keybase/go-merkle-tree v0.0.0-20221220225120-009ea00ffb15
 	github.com/keybase/go-porterstemmer v1.0.2-0.20181016185745-521f1ed5c3f7
 	github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19
-	github.com/keybase/go-triplesec v0.0.0-20221220225315-06ddee08f3c2
-	github.com/keybase/go-triplesec-insecure v0.0.0-20221220225342-ddc3aa12adec
-	github.com/keybase/go-updater v0.0.0-20221221194633-9e97736a0b42
+	github.com/keybase/go-triplesec v0.0.0-20231213205702-981541df982e
+	github.com/keybase/go-triplesec-insecure v0.0.0-20231213205953-ffb6212a205e
 	github.com/keybase/go-winio v0.4.12-0.20180913221037-b1d96ab97b58
 	github.com/keybase/golang-ico v0.0.0-20181117022008-819cbeb217c9
 	github.com/keybase/gomounts v0.0.0-20180302000443-349507f4d353
 	github.com/keybase/keybase-test-vectors v1.0.12-0.20200309162119-ea1e58fecd5d
-	github.com/keybase/pipeliner v0.0.0-20211118220306-ca1be321c9e5
-	github.com/keybase/release v0.0.0-20221220220653-50771d921175
-	github.com/keybase/saltpack v0.0.0-20221220231257-f6cce11cfd0f
+	github.com/keybase/pipeliner v0.0.0-20231213214924-f648db4bba63
+	github.com/keybase/saltpack v0.0.0-20231213211625-726bb684c617
 	github.com/keybase/stellarnet v0.0.0-20200311180805-6c05850f9050
 	github.com/kr/text v0.2.0
 	github.com/kyokomi/emoji v2.2.2+incompatible
@@ -62,25 +60,25 @@ require (
 	github.com/pkg/xattr v0.2.2
 	github.com/qrtz/nativemessaging v0.0.0-20161221035708-f4769a80e040
 	github.com/rcrowley/go-metrics v0.0.0-20161128210544-1f30fe9094a5
-	github.com/sergi/go-diff v1.2.0
+	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3
 	github.com/shirou/gopsutil v2.18.13-0.20181231150826-db425313bfa8+incompatible
 	github.com/stathat/go v1.0.0
 	// NOTE: if stellar/go is updated, consider removing the `replace` directive
 	// for goautoneg at the bottom of this go.mod
 	github.com/stellar/go v0.0.0-20221209134558-b4ba6f8e67f2
-	github.com/stretchr/testify v1.8.1
+	github.com/stretchr/testify v1.8.4
 	github.com/syndtr/goleveldb v1.0.0
 	github.com/urfave/cli v1.22.1
 	github.com/vividcortex/ewma v1.1.2-0.20170804035156-43880d236f69
 	go.uber.org/zap v1.17.0
-	golang.org/x/crypto v0.4.0
+	golang.org/x/crypto v0.16.0
 	golang.org/x/image v0.0.0-20190802002840-cff245a6509b
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
 	golang.org/x/mobile v0.0.0-20221110043201-43a038452099
-	golang.org/x/net v0.4.0
-	golang.org/x/sync v0.1.0
-	golang.org/x/sys v0.3.0
-	golang.org/x/text v0.5.0
+	golang.org/x/net v0.19.0
+	golang.org/x/sync v0.5.0
+	golang.org/x/sys v0.15.0
+	golang.org/x/text v0.14.0
 	golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1
 	gopkg.in/src-d/go-billy.v4 v4.3.2
 	gopkg.in/src-d/go-git.v4 v4.13.1
@@ -89,7 +87,13 @@ require (
 	stathat.com/c/ramcache v1.0.0
 )
 
-require github.com/keybase/dbus v0.0.0-20220506165403-5aa21ea2c23a
+require (
+	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
+	github.com/aws/aws-sdk-go v1.49.13
+	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
+	github.com/keybase/dbus v0.0.0-20220506165403-5aa21ea2c23a
+	gopkg.in/alecthomas/kingpin.v2 v2.2.6
+)
 
 require (
 	4d63.com/gochecknoglobals v0.1.0 // indirect
@@ -104,8 +108,7 @@ require (
 	github.com/RoaringBitmap/roaring v0.4.22-0.20191112221735-4d53b29a8f7d // indirect
 	github.com/StackExchange/wmi v1.2.1 // indirect
 	github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 // indirect
-	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
-	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
+	github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
 	github.com/alexkohler/prealloc v1.0.0 // indirect
 	github.com/alingse/asasalint v0.0.11 // indirect
 	github.com/andybalholm/cascadia v0.0.0-20150730174459-3ad29d1ad1c4 // indirect
@@ -116,7 +119,6 @@ require (
 	github.com/asaskevich/govalidator v0.0.0-20180319081651-7d2e70ef918f // indirect
 	github.com/ashanbrown/forbidigo v1.3.0 // indirect
 	github.com/ashanbrown/makezero v1.1.1 // indirect
-	github.com/aws/aws-sdk-go v1.44.164 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bkielbasa/cyclop v1.2.0 // indirect
 	github.com/blevesearch/blevex v0.0.0-20190916190636-152f0fe5c040 // indirect
@@ -300,11 +302,10 @@ require (
 	go4.org v0.0.0-20161118210015-09d86de304dc // indirect
 	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
 	golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/tools v0.1.12 // indirect
+	golang.org/x/mod v0.10.0 // indirect
+	golang.org/x/tools v0.8.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
-	gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
 	gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 // indirect