From 816ad09a5055f2e8cd5ad9d5fd855a2e1dc284c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 09:01:53 +0000 Subject: [PATCH 1/9] Bump actions/stale from 5 to 9 Bumps [actions/stale](https://github.com/actions/stale) from 5 to 9. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v5...v9) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 6e61bf53..1e3ae32b 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -18,7 +18,7 @@ jobs: pull-requests: write steps: - - uses: actions/stale@v5 + - uses: actions/stale@v9 with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: 'Stale issue message' From b278f5a41d691180a7e62025593b5bfd9c662c7b Mon Sep 17 00:00:00 2001 From: Zack Date: Fri, 16 Feb 2024 06:56:06 -0800 Subject: [PATCH 2/9] bump version --- README.md | 2 +- src/cli/cli.go | 2 +- src/install/default.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 624b330d..bc26779d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ src="https://user-images.githubusercontent.com/6550035/46709024-9b23ad00-cbf6-11e8-9fb2-ca8b20b7dbec.jpg" width="408px" border="0" alt="croc">
-Version +Version Coverage Build diff --git a/src/cli/cli.go b/src/cli/cli.go index 4e8945d9..e0928eb0 100644 --- a/src/cli/cli.go +++ b/src/cli/cli.go @@ -36,7 +36,7 @@ func Run() (err error) { app := cli.NewApp() app.Name = Date: Fri, 16 Feb 2024 06:56:33 -0800 Subject: [PATCH 3/9] revert go version back to go.1.21 because of glibc errors --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e0e4bbc3..6dd8f018 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: '1.22' + go-version: '1.21' - name: Prepare source tarball run: | git clone -b ${{ github.event.release.name }} --depth 1 https://github.com/schollz/croc croc-${{ github.event.release.name }} From c83eb59963d1689614336d6d42ac5ba887e77f79 Mon Sep 17 00:00:00 2001 From: qk-santi <94850169+qk-santi@users.noreply.github.com> Date: Sat, 17 Feb 2024 18:41:41 +0100 Subject: [PATCH 4/9] Revert "define ports by amount, not individually" This reverts commit 87152f8706dd4f6cd6baa8cfd6b496b6734be7c2. --- src/cli/cli.go | 27 ++++------- src/croc/croc.go | 102 ++++++++++-------------------------------- src/croc/croc_test.go | 14 +++--- 3 files changed, 38 insertions(+), 105 deletions(-) diff --git a/src/cli/cli.go b/src/cli/cli.go index d91beea1..4e8945d9 100644 --- a/src/cli/cli.go +++ b/src/cli/cli.go @@ -72,8 +72,7 @@ func Run() (err error) { &cli.BoolFlag{Name: "no-local", Usage: "disable local relay when sending"}, &cli.BoolFlag{Name: "no-multi", Usage: "disable multiplexing"}, &cli.BoolFlag{Name: "git", Usage: "enable .gitignore respect / don't send ignored files"}, - &cli.IntFlag{Name: "port", Value: 9009, Usage: "base port for the relay"}, - &cli.IntFlag{Name: "transfers", Value: 4, Usage: "number of ports to use for transfers"}, + &cli.StringFlag{Name: "ports", Value: "9009,9010,9011,9012,9013", Usage: "ports of the local relay (optional)"}, }, HelpName: "croc send", Action: send, @@ -86,8 +85,7 @@ func Run() (err error) { Action: relay, Flags: []cli.Flag{ &cli.StringFlag{Name: "host", Usage: "host of the relay"}, - &cli.IntFlag{Name: "port", Value: 9009, Usage: "base port for the relay"}, - &cli.IntFlag{Name: "transfers", Value: 4, Usage: "number of ports to use for transfers"}, + &cli.StringFlag{Name: "ports", Value: "9009,9010,9011,9012,9013", Usage: "ports of the relay"}, }, }, } @@ -176,15 +174,10 @@ func send(c *cli.Context) (err error) { setDebugLevel(c) comm.Socks5Proxy = c.String("socks5") comm.HttpProxy = c.String("connect") - portString := c.Int("port") - if portString == 0 { - portString = 9009 + portsString := c.String("ports") + if portsString == "" { + portsString = "9009,9010,9011,9012,9013" } - transfersString := c.Int("transfers") - if transfersString == 0 { - transfersString = 4 - } - crocOptions := croc.Options{ SharedSecret: c.String("code"), IsSender: true, @@ -196,8 +189,7 @@ func send(c *cli.Context) (err error) { DisableLocal: c.Bool("no-local"), OnlyLocal: c.Bool("local"), IgnoreStdin: c.Bool("ignore-stdin"), - BasePort: portString, - TransferPorts: transfersString, + RelayPorts: strings.Split(portsString, ","), Ask: c.Bool("ask"), NoMultiplexing: c.Bool("no-multi"), RelayPassword: determinePass(c), @@ -230,11 +222,8 @@ func send(c *cli.Context) (err error) { if !c.IsSet("no-local") { crocOptions.DisableLocal = rememberedOptions.DisableLocal } - if !c.IsSet("port") && rememberedOptions.BasePort > 0 { - crocOptions.BasePort = rememberedOptions.BasePort - } - if !c.IsSet("transfers") && rememberedOptions.TransferPorts > 0 { - crocOptions.TransferPorts = rememberedOptions.TransferPorts + if !c.IsSet("ports") && len(rememberedOptions.RelayPorts) > 0 { + crocOptions.RelayPorts = rememberedOptions.RelayPorts } if !c.IsSet("code") { crocOptions.SharedSecret = rememberedOptions.SharedSecret diff --git a/src/croc/croc.go b/src/croc/croc.go index 10cebd1e..a4e23a19 100644 --- a/src/croc/croc.go +++ b/src/croc/croc.go @@ -60,8 +60,7 @@ type Options struct { Debug bool RelayAddress string RelayAddress6 string - BasePort int - TransferPorts int + RelayPorts []string RelayPassword string Stdout bool NoPrompt bool @@ -530,26 +529,21 @@ func (c *Client) sendCollectFiles(filesInfo []FileInfo) (err error) { func (c *Client) setupLocalRelay() { // setup the relay locally - basePort := c.Options.BasePort - transferPorts := c.Options.TransferPorts - ports := make([]string, transferPorts+1) - for i := range ports { - ports[i] = strconv.Itoa(basePort + i) - } - openPorts := utils.FindOpenPorts("127.0.0.1", basePort, transferPorts+1) - if len(openPorts) < len(ports) { + firstPort, _ := strconv.Atoi(c.Options.RelayPorts[0]) + openPorts := utils.FindOpenPorts("127.0.0.1", firstPort, len(c.Options.RelayPorts)) + if len(openPorts) < len(c.Options.RelayPorts) { panic("not enough open ports to run local relay") } for i, port := range openPorts { - ports[i] = fmt.Sprint(port) + c.Options.RelayPorts[i] = fmt.Sprint(port) } - for _, port := range ports { + for _, port := range c.Options.RelayPorts { go func(portStr string) { debugString := "warn" if c.Options.Debug { debugString = "debug" } - err := tcp.Run(debugString, "127.0.0.1", portStr, c.Options.RelayPassword, fmt.Sprintf(strconv.Itoa(basePort)+","+strconv.Itoa(transferPorts))) + err := tcp.Run(debugString, "127.0.0.1", portStr, c.Options.RelayPassword, strings.Join(c.Options.RelayPorts[1:], ",")) if err != nil { panic(err) } @@ -568,7 +562,7 @@ func (c *Client) broadcastOnLocalNetwork(useipv6 bool) { // look for peers first settings := peerdiscovery.Settings{ Limit: -1, - Payload: []byte("croc" + strconv.Itoa(c.Options.BasePort)), + Payload: []byte("croc" + c.Options.RelayPorts[0]), Delay: 20 * time.Millisecond, TimeLimit: timeLimit, } @@ -588,10 +582,10 @@ func (c *Client) transferOverLocalRelay(errchan chan<- error) { time.Sleep(500 * time.Millisecond) log.Debug("establishing connection") var banner string - conn, banner, ipaddr, err := tcp.ConnectToTCPServer("127.0.0.1:"+strconv.Itoa(c.Options.BasePort), c.Options.RelayPassword, c.Options.SharedSecret[:3]) + conn, banner, ipaddr, err := tcp.ConnectToTCPServer("127.0.0.1:"+c.Options.RelayPorts[0], c.Options.RelayPassword, c.Options.SharedSecret[:3]) log.Debugf("banner: %s", banner) if err != nil { - err = fmt.Errorf("could not connect to 127.0.0.1:%s: %w", c.Options.BasePort, err) + err = fmt.Errorf("could not connect to 127.0.0.1:%s: %w", c.Options.RelayPorts[0], err) log.Debug(err) // not really an error because it will try to connect over the actual relay return @@ -610,26 +604,10 @@ func (c *Client) transferOverLocalRelay(errchan chan<- error) { c.conn[0] = conn log.Debug("exchanged header message") c.Options.RelayAddress = "127.0.0.1" - var basePort, transferPorts int - banner_split := strings.Split(banner, ",") - if len(banner_split) != 2 { - panic(fmt.Sprintf("Expected port and number of transfer ports in banner: %v", banner)) - } - basePort, err = strconv.Atoi(banner_split[0]) - if err == nil { - c.Options.BasePort = basePort - } else { - panic(fmt.Sprintf("could not get transfer ports: %v", err)) - } - transferPorts, err = strconv.Atoi(banner_split[1]) - if err == nil { - c.Options.TransferPorts = transferPorts - } else { - panic(fmt.Sprintf("could not get transfer ports: %v", err)) - } + c.Options.RelayPorts = strings.Split(banner, ",") if c.Options.NoMultiplexing { log.Debug("no multiplexing") - c.Options.TransferPorts = 1 + c.Options.RelayPorts = []string{c.Options.RelayPorts[0]} } c.ExternalIP = ipaddr errchan <- c.transfer() @@ -727,7 +705,7 @@ func (c *Client) Send(filesInfo []FileInfo, emptyFoldersToTransfer []FileInfo, t log.Debugf("error getting local ips: %v", err) } // prepend the port that is being listened to - ips = append([]string{strconv.Itoa(c.Options.BasePort)}, ips...) + ips = append([]string{c.Options.RelayPorts[0]}, ips...) } bips, _ := json.Marshal(ips) if err = conn.Send(bips); err != nil { @@ -747,26 +725,10 @@ func (c *Client) Send(filesInfo []FileInfo, emptyFoldersToTransfer []FileInfo, t } c.conn[0] = conn - var basePort, transferPorts int - banner_split := strings.Split(banner, ",") - if len(banner_split) != 2 { - panic(fmt.Sprintf("Expected port and number of transfer ports in banner: %v", banner)) - } - basePort, err = strconv.Atoi(banner_split[0]) - if err == nil { - c.Options.BasePort = basePort - } else { - panic(fmt.Sprintf("could not get transfer ports: %v", err)) - } - transferPorts, err = strconv.Atoi(banner_split[1]) - if err == nil { - c.Options.TransferPorts = transferPorts - } else { - panic(fmt.Sprintf("could not get transfer ports: %v", err)) - } + c.Options.RelayPorts = strings.Split(banner, ",") if c.Options.NoMultiplexing { log.Debug("no multiplexing") - c.Options.TransferPorts = 1 + c.Options.RelayPorts = []string{c.Options.RelayPorts[0]} } c.ExternalIP = ipaddr log.Debug("exchanged header message") @@ -986,26 +948,10 @@ func (c *Client) Receive() (err error) { if err = c.conn[0].Send(handshakeRequest); err != nil { log.Errorf("handshake send error: %v", err) } - var basePort, transferPorts int - banner_split := strings.Split(banner, ",") - if len(banner_split) != 2 { - panic(fmt.Sprintf("Expected port and number of transfer ports in banner: %v", banner)) - } - basePort, err = strconv.Atoi(banner_split[0]) - if err == nil { - c.Options.BasePort = basePort - } else { - panic(fmt.Sprintf("could not get transfer ports: %v", err)) - } - transferPorts, err = strconv.Atoi(banner_split[1]) - if err == nil { - c.Options.TransferPorts = transferPorts - } else { - panic(fmt.Sprintf("could not get transfer ports: %v", err)) - } + c.Options.RelayPorts = strings.Split(banner, ",") if c.Options.NoMultiplexing { log.Debug("no multiplexing") - c.Options.TransferPorts = 1 + c.Options.RelayPorts = []string{c.Options.RelayPorts[0]} } log.Debug("exchanged header message") fmt.Fprintf(os.Stderr, "\rsecuring channel...") @@ -1309,9 +1255,9 @@ func (c *Client) processMessagePake(m message.Message) (err error) { // connects to the other ports of the server for transfer var wg sync.WaitGroup - wg.Add(c.Options.TransferPorts + 1) - for i := 0; i <= c.Options.TransferPorts; i++ { - log.Debugf("port: [%d]", c.Options.BasePort+i) + wg.Add(len(c.Options.RelayPorts)) + for i := 0; i < len(c.Options.RelayPorts); i++ { + log.Debugf("port: [%s]", c.Options.RelayPorts[i]) go func(j int) { defer wg.Done() var host string @@ -1324,7 +1270,7 @@ func (c *Client) processMessagePake(m message.Message) (err error) { return } } - server := net.JoinHostPort(host, strconv.Itoa(c.Options.BasePort+j)) + server := net.JoinHostPort(host, c.Options.RelayPorts[j]) log.Debugf("connecting to %s", server) c.conn[j+1], _, _, err = tcp.ConnectToTCPServer( server, @@ -1802,7 +1748,7 @@ func (c *Client) updateState() (err error) { if err != nil { return } - for i := 0; i <= c.Options.TransferPorts; i++ { + for i := 0; i < len(c.Options.RelayPorts); i++ { log.Debugf("starting sending over comm %d", i) go c.sendData(i) } @@ -1915,7 +1861,7 @@ func (c *Client) sendData(i int) { defer func() { log.Debugf("finished with %d", i) c.numfinished++ - if c.numfinished == c.Options.TransferPorts+1 { + if c.numfinished == len(c.Options.RelayPorts) { log.Debug("closing file") if err := c.fread.Close(); err != nil { log.Errorf("error closing file: %v", err) @@ -1939,7 +1885,7 @@ func (c *Client) sendData(i int) { time.Sleep(r.Delay()) } - if math.Mod(curi, float64(c.Options.TransferPorts+1)) == float64(i) { + if math.Mod(curi, float64(len(c.Options.RelayPorts))) == float64(i) { // check to see if this is a chunk that the recipient wants usableChunk := true c.mutex.Lock() diff --git a/src/croc/croc_test.go b/src/croc/croc_test.go index 0a4447d6..445ec5af 100644 --- a/src/croc/croc_test.go +++ b/src/croc/croc_test.go @@ -18,7 +18,7 @@ import ( func init() { log.SetLevel("trace") - go tcp.Run("debug", "127.0.0.1", "8281", "pass123", "8281,4") + go tcp.Run("debug", "127.0.0.1", "8281", "pass123", "8282,8283,8284,8285") go tcp.Run("debug", "127.0.0.1", "8282", "pass123") go tcp.Run("debug", "127.0.0.1", "8283", "pass123") go tcp.Run("debug", "127.0.0.1", "8284", "pass123") @@ -35,7 +35,7 @@ func TestCrocReadme(t *testing.T) { SharedSecret: "8123-testingthecroc", Debug: true, RelayAddress: "127.0.0.1:8281", - BasePort: 8281, + RelayPorts: []string{"8281"}, RelayPassword: "pass123", Stdout: false, NoPrompt: true, @@ -102,7 +102,7 @@ func TestCrocEmptyFolder(t *testing.T) { SharedSecret: "8123-testingthecroc", Debug: true, RelayAddress: "127.0.0.1:8281", - BasePort: 8281, + RelayPorts: []string{"8281"}, RelayPassword: "pass123", Stdout: false, NoPrompt: true, @@ -169,7 +169,7 @@ func TestCrocSymlink(t *testing.T) { SharedSecret: "8124-testingthecroc", Debug: true, RelayAddress: "127.0.0.1:8281", - BasePort: 8281, + RelayPorts: []string{"8281"}, RelayPassword: "pass123", Stdout: false, NoPrompt: true, @@ -271,8 +271,7 @@ func TestCrocLocal(t *testing.T) { SharedSecret: "8123-testingthecroc", Debug: true, RelayAddress: "127.0.0.1:8181", - BasePort: 8181, - TransferPorts: 1, + RelayPorts: []string{"8181", "8182"}, RelayPassword: "pass123", Stdout: true, NoPrompt: true, @@ -352,8 +351,7 @@ func TestCrocError(t *testing.T) { SharedSecret: "8123-testingthecroc2", Debug: true, RelayAddress: "doesntexistok.com:8381", - BasePort: 8381, - TransferPorts: 1, + RelayPorts: []string{"8381", "8382"}, RelayPassword: "pass123", Stdout: true, NoPrompt: true, From e1644401dad356fb4aa31434cd2ea7f666b54f39 Mon Sep 17 00:00:00 2001 From: qk-santi <94850169+qk-santi@users.noreply.github.com> Date: Sat, 17 Feb 2024 19:09:53 +0100 Subject: [PATCH 5/9] version compatible basePort and transfers --- src/cli/cli.go | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/cli/cli.go b/src/cli/cli.go index 4e8945d9..ed4d7867 100644 --- a/src/cli/cli.go +++ b/src/cli/cli.go @@ -72,7 +72,8 @@ func Run() (err error) { &cli.BoolFlag{Name: "no-local", Usage: "disable local relay when sending"}, &cli.BoolFlag{Name: "no-multi", Usage: "disable multiplexing"}, &cli.BoolFlag{Name: "git", Usage: "enable .gitignore respect / don't send ignored files"}, - &cli.StringFlag{Name: "ports", Value: "9009,9010,9011,9012,9013", Usage: "ports of the local relay (optional)"}, + &cli.IntFlag{Name: "port", Value: 9009, Usage: "base port for the relay"}, + &cli.IntFlag{Name: "transfers", Value: 4, Usage: "number of ports to use for transfers"}, }, HelpName: "croc send", Action: send, @@ -174,10 +175,21 @@ func send(c *cli.Context) (err error) { setDebugLevel(c) comm.Socks5Proxy = c.String("socks5") comm.HttpProxy = c.String("connect") - portsString := c.String("ports") - if portsString == "" { - portsString = "9009,9010,9011,9012,9013" + + portParam := c.Int("port") + if portParam == 0 { + portParam = 9009 } + transfersParam := c.Int("transfers") + if transfersParam == 0 { + transfersParam = 4 + } + + ports := make([]string, transfersParam+1) + for i := 0; i <= transfersParam; i++ { + ports[i] = strconv.Itoa(portParam + i) + } + crocOptions := croc.Options{ SharedSecret: c.String("code"), IsSender: true, @@ -189,7 +201,7 @@ func send(c *cli.Context) (err error) { DisableLocal: c.Bool("no-local"), OnlyLocal: c.Bool("local"), IgnoreStdin: c.Bool("ignore-stdin"), - RelayPorts: strings.Split(portsString, ","), + RelayPorts: ports, Ask: c.Bool("ask"), NoMultiplexing: c.Bool("no-multi"), RelayPassword: determinePass(c), From 4f1f57b1ba488cbdfdc54da9abfe2ae559924aea Mon Sep 17 00:00:00 2001 From: Travis Date: Thu, 15 Feb 2024 12:04:19 +0800 Subject: [PATCH 6/9] remove unnecessary trailing newline character when stdout is enabled --- src/croc/croc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/croc/croc.go b/src/croc/croc.go index e1704b42..61262c7b 100644 --- a/src/croc/croc.go +++ b/src/croc/croc.go @@ -1044,7 +1044,7 @@ func (c *Client) transfer() (err error) { if err = os.Remove(pathToFile); err != nil { log.Warnf("error removing %s: %v", pathToFile, err) } - fmt.Print("\n") + fmt.Fprint(os.Stderr, "\n") } if err != nil && strings.Contains(err.Error(), "pake not successful") { log.Debugf("pake error: %s", err.Error()) From d92cff92b997a754c16cc818687243f0f9a73469 Mon Sep 17 00:00:00 2001 From: Zack Date: Mon, 19 Feb 2024 07:46:35 -0800 Subject: [PATCH 7/9] add arm/arm64 builds for windows fixes #664 --- .github/workflows/release.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6dd8f018..330daea2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,6 +39,10 @@ jobs: zip croc_${{ github.event.release.name }}_Windows-64bit.zip croc.exe GOOS=windows GOARCH=386 go build -ldflags="-s -w" -o croc.exe zip croc_${{ github.event.release.name }}_Windows-32bit.zip croc.exe + GOOS=windows GOARCH=arm go build -ldflags="-s -w" -o croc.exe + zip croc_${{ github.event.release.name }}_Windows-ARM.zip croc.exe + GOOS=windows GOARCH=arm64 go build -ldflags="-s -w" -o croc.exe + zip croc_${{ github.event.release.name }}_Windows-ARM64.zip croc.exe GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o croc upx --brute croc tar -czvf croc_${{ github.event.release.name }}_Linux-64bit.tar.gz croc @@ -60,6 +64,8 @@ jobs: sha256sum croc_${{ github.event.release.name }}_src.tar.gz >> croc_${{ github.event.release.name }}_checksums.txt sha256sum croc_${{ github.event.release.name }}_Windows-64bit.zip >> croc_${{ github.event.release.name }}_checksums.txt sha256sum croc_${{ github.event.release.name }}_Windows-32bit.zip >> croc_${{ github.event.release.name }}_checksums.txt + sha256sum croc_${{ github.event.release.name }}_Windows-ARM.zip >> croc_${{ github.event.release.name }}_checksums.txt + sha256sum croc_${{ github.event.release.name }}_Windows-ARM64.zip >> croc_${{ github.event.release.name }}_checksums.txt sha256sum croc_${{ github.event.release.name }}_Windows7-64bit.zip >> croc_${{ github.event.release.name }}_checksums.txt sha256sum croc_${{ github.event.release.name }}_Windows7-32bit.zip >> croc_${{ github.event.release.name }}_checksums.txt sha256sum croc_${{ github.event.release.name }}_Linux-64bit.tar.gz >> croc_${{ github.event.release.name }}_checksums.txt @@ -76,6 +82,8 @@ jobs: croc_${{ github.event.release.name }}_src.tar.gz croc_${{ github.event.release.name }}_Windows-64bit.zip croc_${{ github.event.release.name }}_Windows-32bit.zip + croc_${{ github.event.release.name }}_Windows-ARM.zip + croc_${{ github.event.release.name }}_Windows-ARM64.zip croc_${{ github.event.release.name }}_Windows7-64bit.zip croc_${{ github.event.release.name }}_Windows7-32bit.zip croc_${{ github.event.release.name }}_Linux-64bit.tar.gz From 11bc4eecc6cc8e409483b570f6f4307855347e3b Mon Sep 17 00:00:00 2001 From: Zack Date: Mon, 19 Feb 2024 07:46:53 -0800 Subject: [PATCH 8/9] update deps --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 74b6d371..3c343fe0 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/schollz/progressbar/v3 v3.14.1 github.com/stretchr/testify v1.8.2 golang.org/x/crypto v0.19.0 - golang.org/x/net v0.20.0 + golang.org/x/net v0.21.0 golang.org/x/time v0.5.0 ) @@ -27,7 +27,7 @@ require ( github.com/magisterquis/connectproxy v0.0.0-20200725203833-3582e84f0c9b github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/rivo/uniseg v0.4.6 // indirect + github.com/rivo/uniseg v0.4.7 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/tscholl2/siec v0.0.0-20210707234609-9bdfc483d499 // indirect diff --git a/go.sum b/go.sum index 80a483b2..60a94316 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,8 @@ github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= -github.com/rivo/uniseg v0.4.6 h1:Sovz9sDSwbOz9tgUy8JpT+KgCkPYJEN/oYzlJiYTNLg= -github.com/rivo/uniseg v0.4.6/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= +github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -85,8 +85,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= From 8ac1e3a501557ef9ed9c3d6c3a72fe2a2d39e2c7 Mon Sep 17 00:00:00 2001 From: Zack Date: Mon, 19 Feb 2024 07:47:23 -0800 Subject: [PATCH 9/9] bump version --- README.md | 2 +- src/cli/cli.go | 2 +- src/install/default.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bc26779d..009b4a3d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ src="https://user-images.githubusercontent.com/6550035/46709024-9b23ad00-cbf6-11e8-9fb2-ca8b20b7dbec.jpg" width="408px" border="0" alt="croc">
-Version +Version Coverage