fix: 修复cookie在http协议下设置不生效的问题 weaigc#65

QAbot-zh · Sep 11, 2023 · ecd32b3 · ecd32b3
1 parent f5e355f
commit ecd32b3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/components/settings.tsx b/src/components/settings.tsx
@@ -47,7 +47,7 @@ export function Settings() {
       }
       setImageOnly(checked)
     } else {
-      toast.error('请先配置用户信息')
+      setImageOnly(checked)
     }
   }, [curlValue])
 
@@ -78,7 +78,10 @@ export function Settings() {
           <Input
             value={curlValue}
             placeholder="在此填写用户信息，格式: curl 'https://www.bing.com/turing/captcha/challenge' ..."
-            onChange={e => setCurlValue(e.target.value)}
+            onChange={e => {
+              setCurlValue(e.target.value)
+              setImageOnly(!Boolean(e.target.value))
+            }}
           />
           <div className="flex gap-2">
             <Switch
@@ -126,8 +129,7 @@ export function Settings() {
                     toast.error('用户信息格式不正确')
                     return
                   }
-                  const maxAge = 86400 * 30
-                  encodeHeadersToCookie(headerValue).forEach(cookie => document.cookie = `${cookie}; Max-Age=${maxAge}; Path=/; SameSite=None; Secure`)
+                  encodeHeadersToCookie(headerValue).forEach(cookie => setCookie(cookie))
                 } else {
                   [...ChunkKeys, 'BING_COOKIE', 'BING_UA', 'BING_IP', '_U'].forEach(key => setCookie(key, ''))
                 }

diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -75,7 +75,7 @@ export function parseHeadersFromCurl(content: string) {
   const re = /-H '([^:]+):\s*([^']+)/mg
   const headers: HeadersInit = {}
   content = content.replaceAll('-H "', '-H \'').replaceAll('" ^', '\'\\').replaceAll('^\\^"', '"') // 将 cmd curl 转成 bash curl
-  content.replace(re, (_: string, key: string, value: string) => {
+  content.split('curl ').shift()?.replace(re, (_: string, key: string, value: string) => {
     headers[key] = value
     return ''
   })
@@ -111,9 +111,11 @@ export function parseCookie(cookie: string, cookieName: string) {
   return targetCookie ? decodeURIComponent(targetCookie).trim() : cookie.indexOf('=') === -1 ? cookie.trim() : ''
 }
 
-export function setCookie(key: string, value: string) {
-  const maxAge = value ? 86400 * 30 : 0
-  document.cookie = `${key}=${value || ''}; Path=/; Max-Age=${maxAge}; SameSite=None; Secure`
+export function setCookie(key: string, value?: string) {
+  const cookie = value === undefined ? key : `${key}=${value || ''}`
+  const maxAge = cookie.endsWith('=') ? 0 : 86400 * 30
+  const cookieSuffix = location.protocol === 'http:' ? '' : 'SameSite=None; Secure'
+  document.cookie = `${cookie}; Path=/; Max-Age=${maxAge}; ${cookieSuffix}`
 }
 
 export function getCookie(cookieName: string) {

diff --git a/src/pages/api/create.ts b/src/pages/api/create.ts
@@ -34,7 +34,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
         }
         const cookies = [`BING_IP=${headers['x-forwarded-for']}`]
 
-        res.setHeader('set-cookie', cookies.map(cookie => `${cookie.trim()}; Max-Age=${86400 * 30}; Path=/; SameSite=None; Secure`))
+        res.setHeader('set-cookie', cookies.map(cookie => `${cookie.trim()}; Max-Age=${86400 * 30}; Path=/;`))
         debug('headers', headers)
         res.writeHead(200, {
           'Content-Type': 'application/json',