feat: support IP rate limiting #59
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nomeguy
requested changes
Aug 9, 2024
controllers/rule.go
Outdated
| @@ -131,6 +131,8 @@ func checkExpressions(expressions []*object.Expression, ruleType string) error { | |||
| return checkWafRule(values) | |||
| case "IP": | |||
| return checkIpRule(values) | |||
| case "IpRate": | |||
There was a problem hiding this comment.
Label is "IP Rate Limiting"
| @@ -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.
It is not allowed to be zero.
controllers/rule.go
Outdated
|
|
||
| func checkIpRateRule(expressions []*object.Expression) error { | ||
| if len(expressions) != 1 { | ||
| return errors.New("IpRate rule should have only one expression") |
There was a problem hiding this comment.
Better to limit this in frontend too
There was a problem hiding this comment.
It has been limited in frontend.
web/src/RuleEditPage.js
Outdated
| @@ -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.
Label is "IP Rate Limiting"
web/src/RuleEditPage.js
Outdated
| { | ||
| this.state.rule.type === "IpRate" ? ( | ||
| <IpRateRuleTable | ||
| title={"IP Rate"} |
There was a problem hiding this comment.
Label is "IP Rate Limiting"
| renderTable(table) { | ||
| const columns = [ | ||
| { | ||
| title: "Name", |
| ), | ||
| }, | ||
| { | ||
| title: "Rate", |
| ), | ||
| }, | ||
| { | ||
| title: "Block Duration", |
web/src/components/UaRuleTable.js
Outdated
| @@ -147,7 +147,7 @@ class UaRuleTable extends React.Component { | |||
| <div> | |||
| {this.props.title} | |||
| <Button style={{marginRight: "5px"}} type="primary" size="small" onClick={() => this.addRow(table)}>{"Add"}</Button> | |||
| <Button style={{marginRight: "5px"}} type="primary" size="small" onClick={() => this.restore()}>{"Restore Build-in User-Agent Rules"}</Button> | |||
| <Button style={{marginRight: "5px"}} type="primary" size="small" onClick={() => this.restore()}>{"Restore"}</Button> | |||
rule/rule.go
Outdated
| @@ -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.
Label is "IP Rate Limiting"
nomeguy
approved these changes
Aug 10, 2024
|
🎉 This PR is included in version 1.29.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix: #58
P.S. update antd to ~4.24.0