headscale: backport trim of oidc secret path
This is a backport of https://github.com/juanfont/headscale/pull/1697 which trims the oidc client_secret_path.
This commit is contained in:
parent
00b403bd95
commit
b54cb6cd11
@ -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];
|
||||
|
13
pkgs/servers/headscale/trim-oidc-secret-path.patch
Normal file
13
pkgs/servers/headscale/trim-oidc-secret-path.patch
Normal file
@ -0,0 +1,13 @@
|
||||
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{
|
Loading…
Reference in New Issue
Block a user