-
-
Notifications
You must be signed in to change notification settings - Fork 23
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: support IP rate limiting #59
Changes from 3 commits
5b59dc3
e86708f
8a4a8fb
e8a7adb
2f7d946
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -131,6 +131,8 @@ func checkExpressions(expressions []*object.Expression, ruleType string) error { | |
return checkWafRule(values) | ||
case "IP": | ||
return checkIpRule(values) | ||
case "IpRate": | ||
return checkIpRateRule(expressions) | ||
} | ||
return nil | ||
} | ||
|
@@ -157,3 +159,19 @@ func checkIpRule(ipLists []string) error { | |
} | ||
return nil | ||
} | ||
|
||
func checkIpRateRule(expressions []*object.Expression) error { | ||
if len(expressions) != 1 { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Will this be zero? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It is not allowed to be zero. |
||
return errors.New("IpRate rule should have only one expression") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Better to limit this in frontend too There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It has been limited in frontend. |
||
} | ||
expression := expressions[0] | ||
_, err := util.ParseIntWithError(expression.Operator) | ||
if err != nil { | ||
return err | ||
} | ||
_, err = util.ParseIntWithError(expression.Value) | ||
if err != nil { | ||
return err | ||
} | ||
return nil | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,6 +36,10 @@ func CheckRules(ruleIds []string, r *http.Request) (string, string, error) { | |
ruleObj = &IpRule{} | ||
case "WAF": | ||
ruleObj = &WafRule{} | ||
case "IpRate": | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Label is "IP Rate Limiting" |
||
ruleObj = &IpRateRule{ | ||
ruleName: rule.GetId(), | ||
} | ||
default: | ||
return "", "", fmt.Errorf("unknown rule type: %s for rule: %s", rule.Type, rule.GetId()) | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,128 @@ | ||
// Copyright 2024 The casbin Authors. All Rights Reserved. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package rule | ||
|
||
import ( | ||
"net/http" | ||
"sync" | ||
"time" | ||
|
||
"github.com/casbin/caswaf/object" | ||
"github.com/casbin/caswaf/util" | ||
"golang.org/x/time/rate" | ||
) | ||
|
||
type IpRateRule struct { | ||
ruleName string | ||
} | ||
|
||
type IpRateLimiter struct { | ||
ips map[string]*rate.Limiter | ||
mu *sync.RWMutex | ||
r rate.Limit | ||
b int | ||
} | ||
|
||
var blackList = map[string]map[string]time.Time{} | ||
|
||
var ipRateLimiters = map[string]*IpRateLimiter{} | ||
|
||
// NewIpRateLimiter . | ||
func NewIpRateLimiter(r rate.Limit, b int) *IpRateLimiter { | ||
i := &IpRateLimiter{ | ||
ips: make(map[string]*rate.Limiter), | ||
mu: &sync.RWMutex{}, | ||
r: r, | ||
b: b, | ||
} | ||
|
||
return i | ||
} | ||
|
||
// AddIP creates a new rate limiter and adds it to the ips map, | ||
// using the IP address as the key | ||
func (i *IpRateLimiter) AddIP(ip string) *rate.Limiter { | ||
i.mu.Lock() | ||
defer i.mu.Unlock() | ||
|
||
limiter := rate.NewLimiter(i.r, i.b) | ||
|
||
i.ips[ip] = limiter | ||
|
||
return limiter | ||
} | ||
|
||
// GetLimiter returns the rate limiter for the provided IP address if it exists. | ||
// Otherwise, calls AddIP to add IP address to the map | ||
func (i *IpRateLimiter) GetLimiter(ip string) *rate.Limiter { | ||
i.mu.Lock() | ||
limiter, exists := i.ips[ip] | ||
|
||
if !exists { | ||
i.mu.Unlock() | ||
return i.AddIP(ip) | ||
} | ||
|
||
i.mu.Unlock() | ||
|
||
return limiter | ||
} | ||
|
||
func (r *IpRateRule) checkRule(expressions []*object.Expression, req *http.Request) (bool, string, string, error) { | ||
expression := expressions[0] // IpRate rule should have only one expression | ||
clientIp := util.GetClientIp(req) | ||
|
||
// If the client IP is in the blacklist, check the block time | ||
createAt, ok := blackList[r.ruleName][clientIp] | ||
if ok { | ||
blockTime := util.ParseInt(expression.Value) | ||
if time.Now().Sub(createAt) < time.Duration(blockTime)*time.Second { | ||
return true, "Block", "Rate limit exceeded", nil | ||
} else { | ||
delete(blackList, clientIp) | ||
} | ||
} | ||
|
||
// If the client IP is not in the blacklist, check the rate limit | ||
ipRateLimiter := ipRateLimiters[r.ruleName] | ||
parseInt := util.ParseInt(expression.Operator) | ||
if ipRateLimiter == nil { | ||
ipRateLimiter = NewIpRateLimiter(rate.Limit(parseInt), parseInt) | ||
ipRateLimiters[r.ruleName] = ipRateLimiter | ||
} | ||
|
||
// If the rate limit has changed, update the rate limiter | ||
limiter := ipRateLimiter.GetLimiter(clientIp) | ||
if ipRateLimiter.r != rate.Limit(parseInt) { | ||
ipRateLimiter.r = rate.Limit(parseInt) | ||
ipRateLimiter.b = parseInt | ||
limiter.SetLimit(ipRateLimiter.r) | ||
limiter.SetBurst(ipRateLimiter.b) | ||
err := limiter.Wait(req.Context()) | ||
if err != nil { | ||
return false, "", "", err | ||
} | ||
} else { | ||
// If the rate limit is exceeded, add the client IP to the blacklist | ||
allow := limiter.Allow() | ||
if !allow { | ||
blackList[r.ruleName] = map[string]time.Time{} | ||
blackList[r.ruleName][clientIp] = time.Now() | ||
return true, "Block", "Rate limit exceeded", nil | ||
} | ||
} | ||
|
||
return false, "", "", nil | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,133 @@ | ||
package rule | ||
|
||
import ( | ||
"net/http" | ||
"testing" | ||
|
||
"github.com/casbin/caswaf/object" | ||
) | ||
|
||
func TestIpRateRule_checkRule(t *testing.T) { | ||
type fields struct { | ||
ruleName string | ||
} | ||
type args struct { | ||
args []struct { | ||
expressions []*object.Expression | ||
req *http.Request | ||
} | ||
} | ||
|
||
tests := []struct { | ||
name string | ||
fields fields | ||
args args | ||
want []bool | ||
want1 []string | ||
want2 []string | ||
wantErr []bool | ||
}{ | ||
{ | ||
name: "Test 1", | ||
fields: fields{ | ||
ruleName: "rule1", | ||
}, | ||
args: args{ | ||
args: []struct { | ||
expressions []*object.Expression | ||
req *http.Request | ||
}{ | ||
{ | ||
expressions: []*object.Expression{ | ||
{ | ||
Operator: "1", | ||
Value: "1", | ||
}, | ||
}, | ||
req: &http.Request{ | ||
RemoteAddr: "127.0.0.1", | ||
}, | ||
}, | ||
{ | ||
expressions: []*object.Expression{ | ||
{ | ||
Operator: "1", | ||
Value: "1", | ||
}, | ||
}, | ||
req: &http.Request{ | ||
RemoteAddr: "127.0.0.1", | ||
}, | ||
}, | ||
}, | ||
}, | ||
want: []bool{false, true}, | ||
want1: []string{"", "Block"}, | ||
want2: []string{"", "Rate limit exceeded"}, | ||
wantErr: []bool{false, false}, | ||
}, | ||
{ | ||
name: "Test 2", | ||
fields: fields{ | ||
ruleName: "rule2", | ||
}, | ||
args: args{ | ||
args: []struct { | ||
expressions []*object.Expression | ||
req *http.Request | ||
}{ | ||
{ | ||
expressions: []*object.Expression{ | ||
{ | ||
Operator: "1", | ||
Value: "1", | ||
}, | ||
}, | ||
req: &http.Request{ | ||
RemoteAddr: "127.0.0.1", | ||
}, | ||
}, | ||
{ | ||
expressions: []*object.Expression{ | ||
{ | ||
Operator: "10", | ||
Value: "1", | ||
}, | ||
}, | ||
req: &http.Request{ | ||
RemoteAddr: "127.0.0.1", | ||
}, | ||
}, | ||
}, | ||
}, | ||
want: []bool{false, false}, | ||
want1: []string{"", ""}, | ||
want2: []string{"", ""}, | ||
wantErr: []bool{false, false}, | ||
}, | ||
} | ||
|
||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
r := &IpRateRule{ | ||
ruleName: tt.fields.ruleName, | ||
} | ||
for i, arg := range tt.args.args { | ||
got, got1, got2, err := r.checkRule(arg.expressions, arg.req) | ||
if (err != nil) != tt.wantErr[i] { | ||
t.Errorf("checkRule() error = %v, wantErr %v", err, tt.wantErr) | ||
return | ||
} | ||
if got != tt.want[i] { | ||
t.Errorf("checkRule() got = %v, want %v", got, tt.want) | ||
} | ||
if got1 != tt.want1[i] { | ||
t.Errorf("checkRule() got1 = %v, want %v", got1, tt.want1) | ||
} | ||
if got2 != tt.want2[i] { | ||
t.Errorf("checkRule() got2 = %v, want %v", got2, tt.want2) | ||
} | ||
} | ||
}) | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,6 +20,7 @@ import i18next from "i18next"; | |
import WafRuleTable from "./components/WafRuleTable"; | ||
import IpRuleTable from "./components/IpRuleTable"; | ||
import UaRuleTable from "./components/UaRuleTable"; | ||
import IpRateRuleTable from "./components/IpRateRuleTable"; | ||
|
||
const {Option} = Select; | ||
|
||
|
@@ -57,6 +58,15 @@ class RuleEditPage extends React.Component { | |
}); | ||
} | ||
|
||
updateRuleFieldInExpressions(index, key, value) { | ||
const rule = Setting.deepCopy(this.state.rule); | ||
rule.expressions[index][key] = value; | ||
this.updateRuleField("expressions", rule.expressions); | ||
this.setState({ | ||
rule: rule, | ||
}); | ||
} | ||
|
||
renderRule() { | ||
return ( | ||
<Card size="small" title={ | ||
|
@@ -86,7 +96,7 @@ class RuleEditPage extends React.Component { | |
{value: "WAF", text: "WAF"}, | ||
{value: "IP", text: "IP"}, | ||
{value: "User-Agent", text: "User-Agent"}, | ||
// {value: "frequency", text: "Frequency"}, | ||
{value: "IpRate", text: "IP Rate"}, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Label is "IP Rate Limiting" |
||
// {value: "complex", text: "Complex"}, | ||
].map((item, index) => <Option key={index} value={item.value}>{item.text}</Option>) | ||
} | ||
|
@@ -131,6 +141,17 @@ class RuleEditPage extends React.Component { | |
/> | ||
) : null | ||
} | ||
{ | ||
this.state.rule.type === "IpRate" ? ( | ||
<IpRateRuleTable | ||
title={"IP Rate"} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Label is "IP Rate Limiting" There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i18n |
||
table={this.state.rule.expressions} | ||
ruleName={this.state.rule.name} | ||
account={this.props.account} | ||
onUpdateTable={(value) => {this.updateRuleField("expressions", value);}} | ||
/> | ||
) : null | ||
} | ||
</Col> | ||
</Row> | ||
{ | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Label is "IP Rate Limiting"