Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Note that multistage builds can leverage the tag applied (at build
# time) to this container

FROM --platform=linux/amd64 golang:1.25 AS golauncherbuild
FROM --platform=linux/amd64 golang:1.26 AS golauncherbuild
LABEL maintainer="engineering@kolide.co"

# fake data or not?
Expand Down
4 changes: 2 additions & 2 deletions ee/localserver/dt4a_auth_middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,8 @@ func (c *chain) validate(trustedKeys map[string]*ecdsa.PublicKey) error {
// make a copy of the root key so that we can reassign it
parentEcdsa := &ecdsa.PublicKey{
Curve: rootKey.Curve,
X: rootKey.X,
Y: rootKey.Y,
X: rootKey.X, //nolint:staticcheck
Y: rootKey.Y, //nolint:staticcheck
}

var currentPayload payload
Expand Down
4 changes: 2 additions & 2 deletions ee/localserver/dt4a_auth_middleware_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -470,8 +470,8 @@ func toJWK(key any, kid string) (*jwk, error) {
}

// Encode x and y coordinates using base64 URL encoding (unpadded).
xStr := base64.RawURLEncoding.EncodeToString(k.X.Bytes())
yStr := base64.RawURLEncoding.EncodeToString(k.Y.Bytes())
xStr := base64.RawURLEncoding.EncodeToString(k.X.Bytes()) //nolint:staticcheck
yStr := base64.RawURLEncoding.EncodeToString(k.Y.Bytes()) //nolint:staticcheck

return &jwk{
Curve: crv,
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,6 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)

go 1.25.9
go 1.26.2

replace github.com/go-ole/go-ole v1.3.0 => github.com/kolide/go-ole v0.0.0-20241008210444-65130153c767
Loading