Skip to content

Update to headscale v0.26.1 #604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Update to headscale v0.26.1 #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
70d2ff3
Update to headscale v0.24.1
majst01 Jan 24, 2025
6ec1cd1
Merge master
majst01 Feb 19, 2025
8426320
Merge branch 'master' of https://github.com/metal-stack/metal-api int…
majst01 Mar 13, 2025
ce9fea1
Update to v0.25.1
majst01 Mar 13, 2025
562d4ba
Merge master
majst01 Jun 26, 2025
184d2f9
Update to headscale v0.26.1
majst01 Jun 26, 2025
a60e067
Prepare for headscale acls
majst01 Jun 26, 2025
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
67 changes: 67 additions & 0 deletions cmd/metal-api/internal/headscale/acl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package headscale_test

import (
"encoding/json"
"testing"

policyv2 "github.com/juanfont/headscale/hscontrol/policy/v2"
"github.com/metal-stack/metal-lib/pkg/pointer"
"github.com/stretchr/testify/require"
"tailscale.com/tailcfg"
)

func TestACLs(t *testing.T) {
defaultACLs := []policyv2.ACL{
{
Action: "accept",
Sources: policyv2.Aliases{
pointer.Pointer(policyv2.AutoGroupMember),
},
Destinations: []policyv2.AliasWithPorts{
{
Alias: pointer.Pointer(policyv2.AutoGroupSelf),
Ports: []tailcfg.PortRange{tailcfg.PortRangeAny},
},
},
},
}

policy := policyv2.Policy{
ACLs: defaultACLs,
}

aclBytes, err := json.Marshal(policy)
require.NoError(t, err)
require.JSONEq(t, `
{
"groups": null,
"hosts": null,
"tagOwners": null,
"acls": [
{
"action": "accept",
"proto": "",
"src": [
"autogroup:member"
],
"dst": [
{
"Alias": "autogroup:self",
"Ports": [
{
"First": 0,
"Last": 65535
}
]
}
]
}
],
"autoApprovers": {
"routes": null,
"exitNode": null
},
"ssh": null
}
`, string(aclBytes))
}
29 changes: 25 additions & 4 deletions cmd/metal-api/internal/headscale/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"time"

headscalev1 "github.com/juanfont/headscale/gen/go/headscale/v1"

"github.com/juanfont/headscale/hscontrol/db"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
Expand All @@ -24,6 +25,7 @@ type HeadscaleClient struct {
logger *slog.Logger
}


