Skip to content

Commit

Permalink
fixed stats websocket endpoint when no match_domains configured
Browse files Browse the repository at this point in the history
  • Loading branch information
yusing committed Nov 2, 2024
1 parent a531896 commit 3bf5205
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
9 changes: 6 additions & 3 deletions internal/api/v1/stats.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,21 @@ func Stats(w http.ResponseWriter, r *http.Request) {
}

func StatsWS(w http.ResponseWriter, r *http.Request) {
var originPats []string

localAddresses := []string{"127.0.0.1", "10.0.*.*", "172.16.*.*", "192.168.*.*"}
originPats := make([]string, len(config.Value().MatchDomains)+len(localAddresses))

if len(originPats) == 0 {
if len(config.Value().MatchDomains) == 0 {
U.LogWarn(r).Msg("no match domains configured, accepting websocket API request from all origins")
originPats = []string{"*"}
} else {
originPats = make([]string, len(config.Value().MatchDomains))
for i, domain := range config.Value().MatchDomains {
originPats[i] = "*." + domain
originPats[i] = "*" + domain
}
originPats = append(originPats, localAddresses...)
}
U.LogInfo(r).Msgf("websocket API request from origins: %s", originPats)
if common.IsDebug {
originPats = []string{"*"}
}
Expand Down
6 changes: 6 additions & 0 deletions internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package config
import (
"os"
"strconv"
"strings"
"sync"
"time"

Expand Down Expand Up @@ -177,6 +178,11 @@ func (cfg *Config) load() E.Error {
errs.Add(cfg.loadRouteProviders(&model.Providers))

cfg.value = model
for i, domain := range model.MatchDomains {
if !strings.HasPrefix(domain, ".") {
model.MatchDomains[i] = "." + domain
}
}
route.SetFindMuxDomains(model.MatchDomains)
return errs.Error()
}
Expand Down
5 changes: 0 additions & 5 deletions internal/route/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@ func SetFindMuxDomains(domains []string) {
if len(domains) == 0 {
findMuxFunc = findMuxAnyDomain
} else {
for i, domain := range domains {
if !strings.HasPrefix(domain, ".") {
domains[i] = "." + domain
}
}
findMuxFunc = findMuxByDomains(domains)
}
}
Expand Down

0 comments on commit 3bf5205

Please sign in to comment.