mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-23 06:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use X-Forwarded-For, add comments

Browse source
This commit is contained in:
Neil Alexander 2020-09-02 17:26:52 +01:00
parent 0959b9da3c
commit 123ee630b7
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
clientapi/routing/rate_limiting.go
View file

@ -28,6 +28,10 @@ func newRateLimits() *rateLimits {
func (l *rateLimits) clean() {
for {
// On a ten minute interval, we'll take an exclusive write
// lock of the entire map and see if any of the channels are
// empty. If they are then we will close and delete them,
// freeing up memory.
time.Sleep(time.Second * 10)
l.limitsMutex.Lock()
for k, c := range l.limits {
@ -41,16 +45,26 @@ func (l *rateLimits) clean() {
}
func (l *rateLimits) rateLimit(req *http.Request) *util.JSONResponse {
// Check if the user has got free resource slots for this request.
// If they don't then we'll return an error.
l.limitsMutex.RLock()
defer l.limitsMutex.RUnlock()
rateLimit, ok := l.limits[req.RemoteAddr]
if !ok {
l.limits[req.RemoteAddr] = make(chan struct{}, l.maxRequests)
rateLimit = l.limits[req.RemoteAddr]
// First of all, work out if X-Forwarded-For was sent to us. If not
// then we'll just use the IP address of the caller.
caller := req.RemoteAddr
if forwardedFor := req.Header.Get("X-Forwarded-For"); forwardedFor != "" {
caller = forwardedFor
}
// Look up the caller's channel, if they have one. If they don't then
// let's create one.
rateLimit, ok := l.limits[caller]
if !ok {
l.limits[caller] = make(chan struct{}, l.maxRequests)
rateLimit = l.limits[caller]
}
// Check if the user has got free resource slots for this request.
// If they don't then we'll return an error.
select {
case rateLimit <- struct{}{}:
default: