From 0ff33cbbc473598db7514232a06294063ecbbc45 Mon Sep 17 00:00:00 2001 From: Geno Roupsky <185580+groupsky@users.noreply.github.com> Date: Sun, 15 Nov 2026 03:04:22 +0200 Subject: [PATCH 1/2] chore(deps): bump go.opentelemetry.io/otel/trace from 1.44.0 to 1.47.0 --- go.mod | 9 +++++---- go.sum | 30 ++++++++++++++---------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index 28ebfbd..6b8c63d 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/dylibso/observe-sdk/go v0.0.0-20240828172851-9145d8ad07e1 // indirect github.com/extism/go-sdk v1.7.1 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect - github.com/go-logr/logr v1.4.3 // indirect + github.com/go-logr/logr v1.4.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/google/s2a-go v0.1.9 // indirect @@ -47,9 +47,10 @@ require ( go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect - go.opentelemetry.io/otel v1.44.0 // indirect - go.opentelemetry.io/otel/metric v1.44.0 // indirect - go.opentelemetry.io/otel/trace v1.44.0 // indirect + go.opentelemetry.io/otel v1.47.0 // indirect + go.opentelemetry.io/otel/log v1.47.0 // indirect + go.opentelemetry.io/otel/metric v1.47.0 // indirect + go.opentelemetry.io/otel/trace v1.47.0 // indirect go.opentelemetry.io/proto/otlp v1.9.0 // indirect golang.org/x/oauth2 v0.36.0 // indirect golang.org/x/sync v0.24.0 // indirect diff --git a/go.sum b/go.sum index ddb3f95..c6220d9 100644 --- a/go.sum +++ b/go.sum @@ -41,8 +41,6 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2 h1:aBangftG7EVZoUb69Os8IaYg++6uMOdKK83QtkkvJik= github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2/go.mod h1:qwXFYgsP6T7XnJtbKlf1HP8AjxZZyzxMmc+Lq5GjlU4= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dylibso/observe-sdk/go v0.0.0-20240828172851-9145d8ad07e1 h1:idfl8M8rPW93NehFw5H1qqH8yG158t5POr+LX9avbJY= github.com/dylibso/observe-sdk/go v0.0.0-20240828172851-9145d8ad07e1/go.mod h1:C8DzXehI4zAbrdlbtOByKX6pfivJTBiV9Jjqv56Yd9Q= github.com/envoyproxy/go-control-plane v0.14.0 h1:hbG2kr4RuFj222B6+7T83thSPqLjwBIfQawTkC++2HA= @@ -55,8 +53,8 @@ github.com/extism/go-sdk v1.7.1/go.mod h1:IT+Xdg5AZM9hVtpFUA+uZCJMge/hbvshl8bwzL github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-resty/resty/v2 v2.17.2 h1:FQW5oHYcIlkCNrMD2lloGScxcHJ0gkjshV3qcQAyHQk= @@ -85,13 +83,11 @@ github.com/infisical/go-sdk v0.9.1/go.mod h1:4Xh9Mj2/8wPmYuyNDbg8oJFajNFBTcrgITB github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= -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/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc= github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc= -github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= -github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= +github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE= +github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg= github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834 h1:ZF+QBjOI+tILZjBaFj3HgFonKXUcwgJ4djLb6i42S3Q= github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834/go.mod h1:m9ymHTgNSEjuxvw8E7WWe4Pl4hZQHXONY8wE6dMLaRk= github.com/tetratelabs/wazero v1.11.0 h1:+gKemEuKCTevU4d7ZTzlsvgd1uaToIDtlQlmNbwqYhA= @@ -103,18 +99,22 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.6 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0/go.mod h1:snMWehoOh2wsEwnvvwtDyFCxVeDAODenXHtn5vzrKjo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q= -go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU= -go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc= -go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc= -go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo= +go.opentelemetry.io/otel v1.47.0 h1:j7ALJ/zgkS7Z6aeJW09p8VC9804bC+PpeTfCD4XPnOM= +go.opentelemetry.io/otel v1.47.0/go.mod h1:8wS9O2qfXrYrzp6hIF/HOYJJf/wIhFPhR2xLuP+iXQU= +go.opentelemetry.io/otel/log v1.47.0 h1:cOTS1CcLbSQeZKanGJ+0JpF/+t4PELi3O3bbl2lqCcI= +go.opentelemetry.io/otel/log v1.47.0/go.mod h1:9byitSQ5pLC6PpqwGXjqdMKya6ZTswHRZh2vvXT33nw= +go.opentelemetry.io/otel/metric v1.47.0 h1:4PptaldXx3Eat1XjMZ68pPJEs5wrhlemctZE9a3UdWY= +go.opentelemetry.io/otel/metric v1.47.0/go.mod h1:ADGSXxRrXM6bjbvLo535EstVFlPpPYZm4LBKixjDHwU= go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58= go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0= go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= -go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk= -go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE= +go.opentelemetry.io/otel/trace v1.47.0 h1:JOjX/Oci8K94QHddo+bbfya/Ai/nf6/dt9ZfrFNWSrM= +go.opentelemetry.io/otel/trace v1.47.0/go.mod h1:jNaSLa2PZEYFG6fRjJABAu+bw4FS08uDmPg28lTghu0= go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A= go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= @@ -170,5 +170,3 @@ google.golang.org/grpc v1.83.2 h1:EManeRomTObA0BU7I8vXgg/78uE5MJ9M8B39EX2WscU= google.golang.org/grpc v1.83.2/go.mod h1:YPI1hK3kDked6iHvgX3tR0y+nX/qpMFKhPgFsokw1S8= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 4808e660d0fb638754c60a7083852e1f70280a77 Mon Sep 17 00:00:00 2001 From: Geno Roupsky <185580+groupsky@users.noreply.github.com> Date: Sun, 15 Nov 2026 03:04:22 +0200 Subject: [PATCH 2/2] test: enable the DH key exchanges in the test sshd OpenSSH 10 sshd (ubuntu-26.04 runners) no longer offers diffie-hellman-group16-sha512 and diffie-hellman-group-exchange-sha256 by default, so TestSSHDMatrix could not negotiate them. --- internal/sshauth/sshd_test.go | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/internal/sshauth/sshd_test.go b/internal/sshauth/sshd_test.go index 5cda2e2..98779d7 100644 --- a/internal/sshauth/sshd_test.go +++ b/internal/sshauth/sshd_test.go @@ -21,22 +21,25 @@ func TestSSHDMatrix(t *testing.T) { user keyKind host keyKind sshOpts []string - sidLen int // the length of the session identifier; 0 = any - algorithm string // the user signature algorithm; "" = the key type + sshdOpts []string // sshd_config lines, for a key exchange that sshd does not offer by default + sidLen int // the length of the session identifier; 0 = any + algorithm string // the user signature algorithm; "" = the key type }{ - {"ed25519 user, ed25519 host, default kex", ed25519Kind, ed25519Kind, nil, 0, ""}, - {"ecdsa256 user, ecdsa256 host", ecdsa256, ecdsa256, nil, 0, ""}, - {"ecdsa384 user, ecdsa384 host", ecdsa384, ecdsa384, nil, 0, ""}, - {"ecdsa521 user, ecdsa521 host", ecdsa521, ecdsa521, nil, 0, ""}, - {"rsa user sha512, rsa host sha512", rsaKind, rsaKind, []string{"HostKeyAlgorithms=rsa-sha2-512"}, 0, ssh.KeyAlgoRSASHA512}, + {"ed25519 user, ed25519 host, default kex", ed25519Kind, ed25519Kind, nil, nil, 0, ""}, + {"ecdsa256 user, ecdsa256 host", ecdsa256, ecdsa256, nil, nil, 0, ""}, + {"ecdsa384 user, ecdsa384 host", ecdsa384, ecdsa384, nil, nil, 0, ""}, + {"ecdsa521 user, ecdsa521 host", ecdsa521, ecdsa521, nil, nil, 0, ""}, + {"rsa user sha512, rsa host sha512", rsaKind, rsaKind, []string{"HostKeyAlgorithms=rsa-sha2-512"}, nil, 0, ssh.KeyAlgoRSASHA512}, {"rsa user sha256, rsa host sha256", rsaKind, rsaKind, - []string{"HostKeyAlgorithms=rsa-sha2-256", "PubkeyAcceptedAlgorithms=rsa-sha2-256"}, 0, ssh.KeyAlgoRSASHA256}, - {"kex curve25519-sha256 (32)", ed25519Kind, ed25519Kind, []string{"KexAlgorithms=curve25519-sha256"}, 32, ""}, - {"kex ecdh-sha2-nistp384 (48)", ed25519Kind, ecdsa384, []string{"KexAlgorithms=ecdh-sha2-nistp384"}, 48, ""}, - {"kex ecdh-sha2-nistp521 (64)", ed25519Kind, ed25519Kind, []string{"KexAlgorithms=ecdh-sha2-nistp521"}, 64, ""}, - {"kex sntrup761x25519-sha512 (64)", ed25519Kind, ed25519Kind, []string{"KexAlgorithms=sntrup761x25519-sha512@openssh.com"}, 64, ""}, - {"kex group16-sha512 (64)", rsaKind, rsaKind, []string{"KexAlgorithms=diffie-hellman-group16-sha512"}, 64, ssh.KeyAlgoRSASHA512}, - {"kex group-exchange-sha256 (32)", ed25519Kind, ed25519Kind, []string{"KexAlgorithms=diffie-hellman-group-exchange-sha256"}, 32, ""}, + []string{"HostKeyAlgorithms=rsa-sha2-256", "PubkeyAcceptedAlgorithms=rsa-sha2-256"}, nil, 0, ssh.KeyAlgoRSASHA256}, + {"kex curve25519-sha256 (32)", ed25519Kind, ed25519Kind, []string{"KexAlgorithms=curve25519-sha256"}, nil, 32, ""}, + {"kex ecdh-sha2-nistp384 (48)", ed25519Kind, ecdsa384, []string{"KexAlgorithms=ecdh-sha2-nistp384"}, nil, 48, ""}, + {"kex ecdh-sha2-nistp521 (64)", ed25519Kind, ed25519Kind, []string{"KexAlgorithms=ecdh-sha2-nistp521"}, nil, 64, ""}, + {"kex sntrup761x25519-sha512 (64)", ed25519Kind, ed25519Kind, []string{"KexAlgorithms=sntrup761x25519-sha512@openssh.com"}, nil, 64, ""}, + {"kex group16-sha512 (64)", rsaKind, rsaKind, []string{"KexAlgorithms=diffie-hellman-group16-sha512"}, + []string{"KexAlgorithms +diffie-hellman-group16-sha512"}, 64, ssh.KeyAlgoRSASHA512}, + {"kex group-exchange-sha256 (32)", ed25519Kind, ed25519Kind, []string{"KexAlgorithms=diffie-hellman-group-exchange-sha256"}, + []string{"KexAlgorithms +diffie-hellman-group-exchange-sha256"}, 32, ""}, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { @@ -44,7 +47,7 @@ func TestSSHDMatrix(t *testing.T) { key := newKey(t, "deploy", tt.user, 0) host := hostSigner(t, tt.host, 1) hosts := knownHosts(t, map[string]ssh.PublicKey{"web-1": host.PublicKey()}) - addr := startSSHD(t, sshdPath, dir, tt.host, key.PublicKey()) + addr := startSSHD(t, sshdPath, dir, tt.host, key.PublicKey(), tt.sshdOpts...) a := startTestAgent(t, key, hosts, dir) out, err := runSSH(t, sshPath, a.socket, addr, name, host.PublicKey(), dir, tt.sshOpts...) reqs, logins, errs := a.results()