Fix TERM not being set when a tty is requested

cmd/breakglass: fallback to HTTP instead of detecting stripping
This follows gokrazy/tools commit ba6a8936f4
2025-12-28 13:11:46 -08:00 · 2025-12-09 17:22:34 +01:00 · 2025-12-05 17:50:59 +01:00 · 2025-12-05 17:34:49 +01:00 · 2025-11-20 07:37:04 +01:00 · 2025-08-24 09:03:20 +02:00
7 changed files with 61 additions and 93 deletions
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -9,21 +9,18 @@ jobs:
    name: CI
    runs-on: ubuntu-latest
    steps:
+    - uses: actions/checkout@v4

-    - name: Set up Go 1.x
-      uses: actions/setup-go@v2
+    - name: Set up latest stable Go
+      uses: actions/setup-go@v5
      with:
-        # Run on the latest minor release of Go 1.19:
-        go-version: ^1.19
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+        go-version: 'stable'

    - name: Ensure all files were formatted as per gofmt
      run: |
        [ "$(gofmt -l $(find . -name '*.go') 2>&1)" = "" ]

-    - name: Build packages
+    - name: Build and test
      run: |
-        go install -v ./...
+        go install ./...
+        go test -v ./...
--- a/README.md
+++ b/README.md
@@ -97,7 +97,7 @@ busybox: ELF 64-bit LSB executable, ARM aarch64, version 1 (SYSV), statically li
 for GNU/Linux 3.7.0, BuildID[sha1]=c9e20e9849ed0ca3c2bd058427ac31a27c008efe, stripped
 $ ln -s busybox sh
 $ tar cf breakglass.tar --dereference sh
-$ breakglass -debug_tarball_pattern=debug.tar gokrazy
+$ breakglass -debug_tarball_pattern=breakglass.tar gokrazy
 /tmp/breakglass564067692 # df -h
 Filesystem                Size      Used Available Use% Mounted on
 /dev/root                60.5M     60.5M         0 100% /
--- a/breakglass.go
+++ b/breakglass.go
@@ -5,21 +5,22 @@ package main
 import (
 	"bufio"
 	"bytes"
+	"context"
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/x509"
-	"encoding/json"
 	"encoding/pem"
 	"flag"
 	"fmt"
 	"io/ioutil"
 	"log"
 	"net"
-	"net/http"
 	"os"
 	"strings"
 	"syscall"

+	"github.com/gokrazy/gokapi"
+	"github.com/gokrazy/gokapi/ondeviceapi"
 	"github.com/gokrazy/gokrazy"

 	"golang.org/x/crypto/ssh"
@@ -115,40 +116,16 @@ func createHostKey(path string) (ssh.Signer, error) {
 }

 func buildTimestamp() (string, error) {
-	var statusReply struct {
-		BuildTimestamp string `json:"BuildTimestamp"`
-	}
-	pw, err := os.ReadFile("/etc/gokr-pw.txt")
+	cfg, err := gokapi.ConnectOnDevice()
 	if err != nil {
 		return "", err
 	}
-	port, err := os.ReadFile("/etc/http-port.txt")
+	cl := ondeviceapi.NewAPIClient(cfg)
+	res, _, err := cl.SuperviseApi.Index(context.Background())
 	if err != nil {
 		return "", err
 	}
-	req, err := http.NewRequest("GET", "http://gokrazy:"+strings.TrimSpace(string(pw))+"@localhost:"+strings.TrimSpace(string(port))+"/", nil)
-	if err != nil {
-		return "", err
-	}
-	req.Header.Set("Content-Type", "application/json")
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return "", err
-	}
-	defer resp.Body.Close()
-	if got, want := resp.StatusCode, http.StatusOK; got != want {
-		b, _ := ioutil.ReadAll(resp.Body)
-		return "", fmt.Errorf("unexpected HTTP status code: got %v, want %v (body: %s)", resp.Status, want, strings.TrimSpace(string(b)))
-	}
-	b, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return "", err
-	}
-	if err := json.Unmarshal(b, &statusReply); err != nil {
-		return "", err
-	}
-	return statusReply.BuildTimestamp, nil
+	return res.BuildTimestamp, nil
 }

 var motd string
