Fix: Disclosures

metrics/prometheus/prometheus.config.yml

@@ -6,4 +6,8 @@ scrape_configs:
       - targets: ["localhost:8080","localhost:3000"]
 
     metrics_path: /api/v1/metrics/
-    scheme: http
+    scheme: http
+
+    authorization:
+      type: Bearer
+      credentials: 'your-api-key-here'

packages/server/.env.example

@@ -169,7 +169,6 @@ JWT_REFRESH_TOKEN_EXPIRY_IN_MINUTES=43200
 # REDIS_KEEP_ALIVE=
 # ENABLE_BULLMQ_DASHBOARD=
 
-
 ############################################################################################################
 ############################################## SECURITY ####################################################
 ############################################################################################################

packages/server/src/controllers/export-import/index.ts

@@ -49,7 +49,45 @@ const importData = async (req: Request, res: Response, next: NextFunction) => {
     }
 }
 
+const exportChatflowMessages = async (req: Request, res: Response, next: NextFunction) => {
+    try {
+        const workspaceId = req.user?.activeWorkspaceId
+        if (!workspaceId) {
+            throw new InternalFlowiseError(
+                StatusCodes.NOT_FOUND,
+                `Error: exportImportController.exportChatflowMessages - workspace ${workspaceId} not found!`
+            )
+        }
+
+        const { chatflowId, chatType, feedbackType, startDate, endDate } = req.body
+        if (!chatflowId) {
+            throw new InternalFlowiseError(
+                StatusCodes.BAD_REQUEST,
+                'Error: exportImportController.exportChatflowMessages - chatflowId is required!'
+            )
+        }
+
+        const apiResponse = await exportImportService.exportChatflowMessages(
+            chatflowId,
+            chatType,
+            feedbackType,
+            startDate,
+            endDate,
+            workspaceId
+        )
+
+        // Set headers for file download
+        res.setHeader('Content-Type', 'application/json')
+        res.setHeader('Content-Disposition', `attachment; filename="${chatflowId}-Message.json"`)
+
+        return res.json(apiResponse)
+    } catch (error) {
+        next(error)
+    }
+}
+
 export default {
     exportData,
-    importData
+    importData,
+    exportChatflowMessages
 }

packages/server/src/enterprise/middleware/passport/index.ts

@@ -429,6 +429,34 @@ export const verifyToken = (req: Request, res: Response, next: NextFunction) =>
     })(req, res, next)
 }
 
+export const verifyTokenForBullMQDashboard = (req: Request, res: Response, next: NextFunction) => {
+    passport.authenticate('jwt', { session: true }, (err: any, user: LoggedInUser, info: object) => {
+        if (err) {
+            return next(err)
+        }
+
+        // @ts-ignore
+        if (info && info.name === 'TokenExpiredError') {
+            if (req.cookies && req.cookies.refreshToken) {
+                return res.redirect('/signin?retry=true')
+            }
+            return res.redirect('/signin')
+        }
+
+        if (!user) {
+            return res.redirect('/signin')
+        }
+
+        const identityManager = getRunningExpressApp().identityManager
+        if (identityManager.isEnterprise() && !identityManager.isLicenseValid()) {
+            return res.redirect('/license-expired')
+        }
+
+        req.user = user
+        next()
+    })(req, res, next)
+}
+
 const storeSSOUserPayload = (ssoToken: string, returnUser: any) => {
     const app = getRunningExpressApp()
     app.cachePool.addSSOTokenCache(ssoToken, returnUser)

packages/server/src/index.ts

@@ -3,6 +3,7 @@
 import cors from 'cors'
 import http from 'http'
 import cookieParser from 'cookie-parser'
+import basicAuth from 'express-basic-auth'
 import { DataSource, IsNull } from 'typeorm'
 import { MODE, Platform } from './Interface'
 import { getNodeModulesPackagePath, getEncryptionKey } from './utils'
@@ -18,7 +19,7 @@
 import flowiseApiV1Router from './routes'
 import errorHandlerMiddleware from './middlewares/errors'
 import { WHITELIST_URLS } from './utils/constants'
-import { initializeJwtCookieMiddleware, verifyToken } from './enterprise/middleware/passport'
+import { initializeJwtCookieMiddleware, verifyToken, verifyTokenForBullMQDashboard } from './enterprise/middleware/passport'
 import { IdentityManager } from './IdentityManager'
 import { SSEStreamer } from './utils/SSEStreamer'
 import { validateAPIKey } from './utils/validateKey'
@@ -35,6 +36,8 @@
 import { GeneralRole, Role } from './enterprise/database/entities/role.entity'
 import { migrateApiKeysFromJsonToDb } from './utils/apiKey'
 import { ExpressAdapter } from '@bull-board/express'
+import { InternalFlowiseError } from './errors/internalFlowiseError'
+import { StatusCodes } from 'http-status-codes'
 
 declare global {
     namespace Express {
@@ -331,7 +334,7 @@
         })
 
         if (process.env.MODE === MODE.QUEUE && process.env.ENABLE_BULLMQ_DASHBOARD === 'true' && !this.identityManager.isCloud()) {
-            this.app.use('/admin/queues', this.queueManager.getBullBoardRouter())
+            this.app.use('/admin/queues', verifyTokenForBullMQDashboard, this.queueManager.getBullBoardRouter())
         }
 
         // ----------------------------------------

packages/server/src/routes/export-import/index.ts

@@ -5,6 +5,8 @@ const router = express.Router()
 
 router.post('/export', checkPermission('workspace:export'), exportImportController.exportData)
 
+router.post('/chatflow-messages', checkPermission('workspace:export'), exportImportController.exportChatflowMessages)
+
 router.post('/import', checkPermission('workspace:import'), exportImportController.importData)
 
 export default router

packages/server/src/routes/index.ts

@@ -19,7 +19,6 @@ import fetchLinksRouter from './fetch-links'
 import filesRouter from './files'
 import flowConfigRouter from './flow-config'
 import getUploadFileRouter from './get-upload-file'
-import getUploadPathRouter from './get-upload-path'
 import internalChatmessagesRouter from './internal-chat-messages'
 import internalPredictionRouter from './internal-predictions'
 import leadsRouter from './leads'
@@ -93,7 +92,6 @@ router.use('/flow-config', flowConfigRouter)
 router.use('/internal-chatmessage', internalChatmessagesRouter)
 router.use('/internal-prediction', internalPredictionRouter)
 router.use('/get-upload-file', getUploadFileRouter)
-router.use('/get-upload-path', getUploadPathRouter)
 router.use('/leads', leadsRouter)
 router.use('/load-prompt', loadPromptRouter)
 router.use('/marketplaces', marketplacesRouter)