Commit Graph

2978 Commits

Author SHA1 Message Date
Kristoffer Dalby d06ba7b522
Merge branch 'main' into sanitise-machine-key-url 2022-09-23 11:09:23 +02:00
Kristoffer Dalby a507a04650
Merge pull request #763 from tsujamin/autoapprovers 2022-09-23 11:07:53 +02:00
Benjamin George Roberts 7761a7b23e fix autoapprover test following tagged authkey change 2022-09-23 18:46:35 +10:00
Benjamin George Roberts 6d2cfd52c5 Merge branch 'main' into autoapprovers 2022-09-23 18:44:36 +10:00
Kristoffer Dalby 75a8fc8b3e
Update changelog
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
2022-09-23 10:44:29 +02:00
Kristoffer Dalby 8fa05c1e72
Merge pull request #767 from tsujamin/preauthkey-tags 2022-09-23 10:42:42 +02:00
Kristoffer Dalby 93082b8092
Protect against user injection for registration CLI page
This commit addresses a potential issue where we allowed unsanitised
content to be passed through a go template without validation.

We now try to unmarshall the incoming node key and fails to render the
template if it is not a valid node key.

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
2022-09-23 10:39:42 +02:00
Benjamin George Roberts d764f52f24 Update changelog 2022-09-23 18:16:16 +10:00
Benjamin George Roberts e5decbd0fa Update changelog 2022-09-23 18:13:48 +10:00
Kristoffer Dalby 8a1c0e0e9b Merge branch 'main' into preauthkey-tags 2022-09-23 18:11:27 +10:00
Benjamin Roberts 5b12ab9894
Merge branch 'main' into autoapprovers 2022-09-23 18:06:31 +10:00
Benjamin George Roberts c52e3aafe6 remove unnecessary checks on slices 2022-09-23 18:04:30 +10:00
Juan Font a46170e2a1
Merge pull request #793 from juanfont/remove-sponsorship
Remove sponsor buttons
2022-09-21 19:50:11 +02:00
Juan Font aca1c1b156
Merge branch 'main' into remove-sponsorship 2022-09-21 18:13:00 +02:00
Juan Font 09863b540d
Merge branch 'main' into preauthkey-tags 2022-09-21 18:03:35 +02:00
Juan Font adb352e663
Merge branch 'main' into autoapprovers 2022-09-21 17:53:17 +02:00
Juan Font c9b39da6b9
Merge pull request #790 from mike-lloyd03/reverse-proxy
Add reverse proxy documentation
2022-09-21 17:52:59 +02:00
Juan Font 6fe86dff00
Merge branch 'main' into remove-sponsorship 2022-09-21 17:47:43 +02:00
Juan Font 9b1dcb2f0c
Merge branch 'main' into reverse-proxy 2022-09-21 17:47:13 +02:00
Juan Font 22c68fff13
Merge pull request #815 from juanfont/remove-gin-references
Removed gin from go.sum (Github security notice)
2022-09-21 17:45:12 +02:00
Juan Font ddd92822b0
Merge branch 'main' into remove-gin-references 2022-09-21 17:26:23 +02:00
Juan Font bd6282d1e3
Merge pull request #801 from juanfont/oidc-integration-testing
Add integration tests for OIDC authentication
2022-09-21 17:26:04 +02:00
Juan Font 7092a3ea47 Merge branch 'oidc-integration-testing' of https://github.com/juanfont/headscale into oidc-integration-testing 2022-09-21 15:02:13 +00:00
Juan Font 695359862e Return stderr too in ExecuteCommand 2022-09-21 15:01:26 +00:00
Juan Font 95948e03c9 Added indication of workaround for #814 2022-09-21 14:47:48 +00:00
Mike Lloyd e286ba817b Format reverse-proxy.md 2022-09-20 20:12:45 -07:00
Juan Font 8aa0eefedd
Merge branch 'main' into oidc-integration-testing 2022-09-20 23:43:45 +02:00
Juan Font e6e5872b4b
Merge branch 'main' into reverse-proxy 2022-09-20 23:34:44 +02:00
Juan Font 2c73f8ee62
Merge branch 'main' into remove-gin-references 2022-09-20 23:32:42 +02:00
Juan Font cdc8bab7d9
Merge pull request #768 from kazauwa/feature/json-logs
toggle json logging via config
2022-09-20 23:32:10 +02:00
Juan Font f2928d7dcb Removed gin from go.sum (Github security notice) 2022-09-20 21:26:11 +00:00
Juan Font 44be239723
Merge branch 'main' into reverse-proxy 2022-09-20 23:16:21 +02:00
Juan Font 397754753f
Merge branch 'main' into feature/json-logs 2022-09-20 23:11:29 +02:00
Juan Font e87b470996 Removed fmt.Println for linting 2022-09-20 21:06:43 +00:00
Juan Font 083d2a871c Linting fixes 2022-09-20 21:02:44 +00:00
Juan Font 7a171cf5ea Added sleep to workaround #814 2022-09-20 20:54:58 +00:00
Juan Font 1563d7555f Use Headscale container to run mockoidc 2022-09-20 20:42:50 +00:00
Juan Font 2e97119db8 Added derp config to OIDC etc 2022-09-20 20:42:12 +00:00
Juan Font b3a53bf642 Do not load the config for CLI mockoidc (and version) 2022-09-20 19:59:22 +00:00
Juan Font a3f18f248c Add internal mockoidc command 2022-09-20 19:58:36 +00:00
Juan Font 1c267f72e0 Capture listen error on mockoidc 2022-09-19 23:07:47 +00:00
Juan Font becf918b78
Merge branch 'main' into remove-sponsorship 2022-09-18 23:58:42 +02:00
Juan Font 9c58395bb3 Removed unused param after routes fix 2022-09-18 21:40:52 +00:00
Juan Font b117ca7720 Added missing TLS key for testing 2022-09-18 21:26:47 +00:00
Juan Font d83a28bd1b
Merge branch 'main' into oidc-integration-testing 2022-09-18 23:25:01 +02:00
Juan Font 42ef71bff9
Merge pull request #811 from kradalby/primary-routes
Fix subnet routers
2022-09-18 21:59:25 +02:00
Kristoffer Dalby f2da1a1665
Add comment and update changelog
Signed-off-by: Kristoffer Dalby <kristoffer@dalby.cc>
2022-09-18 12:14:49 +02:00
Kristoffer Dalby 356b76fc56
Format
Signed-off-by: Kristoffer Dalby <kristoffer@dalby.cc>
2022-09-18 11:37:38 +02:00
Kristoffer Dalby 33ae56acfa
Add primary routes to node
Signed-off-by: Kristoffer Dalby <kristoffer@dalby.cc>
2022-09-18 11:36:35 +02:00
Juan Font 9923adcb8b
Merge branch 'main' into feature/json-logs 2022-09-15 00:22:18 +02:00