From 762913c372b021cb164bc0f3a6d553cba19d258f Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Fri, 5 Apr 2024 20:34:14 +0800 Subject: [PATCH] :bug: Fix(custom): fix compatiblity with typora --- src/main/server/index.ts | 15 +++++++++++++-- src/main/server/routerManager.ts | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/server/index.ts b/src/main/server/index.ts index 30a0ef3..158a12b 100644 --- a/src/main/server/index.ts +++ b/src/main/server/index.ts @@ -92,6 +92,17 @@ class Server { } }) } else { + const remoteAddress = request.socket.remoteAddress || 'unknown' + logger.info('[PicList Server] get a POST request from IP:', remoteAddress) + let urlSP = query ? new URLSearchParams(query) : undefined + if (remoteAddress === '::1' || remoteAddress === '127.0.0.1') { + const serverKey = picgo.getConfig('settings.serverKey') || '' + if (urlSP) { + urlSP.set('key', serverKey) + } else { + urlSP = new URLSearchParams('key=' + serverKey) + } + } if (request.headers['content-type'] && request.headers['content-type'].startsWith('multipart/form-data')) { // @ts-ignore uploadMulter.any()(request, response, (err: any) => { @@ -113,7 +124,7 @@ class Server { handler({ list, response, - urlparams: query ? new URLSearchParams(query) : undefined + urlparams: urlSP }) } }) @@ -141,7 +152,7 @@ class Server { handler!({ ...postObj, response, - urlparams: query ? new URLSearchParams(query) : undefined + urlparams: urlSP }) }) } diff --git a/src/main/server/routerManager.ts b/src/main/server/routerManager.ts index 17d3fa4..43dba2c 100644 --- a/src/main/server/routerManager.ts +++ b/src/main/server/routerManager.ts @@ -46,7 +46,7 @@ router.post('/upload', async ({ }): Promise => { try { const passedKey = urlparams?.get('key') - const serverKey = picgo.getConfig('settings.serverKey') || '' + const serverKey = picgo.getConfig('settings.serverKey') || '' if (serverKey && passedKey !== serverKey) { handleResponse({ response,