@atproto/pds 0.5.55 → 0.5.56

package/dist/rate-limits.js

@@ -1,22 +1,22 @@
 import { DAY, HOUR, MINUTE } from '@atproto/common';
 import { MemoryRateLimiter, RedisRateLimiter } from '@atproto/xrpc-server';
 const SYNC_GET_REPO_PATH = '/xrpc/com.atproto.sync.getRepo';
-export const buildRateLimitsConfig = (rateLimits, redisScratch) => {
+export const buildRateLimitsConfig = (rateLimits, redisScratch, bypass) => {
     if (!rateLimits.enabled)
         return undefined;
+    const { bypassKey, bypassIps } = rateLimits;
     return {
         creator: redisScratch
             ? (opts) => new RedisRateLimiter(redisScratch, opts)
             : (opts) => new MemoryRateLimiter(opts),
-        bypass: ({ req }) => {
-            const { bypassKey, bypassIps } = rateLimits;
-            if (bypassKey && bypassKey === req.headers['x-ratelimit-bypass']) {
+        bypass: (ctx) => {
+            if (bypassKey && bypassKey === ctx.req.headers['x-ratelimit-bypass']) {
                 return true;
             }
-            if (bypassIps && bypassIps.includes(req.ip)) {
+            if (bypassIps && bypassIps.includes(ctx.req.ip)) {
                 return true;
             }
-            return false;
+            return bypass ? bypass(ctx) : false;
         },
         global: [
             {

package/dist/rate-limits.js.map

@@ -1 +1 @@
-{"version":3,"file":"rate-limits.js","sourceRoot":"","sources":["../src/rate-limits.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAM1E,MAAM,kBAAkB,GAAG,gCAAgC,CAAA;AAE3D,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,UAA4B,EAC5B,YAAoB,EACe,EAAE;IACrC,IAAI,CAAC,UAAU,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IAEzC,OAAO;QACL,OAAO,EAAE,YAAY;YACnB,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,gBAAgB,CAAC,YAAY,EAAE,IAAI,CAAC;YACpD,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC;QACzC,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE;YAClB,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,UAAU,CAAA;YAC3C,IAAI,SAAS,IAAI,SAAS,KAAK,GAAG,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC;gBACjE,OAAO,IAAI,CAAA;YACb,CAAC;YACD,IAAI,SAAS,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC5C,OAAO,IAAI,CAAA;YACb,CAAC;YACD,OAAO,KAAK,CAAA;QACd,CAAC;QACD,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,WAAW;gBACjB,UAAU,EAAE,CAAC,GAAG,MAAM;gBACtB,MAAM,EAAE,IAAI;gBACZ,qEAAqE;gBACrE,8DAA8D;gBAC9D,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE;oBACnB,IAAI,GAAG,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;wBACpC,OAAO,IAAI,CAAA;oBACb,CAAC;oBACD,OAAO,GAAG,CAAC,EAAE,CAAA;gBACf,CAAC;aACF;SACF;QACD,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,iBAAiB;gBACvB,UAAU,EAAE,IAAI;gBAChB,MAAM,EAAE,IAAI,EAAE,+BAA+B;aAC9C;YACD;gBACE,IAAI,EAAE,gBAAgB;gBACtB,UAAU,EAAE,GAAG;gBACf,MAAM,EAAE,KAAK,EAAE,+BAA+B;aAC/C;SACF;KACF,CAAA;AACH,CAAC,CAAA","sourcesContent":["import type { Redis } from 'ioredis'\nimport { DAY, HOUR, MINUTE } from '@atproto/common'\nimport { MemoryRateLimiter, RedisRateLimiter } from '@atproto/xrpc-server'\nimport type { Options } from '@atproto/xrpc-server'\nimport type { RateLimitsConfig } from './config/index.js'\n\ntype RateLimitDescriptions = NonNullable<Options['rateLimits']>\n\nconst SYNC_GET_REPO_PATH = '/xrpc/com.atproto.sync.getRepo'\n\nexport const buildRateLimitsConfig = (\n  rateLimits: RateLimitsConfig,\n  redisScratch?: Redis,\n): RateLimitDescriptions | undefined => {\n  if (!rateLimits.enabled) return undefined\n\n  return {\n    creator: redisScratch\n      ? (opts) => new RedisRateLimiter(redisScratch, opts)\n      : (opts) => new MemoryRateLimiter(opts),\n    bypass: ({ req }) => {\n      const { bypassKey, bypassIps } = rateLimits\n      if (bypassKey && bypassKey === req.headers['x-ratelimit-bypass']) {\n        return true\n      }\n      if (bypassIps && bypassIps.includes(req.ip)) {\n        return true\n      }\n      return false\n    },\n    global: [\n      {\n        name: 'global-ip',\n        durationMs: 5 * MINUTE,\n        points: 3000,\n        // getRepo can be a high-volume sync path, so it has its own endpoint\n        // limit and should not consume the shared global read bucket.\n        calcKey: ({ req }) => {\n          if (req.path === SYNC_GET_REPO_PATH) {\n            return null\n          }\n          return req.ip\n        },\n      },\n    ],\n    shared: [\n      {\n        name: 'repo-write-hour',\n        durationMs: HOUR,\n        points: 5000, // creates=3, puts=2, deletes=1\n      },\n      {\n        name: 'repo-write-day',\n        durationMs: DAY,\n        points: 35000, // creates=3, puts=2, deletes=1\n      },\n    ],\n  }\n}\n"]}
+{"version":3,"file":"rate-limits.js","sourceRoot":"","sources":["../src/rate-limits.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAM1E,MAAM,kBAAkB,GAAG,gCAAgC,CAAA;AAE3D,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,UAA4B,EAC5B,YAAoB,EACpB,MAAyC,EACN,EAAE;IACrC,IAAI,CAAC,UAAU,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IACzC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,UAAU,CAAA;IAE3C,OAAO;QACL,OAAO,EAAE,YAAY;YACnB,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,gBAAgB,CAAC,YAAY,EAAE,IAAI,CAAC;YACpD,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC;QACzC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;YACd,IAAI,SAAS,IAAI,SAAS,KAAK,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC;gBACrE,OAAO,IAAI,CAAA;YACb,CAAC;YACD,IAAI,SAAS,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBAChD,OAAO,IAAI,CAAA;YACb,CAAC;YACD,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;QACrC,CAAC;QACD,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,WAAW;gBACjB,UAAU,EAAE,CAAC,GAAG,MAAM;gBACtB,MAAM,EAAE,IAAI;gBACZ,qEAAqE;gBACrE,8DAA8D;gBAC9D,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE;oBACnB,IAAI,GAAG,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;wBACpC,OAAO,IAAI,CAAA;oBACb,CAAC;oBACD,OAAO,GAAG,CAAC,EAAE,CAAA;gBACf,CAAC;aACF;SACF;QACD,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,iBAAiB;gBACvB,UAAU,EAAE,IAAI;gBAChB,MAAM,EAAE,IAAI,EAAE,+BAA+B;aAC9C;YACD;gBACE,IAAI,EAAE,gBAAgB;gBACtB,UAAU,EAAE,GAAG;gBACf,MAAM,EAAE,KAAK,EAAE,+BAA+B;aAC/C;SACF;KACF,CAAA;AACH,CAAC,CAAA","sourcesContent":["import type { Redis } from 'ioredis'\nimport { DAY, HOUR, MINUTE } from '@atproto/common'\nimport { MemoryRateLimiter, RedisRateLimiter } from '@atproto/xrpc-server'\nimport type { HandlerContext, Options } from '@atproto/xrpc-server'\nimport type { RateLimitsConfig } from './config/index.js'\n\ntype RateLimitDescriptions = NonNullable<Options['rateLimits']>\n\nconst SYNC_GET_REPO_PATH = '/xrpc/com.atproto.sync.getRepo'\n\nexport const buildRateLimitsConfig = (\n  rateLimits: RateLimitsConfig,\n  redisScratch?: Redis,\n  bypass?: (ctx: HandlerContext) => boolean,\n): RateLimitDescriptions | undefined => {\n  if (!rateLimits.enabled) return undefined\n  const { bypassKey, bypassIps } = rateLimits\n\n  return {\n    creator: redisScratch\n      ? (opts) => new RedisRateLimiter(redisScratch, opts)\n      : (opts) => new MemoryRateLimiter(opts),\n    bypass: (ctx) => {\n      if (bypassKey && bypassKey === ctx.req.headers['x-ratelimit-bypass']) {\n        return true\n      }\n      if (bypassIps && bypassIps.includes(ctx.req.ip)) {\n        return true\n      }\n      return bypass ? bypass(ctx) : false\n    },\n    global: [\n      {\n        name: 'global-ip',\n        durationMs: 5 * MINUTE,\n        points: 3000,\n        // getRepo can be a high-volume sync path, so it has its own endpoint\n        // limit and should not consume the shared global read bucket.\n        calcKey: ({ req }) => {\n          if (req.path === SYNC_GET_REPO_PATH) {\n            return null\n          }\n          return req.ip\n        },\n      },\n    ],\n    shared: [\n      {\n        name: 'repo-write-hour',\n        durationMs: HOUR,\n        points: 5000, // creates=3, puts=2, deletes=1\n      },\n      {\n        name: 'repo-write-day',\n        durationMs: DAY,\n        points: 35000, // creates=3, puts=2, deletes=1\n      },\n    ],\n  }\n}\n"]}

package/dist/util/ip.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Returns the canonical spelling of an IP address, so that one address always
+ * yields one rate limit key: IPv4-mapped IPv6 becomes plain IPv4, and other
+ * IPv6 addresses lose any zone ID and are lowercased and compressed as in RFC
+ * 5952. Returns null for anything that is not an IP address.
+ */
+export declare function canonicalIp(ip: string): string | null;
+//# sourceMappingURL=ip.d.ts.map

package/dist/util/ip.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ip.d.ts","sourceRoot":"","sources":["../../src/util/ip.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAyBrD"}

package/dist/util/ip.js

@@ -0,0 +1,34 @@
+import { isIP } from 'node:net';
+const IPV4_MAPPED = /^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/;
+/**
+ * Returns the canonical spelling of an IP address, so that one address always
+ * yields one rate limit key: IPv4-mapped IPv6 becomes plain IPv4, and other
+ * IPv6 addresses lose any zone ID and are lowercased and compressed as in RFC
+ * 5952. Returns null for anything that is not an IP address.
+ */
+export function canonicalIp(ip) {
+    const family = isIP(ip);
+    // node:net refuses leading zeros, so its IPv4 addresses are canonical.
+    if (family === 4)
+        return ip;
+    if (family !== 6)
+        return null;
+    const zoneIdx = ip.indexOf('%');
+    const address = zoneIdx === -1 ? ip : ip.slice(0, zoneIdx);
+    // The WHATWG URL parser serializes IPv6 hosts in RFC 5952 form.
+    let canonical;
+    try {
+        canonical = new URL(`http://[${address}]`).hostname.slice(1, -1);
+    }
+    catch {
+        return null;
+    }
+    const mapped = IPV4_MAPPED.exec(canonical);
+    if (mapped) {
+        const hi = parseInt(mapped[1], 16);
+        const lo = parseInt(mapped[2], 16);
+        canonical = `${hi >> 8}.${hi & 0xff}.${lo >> 8}.${lo & 0xff}`;
+    }
+    return isIP(canonical) === 0 ? null : canonical;
+}
+//# sourceMappingURL=ip.js.map

package/dist/util/ip.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ip.js","sourceRoot":"","sources":["../../src/util/ip.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AAE/B,MAAM,WAAW,GAAG,0CAA0C,CAAA;AAE9D;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CAAC,EAAU;IACpC,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,CAAA;IACvB,uEAAuE;IACvE,IAAI,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAA;IAC3B,IAAI,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAA;IAE7B,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IAC/B,MAAM,OAAO,GAAG,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;IAE1D,gEAAgE;IAChE,IAAI,SAAiB,CAAA;IACrB,IAAI,CAAC;QACH,SAAS,GAAG,IAAI,GAAG,CAAC,WAAW,OAAO,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAClE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAC1C,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QAClC,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QAClC,SAAS,GAAG,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,EAAE,CAAA;IAC/D,CAAC;IAED,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;AACjD,CAAC","sourcesContent":["import { isIP } from 'node:net'\n\nconst IPV4_MAPPED = /^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/\n\n/**\n * Returns the canonical spelling of an IP address, so that one address always\n * yields one rate limit key: IPv4-mapped IPv6 becomes plain IPv4, and other\n * IPv6 addresses lose any zone ID and are lowercased and compressed as in RFC\n * 5952. Returns null for anything that is not an IP address.\n */\nexport function canonicalIp(ip: string): string | null {\n  const family = isIP(ip)\n  // node:net refuses leading zeros, so its IPv4 addresses are canonical.\n  if (family === 4) return ip\n  if (family !== 6) return null\n\n  const zoneIdx = ip.indexOf('%')\n  const address = zoneIdx === -1 ? ip : ip.slice(0, zoneIdx)\n\n  // The WHATWG URL parser serializes IPv6 hosts in RFC 5952 form.\n  let canonical: string\n  try {\n    canonical = new URL(`http://[${address}]`).hostname.slice(1, -1)\n  } catch {\n    return null\n  }\n\n  const mapped = IPV4_MAPPED.exec(canonical)\n  if (mapped) {\n    const hi = parseInt(mapped[1], 16)\n    const lo = parseInt(mapped[2], 16)\n    canonical = `${hi >> 8}.${hi & 0xff}.${lo >> 8}.${lo & 0xff}`\n  }\n\n  return isIP(canonical) === 0 ? null : canonical\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.5.55",
+  "version": "0.5.56",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [
@@ -40,23 +40,23 @@
     "@atproto-labs/simple-store": "^0.5.1",
     "@atproto-labs/simple-store-memory": "^0.2.6",
     "@atproto-labs/simple-store-redis": "^0.1.6",
-    "@atproto-labs/xrpc-utils": "^0.1.30",
-    "@atproto/aws": "^0.3.23",
-    "@atproto/common": "^0.8.9",
+    "@atproto-labs/xrpc-utils": "^0.1.31",
+    "@atproto/aws": "^0.3.24",
+    "@atproto/common": "^0.8.10",
     "@atproto/crypto": "^0.5.7",
     "@atproto/did": "^0.5.6",
     "@atproto/identity": "^0.5.23",
-    "@atproto/lex-cbor": "^0.1.9",
+    "@atproto/lex-cbor": "^0.1.10",
     "@atproto/lex-client": "^0.4.2",
     "@atproto/lex-data": "^0.1.10",
     "@atproto/lex-document": "^0.1.16",
     "@atproto/lex-json": "^0.1.9",
     "@atproto/lex-schema": "^0.2.11",
-    "@atproto/oauth-provider": "^0.25.5",
+    "@atproto/oauth-provider": "^0.25.6",
     "@atproto/oauth-scopes": "^0.5.14",
-    "@atproto/repo": "^0.11.4",
+    "@atproto/repo": "^0.11.5",
     "@atproto/syntax": "^0.7.7",
-    "@atproto/xrpc-server": "^0.13.9",
+    "@atproto/xrpc-server": "^0.13.10",
     "@did-plc/lib": "^0.0.4",
     "@hapi/address": "^5.1.1",
     "@noble/curves": "^1.7.0",
@@ -87,7 +87,7 @@
   },
   "devDependencies": {
     "@atproto/api": "^0.30.3",
-    "@atproto/lex": "^0.4.7",
+    "@atproto/lex": "^0.4.8",
     "@atproto/oauth-client-browser-example": "^0.2.1",
     "@atproto/oauth-client-node": "^0.5.16",
     "@did-plc/server": "^0.0.1",