feat: support IP and UA rules #41
Closed
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
…dd-rule # Conflicts: # controllers/rule.go
# Conflicts: # controllers/rule.go # go.sum # object/rule.go # service/proxy.go # service/waf.go # web/src/RuleEditPage.js # web/src/RuleListPage.js # web/src/backend/RuleBackend.js # web/src/components/IPRuleTable.js # web/src/components/WafRuleTable.js
nomeguy
requested changes
Jul 24, 2024
nomeguy
requested changes
Jul 26, 2024
|
|
||
| func GetWAFRulesByIds(ids []string) string { | ||
| // Get rules by id (owner/name) | ||
| owners, names := util.GetOwnersAndNamesFromIds(ids) |
There was a problem hiding this comment.
Don't mess with SQL. It's fragile.
Get all rules and do filtering in Go code
| return true, nil | ||
| } | ||
| case "User-Agent": | ||
| isMatch := checkUARule(rule.Expressions, r.UserAgent()) |
There was a problem hiding this comment.
All isMatch needs to be isMatched
| for _, rule := range rules { | ||
| switch rule.Type { | ||
| case "IP": | ||
| isMatch := checkIPRule(rule.Expressions, clientIp) |
|
|
||
| func createWAF() coraza.WAF { | ||
| func createWAF(site *object.Site) { |
| } | ||
|
|
||
| func UpdateWAF() { | ||
| waf = createWAF() | ||
| func UpdateWAFs() { |
| </Col> | ||
| </Row> | ||
| ) | ||
| } | ||
| <Row style={{marginTop: "20px"}}> | ||
| {/* <Row style={{marginTop: "20px"}}> |
| @@ -150,24 +169,25 @@ class RuleEditPage extends React.Component { | |||
| </Col> | |||
| </Row> | |||
| ) | |||
| } | |||
| } */} | |||
There was a problem hiding this comment.
Don't add commented code, just remove it
| @@ -49,6 +49,7 @@ type Site struct { | |||
| OtherDomains []string `xorm:"varchar(500)" json:"otherDomains"` | |||
| NeedRedirect bool `json:"needRedirect"` | |||
| EnableWaf bool `json:"enableWaf"` | |||
| WafRuleIds []string `xorm:"varchar(500)" json:"wafRuleIds"` | |||
| @@ -116,6 +117,87 @@ func redirectToHost(w http.ResponseWriter, r *http.Request, host string) { | |||
| http.Redirect(w, r, targetUrl, http.StatusMovedPermanently) | |||
| } | |||
|
|
|||
| func checkRules(wafRuleIds []string, r *http.Request, clientIp string) (bool, error) { | |||
There was a problem hiding this comment.
clientIp is already in request I think?
| return true, nil | ||
| } | ||
|
|
||
| func checkUARule(expressions []*object.Expression, userAgent string) bool { |
There was a problem hiding this comment.
struct UaRule {
checkRule(expressions []*object.Expression, req http.Request) (string, string, error)
}
(string, string, error) is (action, reason, error)
action can be "Allow", "Block", etc.
reason is the formatted string
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.
Allow or block requests by IP or UA