@atproto/ozone 0.1.29 → 0.1.30

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atproto/ozone
 
+## 0.1.30
+
+### Patch Changes
+
+- [#2633](https://github.com/bluesky-social/atproto/pull/2633) [`acc9093d2`](https://github.com/bluesky-social/atproto/commit/acc9093d2845eba02b68fb2f9db33e4f1b59bb10) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Obfuscate request headers in logs using utils from @atproto/common
+
+- Updated dependencies [[`acc9093d2`](https://github.com/bluesky-social/atproto/commit/acc9093d2845eba02b68fb2f9db33e4f1b59bb10)]:
+  - @atproto/common@0.4.1
+  - @atproto/crypto@0.4.0
+  - @atproto/xrpc-server@0.5.3
+
 ## 0.1.29
 
 ### Patch Changes

package/dist/logger.d.ts

@@ -1,8 +1,10 @@
+/// <reference types="node" />
 /// <reference types="node/http" />
+import { type IncomingMessage } from 'node:http';
 import { subsystemLogger } from '@atproto/common';
 export declare const dbLogger: ReturnType<typeof subsystemLogger>;
 export declare const seqLogger: ReturnType<typeof subsystemLogger>;
 export declare const httpLogger: ReturnType<typeof subsystemLogger>;
 export declare const langLogger: ReturnType<typeof subsystemLogger>;
-export declare const loggerMiddleware: import("pino-http").HttpLogger<import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, never>;
+export declare const loggerMiddleware: import("pino-http").HttpLogger<IncomingMessage, import("http").ServerResponse<IncomingMessage>, never>;
 //# sourceMappingURL=logger.d.ts.map

package/dist/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,eAAO,MAAM,QAAQ,EAAE,UAAU,CAAC,OAAO,eAAe,CAC3B,CAAA;AAC7B,eAAO,MAAM,SAAS,EAAE,UAAU,CAAC,OAAO,eAAe,CACrB,CAAA;AACpC,eAAO,MAAM,UAAU,EAAE,UAAU,CAAC,OAAO,eAAe,CAChC,CAAA;AAC1B,eAAO,MAAM,UAAU,EAAE,UAAU,CAAC,OAAO,eAAe,CAC3B,CAAA;AAE/B,eAAO,MAAM,gBAAgB,sIAU3B,CAAA"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,WAAW,CAAA;AAEhD,OAAO,EAAoB,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEnE,eAAO,MAAM,QAAQ,EAAE,UAAU,CAAC,OAAO,eAAe,CAC3B,CAAA;AAC7B,eAAO,MAAM,SAAS,EAAE,UAAU,CAAC,OAAO,eAAe,CACrB,CAAA;AACpC,eAAO,MAAM,UAAU,EAAE,UAAU,CAAC,OAAO,eAAe,CAChC,CAAA;AAC1B,eAAO,MAAM,UAAU,EAAE,UAAU,CAAC,OAAO,eAAe,CAC3B,CAAA;AAE/B,eAAO,MAAM,gBAAgB,wGAa3B,CAAA"}

package/dist/logger.js

@@ -1,10 +1,30 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loggerMiddleware = exports.langLogger = exports.httpLogger = exports.seqLogger = exports.dbLogger = void 0;
-const pino_http_1 = __importDefault(require("pino-http"));
+const pino_http_1 = __importStar(require("pino-http"));
 const common_1 = require("@atproto/common");
 exports.dbLogger = (0, common_1.subsystemLogger)('ozone:db');
 exports.seqLogger = (0, common_1.subsystemLogger)('ozone:sequencer');
@@ -13,11 +33,14 @@ exports.langLogger = (0, common_1.subsystemLogger)('ozone:lang');
 exports.loggerMiddleware = (0, pino_http_1.default)({
     logger: exports.httpLogger,
     serializers: {
-        err: (err) => {
-            return {
-                code: err?.code,
-                message: err?.message,
-            };
+        err: (err) => ({
+            code: err?.['code'],
+            message: err?.['message'],
+        }),
+        req: (req) => {
+            const serialized = pino_http_1.stdSerializers.req(req);
+            const headers = (0, common_1.obfuscateHeaders)(serialized.headers);
+            return { ...serialized, headers };
         },
     },
 });

package/dist/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAgC;AAChC,4CAAiD;AAEpC,QAAA,QAAQ,GACnB,IAAA,wBAAe,EAAC,UAAU,CAAC,CAAA;AAChB,QAAA,SAAS,GACpB,IAAA,wBAAe,EAAC,iBAAiB,CAAC,CAAA;AACvB,QAAA,UAAU,GACrB,IAAA,wBAAe,EAAC,OAAO,CAAC,CAAA;AACb,QAAA,UAAU,GACrB,IAAA,wBAAe,EAAC,YAAY,CAAC,CAAA;AAElB,QAAA,gBAAgB,GAAG,IAAA,mBAAQ,EAAC;IACvC,MAAM,EAAE,kBAAU;IAClB,WAAW,EAAE;QACX,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE;YACX,OAAO;gBACL,IAAI,EAAE,GAAG,EAAE,IAAI;gBACf,OAAO,EAAE,GAAG,EAAE,OAAO;aACtB,CAAA;QACH,CAAC;KACF;CACF,CAAC,CAAA"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uDAAoD;AACpD,4CAAmE;AAEtD,QAAA,QAAQ,GACnB,IAAA,wBAAe,EAAC,UAAU,CAAC,CAAA;AAChB,QAAA,SAAS,GACpB,IAAA,wBAAe,EAAC,iBAAiB,CAAC,CAAA;AACvB,QAAA,UAAU,GACrB,IAAA,wBAAe,EAAC,OAAO,CAAC,CAAA;AACb,QAAA,UAAU,GACrB,IAAA,wBAAe,EAAC,YAAY,CAAC,CAAA;AAElB,QAAA,gBAAgB,GAAG,IAAA,mBAAQ,EAAC;IACvC,MAAM,EAAE,kBAAU;IAClB,WAAW,EAAE;QACX,GAAG,EAAE,CAAC,GAAY,EAAE,EAAE,CAAC,CAAC;YACtB,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC;YACnB,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC;SAC1B,CAAC;QACF,GAAG,EAAE,CAAC,GAAoB,EAAE,EAAE;YAC5B,MAAM,UAAU,GAAG,0BAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAC1C,MAAM,OAAO,GAAG,IAAA,yBAAgB,EAAC,UAAU,CAAC,OAAO,CAAC,CAAA;YACpD,OAAO,EAAE,GAAG,UAAU,EAAE,OAAO,EAAE,CAAA;QACnC,CAAC;KACF;CACF,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
@@ -33,13 +33,13 @@
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
     "@atproto/api": "^0.12.24",
-    "@atproto/common": "^0.4.0",
+    "@atproto/common": "^0.4.1",
     "@atproto/crypto": "^0.4.0",
     "@atproto/identity": "^0.4.0",
     "@atproto/lexicon": "^0.4.0",
     "@atproto/syntax": "^0.3.0",
     "@atproto/xrpc": "^0.5.0",
-    "@atproto/xrpc-server": "^0.5.2"
+    "@atproto/xrpc-server": "^0.5.3"
   },
   "devDependencies": {
     "@did-plc/server": "^0.0.1",
@@ -52,7 +52,7 @@
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
     "@atproto/lex-cli": "^0.4.0",
-    "@atproto/pds": "^0.4.40"
+    "@atproto/pds": "^0.4.41"
   },
   "scripts": {
     "codegen": "lex gen-server ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/* ../../lexicons/tools/ozone/*/*",

package/src/logger.ts

@@ -1,5 +1,6 @@
-import pinoHttp from 'pino-http'
-import { subsystemLogger } from '@atproto/common'
+import { type IncomingMessage } from 'node:http'
+import pinoHttp, { stdSerializers } from 'pino-http'
+import { obfuscateHeaders, subsystemLogger } from '@atproto/common'
 
 export const dbLogger: ReturnType<typeof subsystemLogger> =
   subsystemLogger('ozone:db')
@@ -13,11 +14,14 @@ export const langLogger: ReturnType<typeof subsystemLogger> =
 export const loggerMiddleware = pinoHttp({
   logger: httpLogger,
   serializers: {
-    err: (err) => {
-      return {
-        code: err?.code,
-        message: err?.message,
-      }
+    err: (err: unknown) => ({
+      code: err?.['code'],
+      message: err?.['message'],
+    }),
+    req: (req: IncomingMessage) => {
+      const serialized = stdSerializers.req(req)
+      const headers = obfuscateHeaders(serialized.headers)
+      return { ...serialized, headers }
     },
   },
 })