add path prefix #196.

This commit is contained in:
Miroslav Šedivý 2022-09-01 18:22:01 +02:00
parent 43fe80c82e
commit 86ab5edf4b
4 changed files with 23 additions and 4 deletions

View File

@ -4,6 +4,7 @@
### New Features ### New Features
- Added `m1k1o/neko:vivaldi` tag (thanks @Xeddius). - Added `m1k1o/neko:vivaldi` tag (thanks @Xeddius).
- Added `NEKO_PATH_PREFIX`.
## [n.eko v2.6](https://github.com/m1k1o/neko/releases/tag/v2.6) ## [n.eko v2.6](https://github.com/m1k1o/neko/releases/tag/v2.6)

View File

@ -134,6 +134,9 @@ nat1to1: <ip>
#### `NEKO_PROXY`: #### `NEKO_PROXY`:
- Enable reverse proxy mode, so that neko trusts `X-Forwarded-For` headers. - Enable reverse proxy mode, so that neko trusts `X-Forwarded-For` headers.
- e.g. `false` - e.g. `false`
#### `NEKO_PATH_PREFIX`:
- Path prefix for HTTP requests.
- e.g. `/neko/`
### Expert settings ### Expert settings

View File

@ -30,6 +30,12 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler) *Server {
router.Use(middleware.RequestLogger(&logformatter{logger})) router.Use(middleware.RequestLogger(&logformatter{logger}))
router.Use(middleware.Recoverer) // Recover from panics without crashing server router.Use(middleware.Recoverer) // Recover from panics without crashing server
if conf.PathPrefix != "/" {
router.Use(func(h http.Handler) http.Handler {
return http.StripPrefix(conf.PathPrefix, h)
})
}
router.Get("/ws", func(w http.ResponseWriter, r *http.Request) { router.Get("/ws", func(w http.ResponseWriter, r *http.Request) {
err := webSocketHandler.Upgrade(w, r) err := webSocketHandler.Upgrade(w, r)
if err != nil { if err != nil {

View File

@ -1,15 +1,18 @@
package config package config
import ( import (
"path"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
) )
type Server struct { type Server struct {
Cert string Cert string
Key string Key string
Bind string Bind string
Static string Static string
PathPrefix string
} }
func (Server) Init(cmd *cobra.Command) error { func (Server) Init(cmd *cobra.Command) error {
@ -33,6 +36,11 @@ func (Server) Init(cmd *cobra.Command) error {
return err return err
} }
cmd.PersistentFlags().String("path_prefix", "/", "path prefix for HTTP requests")
if err := viper.BindPFlag("path_prefix", cmd.PersistentFlags().Lookup("path_prefix")); err != nil {
return err
}
return nil return nil
} }
@ -41,4 +49,5 @@ func (s *Server) Set() {
s.Key = viper.GetString("key") s.Key = viper.GetString("key")
s.Bind = viper.GetString("bind") s.Bind = viper.GetString("bind")
s.Static = viper.GetString("static") s.Static = viper.GetString("static")
s.PathPrefix = path.Join("/", path.Clean(viper.GetString("path_prefix")))
} }