Fixes mm-1355 adds rate limiting apis
Этот коммит содержится в:
@@ -9,7 +9,10 @@ import (
|
||||
"github.com/gorilla/mux"
|
||||
"github.com/mattermost/platform/store"
|
||||
"github.com/mattermost/platform/utils"
|
||||
"github.com/throttled/throttled"
|
||||
throttledStore "github.com/throttled/throttled/store"
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -35,10 +38,40 @@ func NewServer() {
|
||||
|
||||
func StartServer() {
|
||||
l4g.Info("Starting Server...")
|
||||
|
||||
l4g.Info("Server is listening on " + utils.Cfg.ServiceSettings.Port)
|
||||
|
||||
var handler http.Handler = Srv.Router
|
||||
|
||||
if utils.Cfg.RateLimitSettings.UseRateLimiter {
|
||||
l4g.Info("RateLimiter is enabled")
|
||||
|
||||
vary := throttled.VaryBy{}
|
||||
|
||||
if utils.Cfg.RateLimitSettings.VaryByRemoteAddr {
|
||||
vary.RemoteAddr = true
|
||||
}
|
||||
|
||||
if len(utils.Cfg.RateLimitSettings.VaryByHeader) > 0 {
|
||||
vary.Headers = strings.Fields(utils.Cfg.RateLimitSettings.VaryByHeader)
|
||||
|
||||
if utils.Cfg.RateLimitSettings.VaryByRemoteAddr {
|
||||
l4g.Warn("RateLimitSettings not configured properly using VaryByHeader and disabling VaryByRemoteAddr")
|
||||
vary.RemoteAddr = false
|
||||
}
|
||||
}
|
||||
|
||||
th := throttled.RateLimit(throttled.PerSec(utils.Cfg.RateLimitSettings.PerSec), &vary, throttledStore.NewMemStore(utils.Cfg.RateLimitSettings.MemoryStoreSize))
|
||||
|
||||
th.DeniedHandler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
l4g.Error("%v: code=429 ip=%v", r.URL.Path, GetIpAddress(r))
|
||||
throttled.DefaultDeniedHandler.ServeHTTP(w, r)
|
||||
})
|
||||
|
||||
handler = th.Throttle(Srv.Router)
|
||||
}
|
||||
|
||||
go func() {
|
||||
err := Srv.Server.ListenAndServe(":"+utils.Cfg.ServiceSettings.Port, Srv.Router)
|
||||
err := Srv.Server.ListenAndServe(":"+utils.Cfg.ServiceSettings.Port, handler)
|
||||
if err != nil {
|
||||
l4g.Critical("Error starting server, err:%v", err)
|
||||
time.Sleep(time.Second)
|
||||
|
||||
Ссылка в новой задаче
Block a user