marcel/zoraxy
1
0
Fork 0
mirror of https://github.com/tobychui/zoraxy.git synced 2025-06-04 22:57:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

clean up implementation

Browse Source
This commit is contained in:
kirari04 2024-06-11 22:04:30 +02:00
parent 9545343151
commit bb1b161ae2
No known key found for this signature in database
GPG Key ID: 373DF6E799D233FD
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mod/dynamicproxy/Server.go
View File

@ -73,11 +73,12 @@ func (h *ProxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} }
// Rate Limit Check // Rate Limit Check
// if sep.RequireBasicAuth { if sep.RequireRateLimit {
if err := handleRateLimit(w, r, sep); err != nil { err := h.handleRateLimitRouting(w, r, sep)
return if err != nil {
return
}
} }
// }
//Validate basic auth //Validate basic auth
if sep.RequireBasicAuth { if sep.RequireBasicAuth {

10
src/mod/dynamicproxy/ratelimit.go
View File

@ -50,6 +50,14 @@ func (t *IpTable) Clear() {
var ipTable = IpTable{} var ipTable = IpTable{}
func (h *ProxyHandler) handleRateLimitRouting(w http.ResponseWriter, r *http.Request, pe *ProxyEndpoint) error {
err := handleRateLimit(w, r, pe)
if err != nil {
h.logRequest(r, false, 429, "ratelimit", pe.Domain)
}
return err
}
func handleRateLimit(w http.ResponseWriter, r *http.Request, pe *ProxyEndpoint) error { func handleRateLimit(w http.ResponseWriter, r *http.Request, pe *ProxyEndpoint) error {
ip, _, err := net.SplitHostPort(r.RemoteAddr) ip, _, err := net.SplitHostPort(r.RemoteAddr)
if err != nil { if err != nil {
@ -60,7 +68,7 @@ func handleRateLimit(w http.ResponseWriter, r *http.Request, pe *ProxyEndpoint)
ipTable.Increment(ip) ipTable.Increment(ip)
if ipTable.Exceeded(ip, 10) { if ipTable.Exceeded(ip, int64(pe.RateLimit)) {
w.WriteHeader(429) w.WriteHeader(429)
return errors.New("rate limit exceeded") return errors.New("rate limit exceeded")
} }

4
src/mod/dynamicproxy/typedef.go
View File

@ -125,8 +125,8 @@ type ProxyEndpoint struct {
BasicAuthExceptionRules []*BasicAuthExceptionRule //Path to exclude in a basic auth enabled proxy target BasicAuthExceptionRules []*BasicAuthExceptionRule //Path to exclude in a basic auth enabled proxy target
// Rate Limiting // Rate Limiting
EnableRateLimiting bool RequireRateLimit bool
RateLimiting int // Rate limit in requests per second RateLimit int64 // Rate limit in requests per second
//Access Control //Access Control
AccessFilterUUID string //Access filter ID AccessFilterUUID string //Access filter ID