get rate limit ip correctly

bluesky-social · Sep 11, 2023 · 69b7753 · 69b7753
1 parent b3046c3
commit 69b7753
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/packages/pds/src/index.ts b/packages/pds/src/index.ts
@@ -137,6 +137,7 @@ export class PDS {
     )
 
     const app = express()
+    app.set('trust proxy', true)
     app.use(cors())
     app.use(loggerMiddleware)
     app.use(compression())

diff --git a/packages/xrpc-server/src/index.ts b/packages/xrpc-server/src/index.ts
@@ -5,4 +5,4 @@ export * from './stream'
 export * from './rate-limiter'
 
 export type { ServerTiming } from './util'
-export { getReqIp, serverTimingHeader, ServerTimer } from './util'
+export { serverTimingHeader, ServerTimer } from './util'
diff --git a/packages/xrpc-server/src/rate-limiter.ts b/packages/xrpc-server/src/rate-limiter.ts
@@ -14,7 +14,6 @@ import {
   RateLimiterStatus,
   XRPCReqContext,
 } from './types'
-import { getReqIp } from './util'
 
 export type RateLimiterOpts = {
   keyPrefix: string
@@ -155,5 +154,5 @@ export const getTightestLimit = (
   return lowest
 }
 
-const defaultKey: CalcKeyFn = (ctx: XRPCReqContext) => getReqIp(ctx.req)
+const defaultKey: CalcKeyFn = (ctx: XRPCReqContext) => ctx.req.ip
 const defaultPoints: CalcPointsFn = () => 1
diff --git a/packages/xrpc-server/src/util.ts b/packages/xrpc-server/src/util.ts
@@ -268,10 +268,6 @@ function decodeBodyStream(
   return stream
 }
 
-export const getReqIp = (req: express.Request): string => {
-  return req.ips.at(-1) ?? req.ip
-}
-
 export function serverTimingHeader(timings: ServerTiming[]) {
   return timings
     .map((timing) => {