update divert blob config to use basic admin auth

bluesky-social · Mar 11, 2024 · f2ac002 · f2ac002
1 parent 641fcd6
commit f2ac002
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/packages/ozone/src/config/config.ts b/packages/ozone/src/config/config.ts
@@ -51,12 +51,12 @@ export const envToCfg = (env: OzoneEnvironment): OzoneConfig => {
   }
 
   const blobDivertServiceCfg =
-    env.blobDivertServiceUrl && env.blobDivertServiceAuthToken
+    env.blobDivertUrl && env.blobDivertAdminPassword
       ? {
-          url: env.blobDivertServiceUrl,
-          authToken: env.blobDivertServiceAuthToken,
+          url: env.blobDivertUrl,
+          adminPassword: env.blobDivertAdminPassword,
         }
-      : undefined
+      : null
   const accessCfg: OzoneConfig['access'] = {
     admins: env.adminDids,
     moderators: env.moderatorDids,
@@ -70,7 +70,7 @@ export const envToCfg = (env: OzoneEnvironment): OzoneConfig => {
     pds: pdsCfg,
     cdn: cdnCfg,
     identity: identityCfg,
-    blobDivertService: blobDivertServiceCfg,
+    blobDivert: blobDivertServiceCfg,
     access: accessCfg,
   }
 }
@@ -82,7 +82,7 @@ export type OzoneConfig = {
   pds: PdsConfig | null
   cdn: CdnConfig
   identity: IdentityConfig
-  blobDivertService?: BlobReportServiceConfig
+  blobDivert: BlobDivertConfig | null
   access: AccessConfig
 }
 
@@ -94,9 +94,9 @@ export type ServiceConfig = {
   devMode?: boolean
 }
 
-export type BlobReportServiceConfig = {
+export type BlobDivertConfig = {
   url: string
-  authToken: string
+  adminPassword: string
 }
 
 export type DatabaseConfig = {

diff --git a/packages/ozone/src/config/env.ts b/packages/ozone/src/config/env.ts
@@ -25,8 +25,8 @@ export const readEnv = (): OzoneEnvironment => {
     triageDids: envList('OZONE_TRIAGE_DIDS'),
     adminPassword: envStr('OZONE_ADMIN_PASSWORD'),
     signingKeyHex: envStr('OZONE_SIGNING_KEY_HEX'),
-    blobDivertServiceUrl: envStr('OZONE_BLOB_DIVERT_SERVICE_URL'),
-    blobDivertServiceAuthToken: envStr('OZONE_BLOB_DIVERT_SERVICE_AUTH_TOKEN'),
+    blobDivertUrl: envStr('OZONE_BLOB_DIVERT_URL'),
+    blobDivertAdminPassword: envStr('OZONE_BLOB_DIVERT_ADMIN_PASSWORD'),
   }
 }
 
@@ -54,6 +54,6 @@ export type OzoneEnvironment = {
   triageDids: string[]
   adminPassword?: string
   signingKeyHex?: string
-  blobDivertServiceUrl?: string
-  blobDivertServiceAuthToken?: string
+  blobDivertUrl?: string
+  blobDivertAdminPassword?: string
 }
diff --git a/packages/ozone/src/context.ts b/packages/ozone/src/context.ts
@@ -70,10 +70,10 @@ export class AppContext {
       })
 
     const backgroundQueue = new BackgroundQueue(db)
-    const blobDiverter = cfg.blobDivertService
+    const blobDiverter = cfg.blobDivert
       ? new BlobDiverter(db, {
           idResolver,
-          serviceConfig: cfg.blobDivertService,
+          serviceConfig: cfg.blobDivert,
         })
       : undefined
     const eventPusher = new EventPusher(db, createAuthHeaders, {

diff --git a/packages/ozone/src/daemon/blob-diverter.ts b/packages/ozone/src/daemon/blob-diverter.ts
@@ -10,17 +10,17 @@ import { CID } from 'multiformats/cid'
 
 import Database from '../db'
 import { retryHttp } from '../util'
-import { BlobReportServiceConfig } from '../config'
+import { BlobDivertConfig } from '../config'
 
 export class BlobDiverter {
-  serviceConfig: BlobReportServiceConfig
+  serviceConfig: BlobDivertConfig
   idResolver: IdResolver
 
   constructor(
     public db: Database,
     services: {
       idResolver: IdResolver
-      serviceConfig: BlobReportServiceConfig
+      serviceConfig: BlobDivertConfig
     },
   ) {
     this.serviceConfig = services.serviceConfig
@@ -69,7 +69,7 @@ export class BlobDiverter {
       method: 'POST',
       data: imageStream,
       headers: {
-        Authorization: this.serviceConfig.authToken,
+        Authorization: basicAuth('admin', this.serviceConfig.adminPassword),
         'Content-Type': contentType,
       },
     })
@@ -144,3 +144,7 @@ export class BlobDiverter {
     return true
   }
 }
+
+const basicAuth = (username: string, password: string) => {
+  return 'Basic ' + Buffer.from(`${username}:${password}`).toString('base64')
+}