From deb0e1594060a0cceb2bfc4a756088c00fc38ca7 Mon Sep 17 00:00:00 2001 From: Tan Le Date: Thu, 8 Aug 2024 10:46:19 +0000 Subject: [PATCH 1/3] chore: add pm2 commands --- package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package.json b/package.json index 65f9ef8c70e..af809cadc41 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,8 @@ "build-force": "pnpm clean && turbo run build --force", "dev": "turbo run dev --parallel", "start": "run-script-os", + "start:pm2": "pm2 start pnpm --name flowise -- start", + "stop:pm2": "pm2 stop flowise", "start:windows": "cd packages/server/bin && run start", "start:default": "cd packages/server/bin && ./run start", "clean": "pnpm --filter \"./packages/**\" clean", From 67b315d6af61b0b49d3be3b6221cf0e16cd8fb32 Mon Sep 17 00:00:00 2001 From: Tan Le Date: Fri, 9 Aug 2024 04:24:51 +0000 Subject: [PATCH 2/3] chore: format package.json --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index af809cadc41..229b4f7f00e 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,8 @@ "build-force": "pnpm clean && turbo run build --force", "dev": "turbo run dev --parallel", "start": "run-script-os", - "start:pm2": "pm2 start pnpm --name flowise -- start", - "stop:pm2": "pm2 stop flowise", + "start:pm2": "pm2 start pnpm --name flowise -- start", + "stop:pm2": "pm2 stop flowise", "start:windows": "cd packages/server/bin && run start", "start:default": "cd packages/server/bin && ./run start", "clean": "pnpm --filter \"./packages/**\" clean", @@ -97,5 +97,6 @@ } ] ] - } + }, + "packageManager": "pnpm@9.7.0+sha512.dc09430156b427f5ecfc79888899e1c39d2d690f004be70e05230b72cb173d96839587545d09429b55ac3c429c801b4dc3c0e002f653830a420fa2dd4e3cf9cf" } From 15028306034e58cd906d9b51ac6c1d69a8b94603 Mon Sep 17 00:00:00 2001 From: Tan Le Date: Sun, 18 Aug 2024 11:09:28 +0700 Subject: [PATCH 3/3] fix: ignore allowed origins from chatbot config when origin header is undefined as correct cors behavior --- packages/server/src/controllers/predictions/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/server/src/controllers/predictions/index.ts b/packages/server/src/controllers/predictions/index.ts index aaebb92d400..0e78c80f7cd 100644 --- a/packages/server/src/controllers/predictions/index.ts +++ b/packages/server/src/controllers/predictions/index.ts @@ -26,13 +26,13 @@ const createPrediction = async (req: Request, res: Response, next: NextFunction) throw new InternalFlowiseError(StatusCodes.NOT_FOUND, `Chatflow ${req.params.id} not found`) } let isDomainAllowed = true - logger.info(`[server]: Request originated from ${req.headers.origin}`) + logger.info(`[server]: Request originated from ${req.headers.origin || 'UNKNOWN ORIGIN'}`) if (chatflow.chatbotConfig) { const parsedConfig = JSON.parse(chatflow.chatbotConfig) // check whether the first one is not empty. if it is empty that means the user set a value and then removed it. const isValidAllowedOrigins = parsedConfig.allowedOrigins?.length && parsedConfig.allowedOrigins[0] !== '' - if (isValidAllowedOrigins) { - const originHeader = req.headers.origin as string + if (isValidAllowedOrigins && req.headers.origin) { + const originHeader = req.headers.origin const origin = new URL(originHeader).host isDomainAllowed = parsedConfig.allowedOrigins.filter((domain: string) => {