From d56b409cb9aa14ed5f345502125b3535e8d51c42 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 Aug 2022 20:44:38 +0000
Subject: [PATCH 1/3] docs(README): update contributors
---
README.md | 70 ++++++++++++++++++++++++++++++++++---------------------
1 file changed, 43 insertions(+), 27 deletions(-)
diff --git a/README.md b/README.md
index 0cfed4dd..911fd2e4 100644
--- a/README.md
+++ b/README.md
@@ -232,13 +232,6 @@ make build
unreality
-
-
- 
-
- Moritz Poldrack
-
- |
@@ -246,8 +239,22 @@ make build
ohdearaugustin
|
+
+
+
+
+ Moritz Poldrack
+
+ |
+
+
+ 
+
+ GrigoriyMikhalkin
+
+ |
@@ -262,13 +269,6 @@ make build
Eugen Biegler
|
-
-
- 
-
- Aaron Bieber
-
- |
@@ -276,6 +276,13 @@ make build
Anton Schubert
|
+
+
+
+
+ Aaron Bieber
+
+ |
@@ -283,13 +290,6 @@ make build
Fernando De Lucchi
|
-
-
-
-
- GrigoriyMikhalkin
-
- |
|
@@ -496,6 +496,13 @@ make build
Pierre Carru
|
+
+
+ 
+
+ Rasmus Moorats
+
+ |
@@ -503,6 +510,8 @@ make build
rcursaru
|
+
+
@@ -510,8 +519,6 @@ make build
WhiteSource Renovate
|
-
-
@@ -526,6 +533,13 @@ make build
Shaanan Cohney
|
+
+
+ 
+
+ sophware
+
+ |
@@ -540,6 +554,8 @@ make build
Teteros
|
+
+
@@ -554,8 +570,6 @@ make build
Tianon Gravi
|
-
-
@@ -584,6 +598,8 @@ make build
Ziyuan Han
|
+
+
@@ -598,8 +614,6 @@ make build
henning mueller
|
-
-
@@ -628,6 +642,8 @@ make build
Wakeful-Cloud
|
+
+
From 5b14cafddd91bad3b0b9a5a454601f131b863d7e Mon Sep 17 00:00:00 2001
From: Juan Font Alonso
Date: Sun, 14 Aug 2022 12:04:31 +0200
Subject: [PATCH 2/3] Fixed another recurrence of MachineKey
---
api.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/api.go b/api.go
index 7e76b3e3..2c27ba8b 100644
--- a/api.go
+++ b/api.go
@@ -699,7 +699,7 @@ func (h *Headscale) handleMachineRegistrationNew(
resp.AuthURL = fmt.Sprintf(
"%s/oidc/register/%s",
strings.TrimSuffix(h.cfg.ServerURL, "/"),
- machineKey.String(),
+ NodePublicKeyStripPrefix(registerRequest.NodeKey),
)
} else {
resp.AuthURL = fmt.Sprintf("%s/register/%s",
From 90bb6ea907b74794dfdcf77edee3c7f23f6ea5de Mon Sep 17 00:00:00 2001
From: Juan Font Alonso
Date: Sun, 14 Aug 2022 12:10:20 +0200
Subject: [PATCH 3/3] Minor formatting changes
---
api.go | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/api.go b/api.go
index 2c27ba8b..2d55ccd3 100644
--- a/api.go
+++ b/api.go
@@ -603,10 +603,12 @@ func (h *Headscale) handleMachineExpired(
if h.cfg.OIDC.Issuer != "" {
resp.AuthURL = fmt.Sprintf("%s/oidc/register/%s",
- strings.TrimSuffix(h.cfg.ServerURL, "/"), NodePublicKeyStripPrefix(registerRequest.NodeKey))
+ strings.TrimSuffix(h.cfg.ServerURL, "/"),
+ NodePublicKeyStripPrefix(registerRequest.NodeKey))
} else {
resp.AuthURL = fmt.Sprintf("%s/register/%s",
- strings.TrimSuffix(h.cfg.ServerURL, "/"), NodePublicKeyStripPrefix(registerRequest.NodeKey))
+ strings.TrimSuffix(h.cfg.ServerURL, "/"),
+ NodePublicKeyStripPrefix(registerRequest.NodeKey))
}
respBody, err := encode(resp, &machineKey, h.privateKey)
@@ -703,7 +705,8 @@ func (h *Headscale) handleMachineRegistrationNew(
)
} else {
resp.AuthURL = fmt.Sprintf("%s/register/%s",
- strings.TrimSuffix(h.cfg.ServerURL, "/"), NodePublicKeyStripPrefix(registerRequest.NodeKey))
+ strings.TrimSuffix(h.cfg.ServerURL, "/"),
+ NodePublicKeyStripPrefix(registerRequest.NodeKey))
}
respBody, err := encode(resp, &machineKey, h.privateKey)
|