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 0cfed4d..911fd2e 100644
--- a/README.md
+++ b/README.md
@@ -232,13 +232,6 @@ make build
<sub style="font-size:14px"><b>unreality</b></sub>
</a>
</td>
- <td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
- <a href=https://github.com/mpldr>
- <img src=https://avatars.githubusercontent.com/u/33086936?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=Moritz Poldrack/>
- <br />
- <sub style="font-size:14px"><b>Moritz Poldrack</b></sub>
- </a>
- </td>
<td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
<a href=https://github.com/ohdearaugustin>
<img src=https://avatars.githubusercontent.com/u/14001491?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=ohdearaugustin/>
@@ -246,8 +239,22 @@ make build
<sub style="font-size:14px"><b>ohdearaugustin</b></sub>
</a>
</td>
+ <td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
+ <a href=https://github.com/mpldr>
+ <img src=https://avatars.githubusercontent.com/u/33086936?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=Moritz Poldrack/>
+ <br />
+ <sub style="font-size:14px"><b>Moritz Poldrack</b></sub>
+ </a>
+ </td>
</tr>
<tr>
+ <td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
+ <a href=https://github.com/GrigoriyMikhalkin>
+ <img src=https://avatars.githubusercontent.com/u/3637857?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=GrigoriyMikhalkin/>
+ <br />
+ <sub style="font-size:14px"><b>GrigoriyMikhalkin</b></sub>
+ </a>
+ </td>
<td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
<a href=https://github.com/Niek>
<img src=https://avatars.githubusercontent.com/u/213140?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=Niek van der Maas/>
@@ -262,13 +269,6 @@ make build
<sub style="font-size:14px"><b>Eugen Biegler</b></sub>
</a>
</td>
- <td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
- <a href=https://github.com/qbit>
- <img src=https://avatars.githubusercontent.com/u/68368?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=Aaron Bieber/>
- <br />
- <sub style="font-size:14px"><b>Aaron Bieber</b></sub>
- </a>
- </td>
<td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
<a href=https://github.com/iSchluff>
<img src=https://avatars.githubusercontent.com/u/1429641?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=Anton Schubert/>
@@ -276,6 +276,13 @@ make build
<sub style="font-size:14px"><b>Anton Schubert</b></sub>
</a>
</td>
+ <td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
+ <a href=https://github.com/qbit>
+ <img src=https://avatars.githubusercontent.com/u/68368?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=Aaron Bieber/>
+ <br />
+ <sub style="font-size:14px"><b>Aaron Bieber</b></sub>
+ </a>
+ </td>
<td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
<a href=https://github.com/fdelucchijr>
<img src=https://avatars.githubusercontent.com/u/69133647?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=Fernando De Lucchi/>
@@ -283,13 +290,6 @@ make build
<sub style="font-size:14px"><b>Fernando De Lucchi</b></sub>
</a>
</td>
- <td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
- <a href=https://github.com/GrigoriyMikhalkin>
- <img src=https://avatars.githubusercontent.com/u/3637857?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=GrigoriyMikhalkin/>
- <br />
- <sub style="font-size:14px"><b>GrigoriyMikhalkin</b></sub>
- </a>
- </td>
</tr>
<tr>
<td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
@@ -496,6 +496,13 @@ make build
<sub style="font-size:14px"><b>Pierre Carru</b></sub>
</a>
</td>
+ <td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
+ <a href=https://github.com/nnsee>
+ <img src=https://avatars.githubusercontent.com/u/36747857?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=Rasmus Moorats/>
+ <br />
+ <sub style="font-size:14px"><b>Rasmus Moorats</b></sub>
+ </a>
+ </td>
<td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
<a href=https://github.com/rcursaru>
<img src=https://avatars.githubusercontent.com/u/16259641?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=rcursaru/>
@@ -503,6 +510,8 @@ make build
<sub style="font-size:14px"><b>rcursaru</b></sub>
</a>
</td>
+</tr>
+<tr>
<td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
<a href=https://github.com/renovate-bot>
<img src=https://avatars.githubusercontent.com/u/25180681?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=WhiteSource Renovate/>
@@ -510,8 +519,6 @@ make build
<sub style="font-size:14px"><b>WhiteSource Renovate</b></sub>
</a>
</td>
-</tr>
-<tr>
<td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
<a href=https://github.com/ryanfowler>
<img src=https://avatars.githubusercontent.com/u/2668821?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=Ryan Fowler/>
@@ -526,6 +533,13 @@ make build
<sub style="font-size:14px"><b>Shaanan Cohney</b></sub>
</a>
</td>
+ <td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
+ <a href=https://github.com/sophware>
+ <img src=https://avatars.githubusercontent.com/u/41669?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=sophware/>
+ <br />
+ <sub style="font-size:14px"><b>sophware</b></sub>
+ </a>
+ </td>
<td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
<a href=https://github.com/m-tanner-dev0>
<img src=https://avatars.githubusercontent.com/u/97977342?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=Tanner/>
@@ -540,6 +554,8 @@ make build
<sub style="font-size:14px"><b>Teteros</b></sub>
</a>
</td>
+</tr>
+<tr>
<td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
<a href=https://github.com/gitter-badger>
<img src=https://avatars.githubusercontent.com/u/8518239?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=The Gitter Badger/>
@@ -554,8 +570,6 @@ make build
<sub style="font-size:14px"><b>Tianon Gravi</b></sub>
</a>
</td>
-</tr>
-<tr>
<td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
<a href=https://github.com/woudsma>
<img src=https://avatars.githubusercontent.com/u/6162978?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=Tjerk Woudsma/>
@@ -584,6 +598,8 @@ make build
<sub style="font-size:14px"><b>Ziyuan Han</b></sub>
</a>
</td>
+</tr>
+<tr>
<td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
<a href=https://github.com/derelm>
<img src=https://avatars.githubusercontent.com/u/465155?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=derelm/>
@@ -598,8 +614,6 @@ make build
<sub style="font-size:14px"><b>henning mueller</b></sub>
</a>
</td>
-</tr>
-<tr>
<td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
<a href=https://github.com/ignoramous>
<img src=https://avatars.githubusercontent.com/u/852289?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=ignoramous/>
@@ -628,6 +642,8 @@ make build
<sub style="font-size:14px"><b>Wakeful-Cloud</b></sub>
</a>
</td>
+</tr>
+<tr>
<td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
<a href=https://github.com/xpzouying>
<img src=https://avatars.githubusercontent.com/u/3946563?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=zy/>
From 5b14cafddd91bad3b0b9a5a454601f131b863d7e Mon Sep 17 00:00:00 2001
From: Juan Font Alonso <juanfontalonso@gmail.com>
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 7e76b3e..2c27ba8 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 <juanfontalonso@gmail.com>
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 2c27ba8..2d55ccd 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)