--- a/cmd/breakglass/breakglass.go
+++ b/cmd/breakglass/breakglass.go
@@ -26,7 +26,6 @@ import (
 	"github.com/gokrazy/internal/config"
 	"github.com/gokrazy/internal/httpclient"
 	"github.com/gokrazy/internal/instanceflag"
-	"github.com/gokrazy/internal/tlsflag"
 	"github.com/gokrazy/internal/updateflag"
 )

@@ -35,9 +34,11 @@ type bg struct {
 	cfg          *config.Struct
 	forceRestart bool
 	sshConfig    string
+	insecure     bool

 	// state
 	GOARCH string
+	update updateflag.Value
 }

 func (bg *bg) startBreakglass() error {
@@ -46,35 +47,26 @@ func (bg *bg) startBreakglass() error {
 		return err
 	}

-	updateHttpClient, foundMatchingCertificate, updateBaseURL, err := httpclient.For(bg.cfg)
+	updateHttpClient, _, updateBaseURL, err := httpclient.For(bg.update, bg.cfg)
 	if err != nil {
 		return err
 	}
 	updateHttpClient.Jar = jar

-	remoteScheme, err := httpclient.GetRemoteScheme(updateBaseURL)
-	if remoteScheme == "https" && !tlsflag.Insecure() {
-		updateBaseURL.Scheme = "https"
-		updateflag.SetUpdate(updateBaseURL.String())
-	}
-
-	if updateBaseURL.Scheme != "https" && foundMatchingCertificate {
-		fmt.Printf("\n")
-		fmt.Printf("!!!WARNING!!! Possible SSL-Stripping detected!\n")
-		fmt.Printf("Found certificate for hostname in your client configuration but the host does not offer https!\n")
-		fmt.Printf("\n")
-		if !tlsflag.Insecure() {
-			log.Fatalf("update canceled: TLS certificate found, but negotiating a TLS connection with the target failed")
-		}
-		fmt.Printf("Proceeding anyway as requested (-insecure).\n")
-	}
-
-	if err != nil {
-		return err
-	}
-
 	form, err := updateHttpClient.Get(updateBaseURL.String() + "status?path=/user/breakglass")
 	if err != nil {
+		if updateBaseURL.Scheme == "https" && bg.insecure {
+			// Try falling back to HTTP
+			bg.cfg.Update.UseTLS = "off"
+			updateHttpClient, _, updateBaseURL, err = httpclient.For(bg.update, bg.cfg)
+			if err != nil {
+				return err
+			}
+			form, err = updateHttpClient.Get(updateBaseURL.String() + "status?path=/user/breakglass")
+			if err != nil {
+				return err
+			}
+		}
 		return err
 	}
 	if form.StatusCode == http.StatusNotFound {
@@ -198,6 +190,11 @@ func breakglass() error {
 			false,
 			"prepare the SSH connection only, but do not execute SSH (useful for using breakglass within an SSH ProxyCommand)")

+		insecure = flag.Bool(
+			"insecure",
+			false,
+			"Fall back to HTTP if HTTPS is configured, but does not work.")
+
 		proxy = flag.Bool(
 			"proxy",
 			false,
@@ -209,13 +206,6 @@ func breakglass() error {
 			"an alternative per-user configuration file for ssh and scp")
 	)

-	// TODO: remove the -tls and -gokrazy_url flags after 2023-June (half a year
-	// after the introduction of instance centric config), so that we can then
-	// merge these flags into tools/internal/oldpacker and remove their global
-	// state.
-	tlsflag.RegisterFlags(flag.CommandLine)
-	updateflag.RegisterFlags(flag.CommandLine, "gokrazy_url")
-
 	flag.Usage = func() {
 		fmt.Fprintf(os.Stderr, "Usage of %s:\n\n", os.Args[0])

@@ -231,13 +221,6 @@ func breakglass() error {
 		log.Fatalf("syntax: breakglass <hostname> [command]")
 	}

-	// If the user did not explicitly specify -update=yes, we default to it.
-	// This differs from the gokr-packer, but breakglass is only useful for
-	// gokrazy instances that already exist.
-	if updateflag.NewInstallation() {
-		updateflag.SetUpdate("yes")
-	}
-
 	instance := flag.Arg(0)
 	instanceflag.SetInstance(instance)

@@ -255,6 +238,8 @@ func breakglass() error {
 		cfg:          cfg,
 		forceRestart: *forceRestart,
 		sshConfig:    *sshConfig,
+		insecure:     *insecure,
+		update:       updateflag.Value{Update: "yes"},
 	}
 	if cfg.Update.Hostname == "" {
 		cfg.Update.Hostname = cfg.Hostname
--- a/go.mod
+++ b/go.mod
@@ -1,15 +1,16 @@
 module github.com/gokrazy/breakglass

-go 1.21
+go 1.24.0

 require (
-	github.com/gokrazy/gokrazy v0.0.0-20230812092215-346db1998f83
-	github.com/gokrazy/internal v0.0.0-20250126213949-423a5b587b57
+	github.com/gokrazy/gokapi v0.0.0-20250222071133-506fdb322775
+	github.com/gokrazy/gokrazy v0.0.0-20250222061409-bd0bb5f1d0b5
+	github.com/gokrazy/internal v0.0.0-20251208203110-3c1aa9087c82
 	github.com/google/renameio/v2 v2.0.0
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/kr/pty v1.1.8
 	github.com/pkg/sftp v1.13.5
-	golang.org/x/crypto v0.31.0
+	golang.org/x/crypto v0.45.0
 )

 require (
@@ -18,5 +19,6 @@ require (
 	github.com/kr/fs v0.1.0 // indirect
 	github.com/mdlayher/watchdog v0.0.0-20221003142519-49be0df7b3b5 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/oauth2 v0.27.0 // indirect
+	golang.org/x/sys v0.38.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -3,10 +3,12 @@ github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
 github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gokrazy/gokrazy v0.0.0-20230812092215-346db1998f83 h1:Y4sADvUYd/c0eqnqebipHHl0GMpAxOQeTzPnwI4ievM=
-github.com/gokrazy/gokrazy v0.0.0-20230812092215-346db1998f83/go.mod h1:9q5Tg+q+YvRjC3VG0gfMFut46dhbhtAnvUEp4lPjc6c=
-github.com/gokrazy/internal v0.0.0-20250126213949-423a5b587b57 h1:f5bEvO4we3fbfiBkECrrUgWQ8OH6J3SdB2Dwxid/Yx4=
-github.com/gokrazy/internal v0.0.0-20250126213949-423a5b587b57/go.mod h1:SJG1KwuJQXFEoBgryaNCkMbdISyovDgZd0xmXJRZmiw=
+github.com/gokrazy/gokapi v0.0.0-20250222071133-506fdb322775 h1:f5+2UMRRbr3+e/gdWCBNn48chS/KMMljfbmlSSHfRBA=
+github.com/gokrazy/gokapi v0.0.0-20250222071133-506fdb322775/go.mod h1:q9mIV8al0wqmqFXJhKiO3SOHkL9/7Q4kIMynqUQWhgU=
+github.com/gokrazy/gokrazy v0.0.0-20250222061409-bd0bb5f1d0b5 h1:VQhDGxRliP4ZTQ8+33v4VKtOpX4VzN8pA4zBMZQSSxs=
+github.com/gokrazy/gokrazy v0.0.0-20250222061409-bd0bb5f1d0b5/go.mod h1:6fAh0J7aH6o5HWSiwN6uxNlm6Rjx1BxeNMWyNBQZ6sI=
+github.com/gokrazy/internal v0.0.0-20251208203110-3c1aa9087c82 h1:4ghNfD9NaZLpFrqQiBF6mPVFeMYXJSky38ubVA4ic2E=
+github.com/gokrazy/internal v0.0.0-20251208203110-3c1aa9087c82/go.mod h1:dQY4EMkD4L5ZjYJ0SPtpgYbV7MIUMCxNIXiOfnZ6jP4=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg=
@@ -31,18 +33,20 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
+golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
+golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
+golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
+golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
--- a/ssh.go
+++ b/ssh.go
@@ -242,6 +242,9 @@ func (s *session) request(ctx context.Context, req *ssh.Request) error {
 		if err := ssh.Unmarshal(req.Payload, &r); err != nil {
 			return err
 		}
+		if r.TERM != "" {
+			s.env = append(s.env, fmt.Sprintf("TERM=%s", r.TERM))
+		}

 		var err error
 		s.ptyf, s.ttyf, err = pty.Open()
Author	SHA1	Message	Date
Timmy Welch	1e30fc3ba8	Fix TERM not being set when a tty is requested Some checks failed Push / CI (push) Has been cancelled Details	2025-12-28 13:11:46 -08:00
Michael Stapelberg	3d571d9ebb	cmd/breakglass: fallback to HTTP instead of detecting stripping This follows gokrazy/tools commit `ba6a8936f4`	2025-12-09 17:22:34 +01:00
Michael Stapelberg	e8f40f784b	cmd/breakglass: use updateflag.Value, add own -insecure flag related to https://github.com/gokrazy/tools/pull/68	2025-12-05 17:50:59 +01:00
Michael Stapelberg	e4167a5b08	cmd/breakglass: remove old -gokrazy_url and -tls flags These have been deprecated for years. All users should have switched to the instance-centric config by now. related to https://github.com/gokrazy/tools/pull/68	2025-12-05 17:34:49 +01:00
dependabot[bot]	596b54e033	Bump golang.org/x/crypto from 0.35.0 to 0.45.0 (#26 ) Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.35.0 to 0.45.0. - [Commits](https://github.com/golang/crypto/compare/v0.35.0...v0.45.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-version: 0.45.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-11-20 07:37:04 +01:00
Mark Drayton	02513c1dab	README: fix -debug_tarball_pattern name mismatch (#25 )	2025-08-24 09:03:20 +02:00
dependabot[bot]	ac3ee429ce	Bump golang.org/x/oauth2 from 0.23.0 to 0.27.0 (#24 ) Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.23.0 to 0.27.0. - [Commits](https://github.com/golang/oauth2/compare/v0.23.0...v0.27.0) --- updated-dependencies: - dependency-name: golang.org/x/oauth2 dependency-version: 0.27.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-07-19 10:26:34 +02:00
dependabot[bot]	c0fb5a7864	Bump golang.org/x/crypto from 0.33.0 to 0.35.0 (#23 ) Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.33.0 to 0.35.0. - [Commits](https://github.com/golang/crypto/compare/v0.33.0...v0.35.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-version: 0.35.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-04-15 08:47:08 +02:00
Michael Stapelberg	adb5ce3ea1	use gokapi package to query build timestamp	2025-02-22 08:12:43 +01:00
Michael Stapelberg	62e5a663a8	GitHub Actions: update to latest versions of actions	2025-02-22 07:23:07 +01:00
Tim H	8965ef43ba	Get buildTimestamp via a request to Unix socket (#22 ) Fixes https://github.com/gokrazy/breakglass/issues/21	2025-02-22 07:20:22 +01:00
Michael Stapelberg	5f675f1989	pull in latest gokrazy package	2025-02-22 07:18:42 +01:00
Michael Stapelberg	a233c4f4d4	go.mod: bump language version to 1.24	2025-02-22 07:18:24 +01:00