Supercharge your AI agents with data from the web and beyond. Building the library for superintelligence. 🔥
TypeScript aiai-agentsai-crawlerai-scrapingai-searchcrawlerdata-extractionhtml-to-markdownllmmarkdownscraperscrapingweb-crawlerweb-dataweb-data-extractionweb-scraperweb-scrapingweb-searchwebscraping
fix: Make PostgreSQL credentials configurable via environment variables (#2388)
Adra004a58fecf8a
diff --git a/SELF_HOST.md b/SELF_HOST.mdindex 5ba25dc9b..e67e05eca 100644--- a/SELF_HOST.md+++ b/SELF_HOST.md@@ -96,6 +96,13 @@ BULL_AUTH_KEY=CHANGEME# REDIS_URL=redis://redis:6379# REDIS_RATE_LIMIT_URL=redis://redis:6379+## === PostgreSQL Database Configuration ===+# Configure PostgreSQL credentials. These should match the credentials used by the nuq-postgres container.+# If you change these, ensure all three are set consistently.+# POSTGRES_USER=postgres+# POSTGRES_PASSWORD=postgres+# POSTGRES_DB=postgres+# Set if you have a llamaparse key you'd like to use to parse pdfs# LLAMAPARSE_API_KEY=diff --git a/apps/api/src/harness.ts b/apps/api/src/harness.tsindex 57107d350..69bc4b840 100644--- a/apps/api/src/harness.ts+++ b/apps/api/src/harness.ts@@ -96,6 +96,19 @@ const NUQ_WORKER_START_PORT = Number(const NUQ_WORKER_COUNT = Number(process.env.NUQ_WORKER_COUNT ?? "5");const NUQ_PREFETCH_WORKER_PORT = NUQ_WORKER_START_PORT + NUQ_WORKER_COUNT;+// PostgreSQL credentials (with defaults for backward compatibility)+const POSTGRES_USER = process.env.POSTGRES_USER ?? "postgres";+const POSTGRES_PASSWORD = process.env.POSTGRES_PASSWORD ?? "postgres";+const POSTGRES_DB = process.env.POSTGRES_DB ?? "postgres";+const POSTGRES_HOST = process.env.POSTGRES_HOST ?? "localhost";+const POSTGRES_PORT = process.env.POSTGRES_PORT ?? "5432";++// Shell escape helper to prevent command injection+function shellEscape(arg: string): string {+ // Wrap in single quotes and escape any single quotes within+ return `'${arg.replace(/'/g, "'\\''")}'`;+}+const logger = {section(message: string) {console.log(@@ -435,7 +448,7 @@ async function startNuqPostgresContainer(logger.info(`Starting PostgreSQL container: ${containerName}`);const start = execForward(`${runtime}@start`,- `${runtime} run -d --name ${containerName} -p 5432:5432 -e POSTGRES_PASSWORD=postgres -e POSTGRES_USER=postgres -e POSTGRES_DB=postgres firecrawl-nuq-postgres:latest`,+ `${runtime} run -d --name ${containerName} -p 5432:5432 -e POSTGRES_PASSWORD=${shellEscape(POSTGRES_PASSWORD)} -e POSTGRES_USER=${shellEscape(POSTGRES_USER)} -e POSTGRES_DB=${shellEscape(POSTGRES_DB)} firecrawl-nuq-postgres:latest`,);await start.promise;logger.success(`PostgreSQL container started: ${containerName}`);@@ -456,9 +469,9 @@ async function waitForPostgres(const client = new Client({host,port,- user: "postgres",- password: "postgres",- database: "postgres",+ user: POSTGRES_USER,+ password: POSTGRES_PASSWORD,+ database: POSTGRES_DB,connectionTimeoutMillis: 2000,});@@ -478,11 +491,28 @@ async function waitForPostgres(}async function setupNuqPostgres(): Promise<Services["nuqPostgres"]> {+ // If NUQ_DATABASE_URL is already set, respect it (user's explicit choice)if (process.env.NUQ_DATABASE_URL) {logger.info("NUQ_DATABASE_URL is set, skipping container management");return undefined;}+ // Check if we're running in docker-compose (POSTGRES_HOST is set and not localhost)+ const isDockerCompose = POSTGRES_HOST !== "localhost";++ if (isDockerCompose) {+ // Running in docker-compose: construct URL with proper encoding+ logger.section("Setting up NUQ PostgreSQL connection for docker-compose");+ const dbUrl = `postgresql://${encodeURIComponent(POSTGRES_USER)}:${encodeURIComponent(POSTGRES_PASSWORD)}@${POSTGRES_HOST}:${POSTGRES_PORT}/${encodeURIComponent(POSTGRES_DB)}`;+ process.env.NUQ_DATABASE_URL = dbUrl;+ process.env.NUQ_DATABASE_URL_LISTEN = dbUrl;+ logger.success(+ "NUQ PostgreSQL connection configured with encoded credentials",+ );+ return undefined;+ }++ // Running locally: manage containerlogger.section("Setting up NUQ PostgreSQL container");const runtime = await detectContainerRuntime();@@ -508,8 +538,8 @@ async function setupNuqPostgres(): Promise<Services["nuqPostgres"]> {// Wait for PostgreSQL to be readyawait waitForPostgres("localhost", 5432);- // Set environment variables for the services- const dbUrl = "postgresql://postgres:postgres@localhost:5432/postgres";+ // Set environment variables for the services with proper encoding+ const dbUrl = `postgresql://${encodeURIComponent(POSTGRES_USER)}:${encodeURIComponent(POSTGRES_PASSWORD)}@localhost:5432/${encodeURIComponent(POSTGRES_DB)}`;process.env.NUQ_DATABASE_URL = dbUrl;process.env.NUQ_DATABASE_URL_LISTEN = dbUrl;diff --git a/docker-compose.yaml b/docker-compose.yamlindex 221fc9fb5..184e1d60e 100644--- a/docker-compose.yaml+++ b/docker-compose.yaml@@ -25,7 +25,11 @@ x-common-env: &common-envREDIS_URL: ${REDIS_URL:-redis://redis:6379}REDIS_RATE_LIMIT_URL: ${REDIS_URL:-redis://redis:6379}PLAYWRIGHT_MICROSERVICE_URL: ${PLAYWRIGHT_MICROSERVICE_URL:-http://playwright-service:3000/scrape}- NUQ_DATABASE_URL: postgres://postgres:postgres@nuq-postgres:5432/postgres+ POSTGRES_USER: ${POSTGRES_USER:-postgres}+ POSTGRES_PASSWORD: "${POSTGRES_PASSWORD:-postgres}"+ POSTGRES_DB: ${POSTGRES_DB:-postgres}+ POSTGRES_HOST: ${POSTGRES_HOST:-nuq-postgres}+ POSTGRES_PORT: ${POSTGRES_PORT:-5432}USE_DB_AUTHENTICATION: ${USE_DB_AUTHENTICATION}OPENAI_API_KEY: ${OPENAI_API_KEY}OPENAI_BASE_URL: ${OPENAI_BASE_URL}@@ -108,9 +112,9 @@ services:nuq-postgres:build: apps/nuq-postgresenvironment:- POSTGRES_USER: postgres- POSTGRES_PASSWORD: postgres- POSTGRES_DB: postgres+ POSTGRES_USER: ${POSTGRES_USER:-postgres}+ POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}+ POSTGRES_DB: ${POSTGRES_DB:-postgres}networks:- backendports: