add default allow thing

Author: tabcat

src/cli/daemon.ts

@@ -2,6 +2,7 @@ import "dotenv/config";
 import { enable, logger } from "@libp2p/logger";
 import { Multiaddr } from "@multiformats/multiaddr";
 import type { Libp2pOptions } from "libp2p";
+import { join, resolve } from "node:path";
 import { parseArgs } from "node:util";
 import { SupportedPrivateKey } from "../challenge.js";
 import { ZZZYNC } from "../constants.js";
@@ -42,8 +43,9 @@ export const run: SubCommand["run"] = async (args: string[]) => {
   ) {
     throw new Error(`--config directory must be named ".${command}"`);
   }
+  const CONFIG_DIR = resolve(values.config);
   const { CONFIG_PATH, datastore, blockstore } = await setupConfig(
-    values.config,
+    CONFIG_DIR,
     "daemon",
   );
   const config: DaemonConfig = await import(CONFIG_PATH);
@@ -74,6 +76,13 @@ export const run: SubCommand["run"] = async (args: string[]) => {
     libp2p.privateKey = privateKey;
   }
 
+  const handlerOptions = config.handlerOptions ?? {};
+
+  if (handlerOptions.allow == null) {
+    const { createAllow } = await import(join(__dirname, "default-allow.js"));
+    handlerOptions.allow = createAllow(CONFIG_DIR);
+  }
+
   const helia = await createZzzyncServer({
     blockstore,
     datastore,

src/cli/default-allow.ts

@@ -0,0 +1,33 @@
+import { logger } from "@libp2p/logger";
+import { existsSync, readFileSync, watchFile } from "node:fs";
+import { join } from "node:path";
+import { SupportedPrivateKey } from "../challenge.js";
+import { ZZZYNC } from "../constants.js";
+import { AllowFn } from "../handler.js";
+import { contenthash } from "../utils.js";
+
+const log = logger(`${ZZZYNC}:allow`);
+
+export function createDefaultAllow(configDir: string): AllowFn {
+  const allowPath = join(configDir, "allow");
+  const allowed = new Set<string>();
+
+  watchFile(allowPath, { interval: 500 }, (cur, prev) => {
+    if (cur.mtimeMs === prev.mtimeMs) {
+      return;
+    }
+    log("allow list updated");
+    allowed.clear();
+
+    if (!existsSync(allowPath)) return;
+
+    const data = readFileSync(allowPath, "utf8");
+    for (const line of data.split("\n")) {
+      allowed.add(line);
+    }
+  });
+
+  return (publicKey: SupportedPrivateKey["publicKey"]): boolean => {
+    return allowed.has(contenthash(publicKey));
+  };
+}

src/cli/upload.ts

@@ -69,8 +69,9 @@ export const run: SubCommand["run"] = async (args: string[]) => {
   ) {
     throw new Error(`--config directory must be named ".${command}"`);
   }
+  const CONFIG_DIR = resolve(values.config);
   const { CONFIG_PATH, datastore, blockstore } = await setupConfig(
-    values.config,
+    CONFIG_DIR,
     "upload",
   );
   const config: UploadConfig<ZzzyncServices> = await import(CONFIG_PATH);

src/cli/utils.ts

@@ -10,7 +10,7 @@ import { Datastore } from "interface-datastore";
 import { base36 } from "multiformats/bases/base36";
 import { existsSync } from "node:fs";
 import { mkdir } from "node:fs/promises";
-import { join, resolve } from "node:path";
+import { join } from "node:path";
 import { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { SupportedPrivateKey } from "../challenge.js";
@@ -94,16 +94,13 @@ export const setupConfig = async (
 ): Promise<
   { CONFIG_PATH: string; blockstore: Blockstore; datastore: Datastore; }
 > => {
-  const CONFIG_DIR = resolve(dir);
-  await mkdir(CONFIG_DIR, { recursive: true });
+  await mkdir(dir, { recursive: true });
 
-  const datastore = new LevelDatastore(join(CONFIG_DIR, `${space}/datastore`));
-  const blockstore = new LevelBlockstore(
-    join(CONFIG_DIR, `${space}/blockstore`),
-  );
+  const datastore = new LevelDatastore(join(dir, `${space}/datastore`));
+  const blockstore = new LevelBlockstore(join(dir, `${space}/blockstore`));
 
   const DEFAULT_CONFIG_PATH = join(__dirname, "daemon-config.js");
-  const CUSTOM_CONFIG_PATH = join(CONFIG_DIR, `${space}/config.js`);
+  const CUSTOM_CONFIG_PATH = join(dir, `${space}/config.js`);
   const CONFIG_PATH = existsSync(CUSTOM_CONFIG_PATH)
     ? CUSTOM_CONFIG_PATH
     : DEFAULT_CONFIG_PATH;

src/handler.ts

@@ -37,7 +37,11 @@ import defer from "p-defer";
 import * as varint from "uint8-varint";
 import { isUint8ArrayList, Uint8ArrayList } from "uint8arraylist";
 import { equals } from "uint8arrays";
-import { buildChallenge, generateNonce } from "./challenge.js";
+import {
+  buildChallenge,
+  generateNonce,
+  SupportedPrivateKey,
+} from "./challenge.js";
 import {
   CODEC_DAG_PB,
   CODEC_IDENTITY,
@@ -218,7 +222,7 @@ export async function* readCarFile(
 }
 
 export type AllowFn = (
-  ipnsMultihash: IpnsMultihash,
+  dialerPublicKey: SupportedPrivateKey["publicKey"],
   options?: AbortOptions,
 ) => Promise<boolean> | boolean;
 
@@ -274,7 +278,9 @@ export const createZzzyncHandler =
       }
       const dialerLibp2pKey = dialerPublicKey.toCID();
 
-      if (options.allow && !(await options.allow(dialerIpns, { signal }))) {
+      if (
+        options.allow && !(await options.allow(dialerPublicKey, { signal }))
+      ) {
         const error = new Error("ipns key not allowed");
         log.error(error.message);
         throw error;

src/utils.ts

@@ -56,6 +56,6 @@ export function publicKeyAsIpnsMultihash(
   return null;
 }
 
-export function contenthash(publicKey: PublicKey) {
+export function contenthash(publicKey: PublicKey): string {
   return `/ipns/${publicKey.toCID().toString(base36)}`;
 }