diff --git a/.gitignore b/.gitignore index 9f34fcb..32c1788 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .env .venv .vscode +.idea build greeting.md node_modules diff --git a/src/proxy/anthropic.ts b/src/proxy/anthropic.ts index 19abb85..6002a2a 100644 --- a/src/proxy/anthropic.ts +++ b/src/proxy/anthropic.ts @@ -14,7 +14,7 @@ import { createPreprocessorMiddleware, finalizeBody, languageFilter, - removeOriginHeaders, + stripHeaders, } from "./middleware/request"; import { ProxyResHandlerWithBody, @@ -78,7 +78,7 @@ const rewriteAnthropicRequest = ( addAnthropicPreamble, languageFilter, blockZoomerOrigins, - removeOriginHeaders, + stripHeaders, finalizeBody, ]; diff --git a/src/proxy/middleware/request/index.ts b/src/proxy/middleware/request/index.ts index 3f10fc6..e35342b 100644 --- a/src/proxy/middleware/request/index.ts +++ b/src/proxy/middleware/request/index.ts @@ -19,7 +19,7 @@ export { blockZoomerOrigins } from "./block-zoomer-origins"; export { finalizeBody } from "./finalize-body"; export { languageFilter } from "./language-filter"; export { limitCompletions } from "./limit-completions"; -export { removeOriginHeaders } from "./remove-origin-headers"; +export { stripHeaders } from "./strip-headers"; export { transformKoboldPayload } from "./transform-kobold-payload"; /** diff --git a/src/proxy/middleware/request/remove-origin-headers.ts b/src/proxy/middleware/request/remove-origin-headers.ts deleted file mode 100644 index ae44353..0000000 --- a/src/proxy/middleware/request/remove-origin-headers.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { ProxyRequestMiddleware } from "."; - -/** - * Removes origin and referer headers before sending the request to the API for - * privacy reasons. - **/ -export const removeOriginHeaders: ProxyRequestMiddleware = (proxyReq) => { - proxyReq.setHeader("origin", ""); - proxyReq.setHeader("referer", ""); -}; diff --git a/src/proxy/middleware/request/strip-headers.ts b/src/proxy/middleware/request/strip-headers.ts new file mode 100644 index 0000000..793aae0 --- /dev/null +++ b/src/proxy/middleware/request/strip-headers.ts @@ -0,0 +1,16 @@ +import { ProxyRequestMiddleware } from "."; + +/** + * Removes origin and referer headers before sending the request to the API for + * privacy reasons. + **/ +export const stripHeaders: ProxyRequestMiddleware = (proxyReq) => { + proxyReq.setHeader("origin", ""); + proxyReq.setHeader("referer", ""); + + proxyReq.removeHeader("cf-connecting-ip"); + proxyReq.removeHeader("forwarded"); + proxyReq.removeHeader("true-client-ip"); + proxyReq.removeHeader("x-forwarded-for"); + proxyReq.removeHeader("x-real-ip"); +}; diff --git a/src/proxy/openai.ts b/src/proxy/openai.ts index 43c03ab..773ccd3 100644 --- a/src/proxy/openai.ts +++ b/src/proxy/openai.ts @@ -23,7 +23,7 @@ import { finalizeBody, languageFilter, limitCompletions, - removeOriginHeaders, + stripHeaders, } from "./middleware/request"; import { createOnProxyResHandler, @@ -127,7 +127,7 @@ const rewriteRequest = ( languageFilter, limitCompletions, blockZoomerOrigins, - removeOriginHeaders, + stripHeaders, finalizeBody, ]; @@ -148,7 +148,7 @@ const rewriteEmbeddingsRequest = ( ) => { const rewriterPipeline = [ addKeyForEmbeddingsRequest, - removeOriginHeaders, + stripHeaders, finalizeBody, ]; diff --git a/src/proxy/palm.ts b/src/proxy/palm.ts index e9b6ecc..ea5d393 100644 --- a/src/proxy/palm.ts +++ b/src/proxy/palm.ts @@ -13,7 +13,7 @@ import { createPreprocessorMiddleware, finalizeBody, languageFilter, - removeOriginHeaders, + stripHeaders, } from "./middleware/request"; import { ProxyResHandlerWithBody, @@ -83,7 +83,7 @@ const rewritePalmRequest = ( addKey, languageFilter, blockZoomerOrigins, - removeOriginHeaders, + stripHeaders, finalizeBody, ];