Unverified Commit c555d2ea authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

Merge pull request #318832 from adamcstephens/headscale/trim-secret 

headscale: backport trim of oidc secret path
parents c9271ba1 b54cb6cd

pkgs/servers/headscale/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,11 @@ buildGoModule rec { 


  vendorHash = "sha256-IOkbbFtE6+tNKnglE/8ZuNxhPSnloqM2sLgTvagMmnc=";



  patches = [

    # backport of https://github.com/juanfont/headscale/pull/1697

    ./trim-oidc-secret-path.patch

  ];



  ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"];



  nativeBuildInputs = [installShellFiles];

pkgs/servers/headscale/trim-oidc-secret-path.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/hscontrol/config.go b/hscontrol/config.go

index 0e83a1c..71fbfb0 100644

--- a/hscontrol/config.go

+++ b/hscontrol/config.go

@@ -573,7 +573,7 @@ func GetHeadscaleConfig() (*Config, error) {

 		if err != nil {

 			return nil, err

 		}

-		oidcClientSecret = string(secretBytes)

+		oidcClientSecret = strings.TrimSpace(string(secretBytes))

 	}

 

 	return &Config{