From 8d5fce9165aad1e94a00d4327f381733b92eb63b Mon Sep 17 00:00:00 2001 From: Louis Date: Thu, 21 Dec 2023 14:10:33 +0700 Subject: [PATCH] fix: malicious redirections & security risk --- docs/src/containers/Banner/index.js | 1 + docs/src/containers/Footer/index.js | 1 + extensions/inference-openai-extension/src/@types/global.d.ts | 3 +-- extensions/inference-openai-extension/src/helpers/sse.ts | 3 +-- extensions/inference-openai-extension/src/index.ts | 2 +- extensions/inference-openai-extension/webpack.config.js | 5 +---- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/docs/src/containers/Banner/index.js b/docs/src/containers/Banner/index.js index ea00cf8b1..482ff1041 100644 --- a/docs/src/containers/Banner/index.js +++ b/docs/src/containers/Banner/index.js @@ -71,6 +71,7 @@ export default function AnnoncementBanner() { key={i} href={social.href} target="_blank" + rel="noopener" > {social.icon} diff --git a/docs/src/containers/Footer/index.js b/docs/src/containers/Footer/index.js index 6c04faab6..39f6126ec 100644 --- a/docs/src/containers/Footer/index.js +++ b/docs/src/containers/Footer/index.js @@ -109,6 +109,7 @@ export default function Footer() { key={i} href={social.href} target="_blank" + rel="noopener" > {social.icon} diff --git a/extensions/inference-openai-extension/src/@types/global.d.ts b/extensions/inference-openai-extension/src/@types/global.d.ts index bb0c6e9bf..84f86c145 100644 --- a/extensions/inference-openai-extension/src/@types/global.d.ts +++ b/extensions/inference-openai-extension/src/@types/global.d.ts @@ -1,6 +1,5 @@ -import { Model } from "@janhq/core"; - declare const MODULE: string; +declare const OPENAI_DOMAIN: string; declare interface EngineSettings { full_url?: string; diff --git a/extensions/inference-openai-extension/src/helpers/sse.ts b/extensions/inference-openai-extension/src/helpers/sse.ts index 3a9401878..bbfc5e1fd 100644 --- a/extensions/inference-openai-extension/src/helpers/sse.ts +++ b/extensions/inference-openai-extension/src/helpers/sse.ts @@ -1,5 +1,4 @@ import { Observable } from "rxjs"; -import { EngineSettings, OpenAIModel } from "../@types/global"; /** * Sends a request to the inference server to generate a response based on the recent messages. @@ -16,7 +15,7 @@ export function requestInference( ): Observable { return new Observable((subscriber) => { let model_id: string = model.id; - if (engine.full_url.includes("openai.azure.com")) { + if (engine.full_url.includes(OPENAI_DOMAIN)) { model_id = engine.full_url.split("/")[5]; } const requestBody = JSON.stringify({ diff --git a/extensions/inference-openai-extension/src/index.ts b/extensions/inference-openai-extension/src/index.ts index 0f3a5064d..80d211d95 100644 --- a/extensions/inference-openai-extension/src/index.ts +++ b/extensions/inference-openai-extension/src/index.ts @@ -22,7 +22,6 @@ import { InferenceExtension } from "@janhq/core"; import { requestInference } from "./helpers/sse"; import { ulid } from "ulid"; import { join } from "path"; -import { EngineSettings, OpenAIModel } from "./@types/global"; /** * A class that implements the InferenceExtension interface from the @janhq/core package. @@ -108,6 +107,7 @@ export default class JanInferenceOpenAIExtension implements InferenceExtension { */ async inference(data: MessageRequest): Promise { const timestamp = Date.now(); + const message: ThreadMessage = { thread_id: data.threadId, created: timestamp, diff --git a/extensions/inference-openai-extension/webpack.config.js b/extensions/inference-openai-extension/webpack.config.js index 45be62271..72b7d90c1 100644 --- a/extensions/inference-openai-extension/webpack.config.js +++ b/extensions/inference-openai-extension/webpack.config.js @@ -18,10 +18,7 @@ module.exports = { plugins: [ new webpack.DefinePlugin({ MODULE: JSON.stringify(`${packageJson.name}/${packageJson.module}`), - INFERENCE_URL: JSON.stringify( - process.env.INFERENCE_URL || - "http://127.0.0.1:3928/inferences/llamacpp/chat_completion" - ), + OPENAI_DOMAIN: JSON.stringify("openai.azure.com"), }), ], output: {