TheArchive/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-23 18:15:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #684 from juanfont/fix-api-mux

Browse Source 
Fix API router
This commit is contained in:
Juan Font 2022-07-22 09:06:06 +02:00 committed by GitHub
commit 1a9a9b718d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -34,6 +34,7 @@
- Improve shutdown behaviour [#651](https://github.com/juanfont/headscale/pull/651) - Improve shutdown behaviour [#651](https://github.com/juanfont/headscale/pull/651)
- Drop Gin as web framework in Headscale [648](https://github.com/juanfont/headscale/pull/648) [677](https://github.com/juanfont/headscale/pull/677) - Drop Gin as web framework in Headscale [648](https://github.com/juanfont/headscale/pull/648) [677](https://github.com/juanfont/headscale/pull/677)
- Make tailnet node updates check interval configurable [#675](https://github.com/juanfont/headscale/pull/675) - Make tailnet node updates check interval configurable [#675](https://github.com/juanfont/headscale/pull/675)
- Fix regression with HTTP API [#684](https://github.com/juanfont/headscale/pull/684)
## 0.15.0 (2022-03-20) ## 0.15.0 (2022-03-20)

8
app.go
View File

@ -445,11 +445,9 @@ func (h *Headscale) createRouter(grpcMux *runtime.ServeMux) *mux.Router {
router.HandleFunc("/bootstrap-dns", h.DERPBootstrapDNSHandler) router.HandleFunc("/bootstrap-dns", h.DERPBootstrapDNSHandler)
} }
api := router.PathPrefix("/api").Subrouter() apiRouter := router.PathPrefix("/api").Subrouter()
api.Use(h.httpAuthenticationMiddleware) apiRouter.Use(h.httpAuthenticationMiddleware)
{ apiRouter.PathPrefix("/v1/").HandlerFunc(grpcMux.ServeHTTP)
api.HandleFunc("/v1/*any", grpcMux.ServeHTTP)
}
router.PathPrefix("/").HandlerFunc(stdoutHandler) router.PathPrefix("/").HandlerFunc(stdoutHandler)