liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(api): temporarily use custom client-ip header for ratelimiting

Browse Source
This commit is contained in:
spiral 2023-03-19 14:17:03 -04:00
parent a888e9693b
commit b2f47f8e53
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/api/src/middleware/ratelimit.rs
View File

@ -62,7 +62,7 @@ pub async fn do_request_ratelimited<B>(
) -> Response { ) -> Response {
if let Some(redis) = redis { if let Some(redis) = redis {
let headers = request.headers().clone(); let headers = request.headers().clone();
let source_ip = header_or_unknown(headers.get("Fly-Client-IP")); let source_ip = header_or_unknown(headers.get("X-PluralKit-Client-IP"));
// https://github.com/rust-lang/rust/issues/53667 // https://github.com/rust-lang/rust/issues/53667
let (rl_key, rate) = if let Some(header) = request.headers().clone().get("X-PluralKit-App") let (rl_key, rate) = if let Some(header) = request.headers().clone().get("X-PluralKit-App")

3
services/web-proxy/main.go
View File

@ -37,6 +37,9 @@ func (p ProxyHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
return return
} }
r.Header.Del("X-PluralKit-Client-IP")
r.Header.Set("X-PluralKit-Client-IP", r.Header.Get("Fly-Client-IP"))
startTime := time.Now() startTime := time.Now()
r = r.WithContext(context.WithValue(r.Context(), "req-time", startTime)) r = r.WithContext(context.WithValue(r.Context(), "req-time", startTime))