func NewHeadscaleClient(addr, controlPlaneAddr, apiKey string, logger *slog.Logger) (client *HeadscaleClient, err error) {
if addr != "" || apiKey != "" {
if addr == "" {
Expand Down Expand Up @@ -74,14 +76,21 @@ func (h *HeadscaleClient) GetControlPlaneAddress() string {
}

func (h *HeadscaleClient) UserExists(ctx context.Context, name string) bool {
req := &headscalev1.GetUserRequest{
req := &headscalev1.ListUsersRequest{
Name: name,
}
if _, err := h.client.GetUser(ctx, req); err != nil {
resp, err := h.client.ListUsers(ctx, req)
if err != nil {
return false
}
// Should only return one user.
for _, user := range resp.Users {
if user.Name == name {
return true
}
}

return true
return false
}

func (h *HeadscaleClient) CreateUser(ctx context.Context, name string) error {
Expand All @@ -98,8 +107,20 @@ func (h *HeadscaleClient) CreateUser(ctx context.Context, name string) error {
}

func (h *HeadscaleClient) CreatePreAuthKey(ctx context.Context, user string, expiration time.Time, isEphemeral bool) (key string, err error) {

userResp, err := h.client.ListUsers(ctx, &headscalev1.ListUsersRequest{
Name: user,
})
if err != nil {
return "", fmt.Errorf("unable to fetch vpn user with id:%s error:%w", user, err)
}
if len(userResp.GetUsers()) != 1 {
return "", fmt.Errorf("unable to fetch single vpn user with id:%s, got:%d", user, len(userResp.GetUsers()))
}
headscaleUser := userResp.GetUsers()[0]

req := &headscalev1.CreatePreAuthKeyRequest{
User: user,
User: headscaleUser.GetId(),
Expiration: timestamppb.New(expiration),
Ephemeral: isEphemeral,
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/metal-api/internal/service/audit-service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func (r *auditResource) find(request *restful.Request, response *restful.Respons
ForwardedFor: requestPayload.ForwardedFor,
RemoteAddr: requestPayload.RemoteAddr,
Body: requestPayload.Body,
StatusCode: requestPayload.StatusCode,
StatusCode: &requestPayload.StatusCode,
Error: requestPayload.Error,
})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/metal-api/internal/service/v1/audit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ type AuditResponse struct {
RemoteAddr string `json:"remote_addr" optional:"true"`

Body string `json:"body" optional:"true"`
StatusCode int `json:"status_code" optional:"true"`
StatusCode *int `json:"status_code" optional:"true"`

// Internal errors
Error string `json:"error" optional:"true"`
Expand Down
115 changes: 59 additions & 56 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/metal-stack/metal-api

go 1.24
go 1.24.0

toolchain go1.24.4

require (
connectrpc.com/connect v1.18.1
Expand All @@ -13,43 +15,47 @@ require (
github.com/go-openapi/spec v0.21.0
github.com/google/go-cmp v0.7.0
github.com/google/uuid v1.6.0
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2
github.com/juanfont/headscale v0.23.0
github.com/juanfont/headscale v0.26.1
github.com/klauspost/connect-compress/v2 v2.0.0
github.com/looplab/fsm v1.0.2
github.com/metal-stack/go-ipam v1.14.11
github.com/metal-stack/go-ipam v1.14.12
github.com/metal-stack/masterdata-api v0.11.11
github.com/metal-stack/metal-lib v0.21.0
github.com/metal-stack/metal-lib v0.23.0
github.com/metal-stack/security v0.9.4
github.com/metal-stack/v v1.0.3
github.com/nsqio/go-nsq v1.1.0
github.com/prometheus/client_golang v1.22.0
github.com/samber/lo v1.50.0
github.com/samber/lo v1.51.0
github.com/spf13/cobra v1.9.1
github.com/spf13/viper v1.20.1
github.com/stretchr/testify v1.10.0
github.com/testcontainers/testcontainers-go v0.37.0
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
golang.org/x/crypto v0.38.0
golang.org/x/sync v0.14.0
google.golang.org/grpc v1.72.1
golang.org/x/crypto v0.39.0
golang.org/x/sync v0.15.0
google.golang.org/grpc v1.73.0
google.golang.org/protobuf v1.36.6
gopkg.in/rethinkdb/rethinkdb-go.v6 v6.2.2
tailscale.com v1.84.2
)

// Newer versions do not export base entities which are used to composite other entities.
// This breaks metalctl and friends
replace github.com/emicklei/go-restful-openapi/v2 => github.com/emicklei/go-restful-openapi/v2 v2.9.1

require (
dario.cat/mergo v1.0.1 // indirect
dario.cat/mergo v1.0.2 // indirect
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/containerd/errdefs v1.0.0 // indirect
github.com/containerd/errdefs/pkg v0.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/coreos/go-oidc/v3 v3.14.1 // indirect
Expand All @@ -60,40 +66,40 @@ require (
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/docker v28.1.1+incompatible // indirect
github.com/docker/docker v28.3.0+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/ebitengine/purego v0.8.2 // indirect
github.com/ebitengine/purego v0.8.4 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/glebarez/go-sqlite v1.22.0 // indirect
github.com/glebarez/sqlite v1.11.0 // indirect
github.com/go-gormigrate/gormigrate/v2 v2.1.3 // indirect
github.com/go-gormigrate/gormigrate/v2 v2.1.4 // indirect
github.com/go-jose/go-jose/v4 v4.1.0 // indirect
github.com/go-json-experiment/json v0.0.0-20250213060926-925ba3f173fa // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-json-experiment/json v0.0.0-20250625182306-a9cfae7f3654 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-openapi/errors v0.22.1 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonpointer v0.21.1 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/runtime v0.28.0 // indirect
github.com/go-openapi/strfmt v0.23.0 // indirect
github.com/go-openapi/swag v0.23.1 // indirect
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
github.com/goccy/go-json v0.10.5 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v1.0.0 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/icza/dyno v0.0.0-20230330125955-09f820a8d9c0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
github.com/jackc/pgx/v5 v5.7.2 // indirect
github.com/jackc/pgx/v5 v5.7.5 // indirect
github.com/jackc/puddle/v2 v2.2.2 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
Expand All @@ -102,11 +108,11 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.18.0 // indirect
github.com/lestrrat-go/blackmagic v1.0.3 // indirect
github.com/lestrrat-go/blackmagic v1.0.4 // indirect
github.com/lestrrat-go/httpcc v1.0.1 // indirect
github.com/lestrrat-go/httprc v1.0.6 // indirect
github.com/lestrrat-go/iter v1.0.2 // indirect
github.com/lestrrat-go/jwx/v2 v2.1.5 // indirect
github.com/lestrrat-go/jwx/v2 v2.1.6 // indirect
github.com/lestrrat-go/option v1.0.1 // indirect
github.com/lib/pq v1.10.9 // indirect
github.com/lopezator/migrator v0.3.1 // indirect
Expand All @@ -119,7 +125,6 @@ require (
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/go-archive v0.1.0 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/sys/atomicwriter v0.1.0 // indirect
github.com/moby/sys/sequential v0.6.0 // indirect
github.com/moby/sys/user v0.4.0 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
Expand All @@ -134,65 +139,63 @@ require (
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.63.0 // indirect
github.com/prometheus/procfs v0.16.0 // indirect
github.com/puzpuzpuz/xsync/v3 v3.5.0 // indirect
github.com/redis/go-redis/v9 v9.7.3 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.65.0 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/redis/go-redis/v9 v9.11.0 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/rs/zerolog v1.33.0 // indirect
github.com/sagikazarmark/locafero v0.8.0 // indirect
github.com/rs/zerolog v1.34.0 // indirect
github.com/sagikazarmark/locafero v0.9.0 // indirect
github.com/segmentio/asm v1.2.0 // indirect
github.com/shirou/gopsutil/v4 v4.25.3 // indirect
github.com/shirou/gopsutil/v4 v4.25.5 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.14.0 // indirect
github.com/spf13/cast v1.7.1 // indirect
github.com/spf13/cast v1.9.2 // indirect
github.com/spf13/pflag v1.0.6 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a // indirect
github.com/tailscale/hujson v0.0.0-20250226034555-ec1d1c113d33 // indirect
github.com/tklauser/go-sysconf v0.3.15 // indirect
github.com/tklauser/numcpus v0.10.0 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
go.mongodb.org/mongo-driver v1.17.3 // indirect
go.etcd.io/etcd/api/v3 v3.6.1 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.6.1 // indirect
go.etcd.io/etcd/client/v3 v3.6.1 // indirect
go.mongodb.org/mongo-driver v1.17.4 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
go.opentelemetry.io/otel v1.37.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
go.opentelemetry.io/otel/metric v1.37.0 // indirect
go.opentelemetry.io/otel/trace v1.37.0
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
go4.org/mem v0.0.0-20240501181205-ae6ca9944745 // indirect
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
golang.org/x/net v0.40.0 // indirect
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b
golang.org/x/net v0.41.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/text v0.25.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250512202823-5a2f75b736a9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9 // indirect
golang.org/x/text v0.26.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
gopkg.in/cenkalti/backoff.v2 v2.2.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gorm.io/driver/postgres v1.5.9 // indirect
gorm.io/driver/postgres v1.5.11 // indirect
gorm.io/gorm v1.25.12 // indirect
modernc.org/libc v1.60.1 // indirect
modernc.org/mathutil v1.6.0 // indirect
modernc.org/memory v1.8.0 // indirect
modernc.org/sqlite v1.32.0 // indirect
tailscale.com v1.72.1 // indirect
modernc.org/libc v1.62.1 // indirect
modernc.org/mathutil v1.7.1 // indirect
modernc.org/memory v1.10.0 // indirect
modernc.org/sqlite v1.37.0 // indirect
zgo.at/zcache/v2 v2.1.0 // indirect
)
Loading