Compare commits

..

2 Commits

Author SHA1 Message Date
cardinalnsk
bcea539250 [fix]:
- fix middleware ordering
2025-12-03 05:41:24 +07:00
cardinalnsk
eeb512c98a [feat]:
- add country middleware
- refactor middleware chain
2025-12-03 05:13:07 +07:00
4 changed files with 53 additions and 18 deletions

View File

@ -0,0 +1,31 @@
package middleware
import (
"net/http"
"yobble-gateway-go/internal/logger"
"yobble-gateway-go/pkg/geoip"
)
type CountryMW struct {
Geo *geoip.GeoIPService
}
func (m *CountryMW) AddCountryHeaderIPMiddleware(next http.Handler) http.Handler {
op := "middleware.AddCountryHeaderIPMiddleware"
log := logger.NewLoggerWithOp(op)
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
realIP := GetRealIP(r)
log.Debug(op, "realIP", realIP)
_, countryCode := m.Geo.IsCountryBlocked(realIP)
log.Debug(op, "countryCode", countryCode)
if countryCode != "" {
r.Header.Set("X-Country-Code", countryCode)
} else {
r.Header.Set("X-Country-Code", "Undefined")
}
next.ServeHTTP(w, r)
})
}

View File

@ -31,11 +31,15 @@ func NewServer(cfg *config.Settings, geoIPService *geoip.GeoIPService) *Server {
// Create the main proxy handler // Create the main proxy handler
proxyHandler := proxy.NewProxyHandler(cfg, geoIPService) proxyHandler := proxy.NewProxyHandler(cfg, geoIPService)
//Initialize country middleware
countryMW := &middleware.CountryMW{Geo: geoIPService}
// Apply middleware chain // Apply middleware chain
chain := middleware.RemoveTrailingSlashMiddleware( chain := middleware.RemoveTrailingSlashMiddleware(
middleware.RealIPMiddleware( middleware.RealIPMiddleware(
countryMW.AddCountryHeaderIPMiddleware(
proxyHandler, proxyHandler,
), ),
),
) )
addr := fmt.Sprintf("%s:%s", cfg.Server.Host, cfg.Server.Port) addr := fmt.Sprintf("%s:%s", cfg.Server.Host, cfg.Server.Port)