mirror of
https://github.com/juanfont/headscale.git
synced 2024-11-21 15:05:23 +00:00
218138afee
expand user, add claims to user This commit expands the user table with additional fields that can be retrieved from OIDC providers (and other places) and uses this data in various tailscale response objects if it is available. This is the beginning of implementing https://docs.google.com/document/d/1X85PMxIaVWDF6T_UPji3OeeUqVBcGj_uHRM5CI-AwlY/edit trying to make OIDC more coherant and maintainable in addition to giving the user a better experience and integration with a provider. remove usernames in magic dns, normalisation of emails this commit removes the option to have usernames as part of MagicDNS domains and headscale will now align with Tailscale, where there is a root domain, and the machine name. In addition, the various normalisation functions for dns names has been made lighter not caring about username and special character that wont occur. Email are no longer normalised as part of the policy processing. untagle oidc and regcache, use typed cache This commits stops reusing the registration cache for oidc purposes and switches the cache to be types and not use any allowing the removal of a bunch of casting. try to make reauth/register branches clearer in oidc Currently there was a function that did a bunch of stuff, finding the machine key, trying to find the node, reauthing the node, returning some status, and it was called validate which was very confusing. This commit tries to split this into what to do if the node exists, if it needs to register etc. Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
198 lines
5.5 KiB
Nix
198 lines
5.5 KiB
Nix
{
|
|
description = "headscale - Open Source Tailscale Control server";
|
|
|
|
inputs = {
|
|
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
|
flake-utils.url = "github:numtide/flake-utils";
|
|
};
|
|
|
|
outputs = {
|
|
self,
|
|
nixpkgs,
|
|
flake-utils,
|
|
...
|
|
}: let
|
|
headscaleVersion =
|
|
if (self ? shortRev)
|
|
then self.shortRev
|
|
else "dev";
|
|
in
|
|
{
|
|
overlay = _: prev: let
|
|
pkgs = nixpkgs.legacyPackages.${prev.system};
|
|
buildGo = pkgs.buildGo123Module;
|
|
in rec {
|
|
headscale = buildGo rec {
|
|
pname = "headscale";
|
|
version = headscaleVersion;
|
|
src = pkgs.lib.cleanSource self;
|
|
|
|
# Only run unit tests when testing a build
|
|
checkFlags = ["-short"];
|
|
|
|
# When updating go.mod or go.sum, a new sha will need to be calculated,
|
|
# update this if you have a mismatch after doing a change to thos files.
|
|
vendorHash = "sha256-SDJSFji6498WI9bJLmY62VGt21TtD2GxrxRAWyYyr0c=";
|
|
|
|
subPackages = ["cmd/headscale"];
|
|
|
|
ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"];
|
|
};
|
|
|
|
protoc-gen-grpc-gateway = buildGo rec {
|
|
pname = "grpc-gateway";
|
|
version = "2.22.0";
|
|
|
|
src = pkgs.fetchFromGitHub {
|
|
owner = "grpc-ecosystem";
|
|
repo = "grpc-gateway";
|
|
rev = "v${version}";
|
|
sha256 = "sha256-I1w3gfV06J8xG1xJ+XuMIGkV2/Ofszo7SCC+z4Xb6l4=";
|
|
};
|
|
|
|
vendorHash = "sha256-S4hcD5/BSGxM2qdJHMxOkxsJ5+Ks6m4lKHSS9+yZ17c=";
|
|
|
|
nativeBuildInputs = [pkgs.installShellFiles];
|
|
|
|
subPackages = ["protoc-gen-grpc-gateway" "protoc-gen-openapiv2"];
|
|
};
|
|
|
|
# Upstream does not override buildGoModule properly,
|
|
# importing a specific module, so comment out for now.
|
|
# golangci-lint = prev.golangci-lint.override {
|
|
# buildGoModule = buildGo;
|
|
# };
|
|
|
|
goreleaser = prev.goreleaser.override {
|
|
buildGoModule = buildGo;
|
|
};
|
|
|
|
gotestsum = prev.gotestsum.override {
|
|
buildGoModule = buildGo;
|
|
};
|
|
|
|
gotests = prev.gotests.override {
|
|
buildGoModule = buildGo;
|
|
};
|
|
|
|
gofumpt = prev.gofumpt.override {
|
|
buildGoModule = buildGo;
|
|
};
|
|
};
|
|
}
|
|
// flake-utils.lib.eachDefaultSystem
|
|
(system: let
|
|
pkgs = import nixpkgs {
|
|
overlays = [self.overlay];
|
|
inherit system;
|
|
};
|
|
buildDeps = with pkgs; [git go_1_23 gnumake];
|
|
devDeps = with pkgs;
|
|
buildDeps
|
|
++ [
|
|
golangci-lint
|
|
golines
|
|
nodePackages.prettier
|
|
goreleaser
|
|
nfpm
|
|
gotestsum
|
|
gotests
|
|
gofumpt
|
|
ksh
|
|
ko
|
|
yq-go
|
|
ripgrep
|
|
|
|
# 'dot' is needed for pprof graphs
|
|
# go tool pprof -http=: <source>
|
|
graphviz
|
|
|
|
# Protobuf dependencies
|
|
protobuf
|
|
protoc-gen-go
|
|
protoc-gen-go-grpc
|
|
protoc-gen-grpc-gateway
|
|
buf
|
|
clang-tools # clang-format
|
|
];
|
|
|
|
# Add entry to build a docker image with headscale
|
|
# caveat: only works on Linux
|
|
#
|
|
# Usage:
|
|
# nix build .#headscale-docker
|
|
# docker load < result
|
|
headscale-docker = pkgs.dockerTools.buildLayeredImage {
|
|
name = "headscale";
|
|
tag = headscaleVersion;
|
|
contents = [pkgs.headscale];
|
|
config.Entrypoint = [(pkgs.headscale + "/bin/headscale")];
|
|
};
|
|
in rec {
|
|
# `nix develop`
|
|
devShell = pkgs.mkShell {
|
|
buildInputs =
|
|
devDeps
|
|
++ [
|
|
(pkgs.writeShellScriptBin
|
|
"nix-vendor-sri"
|
|
''
|
|
set -eu
|
|
|
|
OUT=$(mktemp -d -t nar-hash-XXXXXX)
|
|
rm -rf "$OUT"
|
|
|
|
go mod vendor -o "$OUT"
|
|
go run tailscale.com/cmd/nardump --sri "$OUT"
|
|
rm -rf "$OUT"
|
|
'')
|
|
|
|
(pkgs.writeShellScriptBin
|
|
"go-mod-update-all"
|
|
''
|
|
cat go.mod | ${pkgs.silver-searcher}/bin/ag "\t" | ${pkgs.silver-searcher}/bin/ag -v indirect | ${pkgs.gawk}/bin/awk '{print $1}' | ${pkgs.findutils}/bin/xargs go get -u
|
|
go mod tidy
|
|
'')
|
|
];
|
|
|
|
shellHook = ''
|
|
export PATH="$PWD/result/bin:$PATH"
|
|
'';
|
|
};
|
|
|
|
# `nix build`
|
|
packages = with pkgs; {
|
|
inherit headscale;
|
|
inherit headscale-docker;
|
|
};
|
|
defaultPackage = pkgs.headscale;
|
|
|
|
# `nix run`
|
|
apps.headscale = flake-utils.lib.mkApp {
|
|
drv = packages.headscale;
|
|
};
|
|
apps.default = apps.headscale;
|
|
|
|
checks = {
|
|
format =
|
|
pkgs.runCommand "check-format"
|
|
{
|
|
buildInputs = with pkgs; [
|
|
gnumake
|
|
nixpkgs-fmt
|
|
golangci-lint
|
|
nodePackages.prettier
|
|
golines
|
|
clang-tools
|
|
];
|
|
} ''
|
|
${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt ${./.}
|
|
${pkgs.golangci-lint}/bin/golangci-lint run --fix --timeout 10m
|
|
${pkgs.nodePackages.prettier}/bin/prettier --write '**/**.{ts,js,md,yaml,yml,sass,css,scss,html}'
|
|
${pkgs.golines}/bin/golines --max-len=88 --base-formatter=gofumpt -w ${./.}
|
|
${pkgs.clang-tools}/bin/clang-format -style="{BasedOnStyle: Google, IndentWidth: 4, AlignConsecutiveDeclarations: true, AlignConsecutiveAssignments: true, ColumnLimit: 0}" -i ${./.}
|
|
'';
|
|
};
|
|
});
|
|
}
|