public/headscale
1
0 Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-10-27 00:36:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Handle trailing slash on uris

Browse Source 
Co-authored-by: Kristoffer Dalby <kradalby@kradalby.no>
This commit is contained in:
unrealityandKristoffer Dalby authored and GitHub committed 2021-10-08 15:26:31 +08:00
1 parent c487591437
commit 35795c79c3
2 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

api.go
+4 -4
View File
@@ -135,10 +135,10 @@ func (h *Headscale) RegistrationHandler(c *gin.Context) {
Msg("Not registered and not NodeKey rotation. Sending a authurl to register")
if h.cfg.OIDCIssuer != "" {
resp.AuthURL = fmt.Sprintf("%s/oidc/register/%s", h.cfg.ServerURL, mKey.HexString())
resp.AuthURL = fmt.Sprintf("%s/oidc/register/%s", strings.TrimSuffix(h.cfg.ServerURL, "/"), mKey.HexString())
} else {
resp.AuthURL = fmt.Sprintf("%s/register?key=%s",
h.cfg.ServerURL, mKey.HexString())
strings.TrimSuffix(h.cfg.ServerURL, "/"), mKey.HexString())
}
respBody, err := encode(resp, &mKey, h.privateKey)
if err != nil {
@@ -205,10 +205,10 @@ func (h *Headscale) RegistrationHandler(c *gin.Context) {
Str("machine", m.Name).
Msg("The node is sending us a new NodeKey, sending auth url")
if h.cfg.OIDCIssuer != "" {
resp.AuthURL = fmt.Sprintf("%s/oidc/register/%s", h.cfg.ServerURL, mKey.HexString())
resp.AuthURL = fmt.Sprintf("%s/oidc/register/%s", strings.TrimSuffix(h.cfg.ServerURL, "/"), mKey.HexString())
} else {
resp.AuthURL = fmt.Sprintf("%s/register?key=%s",
h.cfg.ServerURL, mKey.HexString())
strings.TrimSuffix(h.cfg.ServerURL, "/"), mKey.HexString())
}
respBody, err := encode(resp, &mKey, h.privateKey)
if err != nil {